[csw-devel] SF.net SVN: gar:[7649] csw/mgar/pkg/spamassassin/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Thu Dec 17 17:37:57 CET 2009
Revision: 7649
http://gar.svn.sourceforge.net/gar/?rev=7649&view=rev
Author: bonivart
Date: 2009-12-17 16:37:57 +0000 (Thu, 17 Dec 2009)
Log Message:
-----------
spamassassin: update to 3.3.0 beta 1
Modified Paths:
--------------
csw/mgar/pkg/spamassassin/trunk/Makefile
csw/mgar/pkg/spamassassin/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.depend
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.gspec
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postinstall
Modified: csw/mgar/pkg/spamassassin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 14:55:24 UTC (rev 7648)
+++ csw/mgar/pkg/spamassassin/trunk/Makefile 2009-12-17 16:37:57 UTC (rev 7649)
@@ -1,6 +1,6 @@
GARNAME = spamassassin
SPKG_NAME = Mail-SpamAssassin
-GARVERSION = 3.2.5
+GARVERSION = 3.3.0
CATEGORIES = net
DESCRIPTION = mail filter with a wide range of tests
@@ -10,30 +10,33 @@
DNS blocklists, and collaborative filtering databases.
endef
-MASTER_SITES = http://apache.jumper.nu/spamassassin/source/
-DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz
+#MASTER_SITES = http://apache.jumper.nu/spamassassin/source/
+MASTER_SITES = http://people.apache.org/~wtogami/devel/
+#DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz
+DISTFILES = $(SPKG_NAME)-$(GARVERSION)-beta1.tar.gz
LICENSE = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION)/LICENSE
-REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns CSWpmuri CSWpmhtmlparser CSWzlib CSWcswclassutils
+REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1
+REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib
+REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim
+REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns
+REQUIRED_PKGS += CSWpmuri CSWpmhtmlparser CSWzlib
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_CLASSES_CSWspamassassin = none cswusergroup cswcpsampleconf cswinitsmf
+SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW
+SAMPLECONF += /opt/csw/etc/spamassassin/local\.cf\.CSW
+INITSMF = /etc/opt/csw/init.d/cswspamd
+USERGROUP = /opt/csw/etc/CSWspamassassin/cswusergroup
CONFIGURE_SCRIPTS = custom
BUILD_SCRIPTS = custom
-TEST_SCRIPTS = custom
+#TEST_SCRIPTS = custom
+TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
-PROTOTYPE_FILTER = awk ' \
- $$$$3 ~ /\/opt\/csw\/etc\/spamassassin\/.+\.pre\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
- $$$$3 ~ /\/opt\/csw\/etc\/spamassassin\/local\.cf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
- $$$$3 ~ /\/opt\/csw\/etc\/CSWspamassassin\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \
- $$$$3 ~ /\/init.d\/cswspamd$$$$/ { $$$$2 = "cswinitsmf" } \
- { print }'
-
include gar/category.mk
WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION)
@@ -45,12 +48,12 @@
perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster )
@$(MAKECOOKIE)
-pre-build-modulated:
- @echo " ==> Pre-build $(GARNAME) (custom)"
- @( cd $(WORKSRC)/spamc ; \
- sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \
- cp Makefile.tmp Makefile.in )
- @$(MAKECOOKIE)
+#pre-build-modulated:
+# @echo " ==> Pre-build $(GARNAME) (custom)"
+# @( cd $(WORKSRC)/spamc ; \
+# sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \
+# cp Makefile.tmp Makefile.in )
+# @$(MAKECOOKIE)
build-custom:
@echo " ==> Building $(GARNAME) (custom)"
@@ -66,6 +69,8 @@
install-custom:
@echo " ==> Installing $(GARNAME) (custom)"
+ @echo "LICENSE = $(WORKSRC)/LICENSE"
+ @ls -l $(WORKSRC)/LICENSE
@rm -rf $(DESTDIR)
@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
@ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)
@@ -75,8 +80,9 @@
@ginstall -m 644 $(FILEDIR)/CSWspamassassin.cswusergroup $(DESTDIR)$(sysconfdir)/CSWspamassassin/cswusergroup
@cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW
@cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd
+ echo "WORKSRC: $(WORKSRC)"
@( cd $(WORKSRC) ; \
- gmake install )
+ gmake DESTDIR=$(DESTDIR) install )
@( cd $(WORKSRC) ; \
cp -r C* INSTALL NOTICE README TRADEMARK U* ldap/ sql/ procmailrc.example sample-* $(DESTDIR)$(docdir)/$(GARNAME)/ )
@( cd $(DESTDIR)/opt/csw/etc/spamassassin ; \
Modified: csw/mgar/pkg/spamassassin/trunk/checksums
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 14:55:24 UTC (rev 7648)
+++ csw/mgar/pkg/spamassassin/trunk/checksums 2009-12-17 16:37:57 UTC (rev 7649)
@@ -1,5 +1 @@
-7fdc1651d0371c4a7f95ac9ae6f828a6 download/Mail-SpamAssassin-3.2.5.tar.gz
-cab47048b63840594cdbef3067760ec6 download/CSWspamassassin.gspec
-7048882870e87e1f8eaa193b5dcaa7a8 download/CSWspamassassin.checkinstall
-ace3e9b5c2b93703e134992fcd73522b download/CSWspamassassin.depend
-b9e397df2e43ffe120332465da5fd68f download/CSWspamassassin.postinstall
+530fb1bd28977271f30b348bc2b68db1 Mail-SpamAssassin-3.3.0-beta1.tar.gz
Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall 2009-12-17 14:55:24 UTC (rev 7648)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.checkinstall 2009-12-17 16:37:57 UTC (rev 7649)
@@ -1,35 +0,0 @@
-# checkinstall for CSWspamassassin
-# This script saves the existing configuration directory user and group
-# in variables used by postinstall to reset the configuration directory
-# permissions.
-
-# If installing on a filesystem that is not running the OS, exit this script.
-if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi
-
-if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then
- PKG_INSTALL_ROOT="/"
-fi
-
-# If available, save user and group permissions for /opt/csw/etc/spamassassin
-# directory
-CONFDIR="/etc/opt/csw/spamassassin"
-if [ ! -d "$CONFDIR" ] ; then
- CONFDIR="/opt/csw/etc/spamassassin"
- if [ ! -d "$CONFDIR" ] ; then
- CONFDIR=""
- fi
-fi
-
-if [ x"$CONFDIR" != x ] ; then
- SPAMDUSER=`ls -ld "$CONFDIR" |awk '{print $3;}'`
- SPAMDGROUP=`ls -ld "$CONFDIR" |awk '{print $4;}'`
-# Make env variables available to other packaging scripts
-cat >$1 <<!
-
-CONFDIR='$CONFDIR'
-SPAMDUSER='$SPAMDUSER'
-SPAMDGROUP='$SPAMDGROUP'
-!
-fi
-
-exit 0
Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.depend
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.depend 2009-12-17 14:55:24 UTC (rev 7648)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.depend 2009-12-17 16:37:57 UTC (rev 7649)
@@ -1,19 +0,0 @@
-P CSWosslrt
-P CSWperl
-P CSWpmarchivetar
-P CSWpmdbi
-P CSWpmdigestsha1
-P CSWpmiosocketinet6
-P CSWpmiosocketssl
-P CSWpmiozlib
-P CSWpmipcountry
-P CSWpmldap
-P CSWpmlibwww
-P CSWpmmaildkim
-P CSWpmmailspf
-P CSWpmmailtools
-P CSWpmmimebase64
-P CSWpmnetdns
-P CSWpmuri
-P CSWpmhtmlparser
-P CSWzlib
Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.gspec
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.gspec 2009-12-17 14:55:24 UTC (rev 7648)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.gspec 2009-12-17 16:37:57 UTC (rev 7649)
@@ -1,8 +0,0 @@
-%var bitname spamassassin
-%var pkgname CSWspamassassin
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
-%copyright
-
-Please see /opt/csw/share/doc/spamassassin/LICENSE for license information.
-
Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postinstall
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postinstall 2009-12-17 14:55:24 UTC (rev 7648)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.postinstall 2009-12-17 16:37:57 UTC (rev 7649)
@@ -1,34 +0,0 @@
-# SA postinstall script to copy configuration files if they do not exist.
-# 2007-09-24 Replace BASEDIR with PKG_INSTALL_ROOT
-# 2008-11-25 Added quotes on CONFDIR/SPAMDUSER in if-block
-
-# Reset permissions on the configuration directory if it existed before
-# package installation
-if [ -n "${CONFDIR}" -a -n "${SPAMDUSER}" ]; then
- echo " Resetting permissions on ${CONFDIR} to ${SPAMDUSER}:${SPAMDGROUP}."
- chown ${SPAMDUSER}:${SPAMDGROUP} ${CONFDIR}
-fi
-
-# Copy configuration files if they do not exist
-if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/local.cf ]; then
- echo "Copying configuration file /opt/csw/etc/spamassassin/local.cf"
- cp -p ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/local.cf.CSW ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/local.cf
-fi
-if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/init.pre ]; then
- echo "Copying configuration file /opt/csw/etc/spamassassin/init.pre"
- cp -p ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/init.pre.CSW ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/init.pre
-fi
-if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v310.pre ]; then
- echo "Copying configuration file /opt/csw/etc/spamassassin/v310.pre"
- cp -p ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v310.pre.CSW ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v310.pre
-fi
-if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v312.pre ]; then
- echo "Copying configuration file /opt/csw/etc/spamassassin/v312.pre"
- cp -p ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v312.pre.CSW ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v312.pre
-fi
-if [ ! -f ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v320.pre ]; then
- echo "Copying configuration file /opt/csw/etc/spamassassin/v320.pre"
- cp -p ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v320.pre.CSW ${PKG_INSTALL_ROOT}/opt/csw/etc/spamassassin/v320.pre
-fi
-
-exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list