Use the buildlink config script wrappers and remove a lot of unnecessary

buildlink.mk files already pulled in by imlib/buildlink.mk.

4 files changed, 42 insertions, 23 deletions

diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index dee3e086dc8..684719c9807 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/25 23:48:42 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/23 15:56:41 jlam Exp $
 
 DISTNAME=	xzgv-0.7
 CATEGORIES=	graphics
@@ -10,9 +10,10 @@ HOMEPAGE=	http://xzgv.browser.org/
 COMMENT=	Image viewer
 
 INFO_FILES=	xzgv
-USE_BUILDLINK_ONLY=yes
-USE_X11BASE=	yes
-USE_GMAKE=	yes
+
+USE_BUILDLINK_ONLY=	yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin
@@ -21,11 +22,5 @@ do-install:
 	@for f in xzgv xzgv-1 xzgv-2 xzgv-3 ; do \
 	${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done
 
-.include "../../x11/gtk/buildlink.mk"
-.include "../../devel/glib/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xzgv/distinfo b/graphics/xzgv/distinfo
index ea12b2347f0..d39017550e2 100644
--- a/graphics/xzgv/distinfo
+++ b/graphics/xzgv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/04/22 21:35:50 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/08/23 15:56:41 jlam Exp $
 
 SHA1 (xzgv-0.7.tar.gz) = e6677cc9f4a2266b06e9962edc2a08a5fdd3feb4
 Size (xzgv-0.7.tar.gz) = 297485 bytes
-SHA1 (patch-aa) = 3dae69b1482291e2e41dad0efe515c901577d5e8
-SHA1 (patch-ab) = 065fbd44ff6178e7ffe105a539a6f3ece1f439dc
+SHA1 (patch-aa) = 7a0d6e6b24d788fb9cf45967e4c3b434c621def3
+SHA1 (patch-ab) = 9ffbc3a9a3ccba62b0838966b36369ab56c33046
diff --git a/graphics/xzgv/patches/patch-aa b/graphics/xzgv/patches/patch-aa
index 2406b8b4e69..656be00b9e4 100644
--- a/graphics/xzgv/patches/patch-aa
+++ b/graphics/xzgv/patches/patch-aa
@@ -1,20 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2001/04/22 21:35:50 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/23 15:56:41 jlam Exp $
 
---- config.mk.orig	Mon Jan  8 04:57:44 2001
+--- config.mk.orig	Sun Jan  7 23:57:44 2001
 +++ config.mk
-@@ -6,8 +6,9 @@
+@@ -6,8 +6,8 @@
  # Set the C compiler to use, and options for it.
  # This is likely to be what you'll want for most systems:
  #
 -CC=gcc
 -CFLAGS=-O2 -Wall
 +#CC=gcc
-+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
-+LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
++#CFLAGS=-O2 -Wall
  
  # Set the awk interpreter to use for a script used while compiling.
  # (This should be a `new' awk, such as gawk or mawk.)
-@@ -27,7 +28,7 @@
+@@ -27,7 +27,7 @@
  # On non-x86-based machines (e.g. Alpha, Sparc, PPC), you should
  # comment it out.
  #
@@ -23,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2001/04/22 21:35:50 jtb Exp $
  
  # Set rendering backend to use. Currently only Imlib 1.x is properly
  # supported, so leave this alone. :-)
-@@ -45,7 +46,7 @@
+@@ -45,7 +45,7 @@
  # MANDIR to directory for man page.
  # Usually it will be simpler to just set PREFIX.
  #
diff --git a/graphics/xzgv/patches/patch-ab b/graphics/xzgv/patches/patch-ab
index fbd3b9a9671..41cc7fa22a4 100644
--- a/graphics/xzgv/patches/patch-ab
+++ b/graphics/xzgv/patches/patch-ab
@@ -1,8 +1,33 @@
-$NetBSD: patch-ab,v 1.2 2001/04/22 21:35:50 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/23 15:56:41 jlam Exp $
 
---- src/Makefile.orig	Tue Apr 10 13:37:01 2001
+--- src/Makefile.orig	Tue Apr 10 08:37:01 2001
 +++ src/Makefile
-@@ -30,7 +30,7 @@
+@@ -9,7 +9,7 @@
+ # This gets definitions for CC, CFLAGS, BINDIR etc.
+ include ../config.mk
+ 
+-CFLAGS+=-DBACKEND_$(BACKEND) `gtk-config --cflags`
++CFLAGS+=-DBACKEND_$(BACKEND) `${GTK_CONFIG} --cflags`
+ 
+ # I could do this less horribly if I made it GNU-make-specific,
+ # but I decided not to. And here we are. :-(
+@@ -18,19 +18,19 @@
+ # `--libs' case.
+ #
+ BACKEND_CFLAGS=`case "$(BACKEND)" in \
+-	IMLIB1) imlib-config --cflags-gdk ;; \
+-	GDK_PIXBUF) gdk-pixbuf-config --cflags ;; \
++	IMLIB1) ${IMLIB_CONFIG} --cflags-gdk ;; \
++	GDK_PIXBUF) ${GDK_PIXBUF_CONFIG} --cflags ;; \
+ 	esac`
+ BACKEND_LIBS=`case "$(BACKEND)" in \
+-	IMLIB1) imlib-config --libs-gdk ;; \
+-	GDK_PIXBUF) gdk-pixbuf-config --libs ;; \
++	IMLIB1) ${IMLIB_CONFIG} --libs-gdk ;; \
++	GDK_PIXBUF) ${GDK_PIXBUF_CONFIG} --libs ;; \
+ 	esac`
+ 
+ # `all' makes install-info too, as it's a bit weird to have something
  # compile when you do `make install'. :-)
  # (It would also be weird to have it made by the `doc' Makefile, IMHO.)