Subject: pkg/28821: Allow festival to build on all NetBSD architectures
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <eric@cirr.com>
List: pkgsrc-bugs
Date: 12/31/2004 07:09:00
>Number:         28821
>Category:       pkg
>Synopsis:       allow audio/festival to build on ?all? NetBSD machines
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 31 07:09:00 +0000 2004
>Originator:     Eric Schnoebelen
>Release:        NetBSD 2.0G
>Organization:
Central Iowa (Model) Railroad
>Environment:
System: NetBSD thezew.cirr.com 2.0G NetBSD 2.0G (GENERIC) #9: Fri Aug 27 15:51:57 CDT 2004 eric@egsner.cirr.com:/work/eric/NetBSD-current/obj/alpha/sys/arch/alpha/compile/GENERIC alpha
Architecture: alpha
Machine: alpha
>Description:
	audio/festival wouldn't build on NetBSD/alpha
>How-To-Repeat:
	# on alpha system
	cd /usr/pkgsrc/audio/festival; sudo make update
>Fix:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/festival/Makefile,v
retrieving revision 1.35
diff -b -u -w -r1.35 Makefile
--- Makefile	21 Dec 2004 18:12:25 -0000	1.35
+++ Makefile	31 Dec 2004 07:06:53 -0000
@@ -68,10 +68,10 @@
 
 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}/ix86_NetBSD.mak ${SPEECHTOOLS}/config/systems/unknown_NetBSD.mak
+	@${CP} ${FILESDIR}/ix86_NetBSD2.0.mak ${SPEECHTOOLS}/config/systems/unknown_NetBSD2.0.mak
+	@${CP} ${FILESDIR}/ix86_NetBSD.mak ${FESTIVAL}/config/systems/unknown_NetBSD.mak
+	@${CP} ${FILESDIR}/ix86_NetBSD2.0.mak ${FESTIVAL}/config/systems/unknown_NetBSD2.0.mak
 
 do-configure:
 	cd ${SPEECHTOOLS} && ${ENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
@@ -82,7 +82,8 @@
 	${FIND} ${FESTIVAL}/lib -type d -print | ${XARGS} ${CHMOD} 755
 	cd ${FESTIVAL} && ${PAX} -rw lib examples ${FHOME}
 	${RM} -f ${FHOME}/lib/etc/NetBSD/audsp
-	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/ix86_NetBSD/audsp ${PREFIX}/libexec
+	# ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/ix86_NetBSD/audsp ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/unknown_NetBSD/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; \
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/audio/festival/PLIST,v
retrieving revision 1.4
diff -b -u -w -r1.4 PLIST
--- PLIST	21 Dec 2004 18:12:25 -0000	1.4
+++ PLIST	31 Dec 2004 07:06:53 -0000
@@ -16,13 +16,13 @@
 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/unknown_${OPSYS}/.made
+share/festival/lib/etc/unknown_${OPSYS}/audsp
 share/festival/lib/fringe.scm
 share/festival/lib/siod.scm
 share/festival/lib/sitevars.scm
 share/festival/lib/web.scm
-@dirrm share/festival/lib/etc/ix86_${OPSYS}
+@dirrm share/festival/lib/etc/unknown_${OPSYS}
 @dirrm share/festival/lib/etc
 @dirrm share/festival/lib
 @dirrm share/festival/examples