ports/152709: [PATCH] mail/mimedefang: remove PERL_SITELIBDIR, respect NOPORTEXAMPLES

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Tue Nov 30 16:30:13 UTC 2010 

>Number:         152709
>Category:       ports
>Synopsis:       [PATCH] mail/mimedefang: remove PERL_SITELIBDIR, respect NOPORTEXAMPLES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 30 16:30:12 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Tue Nov 23 00:07:29 CST 2010
>Description:
- Remove PERL_SITELIBDIR, use SITE_PERL instead
- Respect NOPORTEXAMPLES
- Use LOCALBASE instead of hardcoded /usr/local
- Allow non-/usr/local PREFIX in PKGMESSAGE
- Make portlint happier
- Remove obsolete MD5 sum

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer (wes at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mimedefang-2.68.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.68
diff -u -u -r1.68 Makefile
--- Makefile	5 Sep 2010 05:04:16 -0000	1.68
+++ Makefile	30 Nov 2010 16:15:44 -0000
@@ -14,15 +14,14 @@
 COMMENT=	Milter based anti-spam and anti-virus filtering program
 
 BUILD_DEPENDS=	\
-	${PERL_SITELIBDIR}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 	p5-MIME-Tools>=5.417:${PORTSDIR}/mail/p5-MIME-Tools \
-	${PERL_SITELIBDIR}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${PERL_SITELIBDIR}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-	${PERL_SITELIBDIR}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+	${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
-PERL_SITELIBDIR=	${SITE_PERL}
 GNU_CONFIGURE=	yes
 
 MAILUSER?=		mailnull
@@ -37,11 +36,10 @@
 			--with-quarantinedir=${QUARANTINEDIR} \
 			--prefix=${PREFIX}
 
-
 .if defined (MIMEDEFANG_DISABLE_CLAMAV)
 CONFIGURE_ARGS+=	--disable-antivirus \
 			--disable-clamav \
-			--disable-clamd 
+			--disable-clamd
 .endif
 
 MAN5=	mimedefang-filter.5
@@ -49,13 +47,15 @@
 MAN8=	mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 \
 	md-mx-ctrl.8 watch-mimedefang.8 watch-multiple-mimedefangs.8
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if !exists( /usr/include/libmilter/mfapi.h )
 BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail
 .endif
 
-.if exists( /usr/local/include/libmilter/mfapi.h )
+.if exists( ${LOCALBASE}/include/libmilter/mfapi.h )
 CONFIGURE_ARGS+=	--with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib
 .endif
 
@@ -69,12 +69,13 @@
 	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
 	@${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${PREFIX}/etc/rc.d/mimedefang
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/stream-by-domain-filter ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
+		suggested-minimum-filter-for-windows-clients README ${EXAMPLESDIR}/
 .endif
 	@[ -d ${SPOOLDIR} ] && ${CHGRP} ${MAILUSER} ${SPOOLDIR}
 	@[ -d ${QUARANTINEDIR} ] && ${CHGRP} ${MAILUSER} ${QUARANTINEDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.49
diff -u -u -r1.49 distinfo
--- distinfo	13 Aug 2010 08:41:13 -0000	1.49
+++ distinfo	30 Nov 2010 16:15:44 -0000
@@ -1,3 +1,2 @@
-MD5 (mimedefang-2.68.tar.gz) = b988d34b7d656fcf007a00c23565ed20
 SHA256 (mimedefang-2.68.tar.gz) = af6d947eef87f00fe513045bf79828808ea42b9cf70eaee033d5e96e73edf61a
 SIZE (mimedefang-2.68.tar.gz) = 342973
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	6 Feb 2007 04:53:48 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-To finish installation please follow these steps:
-
-1. Edit /usr/local/etc/mimedefang/mimedefang-filter
-
-2. Reconfigure sendmail to use MIMEDefang, for example add this lines to
-   your sendmail.mc:
-
-   MAIL_FILTER(`mimedefang', `S=local:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl
-   define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl
-
-   rebuild sendmail.cf and install it.
-
-Also, you can install some anti-virus software to check your mail, for example:
-
-   security/clamav
-      Open source AV package with automatic virus definition updates
-   security/f-prot
-      F-Prot Antivirus for BSD Workstations
-   security/vscan
-      Evaluation version of a DOS/Windows/Linux file virus scanner
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/pkg-plist,v
retrieving revision 1.16
diff -u -u -r1.16 pkg-plist
--- pkg-plist	13 Aug 2010 08:41:13 -0000	1.16
+++ pkg-plist	30 Nov 2010 16:15:44 -0000
@@ -18,11 +18,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.TRU64
 %%PORTDOCS%%%%DOCSDIR%%/README.IRIX
 %%PORTDOCS%%%%DOCSDIR%%/README.VEXIRA
-%%PORTDOCS%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
-%%PORTDOCS%%%%EXAMPLESDIR%%/stream-by-domain-filter
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm etc/mimedefang
 @cwd /var/spool
 @dirrm MIMEDefang
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	30 Nov 2010 16:15:44 -0000
@@ -0,0 +1,20 @@
+To finish installation please follow these steps:
+
+1. Edit %%ETCDIR%%/mimedefang-filter
+
+2. Reconfigure sendmail to use MIMEDefang, for example add this lines to
+   your sendmail.mc:
+
+   MAIL_FILTER(`mimedefang', `S=local:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl
+   define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl
+
+   rebuild sendmail.cf and install it.
+
+Also, you can install some anti-virus software to check your mail, for example:
+
+   security/clamav
+      Open source AV package with automatic virus definition updates
+   security/f-prot
+      F-Prot Antivirus for BSD Workstations
+   security/vscan
+      Evaluation version of a DOS/Windows/Linux file virus scanner
--- mimedefang-2.68.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list