ports/160323: [PATCH] japanese/p5-Mail-SpamAssassin. fix sa-update, allow cascading port
Takefu
takefu at airport.fm
Thu Sep 1 01:50:09 UTC 2011
The following reply was made to PR ports/160323; it has been noted by GNATS.
From: Takefu <takefu at airport.fm>
To: freebsd-gnats-submit at FreeBSD.org
Cc:
Subject: Re: ports/160323: [PATCH] japanese/p5-Mail-SpamAssassin. fix sa-update,
allow cascading port
Date: Thu, 01 Sep 2011 10:45:33 +0900
Makefile was wrong.
The only fix that file.
Other fixes, use the previous ones.
--- ja-p5-Mail-SpamAssassin.patch2 begins here ---
--- /usr/ports/japanese/p5-Mail-SpamAssassin/Makefile 2011-08-17 08:15:06.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/Makefile 2011-09-01 10:31:54.000000000 +0900
@@ -20,7 +20,6 @@
PATCH_SITES= http://spamassassin.emaillab.jp/pub/ja-patch/sa${PORTVERSION:R}/:JA
PATCHFILES= spamassassin-${PORTVERSION}-ja-${PATCHLEVEL}.patch:JA
-PATCHLEVEL= 1
PATCH_DIST_STRIP= -p1
MAINTAINER= fmysh at iijmio-mail.jp
@@ -33,12 +32,7 @@
p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
-BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
- p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
- p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
- p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
- p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS= ${RUN_DEPENDS}
CONFLICTS= p5-Mail-SpamAssassin-[0-9]*
@@ -46,12 +40,17 @@
USE_PERL5_RUN= 5.8.8+
USE_LDCONFIG= yes
CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \
- CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
- LOCALSTATEDIR="/var/db/spamassassin"
+ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
+ LOCALSTATEDIR="${BASEDIR}/var/db/spamassassin"
USERS= spamd
GROUPS= spamd
+BASEDIR= # none
+PATCHLEVEL= 1
+PLIST_SUB= BASEDIR=${BASEDIR}
+SUB_LIST= BASEDIR=${BASEDIR}
+
# You can override it if you like
CONTACT_ADDRESS?= The administrator of that system
@@ -93,15 +92,15 @@
.endif
.if defined(WITH_SPF_QUERY)
-RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
+RUN_DEPENDS+= p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
.endif
.if !defined(WITHOUT_IPV6)
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS+= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
.endif
.if !defined(WITHOUT_SSL)
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
CONFIGURE_ARGS+= ENABLE_SSL=yes
@@ -116,17 +115,17 @@
.endif
.if defined(WITH_MYSQL)
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
.endif
.if defined(WITH_PGSQL)
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
.if defined(WITH_RAZOR)
RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
.else
-.if ${PERL_LEVEL} < 501000
+.if ${PERL_LEVEL} < 501000
.if !defined(WITH_DKIM)
RUN_DEPENDS+= p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
.endif
@@ -134,20 +133,24 @@
.endif
.if defined(WITH_DKIM)
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
-. if ${PERL_LEVEL} < 501000
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
-. endif
+RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+.if ${PERL_LEVEL} < 501000
+RUN_DEPENDS+= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
+.endif
RUN_DEPENDS+= p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM
+.if ${PERL_LEVEL} < 501400
+RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
+.else
RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
.endif
+.endif
.if defined(WITH_SACOMPILE)
RUN_DEPENDS+= re2c>=.12.0:${PORTSDIR}/devel/re2c
.endif
.if defined(WITH_RELAY_COUNTRY)
-RUN_DEPENDS+= ${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
+RUN_DEPENDS+= p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
.endif
.if defined(WITH_DCC)
@@ -237,7 +240,7 @@
DOCJA= ${PATCHFILES:S/.patch:JA/.txt/}
TOKENIZER_PRE= tokenizer.pre
-USE_RC_SUBR= sa-spamd.sh
+USE_RC_SUBR= sa-spamd
.if defined(WITH_MYSQL) || defined(WITH_PGSQL)
SUB_LIST+= SQL_FLAG="-Q"
@@ -245,7 +248,7 @@
SUB_LIST+= SQL_FLAG=""
.endif
.if !defined(WITH_AS_ROOT)
-SUB_LIST+= RUN_AS_USER="-u ${USERS} -H /var/spool/spamd"
+SUB_LIST+= RUN_AS_USER="-u ${USERS} -H ${BASEDIR}/var/spool/spamd"
.else
SUB_LIST+= RUN_AS_USER=""
.endif
@@ -278,9 +281,6 @@
.if defined(WITH_DCC)
${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
.endif
-.if !defined(WITH_AWL)
- ${REINPLACE_CMD} -e '/AWL/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v310.pre
-.endif
.if defined(WITH_SACOMPILE)
${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
.endif
@@ -338,6 +338,7 @@
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DOCJA} ${DOCSDIR}
.endif
- @${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
+ @${SED} -e 's#PREFIX#${PREFIX}#' \
+ -e 's#%%BASEDIR%%#${BASEDIR}#' ${PKGMESSAGE}
.include <bsd.port.post.mk>
--- ja-p5-Mail-SpamAssassin.patch2 ends here ---
More information about the freebsd-ports-bugs
mailing list