From owner-svn-ports-all@freebsd.org Sun Feb 10 16:34:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8ACA514D1FB4; Sun, 10 Feb 2019 16:34:44 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2AF6586795; Sun, 10 Feb 2019 16:34:44 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DB341B1E7; Sun, 10 Feb 2019 16:34:44 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1AGYiSE002121; Sun, 10 Feb 2019 16:34:44 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1AGYgTe002113; Sun, 10 Feb 2019 16:34:42 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201902101634.x1AGYgTe002113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 10 Feb 2019 16:34:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492617 - in head/audio/flite: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/audio/flite: . files X-SVN-Commit-Revision: 492617 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2AF6586795 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Feb 2019 16:34:44 -0000 Author: pi Date: Sun Feb 10 16:34:42 2019 New Revision: 492617 URL: https://svnweb.freebsd.org/changeset/ports/492617 Log: audio/flite: upgrade 1.4 -> 2.1 PR: 216018 Submitted by: Simun Mikecin , pi, jrm Reviewed by: tobik Approved by: sobomax (maintainer timeout) Differential Revision: D19138 Added: head/audio/flite/files/patch-Makefile (contents, props changed) head/audio/flite/files/patch-config_common__make__rules - copied, changed from r492616, head/audio/flite/files/patch-shlib_deps head/audio/flite/files/patch-main_Makefile (contents, props changed) Deleted: head/audio/flite/files/patch-lang-cmulex-make_cmulex head/audio/flite/files/patch-parallel-build head/audio/flite/files/patch-shlib_deps head/audio/flite/files/patch-single-exe head/audio/flite/files/patch-src-audio-au_sun.c head/audio/flite/files/patch-tools-funds_sts_main.c head/audio/flite/files/patch-warnings Modified: head/audio/flite/Makefile head/audio/flite/distinfo head/audio/flite/files/patch-configure head/audio/flite/pkg-descr head/audio/flite/pkg-plist Modified: head/audio/flite/Makefile ============================================================================== --- head/audio/flite/Makefile Sun Feb 10 15:44:22 2019 (r492616) +++ head/audio/flite/Makefile Sun Feb 10 16:34:42 2019 (r492617) @@ -2,29 +2,31 @@ # $FreeBSD$ PORTNAME= flite -PORTVERSION= 1.4 -PORTREVISION= 2 +PORTVERSION= 2.1 CATEGORIES= audio -MASTER_SITES= http://www.speech.cs.cmu.edu/flite/packed/${PORTNAME}-${PORTVERSION}/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-release +MASTER_SITES= http://www.festvox.org/flite/packed/${PORTNAME}-2.1/ +DISTNAME= ${PORTNAME}-${PORTVERSION:}-release MAINTAINER= sobomax@FreeBSD.org COMMENT= Small run-time speech synthesis engine -OPTIONS_DEFINE= DOCS +LICENSE= BSD4CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe desthack gmake tar:bzip2 + CPE_VENDOR= cmu GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared=yes USE_LDCONFIG= yes +OPTIONS_DEFINE= DOCS + post-patch: - @${REINPLACE_CMD} -e 's|-pd|-pR|g' ${WRKSRC}/main/Makefile + ${REINPLACE_CMD} -e 's|-pd|-pR|g' ${WRKSRC}/main/Makefile post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Modified: head/audio/flite/distinfo ============================================================================== --- head/audio/flite/distinfo Sun Feb 10 15:44:22 2019 (r492616) +++ head/audio/flite/distinfo Sun Feb 10 16:34:42 2019 (r492617) @@ -1,2 +1,3 @@ -SHA256 (flite-1.4-release.tar.bz2) = 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c -SIZE (flite-1.4-release.tar.bz2) = 15163897 +TIMESTAMP = 1546891281 +SHA256 (flite-2.1-release.tar.bz2) = c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85 +SIZE (flite-2.1-release.tar.bz2) = 14816327 Added: head/audio/flite/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/flite/files/patch-Makefile Sun Feb 10 16:34:42 2019 (r492617) @@ -0,0 +1,19 @@ +--- Makefile.orig 2017-12-25 15:13:21 UTC ++++ Makefile +@@ -106,11 +106,11 @@ tags: + + install: + @echo Installing +- mkdir -p $(DESTDIR)$(INSTALLBINDIR) +- mkdir -p $(DESTDIR)$(INSTALLLIBDIR) +- mkdir -p $(DESTDIR)$(INSTALLINCDIR) +- $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR) +- @ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install ++ mkdir -p $(INSTALLBINDIR) ++ mkdir -p $(INSTALLLIBDIR) ++ mkdir -p $(INSTALLINCDIR) ++ $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR) ++ @ $(MAKE) -C main --no-print-directory DESTDIR=${DESTDIR} install + + time-stamp : + @ echo $(PROJECT_NAME) >.time-stamp Copied and modified: head/audio/flite/files/patch-config_common__make__rules (from r492616, head/audio/flite/files/patch-shlib_deps) ============================================================================== --- head/audio/flite/files/patch-shlib_deps Sun Feb 10 15:44:22 2019 (r492616, copy source) +++ head/audio/flite/files/patch-config_common__make__rules Sun Feb 10 16:34:42 2019 (r492617) @@ -1,14 +1,11 @@ -Respect LDFLAGS in shared libraries -https://bugs.debian.org/577335 - ---- config/common_make_rules.orig 2009-07-30 14:52:56 UTC +--- config/common_make_rules.orig 2017-10-21 14:01:07 UTC +++ config/common_make_rules @@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a - @ rm -rf shared_os.$* && mkdir shared_os.$* + @ rm -rf shared_os && mkdir shared_os @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os.$* && ar x ../$<) -- @ (cd shared_os.$* && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -+ @ (cd shared_os.$* && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)) + @ (cd shared_os && ar x ../$<) +- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) ++ @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)) @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) - @ rm -rf shared_os.$* + @ rm -rf shared_os Modified: head/audio/flite/files/patch-configure ============================================================================== --- head/audio/flite/files/patch-configure Sun Feb 10 15:44:22 2019 (r492616) +++ head/audio/flite/files/patch-configure Sun Feb 10 16:34:42 2019 (r492617) @@ -1,7 +1,7 @@ ---- configure.orig 2009-08-14 22:50:59.000000000 +0200 -+++ configure 2010-09-09 15:07:27.000000000 +0200 -@@ -4079,7 +4079,7 @@ - OTHERLIBS= +--- configure.orig 2017-10-21 14:01:07 UTC ++++ configure +@@ -4213,7 +4213,7 @@ fi + if test "$shared" = true; then case "$target_os" in - linux*|k*bsd*-gnu|gnu*) @@ -9,9 +9,9 @@ SHFLAGS="-fPIC" ;; solaris*) -@@ -4893,7 +4893,7 @@ - AUDIODEFS=-DCST_AUDIO_ALSA - AUDIOLIBS=-lasound +@@ -4413,7 +4413,7 @@ if test "x$AUDIODEFS" = x; then + AUDIODEFS=-DCST_AUDIO_PULSEAUDIO + AUDIOLIBS='-lpulse-simple -lpulse' ;; - *bsd) + *bsd*) Added: head/audio/flite/files/patch-main_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/flite/files/patch-main_Makefile Sun Feb 10 16:34:42 2019 (r492617) @@ -0,0 +1,23 @@ +--- main/Makefile.orig 2017-10-21 14:01:07 UTC ++++ main/Makefile +@@ -133,15 +133,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o flite_lang_list + + install: + # The basic binaries +- @ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR) ++ @ $(INSTALL) -m 755 -s $(BINDIR)/flite $(INSTALLBINDIR) + @ for i in $(VOICES) ; \ + do \ +- $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \ ++ $(INSTALL) -s $(BINDIR)/flite_$$i $(INSTALLBINDIR); \ + done +- $(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR) ++ $(INSTALL) -m 755 -s $(BINDIR)/flite_time $(INSTALLBINDIR) + # The libraries: static and shared (if built) +- cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR) ++ cp -pR $(flite_LIBS_deps) $(INSTALLLIBDIR) + ifdef SHFLAGS +- cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR) ++ cp -pR $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR) + endif + Modified: head/audio/flite/pkg-descr ============================================================================== --- head/audio/flite/pkg-descr Sun Feb 10 15:44:22 2019 (r492616) +++ head/audio/flite/pkg-descr Sun Feb 10 16:34:42 2019 (r492617) @@ -8,4 +8,4 @@ does not require either of these systems to compile an Flite is the answer to the complaint that Festival is too big, too slow, and not portable enough. -WWW: http://cmuflite.org +WWW: http://www.festvox.org/flite/ Modified: head/audio/flite/pkg-plist ============================================================================== --- head/audio/flite/pkg-plist Sun Feb 10 15:44:22 2019 (r492616) +++ head/audio/flite/pkg-plist Sun Feb 10 16:34:42 2019 (r492617) @@ -50,37 +50,53 @@ include/flite/flite_version.h lib/libflite.a lib/libflite.so lib/libflite.so.1 -lib/libflite.so.1.4 +lib/libflite.so.2.1 +lib/libflite_cmu_grapheme_lang.a +lib/libflite_cmu_grapheme_lang.so +lib/libflite_cmu_grapheme_lang.so.1 +lib/libflite_cmu_grapheme_lang.so.2.1 +lib/libflite_cmu_grapheme_lex.a +lib/libflite_cmu_grapheme_lex.so +lib/libflite_cmu_grapheme_lex.so.1 +lib/libflite_cmu_grapheme_lex.so.2.1 +lib/libflite_cmu_indic_lang.a +lib/libflite_cmu_indic_lang.so +lib/libflite_cmu_indic_lang.so.1 +lib/libflite_cmu_indic_lang.so.2.1 +lib/libflite_cmu_indic_lex.a +lib/libflite_cmu_indic_lex.so +lib/libflite_cmu_indic_lex.so.1 +lib/libflite_cmu_indic_lex.so.2.1 lib/libflite_cmu_time_awb.a lib/libflite_cmu_time_awb.so lib/libflite_cmu_time_awb.so.1 -lib/libflite_cmu_time_awb.so.1.4 +lib/libflite_cmu_time_awb.so.2.1 lib/libflite_cmu_us_awb.a lib/libflite_cmu_us_awb.so lib/libflite_cmu_us_awb.so.1 -lib/libflite_cmu_us_awb.so.1.4 +lib/libflite_cmu_us_awb.so.2.1 lib/libflite_cmu_us_kal.a lib/libflite_cmu_us_kal.so lib/libflite_cmu_us_kal.so.1 -lib/libflite_cmu_us_kal.so.1.4 +lib/libflite_cmu_us_kal.so.2.1 lib/libflite_cmu_us_kal16.a lib/libflite_cmu_us_kal16.so lib/libflite_cmu_us_kal16.so.1 -lib/libflite_cmu_us_kal16.so.1.4 +lib/libflite_cmu_us_kal16.so.2.1 lib/libflite_cmu_us_rms.a lib/libflite_cmu_us_rms.so lib/libflite_cmu_us_rms.so.1 -lib/libflite_cmu_us_rms.so.1.4 +lib/libflite_cmu_us_rms.so.2.1 lib/libflite_cmu_us_slt.a lib/libflite_cmu_us_slt.so lib/libflite_cmu_us_slt.so.1 -lib/libflite_cmu_us_slt.so.1.4 +lib/libflite_cmu_us_slt.so.2.1 lib/libflite_cmulex.a lib/libflite_cmulex.so lib/libflite_cmulex.so.1 -lib/libflite_cmulex.so.1.4 +lib/libflite_cmulex.so.2.1 lib/libflite_usenglish.a lib/libflite_usenglish.so lib/libflite_usenglish.so.1 -lib/libflite_usenglish.so.1.4 -%%PORTDOCS%%%%DOCSDIR%%/README +lib/libflite_usenglish.so.2.1 +%%PORTDOCS%%%%DOCSDIR%%/README.md