* Only include bdb.buildlink3.mk if we are using DB[34] as a storage

  driver backend.

* Convert to use bsd.options.mk.  DSPAM_DELIVERY_AGENT_ARGS has been
  deprecated -- just set DSPAM_DELIVERY_AGENT to the LDA instead of
  "custom".

* Only install the documentation for the storage driver used by DSPAM.

* Drop the default signature lifetime from 15 days to 14 days to match
  the DSPAM defaults.

Bump the PKGREVISION to 2.

1 files changed, 35 insertions, 131 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 368f4237931..02961a46387 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2004/07/24 23:06:56 recht Exp $
-#
+# $NetBSD: Makefile,v 1.4 2004/08/06 21:24:13 jlam Exp $
 
 DISTNAME=	dspam-3.0.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
 MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.nuclearelephant.com/projects/dspam/
-COMMENT=	Extremely scalable and statistical hybrid anti-spam filter
+COMMENT=	extremely scalable, statistical-hybrid anti-spam filter
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
-GNU_CONFIGURE=		yes
 
-REPLACE_PERL=		tools/dspam_genaliases.in \
-			tools/dspam_corpus.in \
-			cgi/admin.cgi cgi/admingraph.cgi \
+USE_PERL5=		yes
+REPLACE_PERL=		tools/dspam_genaliases.in			\
+			tools/dspam_corpus.in				\
+			cgi/admin.cgi cgi/admingraph.cgi		\
 			cgi/dspam.cgi cgi/graph.cgi
 
 PKGCONFIG_OVERRIDE+=	dspam.pc.in
@@ -26,37 +25,21 @@ SUBST_CLASSES=		cgi large
 SUBST_STAGE.cgi=	post-patch
 SUBST_FILES.cgi=	cgi/dspam.cgi cgi/admin.cgi 
 SUBST_SED.cgi=		-e "s|/usr/local/bin/dspam|${PREFIX}/bin/dspam|g" \
-			-e "s|/var/dspam|${DSPAM_HOME}|g" \
-			-e "s|/usr/local|${PREFIX}|g" \
-			-e "s|LARGE_SCLAE|LARGE_SCALE|g" \
+			-e "s|/var/dspam|${DSPAM_HOME}|g"		\
+			-e "s|/usr/local|${PREFIX}|g"			\
+			-e "s|LARGE_SCLAE|LARGE_SCALE|g"		\
 			-e "s|-deaf|${DSPAM_PSFLAGS}|g"
 SUBST_MESSAGE.cgi=	"Fixing paths and typos."
 
-BDB_ACCEPTED=		db4 db3
-
-BUILD_DEFS+=		DSPAM_DELIVERY_AGENT
 BUILD_DEFS+=		DSPAM_HOME
-BUILD_DEFS+=		DSPAM_STORAGE_DRIVER
 BUILD_DEFS+=		DSPAM_SIGNATURE_LIFE
-BUILD_DEFS+=		DSPAM_SIGNATURE_ATTACHMENTS
-BUILD_DEFS+=            DSPAM_SIGNATURE_HEADERS
-BUILD_DEFS+=		DSPAM_LARGESCALE
-BUILD_DEFS+=		DSPAM_VIRTUAL_USERS
-BUILD_DEFS+=		DSPAM_USE_WEBMAIL
-BUILD_DEFS+=		DSPAM_HOMEDIR_DOTFILES
 BUILD_DEFS+=		DSPAM_USER DSPAM_GROUP
 BUILD_DEFS+=		DSPAM_BINMODE
-BUILD_DEFS+=		DSPAM_CGI_GRAPHS
-BUILD_DEFS+=		DSPAM_PSFLAGS
 
-DSPAM_DELIVERY_AGENT?=		procmail
-DSPAM_DELIVERY_AGENT_ARGS?=	# empty
+.include "../../mk/bsd.prefs.mk"
 
 DSPAM_HOME?=		${VARBASE}/dspam
-DSPAM_STORAGE_DRIVER?=	${BDB_TYPE}
-DSPAM_SIGNATURE_LIFE?=	15
-
-DSPAM_PSFLAGS?=		aux
+DSPAM_SIGNATURE_LIFE?=	14
 
 DSPAM_BINMODE?=		4511
 DSPAM_USER?=		dspam
@@ -64,7 +47,7 @@ DSPAM_GROUP?=		dspam
 PKG_GROUPS=             ${DSPAM_GROUP}
 PKG_USERS=              ${DSPAM_USER}:${DSPAM_GROUP}
 
-# Default options
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-chi-square
 CONFIGURE_ARGS+=	--enable-robinson-pvalues
 CONFIGURE_ARGS+=	--with-signature-life=${DSPAM_SIGNATURE_LIFE}
@@ -75,112 +58,33 @@ CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_USER}		\
 			--with-dspam-group=${DSPAM_GROUP}		\
 			--with-dspam-mode=${DSPAM_BINMODE}
 
