Sat May 23 12:33:22 2020 UTC ()
mail/dspam: remove unknown configure option


(rillig)
diff -r1.103 -r1.104 pkgsrc/mail/dspam/Makefile
cvs diff -r1.103 -r1.104 pkgsrc/mail/dspam/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/dspam/Makefile 2020/04/28 17:47:59 1.103
+++ pkgsrc/mail/dspam/Makefile 2020/05/23 12:33:22 1.104
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.103 2020/04/28 17:47:59 rillig Exp $ 1# $NetBSD: Makefile,v 1.104 2020/05/23 12:33:22 rillig Exp $
2 2
3DISTNAME= dspam-3.10.2 3DISTNAME= dspam-3.10.2
4PKGREVISION= 27 4PKGREVISION= 28
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dspam/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dspam/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://dspam.sourceforge.net/ 9HOMEPAGE= http://dspam.sourceforge.net/
10COMMENT= Extremely scalable, statistical-hybrid anti-spam filter 10COMMENT= Extremely scalable, statistical-hybrid anti-spam filter
11 11
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16 16
17USE_TOOLS+= pax perl:run pkg-config 17USE_TOOLS+= pax perl:run pkg-config
@@ -29,56 +29,58 @@ SUBST_CLASSES+= cgi @@ -29,56 +29,58 @@ SUBST_CLASSES+= cgi
29SUBST_STAGE.cgi= pre-configure 29SUBST_STAGE.cgi= pre-configure
30SUBST_FILES.cgi+= webui/cgi-bin/configure.pl.in 30SUBST_FILES.cgi+= webui/cgi-bin/configure.pl.in
31SUBST_FILES.cgi+= webui/cgi-bin/dspam.cgi webui/cgi-bin/admin.cgi 31SUBST_FILES.cgi+= webui/cgi-bin/dspam.cgi webui/cgi-bin/admin.cgi
32SUBST_FILES.cgi+= webui/cgi-bin/graph.cgi webui/cgi-bin/admingraph.cgi 32SUBST_FILES.cgi+= webui/cgi-bin/graph.cgi webui/cgi-bin/admingraph.cgi
33SUBST_SED.cgi= -e "s|auxw|${DSPAM_PSFLAGS}|g" 33SUBST_SED.cgi= -e "s|auxw|${DSPAM_PSFLAGS}|g"
34SUBST_SED.cgi+= -e "s|yourdomain.com|${DSPAM_DOMAIN}|g" 34SUBST_SED.cgi+= -e "s|yourdomain.com|${DSPAM_DOMAIN}|g"
35SUBST_SED.cgi+= -e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|" 35SUBST_SED.cgi+= -e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|"
36SUBST_SED.cgi+= -e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|" 36SUBST_SED.cgi+= -e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|"
37SUBST_SED.cgi+= -e "s|\"\\/\";|\"${DSPAM_WWWHOME}\";|" 37SUBST_SED.cgi+= -e "s|\"\\/\";|\"${DSPAM_WWWHOME}\";|"
38SUBST_SED.cgi+= -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|" 38SUBST_SED.cgi+= -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|"
39SUBST_MESSAGE.cgi= Fixing paths and default options. 39SUBST_MESSAGE.cgi= Fixing paths and default options.
40 40
41BUILD_DEFS+= DSPAM_HOME VARBASE 41BUILD_DEFS+= DSPAM_HOME VARBASE
42BUILD_DEFS+= DSPAM_SIGNATURE_LIFE 
43BUILD_DEFS+= DSPAM_BINMODE 42BUILD_DEFS+= DSPAM_BINMODE
44BUILD_DEFS+= DSPAM_LOGDIR 43BUILD_DEFS+= DSPAM_LOGDIR
45BUILD_DEFS+= DSPAM_LOGFILE 44BUILD_DEFS+= DSPAM_LOGFILE
46BUILD_DEFS+= DSPAM_DOMAIN 45BUILD_DEFS+= DSPAM_DOMAIN
47BUILD_DEFS+= DSPAM_WWWHOME 46BUILD_DEFS+= DSPAM_WWWHOME
48BUILD_DEFS+= DSPAM_PIDDIR 47BUILD_DEFS+= DSPAM_PIDDIR
49BUILD_DEFS+= APACHE_USER 48BUILD_DEFS+= APACHE_USER
50BUILD_DEFS+= APACHE_GROUP 49BUILD_DEFS+= APACHE_GROUP
51 50
52.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
53 52
 53# Can be removed after 2020Q4.
 54.if defined(DSPAM_SIGNATURE_LIFE)
 55PKG_FAIL_REASON+= "DSPAM_SIGNATURE_LIFE is not used anymore."
 56.endif
 57
