[Gsrc-commit] /srv/bzr/gsrc/trunk r1092: clean up gnuspool and fix build

[Brandon Invergo]

------------------------------------------------------------
revno: 1092
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-10 12:31:41 +0100
message:
  clean up gnuspool and fix build
added:
  gnu/gnuspool/config.mk
  gnu/gnuspool/files/
  gnu/gnuspool/files/fix-build.diff
modified:
  gnu/gnuspool/Makefile
  gnu/gnuspool/sha256sums

=== modified file 'gnu/gnuspool/Makefile'
--- a/gnu/gnuspool/Makefile     2010-10-23 11:04:01 +0000
+++ b/gnu/gnuspool/Makefile     2012-11-10 11:31:41 +0000
@@ -1,16 +1,38 @@
 GARNAME = gnuspool
 GARVERSION = 1.8
+HOME_URL = http://www.gnu.org/software/gnuspool/
+DESCRIPTION = An advanced spooling system
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnuspool/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/gnuspool/
-DESCRIPTION = GNUspool
+PATCHFILES = fix-build.diff
+
+BUILDDEPS =  
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+INSTALL_ARGS += CFLAGS="-I$(prefix)/include \
+                         -I$(prefix)/include/gtk-2.0" \
+               STAGED_INSTALL=true
+
+post-build:
+       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' $(WORKSRC)/build/Makefile
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/Makefile
+       sed -i -e 's/-g tty/-g $(TTYGROUP)/g' $(WORKSRC)/build/Makefile
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/loccgi/Makefile
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/ins/Makefile
+       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' $(WORKSRC)/build/remcgi/Makefile
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/remcgi/Makefile
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' 
$(WORKSRC)/build/termserv/Makefile
+       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' 
$(WORKSRC)/build/termserv/Makefile
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/lpdint/Makefile
+       sed -i -e 's/-o root/-o $(SPOOLUSER)/g' $(WORKSRC)/build/lpdint/Makefile
+       $(MAKECOOKIE)

=== added file 'gnu/gnuspool/config.mk'
--- a/gnu/gnuspool/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/gnuspool/config.mk    2012-11-10 11:31:41 +0000
@@ -0,0 +1,13 @@
+## Configuration options for gnuspool ##
+
+# gnuspool requires that you set a spool user (default gnuspool)
+SPOOLUSER=gnuspool
+# some files are normally installed to the root group. You can change that here
+ROOTGROUP=$(SPOOLUSER)
+# same for the tty group
+TTYGROUP=$(SPOOLUSER)
+
+CONFIGURE_OPTS ?= --without-x --with-spool-directory=$(prefix)/var/gspool 
SPOOLUSER=$(SPOOLUSER)
+BUILD_OPTS ?=
+
+

