[Gsrc-commit] /srv/bzr/gsrc/trunk r1218: clean up sauce and fix install

[Brandon Invergo]

------------------------------------------------------------
revno: 1218
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-20 21:57:19 +0100
message:
  clean up sauce and fix install
added:
  gnu/sauce/config.mk
  gnu/sauce/files/
  gnu/sauce/files/sauce-0.7.7-fix-install.diff
modified:
  gnu/sauce/Makefile
  gnu/sauce/sha256sums

=== modified file 'gnu/sauce/Makefile'
--- a/gnu/sauce/Makefile        2010-06-10 20:16:29 +0000
+++ b/gnu/sauce/Makefile        2012-11-20 20:57:19 +0000
@@ -1,16 +1,26 @@
 GARNAME = sauce
 GARVERSION = 0.7.7
+HOME_URL = http://www.gnu.org/software/sauce/
+DESCRIPTION = An anti-spam SMTP mail filter
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = sauce/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
-# SIGFILES = 
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/sauce/
-DESCRIPTION = sauce - anti-spam SMTP mail filter
-
-include ../../gar.lib/auto.mk
+SIGFILES = 
+PATCHFILES = $(DISTNAME)-fix-install.diff
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile-DESTDIR
+
+BUILDDEPS = tcl coreutils
+LIBDEPS = 
+
+######################################################################
+
+include ../../gar.mk
+include config.mk
+
+BUILD_ARGS += prefix=$(prefix) 
+DESTDIR_INSTALL_ARGS += prefix=$(prefix) INSTALL=$(prefix)/bin/install
+

=== added file 'gnu/sauce/config.mk'
--- a/gnu/sauce/config.mk       1970-01-01 00:00:00 +0000
+++ b/gnu/sauce/config.mk       2012-11-20 20:57:19 +0000
@@ -0,0 +1,4 @@
+## Configuration options for sauce ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?= username=mail

=== added directory 'gnu/sauce/files'
=== added file 'gnu/sauce/files/sauce-0.7.7-fix-install.diff'
--- a/gnu/sauce/files/sauce-0.7.7-fix-install.diff      1970-01-01 00:00:00 
+0000
+++ b/gnu/sauce/files/sauce-0.7.7-fix-install.diff      2012-11-20 20:57:19 
+0000
@@ -0,0 +1,49 @@
+diff -x config.log -x config.status -ru work/sauce-0.7.7/Makefile 
work/sauce-0.7.7/Makefile
+--- work/sauce-0.7.7/Makefile  2001-03-22 00:53:14.000000000 +0100
++++ work/sauce-0.7.7/Makefile  2012-11-20 21:55:21.086420344 +0100
+@@ -22,12 +22,13 @@
+ 
+ # Edit these variables, if you want to:
+ 
++DESTDIR=
+ prefix=/usr/local
+-var_base=/var
++var_base=$(prefix)/var
+ var_dir=$(var_base)/lib/sauce
+-log_dir=/var/log/sauce
+-etc_dir=/etc
+-tclsh=/usr/bin/tclsh8.2
++log_dir=$(prefix)/var/log/sauce
++etc_dir=$(prefix)/etc
++tclsh=$(prefix)/bin/tclsh8.5
+ var_run_dir=$(var_base)/run
+ fw_lockfile=$(var_run_dir)/sauce-firewall.lock
+ 
+@@ -72,16 +73,21 @@
+ all:          $(TARGETS)
+ 
+ install:      $(TARGETS)
+-              $(INSTALL_DATA) $(TCL_LIBS) $(sharelib_dir)
+-              $(INSTALL_PROGRAM) $(TCL_LIBEXECS) $(sharelib_dir)
+-              $(INSTALL_PROGRAM) $(TCL_USEREXECS) $(bin_dir)
+-              $(INSTALL_PROGRAM) $(TCL_SYSEXECS) $(sbin_dir)
++              $(INSTALL) -d $(DESTDIR)$(sharelib_dir)
++              $(INSTALL) -d $(DESTDIR)$(bin_dir)
++              $(INSTALL) -d $(DESTDIR)$(sbin_dir)
++              $(INSTALL) -d $(DESTDIR)$(uservserv_dir)
++              $(INSTALL_DATA) $(TCL_LIBS) $(DESTDIR)$(sharelib_dir)
++              $(INSTALL_PROGRAM) $(TCL_LIBEXECS) $(DESTDIR)$(sharelib_dir)
++              $(INSTALL_PROGRAM) $(TCL_USEREXECS) $(DESTDIR)$(bin_dir)
++              $(INSTALL_PROGRAM) $(TCL_SYSEXECS) $(DESTDIR)$(sbin_dir)
+               set -e; for f in $(USERV_SERVS); do \
+-                      $(INSTALL_DATA) $$f $(uservserv_dir)/$$f:example; \
++                      $(INSTALL_DATA) $$f 
$(DESTDIR)$(uservserv_dir)/$$f:example; \
+               done
+ 
+ install_doc:  $(DOC_FILES)
+-              $(INSTALL_DATA) $(DOC_FILES) $(doc_dir)
++              $(INSTALL) -d $(DESTDIR)$(doc_dir)
++              $(INSTALL_DATA) $(DOC_FILES) $(DESTDIR)$(doc_dir)
+ 
+ settings:     Makefile
+               $(tclsh) setsettings.tcl >address@hidden                        
        \

=== modified file 'gnu/sauce/sha256sums'
--- a/gnu/sauce/sha256sums      2010-06-11 09:39:08 +0000
+++ b/gnu/sauce/sha256sums      2012-11-20 20:57:19 +0000
@@ -1,1 +1,2 @@
 a39a731d48e161db9cf1edec95df307ea2b61163eae13512e6c689f8d222077b  
download/sauce-0.7.7.tar.gz
+6eb83fbb42b0e2f6d21d290a40323fa3a1617ca588d75e1534ea6b7614391093  
download/sauce-0.7.7-fix-install.diff