diff options
| -rw-r--r-- | mail/dspam/Makefile | 30 | ||||
| -rw-r--r-- | mail/dspam/distinfo | 6 | ||||
| -rw-r--r-- | mail/dspam/options.mk | 6 | ||||
| -rw-r--r-- | mail/dspam/patches/patch-aa | 4 | ||||
| -rw-r--r-- | mail/dspam/patches/patch-ad | 4 |
5 files changed, 28 insertions, 22 deletions
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 88da2f5a53a..da68c021837 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2010/02/04 02:00:36 joerg Exp $ +# $NetBSD: Makefile,v 1.66 2010/03/10 13:43:38 martti Exp $ DISTNAME= dspam-3.8.0 PKGREVISION= 5 @@ -6,9 +6,11 @@ CATEGORIES= mail MASTER_SITES= http://dspam.nuclearelephant.com/sources/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://dspam.nuclearelephant.com/ +HOMEPAGE= http://dspam.sourceforge.net/ COMMENT= Extremely scalable, statistical-hybrid anti-spam filter +LICENSE= gnu-gpl-v2 + PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes @@ -65,15 +67,15 @@ DSPAM_WWWGROUP?= ${APACHE_GROUP} PKG_GROUPS_VARS+= DSPAM_GROUP DSPAM_WWWGROUP PKG_USERS_VARS+= DSPAM_USER DSPAM_WWWUSER -CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE:Q} -CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \ - --with-dspam-home-owner=${DSPAM_USER:Q} \ - --with-dspam-home-group=${DSPAM_GROUP:Q} \ - --with-dspam-owner=${DSPAM_USER:Q} \ - --with-dspam-group=${DSPAM_GROUP:Q} \ - --with-dspam-mode=${DSPAM_BINMODE:Q} \ - --with-logdir=${DSPAM_LOGDIR:Q} \ - --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE} +CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \ + --with-dspam-home-owner=${DSPAM_USER} \ + --with-dspam-home-group=${DSPAM_GROUP} \ + --with-dspam-owner=${DSPAM_USER} \ + --with-dspam-group=${DSPAM_GROUP} \ + --with-dspam-mode=${DSPAM_BINMODE} \ + --with-logdir=${DSPAM_LOGDIR} \ + --sysconfdir=${PKG_SYSCONFDIR} .include "options.mk" .include "../../mk/pthread.buildlink3.mk" @@ -104,9 +106,9 @@ OWN_DIRS_PERMS= ${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_WWWGROUP} 0775 OWN_DIRS_PERMS+= ${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775 OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770 -FILES_SUBST+= DSPAM_USER=${DSPAM_USER:Q} -FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP:Q} -FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR:Q} +FILES_SUBST+= DSPAM_USER=${DSPAM_USER} +FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP} +FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR} SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo index 6bf7e40e70c..e4b7a7d7c79 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.32 2009/03/16 18:13:34 adrianp Exp $ +$NetBSD: distinfo,v 1.33 2010/03/10 13:43:38 martti Exp $ SHA1 (dspam-3.8.0.tar.gz) = d1de7ee2134522adaf52f49167accecf1589fa96 RMD160 (dspam-3.8.0.tar.gz) = e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 Size (dspam-3.8.0.tar.gz) = 726160 bytes -SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c -SHA1 (patch-ad) = cfa68c01cb3f5ce0556c7a3b008dc214bdfbbd95 +SHA1 (patch-aa) = ff48b3bb84a13f841ee38115377fcb97d03798c0 +SHA1 (patch-ad) = 581ac7b6e01e68474ecf944be8620212d69900b9 SHA1 (patch-ae) = 21f450dd67dc2101b44f1a952632b933a3c8a913 SHA1 (patch-af) = 31c86b3f0cb7d7856e46207bee656472fcd093e0 SHA1 (patch-ag) = d4b1cf206f8113a1150687e2942bd69f0b9767ee diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk index 1b7789f97e4..af4628170f3 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.24 2009/08/17 19:09:13 sno Exp $ +# $NetBSD: options.mk,v 1.25 2010/03/10 13:43:38 martti Exp $ .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom) DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS} @@ -24,11 +24,11 @@ PKG_OPTIONS_LEGACY_OPTS+= preferences-extension:dspam-preferences-extension DSPAM_DELIVERY_AGENT?= procmail BUILD_DEFS+= DSPAM_DELIVERY_AGENT .if !empty(DSPAM_DELIVERY_AGENT:Mprocmail) -DSPAM_DELIVERY_AGENT_BIN?= ${LOCALBASE}/bin/procmail +DSPAM_DELIVERY_AGENT_BIN?= ${PREFIX}/bin/procmail BUILD_DEPENDS+= procmail-[0-9]*:../../mail/procmail CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop) -DSPAM_DELIVERY_AGENT_BIN?= ${LOCALBASE}/bin/maildrop +DSPAM_DELIVERY_AGENT_BIN?= ${PREFIX}/bin/maildrop BUILD_DEPENDS+= maildrop-[0-9]*:../../mail/maildrop CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .elif !empty(DSPAM_DELIVERY_AGENT) diff --git a/mail/dspam/patches/patch-aa b/mail/dspam/patches/patch-aa index bed1d6e5fb0..456ec435fee 100644 --- a/mail/dspam/patches/patch-aa +++ b/mail/dspam/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2005/10/20 08:33:13 adrianp Exp $ +$NetBSD: patch-aa,v 1.5 2010/03/10 13:43:38 martti Exp $ + +Make this pkgsrc friendly. --- src/Makefile.in.orig 2005-10-17 14:07:30.000000000 +0100 +++ src/Makefile.in diff --git a/mail/dspam/patches/patch-ad b/mail/dspam/patches/patch-ad index 892051bdaba..518a57b9430 100644 --- a/mail/dspam/patches/patch-ad +++ b/mail/dspam/patches/patch-ad @@ -1,4 +1,6 @@ -$NetBSD: patch-ad,v 1.2 2006/05/06 08:36:10 xtraeme Exp $ +$NetBSD: patch-ad,v 1.3 2010/03/10 13:43:38 martti Exp $ + +Make this pkgsrc friendly. --- src/dspam.conf.in.orig 2006-02-15 22:06:35.000000000 +0200 +++ src/dspam.conf.in 2006-05-05 23:44:16.000000000 +0300 |