diff options
| author | obache <obache@pkgsrc.org> | 2012-03-12 12:43:38 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-03-12 12:43:38 +0000 |
| commit | 1e8e8a637c19749bc592940e936cd76bc014a121 (patch) | |
| tree | ad4b6259ffa7e9197bee417f0ca7bed61dfa9017 | |
| parent | 0d588155153c40dc0ba66ad73737fe5959f4d637 (diff) | |
| download | pkgsrc-1e8e8a637c19749bc592940e936cd76bc014a121.tar.gz | |
Pass X11 include/lib directory to configure,
and fix a bug in configure script for the case:
https://savannah.gnu.org/bugs/index.php?35801
PR#46151 shoud be fixed.
| -rw-r--r-- | multimedia/gnash/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gnash/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/gnash/patches/patch-aa | 12 |
3 files changed, 16 insertions, 4 deletions
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile index 4a111624d9b..84ec2b2dfbf 100644 --- a/multimedia/gnash/Makefile +++ b/multimedia/gnash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2012/03/03 12:54:20 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2012/03/12 12:43:38 obache Exp $ # DISTNAME= gnash-0.8.10 @@ -26,6 +26,8 @@ CONFIG_SHELL= ${TOOLS_BASH} CONFIGURE_ARGS+= --with-boost-incl=${BUILDLINK_PREFIX.boost-headers}/include CONFIGURE_ARGS+= --with-boost-lib=${BUILDLINK_PREFIX.boost-libs}/lib CONFIGURE_ARGS+= --without-gconf +CONFIGURE_ARGS+= --with-x11-incl=${X11BASE}/include +CONFIGURE_ARGS+= --with-x11-lib=${X11BASE}/lib EGDIR= ${PREFIX}/share/examples/gnash INSTALLATION_DIRS= ${EGDIR} diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo index 6aff1ea7276..bcc3dddfa94 100644 --- a/multimedia/gnash/distinfo +++ b/multimedia/gnash/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2012/02/16 10:44:53 obache Exp $ +$NetBSD: distinfo,v 1.18 2012/03/12 12:43:38 obache Exp $ SHA1 (gnash-0.8.10.tar.bz2) = be3b12a5edcd3b05f2ae73d02f0991aa786e7300 RMD160 (gnash-0.8.10.tar.bz2) = 0093174ec0a912309772c033b5f1c1ad46ab41dc Size (gnash-0.8.10.tar.bz2) = 4238106 bytes -SHA1 (patch-aa) = 2698c2841523938772ba9e24a798c3cbc3395380 +SHA1 (patch-aa) = ba87d2d3060ae545dd9a5f42f920d95a56990afc SHA1 (patch-ae) = ca44e2559a1ce0a24baf6d5479636f967e011202 SHA1 (patch-libbase_Makefile.in) = c5b6533f5ac2b2ee26d0547c3054375e72512ccf SHA1 (patch-libcore_Makefile.in) = 6b92917f0be3779b7f6e1993ac29960cef50c736 diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa index ac754847c8a..ea8032ab40d 100644 --- a/multimedia/gnash/patches/patch-aa +++ b/multimedia/gnash/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.13 2012/02/16 10:44:54 obache Exp $ +$NetBSD: patch-aa,v 1.14 2012/03/12 12:43:39 obache Exp $ --- configure.orig 2012-01-19 19:19:29.000000000 +0000 +++ configure @@ -33,3 +33,13 @@ $NetBSD: patch-aa,v 1.13 2012/02/16 10:44:54 obache Exp $ fi if test x"${ac_cv_path_kde4_incl}" != x ; then +@@ -31356,6 +31356,9 @@ else + if test x"${with_x11_incl}" != x ; then + if test -f ${with_x11_incl}/X11/X.h ; then + ac_cv_path_x11_incl="-I`(cd ${with_x11_incl}; pwd)`" ++ ++$as_echo "#define HAVE_X11_X_H 1" >>confdefs.h ++ + else + as_fn_error "${with_x11_incl} directory doesn't contain X.h" "$LINENO" 5 + fi |