2 files changed, 21 insertions, 18 deletions

diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 32908c47fb1b..909adf4c2188 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -12,7 +12,6 @@ COMMENT=	sid and spf milter for Sendmail
 RESTRICTED=	May incorporate intellectual property, possible patent issues
 
 WCONF=		${WRKSRC}/devtools/Site
-MAN8=		sid-filter.8
 DOCSFILES=	FEATURES INSTALL KNOWNBUGS LICENSE README README-SenderID \
 		RELEASE_NOTES rfc4406.txt rfc4407.txt rfc4408.txt
 INSTALL_WRKSRC=	${WRKSRC}/sid-filter
@@ -33,6 +32,8 @@ OPTIONS_DEFINE=	LIBAR NH_MFROM DOCS
 LIBAR_DESC=	build and install libar
 NH_MFROM_DESC=	use NH_MFROM
 
+LIBAR_PLIST_FILES=	include/libar.h lib/libar.a man/man3/ar.3.gz
+
 .include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
@@ -41,11 +42,6 @@ NH_MFROM_DESC=	use NH_MFROM
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 
-.if ${PORT_OPTIONS:MLIBAR}
-MAN3=		ar.3
-PLIST_FILES+=	include/libar.h lib/libar.a man/man3/ar.3.gz
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} -e "s|\`-O'|\`${CFLAGS}'|g" \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -53,26 +49,22 @@ pre-configure:
 	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${SITE} > ${WCONF}/site.config.m4
-.if ${PORT_OPTIONS:MNH_MFROM}
+
+pre-configure-NH_MFROM_on:
 	${ECHO_CMD} \
 		'APPENDDEF(`confENVDEF'\'', `-D_FFR_NH_MFROM'\'')' \
 		>> ${WCONF}/site.config.m4
-.endif
 
 post-install:
-.for i in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man8/
-.endfor
-.if ${PORT_OPTIONS:MLIBAR}
+	${INSTALL_MAN} ${WRKSRC}/*/sid-filter.8 ${STAGEDIR}${PREFIX}/man/man8/
+
+post-install-LIBAR-on:
 	${INSTALL_DATA} ${WRKSRC}/*/libar/libar.a ${STAGEDIR}${PREFIX}/lib/libar.a
 	${INSTALL_DATA} ${WRKSRC}/libar/ar.h ${STAGEDIR}${PREFIX}/include/libar.h
-.for i in ${MAN3}
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man3/
-.endfor
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_MAN} ${WRKSRC}/*/ar.3 ${STAGEDIR}${PREFIX}/man/man3/
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCSFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/sid-milter/files/patch-devtools_M4_UNIX_executable.m4 b/mail/sid-milter/files/patch-devtools_M4_UNIX_executable.m4
new file mode 100644
index 000000000000..a6537b55d637
--- /dev/null
+++ b/mail/sid-milter/files/patch-devtools_M4_UNIX_executable.m4
@@ -0,0 +1,11 @@
+--- devtools/M4/UNIX/executable.m4.orig	2006-10-06 05:44:44 UTC
++++ devtools/M4/UNIX/executable.m4
+@@ -31,7 +31,7 @@ ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE
+ ifdef(`bldNO_INSTALL', ,
+ `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
+ 	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
+-	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
++	${INSTALL} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
+ ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
+ 
+ strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT