From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 21 17:21:29 2014 Return-Path: Delivered-To: svn-ports-branches@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 6DF065AB; Fri, 21 Feb 2014 17:21:29 +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 498471733; Fri, 21 Feb 2014 17:21:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1LHLTjg069100; Fri, 21 Feb 2014 17:21:29 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1LHLSF3069098; Fri, 21 Feb 2014 17:21:28 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402211721.s1LHLSF3069098@svn.freebsd.org> From: Pawel Pekala Date: Fri, 21 Feb 2014 17:21:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r345518 - branches/2014Q1/audio/julius X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2014 17:21:29 -0000 Author: pawel Date: Fri Feb 21 17:21:28 2014 New Revision: 345518 URL: http://svnweb.freebsd.org/changeset/ports/345518 QAT: https://qat.redports.org/buildarchive/r345518/ Log: MFH: r345516 - Fix build with clang [1] - Fix shebangs in perl scripts - Merge binaries stripping to one loop - Support staging PR: port/186655 [1] Submitted by: maintainer Approved by: portmgr (erwin) Modified: branches/2014Q1/audio/julius/Makefile branches/2014Q1/audio/julius/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/julius/Makefile ============================================================================== --- branches/2014Q1/audio/julius/Makefile Fri Feb 21 17:02:44 2014 (r345517) +++ branches/2014Q1/audio/julius/Makefile Fri Feb 21 17:21:28 2014 (r345518) @@ -3,6 +3,7 @@ PORTNAME= julius PORTVERSION= 4.1.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= julius/37582 @@ -13,53 +14,30 @@ COMMENT= Large Vocabulary Continuous Spe BUILD_DEPENDS= ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode RUN_DEPENDS= ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode -MANCOMPRESSED= no GNU_CONFIGURE= yes -USES= iconv -NO_STAGE= yes +USES= iconv perl5 shebangfix +SHEBANG_FILES= jclient-perl/jclient.pl +CONFIGURE_ENV= ac_cv_path_PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -Wno-return-type LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -MANLANG= "" ja -MAN1= accept_check.1 \ - adinrec.1 \ - adintool.1 \ - dfa_determinize.1 \ - dfa_minimize.1 \ - generate-ngram.1 \ - generate.1 \ - gram2sapixml.pl.1 \ - jclient.pl.1 \ - jcontrol.1 \ - julius.1 \ - mkbingram.1 \ - mkbinhmm.1 \ - mkbinhmmlist.1 \ - mkdfa.pl.1 \ - mkgshmm.1 \ - mkss.1 \ - nextword.1 post-configure: - @${FIND} ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -E -e "s|INSTALL=(\.\./)+|INSTALL=install -o root -g wheel|" - @${FIND} ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -E -e "s|install -s|install|" - @${REINPLACE_CMD} -E -e "s|man1/ja|ja/man1|" ${WRKSRC}/man/Makefile + @${FIND} ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ + -e "s|INSTALL=(\.\./)+|INSTALL=install|" \ + -e "s|install -s|install|; s|-m 555|-m 755|g" \ + -e "s,\{(bin|lib|include|man)dir,\(DESTDIR\)$$&,g" \ + -e "/(INSTALL|install)/ s,\{exec_prefix,\(DESTDIR\)$$&,g" + @${REINPLACE_CMD} -E -e "s|man1/ja|ja/man1|" \ + -e "s| /usr/local| ${STAGEDIR}${PREFIX}|g" \ + ${WRKSRC}/man/Makefile post-install: - @${STRIP_CMD} ${PREFIX}/bin/accept_check - @${STRIP_CMD} ${PREFIX}/bin/adinrec - @${STRIP_CMD} ${PREFIX}/bin/adintool - @${STRIP_CMD} ${PREFIX}/bin/dfa_determinize - @${STRIP_CMD} ${PREFIX}/bin/dfa_minimize - @${STRIP_CMD} ${PREFIX}/bin/generate-ngram - @${STRIP_CMD} ${PREFIX}/bin/generate - @${STRIP_CMD} ${PREFIX}/bin/jcontrol - @${STRIP_CMD} ${PREFIX}/bin/julius - @${STRIP_CMD} ${PREFIX}/bin/mkbingram - @${STRIP_CMD} ${PREFIX}/bin/mkbinhmm - @${STRIP_CMD} ${PREFIX}/bin/mkbinhmmlist - @${STRIP_CMD} ${PREFIX}/bin/mkfa - @${STRIP_CMD} ${PREFIX}/bin/mkss - @${STRIP_CMD} ${PREFIX}/bin/nextword +.for file in accept_check adinrec adintool dfa_determinize dfa_minimize \ +generate-ngram generate jcontrol julius mkbingram mkbinhmm mkbinhmmlist mkfa \ +mkss nextword + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} +.endfor .include Modified: branches/2014Q1/audio/julius/pkg-plist ============================================================================== --- branches/2014Q1/audio/julius/pkg-plist Fri Feb 21 17:02:44 2014 (r345517) +++ branches/2014Q1/audio/julius/pkg-plist Fri Feb 21 17:21:28 2014 (r345518) @@ -1,3 +1,4 @@ +@mode 555 bin/accept_check bin/adinrec bin/adintool @@ -20,6 +21,7 @@ bin/mkgshmm bin/mkss bin/nextword bin/yomi2voca.pl +@mode include/julius/acconfig.h include/julius/beam.h include/julius/callback.h @@ -59,5 +61,41 @@ include/sent/util.h include/sent/vocabulary.h lib/libjulius.a lib/libsent.a +man/ja/man1/accept_check.1.gz +man/ja/man1/adinrec.1.gz +man/ja/man1/adintool.1.gz +man/ja/man1/dfa_determinize.1.gz +man/ja/man1/dfa_minimize.1.gz +man/ja/man1/generate-ngram.1.gz +man/ja/man1/generate.1.gz +man/ja/man1/gram2sapixml.pl.1.gz +man/ja/man1/jclient.pl.1.gz +man/ja/man1/jcontrol.1.gz +man/ja/man1/julius.1.gz +man/ja/man1/mkbingram.1.gz +man/ja/man1/mkbinhmm.1.gz +man/ja/man1/mkbinhmmlist.1.gz +man/ja/man1/mkdfa.pl.1.gz +man/ja/man1/mkgshmm.1.gz +man/ja/man1/mkss.1.gz +man/ja/man1/nextword.1.gz +man/man1/accept_check.1.gz +man/man1/adinrec.1.gz +man/man1/adintool.1.gz +man/man1/dfa_determinize.1.gz +man/man1/dfa_minimize.1.gz +man/man1/generate-ngram.1.gz +man/man1/generate.1.gz +man/man1/gram2sapixml.pl.1.gz +man/man1/jclient.pl.1.gz +man/man1/jcontrol.1.gz +man/man1/julius.1.gz +man/man1/mkbingram.1.gz +man/man1/mkbinhmm.1.gz +man/man1/mkbinhmmlist.1.gz +man/man1/mkdfa.pl.1.gz +man/man1/mkgshmm.1.gz +man/man1/mkss.1.gz +man/man1/nextword.1.gz @dirrm include/julius @dirrm include/sent