summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbd <sbd>2011-12-17 10:14:40 +0000
committersbd <sbd>2011-12-17 10:14:40 +0000
commit664dcf5d54bb4cd2b798724a0caafafbcc16f7bb (patch)
tree868268369d987d1bc15c11b01daa69277ce8ce5e
parent71ea1499500440c49d2a8f0386c503487bd1349a (diff)
downloadpkgsrc-664dcf5d54bb4cd2b798724a0caafafbcc16f7bb.tar.gz
Add missing mk/curses buildlink.
Pass BUILDLINK_CPPFLAGS and BUILDLINK_LDFLAGS to the build system. Bump PKGREVISION
-rw-r--r--audio/festival/Makefile7
-rw-r--r--audio/festival/distinfo3
-rw-r--r--audio/festival/patches/patch-speech__tools_config_rules_compile__options.mak11
3 files changed, 19 insertions, 2 deletions
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index ff40f9841f9..99bc2377be0 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2011/11/21 01:35:29 marino Exp $
+# $NetBSD: Makefile,v 1.62 2011/12/17 10:14:40 sbd Exp $
DISTNAME= festival-2.1-release
PKGNAME= festival-2.1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://festvox.org/packed/festival/2.1/
DISTFILES= ${DISTNAME}.tar.gz \
@@ -29,6 +30,9 @@ CONFIGURE_SCRIPT= ${SPEECHTOOLS}/configure
CONFIG_GUESS_OVERRIDE= ${SPEECHTOOLS}/config.guess ${FESTIVAL}/config.guess
CONFIG_SUB_OVERRIDE= ${SPEECHTOOLS}/config.sub ${FESTIVAL}/config.sub
+MAKE_ENV+= BUILDLINK_CPPFLAGS=${BUILDLINK_CPPFLAGS:Q}
+MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
+
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
@@ -109,4 +113,5 @@ do-install:
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/festival_client.1
.include "../../audio/nas/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/festival/distinfo b/audio/festival/distinfo
index adbe068be76..5b2da0afdb9 100644
--- a/audio/festival/distinfo
+++ b/audio/festival/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/11/21 01:35:29 marino Exp $
+$NetBSD: distinfo,v 1.17 2011/12/17 10:14:40 sbd Exp $
SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77
RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b
@@ -11,3 +11,4 @@ SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c
SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463
SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422
SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185
+SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a
diff --git a/audio/festival/patches/patch-speech__tools_config_rules_compile__options.mak b/audio/festival/patches/patch-speech__tools_config_rules_compile__options.mak
new file mode 100644
index 00000000000..e13eec0109d
--- /dev/null
+++ b/audio/festival/patches/patch-speech__tools_config_rules_compile__options.mak
@@ -0,0 +1,11 @@
+$NetBSD: patch-speech__tools_config_rules_compile__options.mak,v 1.1 2011/12/17 10:14:40 sbd Exp $
+
+--- speech_tools/config/rules/compile_options.mak.orig 2001-04-04 13:11:27.000000000 +0000
++++ speech_tools/config/rules/compile_options.mak
+@@ -172,3 +172,6 @@ ifneq ($(STATIC),0)
+ LINKFLAGS += $(STATIC_LINKFLAGS)
+ endif
+
++CFLAGS += $(BUILDLINK_CPPFLAGS)
++CXXFLAGS += $(BUILDLINK_CPPFLAGS)
++LINKFLAGS += $(BUILDLINK_LDFLAGS)