From 2a9398affbd552fec5452cb4643bfa3dc5c55103 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 11 Apr 2002 01:31:34 +0000 Subject: Strongly buildlinkify and use LIBTOOL_OVERRIDE to ensure that the pkgsrc libtool is invoked. --- x11/gnome-core/Makefile | 12 ++++-- x11/gnome-core/distinfo | 5 ++- x11/gnome-core/patches/patch-aa | 92 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 8 deletions(-) (limited to 'x11/gnome-core') diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 81d383b10e3..fdaef7219e4 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2002/03/24 20:03:34 rh Exp $ +# $NetBSD: Makefile,v 1.75 2002/04/11 01:31:34 jlam Exp $ DISTNAME= gnome-core-1.4.0.6 CATEGORIES= x11 gnome @@ -16,14 +16,13 @@ USE_BUILDLINK_ONLY= YES USE_X11BASE= YES USE_GMAKE= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool LOCALSTATEDIR= ${X11PREFIX}/var/gnome GNU_CONFIGURE= YES CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} -USE_PERL5= YES PERL_SCRIPTS= help-browser/gnome-convert help-browser/gnome-download post-patch: @@ -33,6 +32,12 @@ post-patch: ${SED} -e 's#/usr/bin/perl#${PERL5}#g' \ <$${FILE}.orig >$$FILE; \ done + cd ${WRKSRC}; \ + for file in `${FIND} . -name "Makefile.in"`; do \ + ${SED} -e "s|[ ]*-I\$$(includedir)||g" \ + $${file} > $${file}.fixed; \ + ${MV} -f $${file}.fixed $${file}; \ + done post-install: .for prg in gnome-feedback gnome-terminal gpl lgpl fdl @@ -46,6 +51,7 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/libglade/buildlink.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk" +.include "../../lang/perl5/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" .include "../../www/gtkhtml/buildlink.mk" .include "../../www/libghttp/buildlink.mk" diff --git a/x11/gnome-core/distinfo b/x11/gnome-core/distinfo index db7a5d2cf88..66eabe73493 100644 --- a/x11/gnome-core/distinfo +++ b/x11/gnome-core/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.6 2002/03/25 04:47:47 rh Exp $ +$NetBSD: distinfo,v 1.7 2002/04/11 01:31:34 jlam Exp $ SHA1 (gnome-core-1.4.0.6.tar.bz2) = d2c055d3b56416e732042369241d1b0d7423a312 Size (gnome-core-1.4.0.6.tar.bz2) = 5697603 bytes -SHA1 (patch-aa) = 80c363f6ad23043a971843e9fdf6bfb950d8e65b +SHA1 (patch-aa) = 3b409e986eee294aca98784a88aa946a66a6a8e7 SHA1 (patch-ab) = 7790d8305aee701033ed5d508d9c5d330f1194cf +SHA1 (patch-ac) = 02d5c68e9f2fedeb3a5b51900e553b92766ba32b SHA1 (patch-ag) = cf578cd3de610d216499f43dc229c266ab9ef447 SHA1 (patch-aj) = a0afc1cc6c414e710e555112dccb945ded4c3251 diff --git a/x11/gnome-core/patches/patch-aa b/x11/gnome-core/patches/patch-aa index 9c9fa13d42b..e968a7ececb 100644 --- a/x11/gnome-core/patches/patch-aa +++ b/x11/gnome-core/patches/patch-aa @@ -1,8 +1,52 @@ -$NetBSD: patch-aa,v 1.9 2000/10/18 00:06:27 jlam Exp $ +$NetBSD: patch-aa,v 1.10 2002/04/11 01:31:34 jlam Exp $ ---- configure.orig Tue Sep 26 11:51:54 2000 +--- configure.orig Sat Jan 26 18:19:48 2002 +++ configure -@@ -5244,6 +5244,11 @@ +@@ -1325,8 +1325,8 @@ + fi + if test x$gnome_cv_orbit_found = xyes; then + +- ORBIT_CFLAGS=`orbit-config --cflags client server` +- ORBIT_LIBS=`orbit-config --use-service=name --libs client server` ++ ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server` ++ ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server` + + + else +@@ -1343,8 +1343,8 @@ + + gnome_cv_gnorba_found=no + if test x$gnome_cv_orbit_found = xyes; then +- GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" +- GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" ++ GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`" ++ GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`" + if test -n "$GNORBA_LIBS"; then + gnome_cv_gnorba_found=yes + fi +@@ -1364,8 +1364,8 @@ + fi + if test x$gnome_cv_orbit_found = xyes; then + +- GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" +- GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" ++ GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`" ++ GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`" + + + else +@@ -7250,8 +7250,8 @@ + + CFLAGS_save=$CFLAGS + LIBS_save=$LIBS +-CFLAGS=`gnome-config --cflags gnomeui` +-LIBS=`gnome-config --libs gnomeui` ++CFLAGS=`$GNOME_CONFIG --cflags gnomeui` ++LIBS=`$GNOME_CONFIG --libs gnomeui` + + echo $ac_n "checking for gnome_window_icon_set_default_from_file in -lgnomeui""... $ac_c" 1>&6 + echo "configure:7258: checking for gnome_window_icon_set_default_from_file in -lgnomeui" >&5 +@@ -8974,6 +8974,11 @@ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES @@ -14,3 +58,45 @@ $NetBSD: patch-aa,v 1.9 2000/10/18 00:06:27 jlam Exp $ # AM_GNOME_GETTEXT above substs $DATADIRNAME # this is the directory where the *.{mo,gmo} files are installed gnomelocaledir='${prefix}/share/locale' +@@ -9203,7 +9208,10 @@ + PIXBUF_CFLAGS=`$GNOME_CONFIG --cflags gdk_pixbuf` + PIXBUF_LIBS=`$GNOME_CONFIG --libs gdk_pixbuf` + if test "x$PIXBUF_CFLAGS" != x ; then +- vers=`gdk-pixbuf-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` ++ if test "x$GDK_PIXBUF_CONFIG" = "x"; then ++ GDK_PIXBUF_CONFIG=gdk-pixbuf-config ++ fi ++ vers=`$GDK_PIXBUF_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge 0007000; then + echo "$ac_t""found" 1>&6 + else +@@ -9231,8 +9239,8 @@ + echo $ac_n "checking for Glade libraries >= $LIBGLADE_REQUIRED""... $ac_c" 1>&6 + echo "configure:9233: checking for Glade libraries >= $LIBGLADE_REQUIRED" >&5 + libglade_ok=no +-if gnome-config --libs libglade > /dev/null 2>&1; then +- verstxt=`gnome-config --modversion libglade` ++if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then ++ verstxt=`$GNOME_CONFIG --modversion libglade` + vers=`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 1000 + $2;}'` + if test "$vers" -ge 14; then + echo "$ac_t""$marker_ok found $verstxt" 1>&6 +@@ -9248,14 +9256,14 @@ + fi + unset libglade_ok + GT_LIBS="libglade zvt gnorba gnomeui" +-GNOME_TERMINAL_LIBS=`gnome-config --libs $GT_LIBS` +-GNOME_TERMINAL_CFLAGS=`gnome-config --cflags $GT_LIBS` ++GNOME_TERMINAL_LIBS=`$GNOME_CONFIG --libs $GT_LIBS` ++GNOME_TERMINAL_CFLAGS=`$GNOME_CONFIG --cflags $GT_LIBS` + + + + +-GLADE_LIBS=`gnome-config --libs libglade` +-GLADE_CFLAGS=`gnome-config --cflags libglade` ++GLADE_LIBS=`$GNOME_CONFIG --libs libglade` ++GLADE_CFLAGS=`$GNOME_CONFIG --cflags libglade` + + + -- cgit v1.2.3