6 files changed, 40 insertions, 52 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index f835cd659c68..0e1bb304095f 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	dspam
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.8.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
 MAINTAINER=	rob@debank.tv
 COMMENT=	A server-side bayesian spam filter
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-userdir=${PREFIX}/etc/dspam
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-userdir=${PREFIX}/etc/dspam
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
@@ -59,27 +59,22 @@ CONFIGURE_ARGS+=	--with-dspam-mode=4511
 CONFIGURE_ARGS+=	--enable-spam-delivery
 .endif
 
+DOCS=		CHANGE README
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \
 		s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/CHANGE \
-		${DOCSDIR}
 .if defined(WITH_MYSQL)
-	@${MKDIR} ${DOCSDIR}/mysql
-	@${INSTALL_DATA} ${WRKSRC}/tools.mysql_drv/README \
-		${WRKSRC}/tools.mysql_drv/mysql_objects.sql \
-		${WRKSRC}/tools.mysql_drv/virtual_users.sql \
-		${WRKSRC}/tools.mysql_drv/purge.sql \
-		${DOCSDIR}/mysql
 	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/tools.mysql_drv && \
+		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}
 .endif
-.endif
-.if defined(WITH_MYSQL)
-	@${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	@${SED} ${SED_SCRIPT} ${PKGMESSAGE}
 
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index 3ffab0fdf665..295ccf75272d 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1 +1,2 @@
-MD5 (dspam-2.8.1.tar.gz) = bd3b750ca506cb468c80cabc77ea7d01
+MD5 (dspam-2.8.3.tar.gz) = 78cf275ccb7bc3697f275a8292f6c131
+SIZE (dspam-2.8.3.tar.gz) = 462004
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 7b96a428a078..282309417cb7 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -15,15 +15,13 @@ bin/dspam_stats
 lib/libdspam.so
 lib/libdspam.so.4
 lib/libdspam.a
-@comment lib/libdspam.la
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGE
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/README
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/mysql_objects.sql
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/virtual_users.sql
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/purge.sql
-%%PORTDOCS%%%%MYSQL%%@dirrm %%DOCSDIR%%/mysql
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%MYSQL%%%%EXAMPLESDIR%%/README
 %%MYSQL%%%%EXAMPLESDIR%%/mysql.data
+%%MYSQL%%%%EXAMPLESDIR%%/mysql_objects.sql
+%%MYSQL%%%%EXAMPLESDIR%%/purge.sql
+%%MYSQL%%%%EXAMPLESDIR%%/virtual_users.sql
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%
 @dirrm etc/dspam
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index f835cd659c68..0e1bb304095f 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	dspam
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.8.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
 MAINTAINER=	rob@debank.tv
 COMMENT=	A server-side bayesian spam filter
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-userdir=${PREFIX}/etc/dspam
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-userdir=${PREFIX}/etc/dspam
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
@@ -59,27 +59,22 @@ CONFIGURE_ARGS+=	--with-dspam-mode=4511
 CONFIGURE_ARGS+=	--enable-spam-delivery
 .endif
 
+DOCS=		CHANGE README
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \
 		s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/CHANGE \
-		${DOCSDIR}
 .if defined(WITH_MYSQL)
-	@${MKDIR} ${DOCSDIR}/mysql
-	@${INSTALL_DATA} ${WRKSRC}/tools.mysql_drv/README \
-		${WRKSRC}/tools.mysql_drv/mysql_objects.sql \
-		${WRKSRC}/tools.mysql_drv/virtual_users.sql \
-		${WRKSRC}/tools.mysql_drv/purge.sql \
-		${DOCSDIR}/mysql
 	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/tools.mysql_drv && \
+		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}
 .endif
-.endif
-.if defined(WITH_MYSQL)
-	@${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	@${SED} ${SED_SCRIPT} ${PKGMESSAGE}
 
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 3ffab0fdf665..295ccf75272d 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1 +1,2 @@
-MD5 (dspam-2.8.1.tar.gz) = bd3b750ca506cb468c80cabc77ea7d01
+MD5 (dspam-2.8.3.tar.gz) = 78cf275ccb7bc3697f275a8292f6c131
+SIZE (dspam-2.8.3.tar.gz) = 462004
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index 7b96a428a078..282309417cb7 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -15,15 +15,13 @@ bin/dspam_stats
 lib/libdspam.so
 lib/libdspam.so.4
 lib/libdspam.a
-@comment lib/libdspam.la
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGE
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/README
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/mysql_objects.sql
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/virtual_users.sql
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/mysql/purge.sql
-%%PORTDOCS%%%%MYSQL%%@dirrm %%DOCSDIR%%/mysql
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%MYSQL%%%%EXAMPLESDIR%%/README
 %%MYSQL%%%%EXAMPLESDIR%%/mysql.data
+%%MYSQL%%%%EXAMPLESDIR%%/mysql_objects.sql
+%%MYSQL%%%%EXAMPLESDIR%%/purge.sql
+%%MYSQL%%%%EXAMPLESDIR%%/virtual_users.sql
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%
 @dirrm etc/dspam