-.include "../../mk/bsd.prefs.mk"
-
-#
-# Possible: procmail, maildrop or custom
-# Default: procmail
-#
-.if !empty(DSPAM_DELIVERY_AGENT:Mprocmail)
-BUILD_DEPENDS+=		procmail-[0-9]*:../../mail/procmail
-CONFIGURE_ARGS+=	--with-delivery-agent="${LOCALBASE}/bin/procmail"
-.elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop)
-BUILD_DEPENDS+=		maildrop-[0-9]*:../../mail/maildrop
-CONFIGURE_ARGS+=	--with-delivery-agent="${LOCALBASE}/bin/maildrop"
-.elif !empty(DSPAM_DELIVERY_AGENT:Mcustom)
-BUILD_DEFS+=		DSPAM_DELIVERY_AGENT_ARGS
-CONFIGURE_ARGS+=	--with-delivery-agent=${DSPAM_DELIVERY_AGENT_ARGS:Q}
-.endif
-
-#
-# Possible: mysql, pgsql, db3 or db4
-# Default: db3/db4
-#
-.if !empty(DSPAM_STORAGE_DRIVER:Mmysql)
-BUILD_DEFS+=		DSPAM_CLIENT_COMPRESSION
-.  if defined(DSPAM_CLIENT_COMPRESSION) && \
-	!empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-client-compression
-.   endif
-.  include "../../databases/mysql4-client/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv
-CONFIGURE_ARGS+=	\
-	--with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql
-CONFIGURE_ARGS+=	\
-	--with-mysql-libraries=${BUILDLINK_PREFIX.mysql-client}/lib
-.elif !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
-.  include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv
-CONFIGURE_ARGS+=	\
-	--with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql
-CONFIGURE_ARGS+=	\
-	--with-pgsql-libraries=${PGSQL_PREFIX}/lib
-.elif !empty(DSPAM_STORAGE_DRIVER:M${BDB_TYPE})
-CONFIGURE_ARGS+=	--with-storage-driver=lib${BDB_TYPE}_drv
-.endif
-
-#
-# Use of home directory dot file for opt-in/opt-out
-#
-.if defined(DSPAM_HOMEDIR_DOTFILES) && \
-    !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-homedir-dotfiles
-.endif
-
-.if defined(DSPAM_USE_WEBMAIL) && \
-    !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-webmail
-.endif
-
-.if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \
-    !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-signature-attachments
-.endif
-
-.if defined(DSPAM_SIGNATURE_HEADERS) && \
-    !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=        --enable-signature-headers
-.endif
-
-.if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-large-scale
-SUBST_STAGE.large=	post-patch
-SUBST_FILES.large=	cgi/dspam.cgi cgi/admin.cgi 
-SUBST_SED.large=	\
-	-e "s|CONFIG{'LARGE_SCALE'}.*=.*0|CONFIG{'LARGE_SCALE'}	= 1|"
-SUBST_MESSAGE.large=	"Fixing config options."
-.endif
-
-.if defined(DSPAM_VIRTUAL_USERS) && !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-virtual-users
-.endif
-
-.if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss])
-DEPENDS+=	p5-GDGraph3d-[0-9]*:../../graphics/p5-GDGraph3d
-.endif
-
-.if ${OPSYS} == "Linux"
-DSPAM_PSFLAGS?=		-deaf
-.endif
+.include "options.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
-INSTALLATION_DIRS=	share/doc/${PKGBASE} \
-			share/${PKGBASE}/txt share/${PKGBASE}/cgi \
-			share/${PKGBASE}/mysql share/${PKGBASE}/pgsql
+DOCDIR=		${PREFIX}/share/doc/dspam
+DATADIR=	${PREFIX}/share/dspam
 
 post-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASE.NOTES ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DATADIR}
 .for d in txt cgi
-	cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
-		. ${PREFIX}/share/${PKGBASE}/${d}
-.endfor
-.undef d
-	${INSTALL_DATA} ${WRKSRC}/RE* ${PREFIX}/share/doc/${PKGBASE}
-.for d in mysql pgsql
-	cd ${WRKSRC}/tools.${d}_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
-		. ${PREFIX}/share/${PKGBASE}/${d}
+	${INSTALL_DATA_DIR} ${DATADIR}/${d}
+	cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||'	\
+		. ${DATADIR}/${d}
 .endfor
 .undef d
+.if !empty(DSPAM_STORAGE_DRIVER:Mmysql)
+	${INSTALL_DATA_DIR} ${DATADIR}/mysql
+	cd ${WRKSRC}/tools.mysql_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
+		. ${DATADIR}/mysql
+.endif
+.if !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
+	${INSTALL_DATA_DIR} ${DATADIR}/pgsql
+	cd ${WRKSRC}/tools.pgsql_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
+		. ${DATADIR}/pgsql
+.endif
 
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"