Date: Wed, 15 Jan 2014 14:40:19 +0900 From: Masaki TAGAWA <masaki@club.kyutech.ac.jp> To: bug-followup@freebsd.org, vsjcfm@gmail.com, perl@freebsd.org Subject: Re: ports/185779: japanese/p5-Mail-SpamAssassin: warning on desribe Message-ID: <CAOK-M0ZMhzfK97s90H4kTLb3Lw%2B-ECfdUE_rTy7oF_Bg-7JrBQ@mail.gmail.com> In-Reply-To: <201401142050.s0EKo8hi091203@freefall.freebsd.org> References: <201401142050.s0EKo8hi091203@freefall.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
I created patches for this issue.
In order to work correctly, we need a modification of mail/p5-Mail-SpamAssassin.
In addition, this patch makes japanese/p5-Mail-SpamAssassin to support staging.
[-- Attachment #2 --]
diff -ru /usr/ports/japanese/p5-Mail-SpamAssassin.org/Makefile /usr/ports/japanese/p5-Mail-SpamAssassin/Makefile
--- /usr/ports/japanese/p5-Mail-SpamAssassin.org/Makefile 2013-12-31 05:55:18.000000000 +0900
+++ /usr/ports/japanese/p5-Mail-SpamAssassin/Makefile 2014-01-15 14:20:15.000000000 +0900
@@ -30,15 +30,14 @@
Mail::SpamAssassin::Plugin::Tokenizer.3 \
Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA.3
-NO_STAGE= yes
-pre-install:
+pre-install::
@${CAT} ${EXTRA_PATCHES:S/.patch/.plist/} > ${PLIST}
@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
post-install::
- @${CP} ${.CURDIR}/files/${TOKENIZER_PRE} ${ETCDIR}/${TOKENIZER_PRE}.sample
+ @${CP} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample
@[ -f ${ETCDIR}/${TOKENIZER_PRE} ] || \
- ${INSTALL_DATA} ${ETCDIR}/${TOKENIZER_PRE}.sample \
- ${ETCDIR}/${TOKENIZER_PRE}
+ ${INSTALL_DATA} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample \
+ ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}
.include "${MASTERDIR}/Makefile"
diff -ru /usr/ports/japanese/p5-Mail-SpamAssassin.org/files/spamassassin-3.3.2-ja-1.plist /usr/ports/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist
--- /usr/ports/japanese/p5-Mail-SpamAssassin.org/files/spamassassin-3.3.2-ja-1.plist 2012-07-14 22:54:48.000000000 +0900
+++ /usr/ports/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist 2014-01-15 14:09:20.000000000 +0900
@@ -3,5 +3,5 @@
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer
%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer.pm
%%SITE_PERL%%/Mail/SpamAssassin/Util/Charset.pm
-@unexec if cmp -s %%PREFIX%%/%%ETCDIR%%/%%TOKENIZER_PRE%%.sample %%PREFIX%%/%%ETCDIR%%/%%TOKENIZER_PRE%%; then rm -f %%PREFIX%%/%%ETCDIR%%/%%TOKENIZER_PRE%%; fi
-%%ETCDIR%%/%%TOKENIZER_PRE%%.sample
+@unexec if cmp -s %D/etc/mail/spamassassin/%%TOKENIZER_PRE%%.sample %D/etc/mail/spamassassin/%%TOKENIZER_PRE%%; then rm -f %D/etc/mail/spamassassin/%%TOKENIZER_PRE%%; fi
+etc/mail/spamassassin/%%TOKENIZER_PRE%%.sample
[-- Attachment #3 --]
diff -ru /usr/ports/mail/p5-Mail-SpamAssassin.org/Makefile /usr/ports/mail/p5-Mail-SpamAssassin/Makefile
--- /usr/ports/mail/p5-Mail-SpamAssassin.org/Makefile 2014-01-10 18:36:12.000000000 +0900
+++ /usr/ports/mail/p5-Mail-SpamAssassin/Makefile 2014-01-15 13:57:38.000000000 +0900
@@ -195,7 +195,7 @@
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so)
.endif
-pre-install:
+pre-install::
@${MKDIR} ${STAGEDIR}${DATADIR}
@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libspamc.so ${STAGEDIR}${PREFIX}/lib/libspamc.so.0
@${LN} -sf libspamc.so.0 ${STAGEDIR}${PREFIX}/lib/libspamc.so
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOK-M0ZMhzfK97s90H4kTLb3Lw%2B-ECfdUE_rTy7oF_Bg-7JrBQ>