svn commit: r346964 - in head/japanese/p5-Mail-SpamAssassin: . files

[Antoine Brodin]

Author: antoine
Date: Mon Mar  3 20:48:15 2014
New Revision: 346964
URL: http://svnweb.freebsd.org/changeset/ports/346964
QAT: https://qat.redports.org/buildarchive/r346964/

Log:
  Unbreak after master port was staged

Modified:
  head/japanese/p5-Mail-SpamAssassin/Makefile
  head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist

Modified: head/japanese/p5-Mail-SpamAssassin/Makefile
==============================================================================
--- head/japanese/p5-Mail-SpamAssassin/Makefile	Mon Mar  3 20:46:34 2014	(r346963)
+++ head/japanese/p5-Mail-SpamAssassin/Makefile	Mon Mar  3 20:48:15 2014	(r346964)
@@ -25,20 +25,11 @@ TOKENIZER_PRE=	tokenizer.pre
 
 PLIST_SUB+=	TOKENIZER_PRE=${TOKENIZER_PRE}
 
-MAN3=		Mail::SpamAssassin::Util::Charset.3 \
-		Mail::SpamAssassin::Plugin::Tokenizer::MeCab.3 \
-		Mail::SpamAssassin::Plugin::Tokenizer.3 \
-		Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA.3
-
-NO_STAGE=	yes
 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
-	@[ -f ${ETCDIR}/${TOKENIZER_PRE} ] || \
-		${INSTALL_DATA} ${ETCDIR}/${TOKENIZER_PRE}.sample \
-			${ETCDIR}/${TOKENIZER_PRE}
+	@${CP} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample
 
 .include "${MASTERDIR}/Makefile"

Modified: head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist
==============================================================================
--- head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist	Mon Mar  3 20:46:34 2014	(r346963)
+++ head/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist	Mon Mar  3 20:48:15 2014	(r346964)
@@ -3,5 +3,10 @@
 @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/Charset.pm
- at unexec if cmp -s %%PREFIX%%/%%ETCDIR%%/%%TOKENIZER_PRE%%.sample %%PREFIX%%/%%ETCDIR%%/%%TOKENIZER_PRE%%; then rm -f %%PREFIX%%/%%ETCDIR%%/%%TOKENIZER_PRE%%; fi
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer::MeCab.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Charset.3.gz
+ at unexec if cmp -s %D/%%ETCDIR%%/%%TOKENIZER_PRE%%.sample %D/%%ETCDIR%%/%%TOKENIZER_PRE%%; then rm -f %D/%%ETCDIR%%/%%TOKENIZER_PRE%%; fi
 %%ETCDIR%%/%%TOKENIZER_PRE%%.sample
+ at exec if [ ! -f %B/%%TOKENIZER_PRE%% ]; then cp -p %B/%f %B/%%TOKENIZER_PRE%%; fi