4 files changed, 31 insertions, 12 deletions

diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index 904046fae6e4..7dd56c3691c4 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	spambnc
-PORTVERSION=	20041223
+PORTVERSION=	20050115
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spambouncer.org/	\
 		ftp://ftp.spambouncer.org/
-DISTFILES=	sb.tar.gz index.shtml
+DISTFILES=	sb-new.tar.gz index.shtml
 DIST_SUBDIR=	spambnc-${PORTVERSION}
-EXTRACT_ONLY=	sb.tar.gz
+EXTRACT_ONLY=	sb-new.tar.gz
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Set of procmail recipies which handle known/suspected spam
@@ -23,14 +23,27 @@ IGNOREFILES=	index.shtml
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/.pkg-plist
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+SUB_DIRS=	functions docs data auxiliary
+
+.if !defined(NOPORTDOCS)
+MASTER_SITES+=	http://www.spambouncer.org/webdev/configure/:upg
+DISTFILES+=	upgrading.shtml:upg
+IGNOREFILES+=	upgrading.shtml
+.endif
 
 pre-install:
 	@${RM} -f ${PLIST}
 	@(cd ${WRKDIR} && ${FIND} -s . -type f | ${GREP} -v "^\.\/\." | \
 		${SED} -e 's,.,%%DATADIR%%,1' >> ${PLIST})
+.for dd in ${SUB_DIRS}
+	@${ECHO_CMD} "@dirrm %%DATADIR%%/${dd}" >> ${PLIST}
+.endfor
 	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	@${ECHO_CMD} "%%DOCSDIR%%/documentation.html" >> ${PLIST}
+	@${ECHO_CMD} "%%DOCSDIR%%/upgrading.html" >> ${PLIST}
 	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >> ${PLIST}
 .endif
 
@@ -41,9 +54,13 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/index.shtml \
 		${DOCSDIR}/documentation.html
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/upgrading.shtml \
+		${DOCSDIR}/upgrading.html
 .endif
 
 post-install:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
+	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},;s,%%DATADIR%%,${DATADIR},' \
+		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/spambnc/distinfo b/mail/spambnc/distinfo
index c3710cccd7cc..b6658da3c0ac 100644
--- a/mail/spambnc/distinfo
+++ b/mail/spambnc/distinfo
@@ -1,3 +1,4 @@
-MD5 (spambnc-20041223/sb.tar.gz) = e6b2c0be71ac2fc3a0dfa76909f85491
-SIZE (spambnc-20041223/sb.tar.gz) = 408273
-MD5 (spambnc-20041223/index.shtml) = IGNORE
+MD5 (spambnc-20050115/sb-new.tar.gz) = 51e8564e69129c396f8cc30b63a7fcb2
+SIZE (spambnc-20050115/sb-new.tar.gz) = 400804
+MD5 (spambnc-20050115/index.shtml) = IGNORE
+MD5 (spambnc-20050115/upgrading.shtml) = IGNORE
diff --git a/mail/spambnc/files/pkg-message.in b/mail/spambnc/files/pkg-message.in
new file mode 100644
index 000000000000..ae22469b018b
--- /dev/null
+++ b/mail/spambnc/files/pkg-message.in
@@ -0,0 +1,6 @@
+
+The spambounce procmail rules have been installed in %%DATADIR%%/.
+Please read the section entitled "Configuring the Spam Bouncer" in the file
+%%DOCSDIR%%/documentation.html for information on how to set
+up your mailbox, and the file upgrading.html if you are migrating from a
+previous version (before 20050115).
diff --git a/mail/spambnc/pkg-message b/mail/spambnc/pkg-message
deleted file mode 100644
index bf3c8236e724..000000000000
--- a/mail/spambnc/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-
-The spambounce procmail rules have been installed in %%PREFIX%%/share/spambnc/.
-Please read the section entitled "Configuring the Spam Bouncer" in the file
-%%PREFIX%%/share/doc/spambnc/documentation.html for information on how to set
-up your mailbox.