Converted to use buildlink.mk files.

3 files changed, 31 insertions, 8 deletions

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"