diff options
author | rh <rh> | 2002-05-25 11:31:29 +0000 |
---|---|---|
committer | rh <rh> | 2002-05-25 11:31:29 +0000 |
commit | 312525f1efb4b44d63b2ce0e0e33842ba864104b (patch) | |
tree | 65946d16bf82d22afd2f54651de80b3d7d46d416 /devel | |
parent | 933540f10635f9387380f560923be9cd379d0b11 (diff) | |
download | pkgsrc-312525f1efb4b44d63b2ce0e0e33842ba864104b.tar.gz |
Properly include gdk-pixbuf using buildlink. Fix provided by Julio Merino
<jmmv@hispabsd.org> in PR pkg/16815.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/bonobo-conf/Makefile | 9 | ||||
-rw-r--r-- | devel/bonobo-conf/distinfo | 4 | ||||
-rw-r--r-- | devel/bonobo-conf/patches/patch-aa | 21 | ||||
-rw-r--r-- | devel/bonobo-conf/patches/patch-ab | 173 |
4 files changed, 204 insertions, 3 deletions
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 4de53297eb3..d08cc195601 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:47 fredb Exp $ +# $NetBSD: Makefile,v 1.5 2002/05/25 11:31:29 rh Exp $ DISTNAME= bonobo-conf-0.14 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/bonobo-conf/} @@ -9,6 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Bonobo configuration system +BUILD_DEPENDS+= autoconf-[0-9]*:../../devel/autoconf BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES @@ -16,6 +17,9 @@ USE_X11BASE= YES USE_LIBTOOL= YES USE_GMAKE= YES +pre-configure: + cd ${WRKSRC} && autoconf + post-configure: ${RM} -f ${WRKSRC}/libtool ${LN} -s ${LOCALBASE}/bin/libtool ${WRKSRC} @@ -31,5 +35,6 @@ post-install: .include "../../devel/GConf/buildlink.mk" .include "../../devel/popt/buildlink.mk" .include "../../devel/oaf/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo index ea0f4b87fb8..2c328a79d2c 100644 --- a/devel/bonobo-conf/distinfo +++ b/devel/bonobo-conf/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/01/16 01:37:48 rh Exp $ +$NetBSD: distinfo,v 1.4 2002/05/25 11:31:29 rh Exp $ SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a Size (bonobo-conf-0.14.tar.gz) = 438259 bytes +SHA1 (patch-aa) = ff4f1a032862499a2e4682b2475275949fcfb58f +SHA1 (patch-ab) = 3ccae1607d75f44455d2526857637cbe22ad8ff1 diff --git a/devel/bonobo-conf/patches/patch-aa b/devel/bonobo-conf/patches/patch-aa new file mode 100644 index 00000000000..d70bba592a5 --- /dev/null +++ b/devel/bonobo-conf/patches/patch-aa @@ -0,0 +1,21 @@ +--- configure.in.orig Thu Nov 1 12:12:01 2001 ++++ configure.in Tue May 14 18:35:04 2002 +@@ -24,6 +24,7 @@ + AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(glib not found or too old),gmodule) + AM_PATH_OAF(0.6.2,,AC_MSG_ERROR([OAF not found or too old])) + AM_PATH_GTK(1.2.0,,AC_MSG_ERROR([gtk not found or too old])) ++AM_PATH_GDK_PIXBUF(0.17.0,,AC_MSG_ERROR([gdk-pixbuf not found or too old])) + + AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) + if test "x$with_html_dir" = "x" ; then +@@ -65,8 +66,8 @@ + AC_MSG_ERROR([bonobo >= 1.0.14 not found]) + fi + +-BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome`" +-BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome`" ++BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome` $GDK_PIXBUF_LIBS" ++BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome` $GDK_PIXBUF_CFLAGS" + + BONOBO_CONF_LIBS="-lbonobo_conf $BONOBO_LIBS" + BONOBO_CONF_CFLAGS="$BONOBO_CFLAGS" diff --git a/devel/bonobo-conf/patches/patch-ab b/devel/bonobo-conf/patches/patch-ab new file mode 100644 index 00000000000..48e74c6840f --- /dev/null +++ b/devel/bonobo-conf/patches/patch-ab @@ -0,0 +1,173 @@ +--- aclocal.m4.orig Tue May 14 18:26:28 2002 ++++ aclocal.m4 Tue May 14 18:27:19 2002 +@@ -4944,3 +4944,170 @@ + fi + fi]) + ++# Configure paths for gdk-pixbuf ++# Elliot Lee 2000-01-10 ++# stolen from Raph Levien 98-11-18 ++# stolen from Manish Singh 98-9-30 ++# stolen back from Frank Belew ++# stolen from Manish Singh ++# Shamelessly stolen from Owen Taylor ++ ++dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS ++dnl ++AC_DEFUN(AM_PATH_GDK_PIXBUF, ++[dnl ++dnl Get the cflags and libraries from the gdk-pixbuf-config script ++dnl ++AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)], ++ gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="") ++AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)], ++ gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="") ++AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program], ++ , enable_gdk_pixbuftest=yes) ++ ++ if test x$gdk_pixbuf_exec_prefix != x ; then ++ gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" ++ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then ++ GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config ++ fi ++ fi ++ if test x$gdk_pixbuf_prefix != x ; then ++ gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" ++ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then ++ GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config ++ fi ++ fi ++ ++ AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) ++ min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1) ++ AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version) ++ no_gdk_pixbuf="" ++ if test "$GDK_PIXBUF_CONFIG" = "no" ; then ++ no_gdk_pixbuf=yes ++ else ++ GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` ++ GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` ++ ++ gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_gdk_pixbuftest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" ++ LIBS="$LIBS $GDK_PIXBUF_LIBS" ++dnl ++dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity ++dnl checks the results of gdk-pixbuf-config to some extent ++dnl ++ rm -f conf.gdk_pixbuftest ++ AC_TRY_RUN([ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <gdk-pixbuf/gdk-pixbuf.h> ++ ++char* ++my_strdup (char *str) ++{ ++ char *new_str; ++ ++ if (str) ++ { ++ new_str = malloc ((strlen (str) + 1) * sizeof(char)); ++ strcpy (new_str, str); ++ } ++ else ++ new_str = NULL; ++ ++ return new_str; ++} ++ ++int main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.gdk_pixbuftest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = my_strdup("$min_gdk_pixbuf_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); ++ exit(1); ++ } ++ ++ if (($gdk_pixbuf_major_version > major) || ++ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || ++ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); ++ printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); ++ printf("*** best to upgrade to the required version.\n"); ++ printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); ++ printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); ++ printf("*** config.cache before re-running configure\n"); ++ return 1; ++ } ++} ++ ++],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_gdk_pixbuf" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GDK_PIXBUF_CONFIG" = "no" ; then ++ echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" ++ echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" ++ echo "*** full path to gdk-pixbuf-config." ++ else ++ if test -f conf.gdk_pixbuftest ; then ++ : ++ else ++ echo "*** Could not run GDK_PIXBUF test program, checking why..." ++ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" ++ LIBS="$LIBS $GDK_PIXBUF_LIBS" ++ AC_TRY_LINK([ ++#include <stdio.h> ++#include <gdk-pixbuf/gdk-pixbuf.h> ++], [ return 0; ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" ++ echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" ++ echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" ++ echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GDK_PIXBUF_CFLAGS="" ++ GDK_PIXBUF_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GDK_PIXBUF_CFLAGS) ++ AC_SUBST(GDK_PIXBUF_LIBS) ++ rm -f conf.gdk_pixbuftest ++]) ++ |