summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/easytag/Makefile4
-rw-r--r--audio/easytag/distinfo4
-rw-r--r--audio/easytag/patches/patch-aa6
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile23
-rw-r--r--graphics/gdk-pixbuf/Makefile14
-rw-r--r--graphics/gdk-pixbuf/Makefile.common14
-rw-r--r--graphics/gdk-pixbuf/buildlink.mk11
7 files changed, 56 insertions, 20 deletions
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index dae38af5a68..a10af1dd147 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/16 14:52:43 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/16 19:51:51 jlam Exp $
#
DISTNAME= easytag-0.11
@@ -16,7 +16,9 @@ USE_GMAKE= yes
USE_X11BASE= yes
.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+MAKE_ENV+= GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}"
MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 170ad1fe681..048ad31f0c1 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/06/16 14:52:43 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/06/16 19:51:51 jlam Exp $
SHA1 (easytag-0.11.tar.gz) = b111566c7642ce692217c0f80a1ccea91944a632
Size (easytag-0.11.tar.gz) = 284140 bytes
-SHA1 (patch-aa) = b5e866b0eeb365b2319b2fdf60495cb90a85b903
+SHA1 (patch-aa) = ef834386a8b0c5201b673d0c78b2073de0e7815c
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
index db1b69a9fa2..5bbca2dcd01 100644
--- a/audio/easytag/patches/patch-aa
+++ b/audio/easytag/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2001/06/16 14:52:44 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2001/06/16 19:51:51 jlam Exp $
--- Makefile.orig Thu Oct 26 15:18:35 2000
+++ Makefile Fri Jun 15 02:04:42 2001
@@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.4 2001/06/16 14:52:44 jlam Exp $
-GLIBS = `gtk-config --libs`
-GFLAGS = `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
-OPT = -g -Wall -O2
-+GLIBS = ${LDFLAGS} `gtk-config --libs` -lintl
-+GFLAGS = ${CFLAGS} `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
++GLIBS = ${LDFLAGS} `${GTK_CONFIG} --libs` -lintl
++GFLAGS = ${CFLAGS} `${GTK_CONFIG} --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
+OPT = -Wall
#ID3_LIB = -lid3
-MAKE = make
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 394daca3ad3..94ee583dccc 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/15 08:29:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/16 19:53:09 jlam Exp $
.include "../gdk-pixbuf/Makefile.common"
@@ -6,13 +6,24 @@ PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
COMMENT= the GNOME image loading library GNOME canvas support add-on
-DEPENDS+= gnome-libs>=1.0.53:../../x11/gnome-libs
-DEPENDS+= gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
-
CONFLICTS+= gdk-pixbuf<0.10.1
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+GDK_PIXBUF_REQD= 0.10.1
+
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
+
+# Fix config scripts by removing buildlink directory references.
+post-build:
+ @cd ${WRKSRC}; \
+ for file in gnomecanvaspixbufConf.sh; do \
+ ${MV} -f $${file} $${file}.fixme; \
+ ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
+ -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
+ $${file}.fixme > $${file}; \
+ ${RM} -f $${file}.fixme; \
+ ${CHMOD} +x $${file}; \
+ done
do-install:
${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 7a7ddb455ac..8538f282b09 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/18 04:33:53 mjl Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/16 19:53:08 jlam Exp $
#
.include "Makefile.common"
@@ -15,6 +15,18 @@ post-configure:
${SED} -e 's/ doc$$//' ${WRKSRC}/Makefile >${WRKSRC}/.tmp && \
${MV} ${WRKSRC}/.tmp ${WRKSRC}/Makefile
+# Fix config scripts by removing buildlink directory references.
+post-build:
+ @cd ${WRKSRC}; \
+ for file in gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh; do \
+ ${MV} -f $${file} $${file}.fixme; \
+ ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
+ -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
+ $${file}.fixme > $${file}; \
+ ${RM} -f $${file}.fixme; \
+ ${CHMOD} +x $${file}; \
+ done
+
post-install:
${TEST} ${PREFIX} = ${LOCALBASE} || \
${LN} -fs ${PREFIX}/share/aclocal/gdk-pixbuf.m4 \
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index f59d808d587..557d2bbcb52 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2001/06/15 08:30:44 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2001/06/16 19:53:09 jlam Exp $
#
DISTNAME= gdk-pixbuf-0.10.1
@@ -10,11 +10,6 @@ HOMEPAGE= http://www.gnome.org/
BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf
BUILD_DEPENDS+= automake-1.4:../../devel/automake
-DEPENDS+= gtk+>=1.2.8:../../x11/gtk
-
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
USE_GMAKE= # defined
USE_X11BASE= # defined
@@ -22,6 +17,13 @@ USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
+USE_CONFIG_WRAPPER= # defined
+
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+
M4= ${LOCALBASE}/bin/gm4
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index e87caf221b9..4f4361ab0e4 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/15 09:00:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/16 19:53:09 jlam Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf.
#
@@ -27,10 +27,19 @@ BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf_xlib.*
.include "../../graphics/tiff/buildlink.mk"
BUILDLINK_TARGETS.gdk-pixbuf= gdk-pixbuf-buildlink
+BUILDLINK_TARGETS.gdk-pixbuf+= gdk-pixbuf-buildlink-config-wrapper
BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gdk-pixbuf}
+BUILDLINK_CONFIG.gdk-pixbuf= ${X11PREFIX}/bin/gdk-pixbuf-config
+BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf= ${BUILDLINK_DIR}/bin/gdk-pixbuf-config
+
+.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+CONFIGURE_ENV+= GDK_PIXBUF_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}"
+.endif
+
pre-configure: ${BUILDLINK_TARGETS.gdk-pixbuf}
gdk-pixbuf-buildlink: _BUILDLINK_USE
+gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
.include "../../mk/bsd.buildlink.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 16:48:35 +0000