=== added directory 'gnu/gnuspool/files'
=== added file 'gnu/gnuspool/files/fix-build.diff'
--- a/gnu/gnuspool/files/fix-build.diff 1970-01-01 00:00:00 +0000
+++ b/gnu/gnuspool/files/fix-build.diff 2012-11-10 11:31:41 +0000
@@ -0,0 +1,108 @@
+diff -x config.log -x config.status -ru work/gnuspool-1.8/Makefile.in 
work/gnuspool-1.8/Makefile.in
+--- work/gnuspool-1.8/Makefile.in      2010-01-30 19:52:13.000000000 +0100
++++ work/gnuspool-1.8/Makefile.in      2012-11-10 12:20:23.774584437 +0100
+@@ -63,8 +63,8 @@
+       cp -r -p ptrinstall $(DATADIR)
+       cd doc;$(MAKE) install
+       cd cupspy;$(MAKE) install
+-      $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -R
+-      $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -p ALL `who am i|sed -e 's/ 
.*//'`
++#     $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -R
++#     $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -p ALL `who am i|sed -e 's/ 
.*//'`
+       cd udev;$(MAKE) install
+ 
+ install-strip:        all
+@@ -77,8 +77,8 @@
+       cp -r -p ptrinstall $(DATADIR)
+       cd doc;$(MAKE) install-strip
+       cd cupspy;$(MAKE) install-strip
+-      $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -R
+-      $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -p ALL `who am i|sed -e 's/ 
.*//'`
++#     $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -R
++#     $(STAGED_INSTALL) || $(BINDIR)/gspl-uchange -p ALL `who am i|sed -e 's/ 
.*//'`
+       cd udev;$(MAKE) install
+ 
+ install-user user-install:
+diff -x config.log -x config.status -ru work/gnuspool-1.8/doc/Makefile.in 
work/gnuspool-1.8/doc/Makefile.in
+--- work/gnuspool-1.8/doc/Makefile.in  2010-07-01 21:55:35.000000000 +0200
++++ work/gnuspool-1.8/doc/Makefile.in  2012-11-10 12:20:23.791251109 +0100
+@@ -40,6 +40,11 @@
+       # Currently don't do anything
+ 
+ install install-strip: all
++      $(INSTALL) -d -m 755 $(MANDIR)/man1
++      $(INSTALL) -d -m 755 $(MANDIR)/man3
++      $(INSTALL) -d -m 755 $(MANDIR)/man5
++      $(INSTALL) -d -m 755 $(MANDIR)/man8
++      $(INSTALL) -d -m 755 $(PDFDIR)
+       $(INSTALL_DATA) poddoc/man/*.1 $(MANDIR)/man1
+       $(INSTALL_DATA) poddoc/man/*.3 $(MANDIR)/man3
+       $(INSTALL_DATA) poddoc/man/*.5 $(MANDIR)/man5
+diff -x config.log -x config.status -ru 
work/gnuspool-1.8/src/apilib/Makefile.in 
work/gnuspool-1.8/src/apilib/Makefile.in
+--- work/gnuspool-1.8/src/apilib/Makefile.in   2010-02-01 16:59:36.000000000 
+0100
++++ work/gnuspool-1.8/src/apilib/Makefile.in   2012-11-10 12:20:23.791251109 
+0100
+@@ -73,11 +73,15 @@
+       sh ./Hdrmake.sh $(BASE)/config.h $(HDRS)
+ 
+ install: all
++      $(INSTALL) -d -m 755 $(INCLUDEDIR)
++      $(INSTALL) -d -m 755 $(LIBDIR)
+       libtool --mode=install $(INSTALL) $(APILIB) $(LIBDIR)
+       $(INSTALL_DATA) gspool.h $(INCLUDEDIR)
+       $(INSTALL_DATA) $(APILIB) $(LIBDIR)
+ 
+ install-strip: all
++      $(INSTALL) -d -m 755 $(INCLUDEDIR)
++      $(INSTALL) -d -m 755 $(LIBDIR)
+       libtool --mode=install $(INSTALL) -s $(APILIB) $(LIBDIR)/$(APILIB)
+       $(INSTALL_DATA) gspool.h $(INCLUDEDIR)
+       $(INSTALL_DATA) $(APILIB) $(LIBDIR)
+diff -x config.log -x config.status -ru work/gnuspool-1.8/src/lib/Makefile.in 
work/gnuspool-1.8/src/lib/Makefile.in
+--- work/gnuspool-1.8/src/lib/Makefile.in      2010-10-04 13:12:51.000000000 
+0200
++++ work/gnuspool-1.8/src/lib/Makefile.in      2012-11-10 12:20:23.791251109 
+0100
+@@ -71,12 +71,14 @@
+       libtool --mode=link @CC@ $(CCFLAGS) -o $(LIBCURS) $(LIBCURSOBJS) $(LIB) 
$(LIBCURSES) -rpath $(RPATH) -version-info 0:0:0
+ 
+ install: all
++      $(INSTALL) -d -m 755 $(LIBDIR)
+       libtool --mode=install $(INSTALL) $(LIB) $(LIBDIR)
+       libtool --mode=install $(INSTALL) $(LIBCURS) $(LIBDIR)
+       $(RM) $(LIBDIR)/libgnuspool_int.a $(LIBDIR)/libgnuspool_curs.a 
+       $(INSTALL_DATA) $(LIB) $(LIBCURS) $(LIBDIR)
+ 
+ install-strip: all
++      $(INSTALL) -d -m 755 $(LIBDIR)
+       libtool --mode=install $(INSTALL) -s $(LIB) $(LIBDIR)
+       libtool --mode=install $(INSTALL) -s $(LIBCURS) $(LIBDIR)
+       $(RM) $(LIBDIR)/libgnuspool_int.a $(LIBDIR)/libgnuspool_curs.a 
+diff -x config.log -x config.status -ru 
work/gnuspool-1.8/src/lpdint/Makefile.in 
work/gnuspool-1.8/src/lpdint/Makefile.in
+--- work/gnuspool-1.8/src/lpdint/Makefile.in   2009-05-18 13:27:26.000000000 
+0200
++++ work/gnuspool-1.8/src/lpdint/Makefile.in   2012-11-10 12:20:23.791251109 
+0100
+@@ -85,6 +85,7 @@
+       sed -e 's|SPOOLDIR|@spooldir@|' -e 's|DATADIR|@pkgdatadir@|' xtlpc-ctrl 
>$(DATADIR)/xtlpc-ctrl
+       sed -e 's|SPOOLDIR|@spooldir@|' -e 's|DATADIR|@pkgdatadir@|' xtlpd-ctrl 
>$(DATADIR)/xtlpd-ctrl
+       chown $(SPOOLUSER) $(DATADIR)/xtlpc-ctrl $(DATADIR)/xtlpd-ctrl
++      $(INSTALL) -d -m 755 $(SYSCONFDIR)
+       echo '1  BSD  -  -' >$(SYSCONFDIR)/gnuspool.ext
+ 
+ install-strip:        all
+@@ -96,6 +97,7 @@
+       sed -e 's|SPOOLDIR|@spooldir@|' -e 's|DATADIR|@pkgdatadir@|' xtlpc-ctrl 
>$(DATADIR)/xtlpc-ctrl
+       sed -e 's|SPOOLDIR|@spooldir@|' -e 's|DATADIR|@pkgdatadir@|' xtlpd-ctrl 
>$(DATADIR)/xtlpd-ctrl
+       chown $(SPOOLUSER) $(DATADIR)/xtlpc-ctrl $(DATADIR)/xtlpd-ctrl
++      $(INSTALL) -d -m 755 $(SYSCONFDIR)
+       echo '1  BSD  -  -' >$(SYSCONFDIR)/gnuspool.ext
+ 
+ clean:
+diff -x config.log -x config.status -ru work/gnuspool-1.8/util/Makefile.in 
work/gnuspool-1.8/util/Makefile.in
+--- work/gnuspool-1.8/util/Makefile.in 2010-07-01 21:33:09.000000000 +0200
++++ work/gnuspool-1.8/util/Makefile.in 2012-11-10 12:20:23.757917764 +0100
+@@ -36,7 +36,7 @@
+ LEX           =       @LEX@
+ LEXLIB                =       @LEXLIB@
+ RM            =       rm -f
+-PROGS         =       gspl-pmenu gspl-hostedit gspl-xhostedit gspl-passwd
++PROGS         =       gspl-pmenu gspl-hostedit gspl-passwd
+ BUILDPROGS    =       helpparse
+ BINDIR                =       $(DESTDIR)@bindir@
+ SBINDIR               =       $(DESTDIR)@sbindir@

=== modified file 'gnu/gnuspool/sha256sums'
--- a/gnu/gnuspool/sha256sums   2010-10-23 11:02:54 +0000
+++ b/gnu/gnuspool/sha256sums   2012-11-10 11:31:41 +0000
@@ -1,2 +1,3 @@
 3ec91f291d5f49385e126fa26db2e1aefe688fc26570b4da412e470162e7bacb  
download/gnuspool-1.8.tar.gz
+ac39722ce521e7ccf91dd6116a17bf6c012d8595253921fba74a9a5d448e405f  
download/fix-build.diff
 418556a7ee26f32fde200815240a14a9bcfa01e259b4d6aab93f253c268d3d29  
download/gnuspool-1.8.tar.gz.sig