54DSPAM_HOME?= ${VARBASE}/dspam 58DSPAM_HOME?= ${VARBASE}/dspam
55DSPAM_SIGNATURE_LIFE?= 14 
56 59
57DSPAM_BINMODE?= 4511 60DSPAM_BINMODE?= 4511
58DSPAM_USER?= dspam 61DSPAM_USER?= dspam
59DSPAM_GROUP?= dspam 62DSPAM_GROUP?= dspam
60DSPAM_LOGDIR?= ${DSPAM_HOME}/log 63DSPAM_LOGDIR?= ${DSPAM_HOME}/log
61DSPAM_LOGFILE?= ${DSPAM_LOGDIR}/dspam.log 64DSPAM_LOGFILE?= ${DSPAM_LOGDIR}/dspam.log
62DSPAM_DOMAIN?= yourdomain.com 65DSPAM_DOMAIN?= yourdomain.com
63DSPAM_WWWHOME?= /dspam 66DSPAM_WWWHOME?= /dspam
64DSPAM_PIDDIR?= ${VARBASE}/run/dspam 67DSPAM_PIDDIR?= ${VARBASE}/run/dspam
65DSPAM_WWWUSER?= ${APACHE_USER} 68DSPAM_WWWUSER?= ${APACHE_USER}
66DSPAM_WWWGROUP?= ${APACHE_GROUP} 69DSPAM_WWWGROUP?= ${APACHE_GROUP}
67 70
68PKG_GROUPS_VARS+= DSPAM_GROUP DSPAM_WWWGROUP 71PKG_GROUPS_VARS+= DSPAM_GROUP DSPAM_WWWGROUP
69PKG_USERS_VARS+= DSPAM_USER DSPAM_WWWUSER 72PKG_USERS_VARS+= DSPAM_USER DSPAM_WWWUSER
70 73
71CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE} 
72CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \ 74CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \
73 --with-dspam-home-owner=${DSPAM_USER} \ 75 --with-dspam-home-owner=${DSPAM_USER} \
74 --with-dspam-home-group=${DSPAM_GROUP} \ 76 --with-dspam-home-group=${DSPAM_GROUP} \
75 --with-dspam-owner=${DSPAM_USER} \ 77 --with-dspam-owner=${DSPAM_USER} \
76 --with-dspam-group=${DSPAM_GROUP} \ 78 --with-dspam-group=${DSPAM_GROUP} \
77 --with-dspam-mode=${DSPAM_BINMODE} \ 79 --with-dspam-mode=${DSPAM_BINMODE} \
78 --with-logdir=${DSPAM_LOGDIR} \ 80 --with-logdir=${DSPAM_LOGDIR} \
79 --sysconfdir=${PKG_SYSCONFDIR} 81 --sysconfdir=${PKG_SYSCONFDIR}
80 82
81.include "options.mk" 83.include "options.mk"
82.include "../../mk/pthread.buildlink3.mk" 84.include "../../mk/pthread.buildlink3.mk"
83 85
84DOCDIR= ${PREFIX}/share/doc/dspam 86DOCDIR= ${PREFIX}/share/doc/dspam