Upgrade to 20051109, aka SpamBouncer 2.1, and do some cleaning.

3 files changed, 19 insertions, 23 deletions

diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index c05e568f2812..175b983ad8be 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spambnc
-PORTVERSION=	20051030
+PORTVERSION=	20051109
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spambouncer.org/dist/sb/:tarball	\
 		http://www.spambouncer.org/configure/:doc
@@ -24,43 +24,36 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/.pkg-plist
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-SUB_DIRS=	functions docs data auxiliary
+SUB_FILES=	pkg-message
 
 .if !defined(NOPORTDOCS)
 MASTER_SITES+=	http://www.spambouncer.org/configure/:upg
 DISTFILES+=	upgrading.shtml:upg
 IGNOREFILES+=	upgrading.shtml
+PORTDOCS=	documentation.html upgrading.html loglevels.txt
 .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
+	@(cd ${WRKSRC} && ${FIND} -s . -type f | ${GREP} -v "^\.\/\." |	\
+		${GREP} -v docs | ${SED} -e 's,.,%%DATADIR%%,1' > ${PLIST})
+	@(cd ${WRKSRC} && ${FIND} -s . -type d | ${GREP} -v docs | ${SORT} -r |	\
+		${SED} -e 's,.,@dirrm %%DATADIR%%,' >> ${PLIST})
 
 do-install:
 	${MKDIR} ${DATADIR}
-	cd ${WRKDIR} && ${CP} -Rv * ${DATADIR}
+	cd ${WRKSRC} && ${CP} -Rv * ${DATADIR}
+	@${RM} -rf ${DATADIR}/docs
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickstart.shtml \
 		${DOCSDIR}/documentation.html
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/upgrading.shtml \
 		${DOCSDIR}/upgrading.html
+	@${INSTALL_DATA} ${WRKSRC}/docs/loglevels.txt ${DOCSDIR}
 .endif
 
 post-install:
-	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},;s,%%DATADIR%%,${DATADIR},' \
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/mail/spambnc/distinfo b/mail/spambnc/distinfo
index 43fb74e4f7e1..375b1099d1e3 100644
--- a/mail/spambnc/distinfo
+++ b/mail/spambnc/distinfo
@@ -1,4 +1,7 @@
-MD5 (spambnc-20051030/sb.tar.gz) = 49601bd0b1187bbbb7df0bd998c089b8
-SIZE (spambnc-20051030/sb.tar.gz) = 679344
-MD5 (spambnc-20051030/quickstart.shtml) = IGNORE
-MD5 (spambnc-20051030/upgrading.shtml) = IGNORE
+MD5 (spambnc-20051109/sb.tar.gz) = 255cdc3a1370e9866f94883f63e87a98
+SHA256 (spambnc-20051109/sb.tar.gz) = 79917514de6abed36c0eb2503853e9cb0165b9925fa26aa74963c283ea1bdf38
+SIZE (spambnc-20051109/sb.tar.gz) = 658001
+MD5 (spambnc-20051109/quickstart.shtml) = IGNORE
+SHA256 (spambnc-20051109/quickstart.shtml) = IGNORE
+MD5 (spambnc-20051109/upgrading.shtml) = IGNORE
+SHA256 (spambnc-20051109/upgrading.shtml) = IGNORE
diff --git a/mail/spambnc/files/pkg-message.in b/mail/spambnc/files/pkg-message.in
index 7ce7223a7180..512e044aeeab 100644
--- a/mail/spambnc/files/pkg-message.in
+++ b/mail/spambnc/files/pkg-message.in
@@ -3,4 +3,4 @@ The spambouncer 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).
+previous version (before 20051109).