From owner-svn-ports-head@FreeBSD.ORG Mon Mar 3 20:48:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B077B329; Mon, 3 Mar 2014 20:48:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82EC4B91; Mon, 3 Mar 2014 20:48:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23KmGdW011898; Mon, 3 Mar 2014 20:48:16 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23KmG2K011896; Mon, 3 Mar 2014 20:48:16 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201403032048.s23KmG2K011896@svn.freebsd.org> From: Antoine Brodin Date: Mon, 3 Mar 2014 20:48:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346964 - in head/japanese/p5-Mail-SpamAssassin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Mar 2014 20:48:16 -0000 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 -@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 +@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 +@exec if [ ! -f %B/%%TOKENIZER_PRE%% ]; then cp -p %B/%f %B/%%TOKENIZER_PRE%%; fi