From c7313706dc69465ddd88458bc7ae7afd1179feb3 Mon Sep 17 00:00:00 2001 From: agc Date: Mon, 7 Mar 2005 10:34:07 +0000 Subject: Try to make this package build on all NetBSD platforms; patches from Eric Schnoebelen in PR 28821, with some modifications by myself (for configuration purposes). Tested by myself on NetBSD/i386, and on NetBSD/amd64 by Quentin Garnier. --- audio/festival/Makefile | 23 ++++++++++------------- audio/festival/PLIST | 7 +++---- audio/festival/distinfo | 4 +++- audio/festival/files/ix86_NetBSD.mak | 29 ----------------------------- audio/festival/files/ix86_NetBSD2.0.mak | 17 ----------------- audio/festival/files/unknown_NetBSD.mak | 29 +++++++++++++++++++++++++++++ audio/festival/patches/patch-aa | 22 ++++++++++++++++++++++ audio/festival/patches/patch-ab | 22 ++++++++++++++++++++++ 8 files changed, 89 insertions(+), 64 deletions(-) delete mode 100644 audio/festival/files/ix86_NetBSD.mak delete mode 100644 audio/festival/files/ix86_NetBSD2.0.mak create mode 100644 audio/festival/files/unknown_NetBSD.mak create mode 100644 audio/festival/patches/patch-aa create mode 100644 audio/festival/patches/patch-ab (limited to 'audio') diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 7f97b14b0f3..fcd21b934a5 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.35 2004/12/21 18:12:25 agc Exp $ +# $NetBSD: Makefile,v 1.36 2005/03/07 10:34:07 agc Exp $ DISTNAME= festival-1.95-beta PKGNAME= festival-1.95beta CATEGORIES= audio -MASTER_SITES= http://www.cstr.ed.ac.uk/download/festival/1.95/ \ - http://festvox.org/packed/festival/1.95/ \ +MASTER_SITES= http://festvox.org/packed/festival/1.95/ \ ftp://cslu.cse.ogi.edu/pub/tts/ DISTFILES= ${DISTNAME}.tar.gz \ speech_tools-1.2.95-beta.tar.gz @@ -68,10 +67,8 @@ MAKE_ENV+= PKG_EST_HOME="${SPEECHTOOLS}" \ post-patch: @${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile - @${CP} ${FILESDIR}/ix86_NetBSD.mak ${SPEECHTOOLS}/config/systems/ - @${CP} ${FILESDIR}/ix86_NetBSD2.0.mak ${SPEECHTOOLS}/config/systems/ - @${CP} ${FILESDIR}/ix86_NetBSD.mak ${FESTIVAL}/config/systems/ - @${CP} ${FILESDIR}/ix86_NetBSD2.0.mak ${FESTIVAL}/config/systems/ + @${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${SPEECHTOOLS}/config/systems/unknown_${OPSYS}.mak + @${CP} ${FILESDIR}/unknown_${OPSYS}.mak ${FESTIVAL}/config/systems/unknown_${OPSYS}.mak do-configure: cd ${SPEECHTOOLS} && ${ENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} @@ -80,15 +77,15 @@ do-install: ${INSTALL_DATA_DIR} ${FHOME} ${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib ${FIND} ${FESTIVAL}/lib -type d -print | ${XARGS} ${CHMOD} 755 + -@${MV} ${FESTIVAL}/lib/etc/unknown_${OPSYS} ${FESTIVAL}/lib/etc/pkgsrc cd ${FESTIVAL} && ${PAX} -rw lib examples ${FHOME} - ${RM} -f ${FHOME}/lib/etc/NetBSD/audsp - ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/ix86_NetBSD/audsp ${PREFIX}/libexec + ${RM} -f ${FHOME}/lib/etc/unknown_${OPSYS}/audsp ${FHOME}/lib/etc/pkgsrc/audsp + ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/pkgsrc/audsp ${PREFIX}/libexec ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${PREFIX}/libexec/festival_client.naked - for n in festival.sh festival_client.sh sitevars.scm; \ - do {\ - ${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \ - s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ;} \ + for n in festival.sh festival_client.sh sitevars.scm; do \ + ${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \ + s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ; \ done ${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival ${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client diff --git a/audio/festival/PLIST b/audio/festival/PLIST index 747dc0ec165..09fb54083db 100644 --- a/audio/festival/PLIST +++ b/audio/festival/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2004/12/30 14:28:09 agc Exp $ +@comment $NetBSD: PLIST,v 1.6 2005/03/07 10:34:07 agc Exp $ bin/festival bin/festival_client libexec/audsp @@ -16,8 +16,7 @@ share/festival/examples/scfg_parse_text share/festival/examples/text2pos share/festival/examples/text2wave share/festival/lib/cstr.scm -share/festival/lib/etc/ix86_${OPSYS}/.made -share/festival/lib/etc/ix86_${OPSYS}/audsp +share/festival/lib/etc/pkgsrc/.made share/festival/lib/fringe.scm share/festival/lib/siod.scm share/festival/lib/sitevars.scm @@ -139,7 +138,7 @@ share/festival/lib/multisyn/radio_phones_multisyn.scm share/festival/lib/multisyn/send_xwaves.scm share/festival/lib/multisyn/target_cost.scm @dirrm share/festival/lib/multisyn -@dirrm share/festival/lib/etc/ix86_${OPSYS} +@dirrm share/festival/lib/etc/pkgsrc @dirrm share/festival/lib/etc @dirrm share/festival/lib @dirrm share/festival/examples/songs diff --git a/audio/festival/distinfo b/audio/festival/distinfo index 27448525d9a..79e5cc9eb85 100644 --- a/audio/festival/distinfo +++ b/audio/festival/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/02/23 20:39:44 agc Exp $ +$NetBSD: distinfo,v 1.11 2005/03/07 10:34:07 agc Exp $ SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b RMD160 (festival-1.95-beta.tar.gz) = 7f7cce6ab170ab1e83911ed92408576fff32cbd6 @@ -6,3 +6,5 @@ Size (festival-1.95-beta.tar.gz) = 707573 bytes SHA1 (speech_tools-1.2.95-beta.tar.gz) = 5f0533a1b06c56f06e382d752b920ee62a5e8312 RMD160 (speech_tools-1.2.95-beta.tar.gz) = 874b9e6d35bf8a59aeacd3d5b149e24e2a490008 Size (speech_tools-1.2.95-beta.tar.gz) = 1281274 bytes +SHA1 (patch-aa) = 016faac0fbd2291f349b3710aefdc4df736af0d8 +SHA1 (patch-ab) = 23e55253b22df5b8d2bc44b08f6757c90c1f13a8 diff --git a/audio/festival/files/ix86_NetBSD.mak b/audio/festival/files/ix86_NetBSD.mak deleted file mode 100644 index 191a610a112..00000000000 --- a/audio/festival/files/ix86_NetBSD.mak +++ /dev/null @@ -1,29 +0,0 @@ - ########################################################################### - ## ## - ## Author: Alistair Crooks (agc@netbsd.org) ## - ## Date: Wed Oct 27 2004 ## - ## -------------------------------------------------------------------- ## - ## Settings for NetBSD. ## - ## ## - ########################################################################### - -include $(EST)/config/systems/default.mak - -## the native audio module for this type of system -NATIVE_AUDIO_MODULE = NETBSD - -## echo -n doesn't work (well only sometimes ?) -ECHO_N = /usr/bin/printf "%s" - -NAWK=awk - -# GCC_MAKE_SHARED_LIB = ld -Bshareable -x -o XXX - -DEFAULT_JAVA_HOME=${PREFIX}/java - -JAVA=$(JAVA_HOME)/bin/java -JAVAC=$(JAVA_HOME)/bin/javac -JAVAH=$(JAVA_HOME)/bin/javah -jni -JAR=$(JAVA_HOME)/bin/jar cf0v - - diff --git a/audio/festival/files/ix86_NetBSD2.0.mak b/audio/festival/files/ix86_NetBSD2.0.mak deleted file mode 100644 index 53137bf29c4..00000000000 --- a/audio/festival/files/ix86_NetBSD2.0.mak +++ /dev/null @@ -1,17 +0,0 @@ - ########################################################################### - ## ## - ## Author: Alistair Crooks (agc@netbsd.org) ## - ## -------------------------------------------------------------------- ## - ## Settings for NetBSD 2.0 ## - ## ## - ########################################################################### - -# ELF - -include $(EST)/config/systems/ix86_NetBSD.mak - -JAVA_SYSTEM_INCLUDES = -I$(JAVA_HOME)/include -GCC=gcc32 - - - diff --git a/audio/festival/files/unknown_NetBSD.mak b/audio/festival/files/unknown_NetBSD.mak new file mode 100644 index 00000000000..191a610a112 --- /dev/null +++ b/audio/festival/files/unknown_NetBSD.mak @@ -0,0 +1,29 @@ + ########################################################################### + ## ## + ## Author: Alistair Crooks (agc@netbsd.org) ## + ## Date: Wed Oct 27 2004 ## + ## -------------------------------------------------------------------- ## + ## Settings for NetBSD. ## + ## ## + ########################################################################### + +include $(EST)/config/systems/default.mak + +## the native audio module for this type of system +NATIVE_AUDIO_MODULE = NETBSD + +## echo -n doesn't work (well only sometimes ?) +ECHO_N = /usr/bin/printf "%s" + +NAWK=awk + +# GCC_MAKE_SHARED_LIB = ld -Bshareable -x -o XXX + +DEFAULT_JAVA_HOME=${PREFIX}/java + +JAVA=$(JAVA_HOME)/bin/java +JAVAC=$(JAVA_HOME)/bin/javac +JAVAH=$(JAVA_HOME)/bin/javah -jni +JAR=$(JAVA_HOME)/bin/jar cf0v + + diff --git a/audio/festival/patches/patch-aa b/audio/festival/patches/patch-aa new file mode 100644 index 00000000000..816cde32fe3 --- /dev/null +++ b/audio/festival/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.4 2005/03/07 10:35:44 agc Exp $ + +--- speech_tools/config/system.sh 2005/01/10 09:00:19 1.1 ++++ speech_tools/config/system.sh 2005/01/10 09:02:26 +@@ -46,7 +46,7 @@ + sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'` + + # CPU, downcased, /s and some uninteresting details eliminated +-MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null | ++MACHINETYPE=`{ echo unknown ; } 2>/dev/null | + tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | + sed -e 's/i[0-9]86/ix86/' \ + -e 's/sun4/sparc/' \ +@@ -56,7 +56,7 @@ + ` + + # OR revision, only take first two numbers. +-OSREV=`{ uname -r || echo ""; } 2> /dev/null | ++OSREV=`{ echo ""; } 2> /dev/null | + sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'` + + # Sort out various flavours of Linux diff --git a/audio/festival/patches/patch-ab b/audio/festival/patches/patch-ab new file mode 100644 index 00000000000..ac0d080b1a1 --- /dev/null +++ b/audio/festival/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.4 2005/03/07 10:35:44 agc Exp $ + +--- festival/config/system.sh 2005/01/10 09:08:39 1.1 ++++ festival/config/system.sh 2005/01/10 09:08:58 +@@ -46,7 +46,7 @@ + sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'` + + # CPU, downcased, /s and some uninteresting details eliminated +-MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null | ++MACHINETYPE=`{ echo unknown ; } 2>/dev/null | + tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | + sed -e 's/i[0-9]86/ix86/' \ + -e 's/sun4/sparc/' \ +@@ -56,7 +56,7 @@ + ` + + # OR revision, only take first two numbers. +-OSREV=`{ uname -r || echo ""; } 2> /dev/null | ++OSREV=`{ echo ""; } 2> /dev/null | + sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'` + + # Sort out various flavours of Linux -- cgit v1.2.3