[Gsrc-commit] /srv/bzr/gsrc/trunk r1047: clean up gnubatch and make the build process work unattended

[Brandon Invergo]

------------------------------------------------------------
revno: 1047
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-04 16:23:10 +0000
message:
  clean up gnubatch and make the build process work unattended
added:
  gnu/gnubatch/config.mk
  gnu/gnubatch/files/
  gnu/gnubatch/files/fix-build.diff
modified:
  gnu/gnubatch/Makefile
  gnu/gnubatch/sha256sums

=== modified file 'gnu/gnubatch/Makefile'
--- a/gnu/gnubatch/Makefile     2012-08-25 22:15:17 +0000
+++ b/gnu/gnubatch/Makefile     2012-11-04 16:23:10 +0000
@@ -1,16 +1,41 @@
 GARNAME = gnubatch
 GARVERSION = 1.6
+HOME_URL = http://www.gnu.org/software/gnubatch/
+DESCRIPTION = An advanced batch scheduling system
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnubatch/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/gnubatch/
-DESCRIPTION = GNUbatch
+PATCHFILES = fix-build.diff
+
+BUILDDEPS = bison
+LIBDEPS = ncurses gtk
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += BATCHUSER=$(BATCHUSER) STAGED_INSTALL=true
+BUILD_ARGS += BATCHUSER=$(BATCHUSER)
+#              USERMODES="-o $(BATCHUSER) -g ${ROOTGROUP} -m 4755"
+INSTALL_ARGS += BATCHUSER=$(BATCHUSER)
+#              USERMODES="-o $(BATCHUSER) -g ${ROOTGROUP} -m 4755"
+
+pre-configure:
+       sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/Makefile.in
+       sed -i -e 's/-o root/-o $(BATCHUSER)/g' $(WORKSRC)/Makefile.in
+       $(MAKECOOKIE)
+
+post-build:
+       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/-o root/-o $(BATCHUSER)/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/remcgi/Makefile
+       sed -i -e 's/-g gnubatch/-g $(BATCHUSER)/g' 
$(WORKSRC)/build/remcgi/Makefile
+       sed -i -e 's/-o root/-o $(BATCHUSER)/g' $(WORKSRC)/build/remcgi/Makefile
+       $(MAKECOOKIE)

=== added file 'gnu/gnubatch/config.mk'
--- a/gnu/gnubatch/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/gnubatch/config.mk    2012-11-04 16:23:10 +0000
@@ -0,0 +1,23 @@
+## Configuration options for gnubatch ##
+
+## NOTE:
+## Many design aspects of gnubatch work to make it largely incompatible
+## with GSRC, since it requires root priveleges for file permissions 
+## modifications. The GSRC build script probably breaks much or all of
+## gnubatch's functionalaity, so it may be preferable to install it the
+## old-fashioned way. Of course, if you have root priveledges, this may
+## not be a problem.
+
+CONFIGURE_OPTS ?= --enable-sharedlibs
+BUILD_OPTS ?=
+
+# gnubatch, by default, requires the use of a new user "gnubatch", 
+# under which it will be run. You can specify that user here. Note 
+# that, of course, that user has to exist on the system.
+BATCHUSER = gnubatch
+
+# Many files installed by gnubatch are given 'root' or 'tty' group
+# ownership. You can specify your preferred group here. The default is
+# to use the group with the same name as the user.
+ROOTGROUP = $(BATCHUSER)
+TTYGROUP = $(BATCHUSER)

=== added directory 'gnu/gnubatch/files'
=== added file 'gnu/gnubatch/files/fix-build.diff'
--- a/gnu/gnubatch/files/fix-build.diff 1970-01-01 00:00:00 +0000
+++ b/gnu/gnubatch/files/fix-build.diff 2012-11-04 16:23:10 +0000
@@ -0,0 +1,12 @@
+diff -x config.log -x config.status -ru work/gnubatch-1.6/Makefile.in 
work/gnubatch-1.6/Makefile.in
+--- work/gnubatch-1.6/Makefile.in      2012-08-08 11:04:57.000000000 +0000
++++ work/gnubatch-1.6/Makefile.in      2012-11-04 16:19:25.774362265 +0000
+@@ -41,7 +41,7 @@
+ BATCHUSER     =       @BATCHUSER@
+ INSTALL               =       @INSTALL@
+ INSTALL_DATA  =       @INSTALL_DATA@
+-STAGED_INSTALL        =       false
++STAGED_INSTALL        =       true
+ 
+ all:  buildd build-src
+ 
\ No newline at end of file

=== modified file 'gnu/gnubatch/sha256sums'
--- a/gnu/gnubatch/sha256sums   2012-08-21 10:01:24 +0000
+++ b/gnu/gnubatch/sha256sums   2012-11-04 16:23:10 +0000
@@ -1,2 +1,3 @@
 f36c08eec644e1a62646e11222e9ae8fa02e627b441c65833f465bc6661db4d6  
download/gnubatch-1.6.tar.gz
+8cb5cb4f8e00dc7027933d0eaf44c6c00a25e521b9c5bba5258f8eafe10e8bf1  
download/fix-build.diff
 225769e8fd358f5adaecc066c6a4bce507e82cf484bcfff91595ed5d47014c45  
download/gnubatch-1.6.tar.gz.sig