Fix for xpkgwedge, and buildlink-ify

databases/gtksql/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/14 15:04:49 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/14 17:13:02 abs Exp $
 #
 
 DISTNAME=		gtksql-0.3
@@ -15,6 +15,11 @@ COMMENT=		Query tool for PostgreSQL written with GTK
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
 
+MAKE_ENV+=		X11PREFIX=${X11PREFIX}
+
 USE_X11BASE=		# defined
 
+USE_BUILDLINK_ONLY=	yes
+
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"

databases/gtksql/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:10:58 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/14 17:13:02 abs Exp $
 
 SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c
 Size (gtksql-0.3.tar.gz) = 50557 bytes
-SHA1 (patch-aa) = 6e440bb7d5f04d154e4c59ad56416062233a0865
+SHA1 (patch-aa) = 3dcdcf910ca3761f42681e51c4006618c18c2ed2

databases/gtksql/patches/patch-aa

@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/04/09 03:53:51 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/14 17:13:02 abs Exp $
 
 --- Makefile.orig	Sat Jun  5 09:05:36 1999
 +++ Makefile	Fri Apr  7 20:44:08 2000
@@ -28,8 +28,8 @@ $NetBSD: patch-aa,v 1.5 2000/04/09 03:53:51 jlam Exp $
  
 -GTKLIBS     = `gtk-config --libs`
 -GTKCFLAGS   = `gtk-config --cflags`
-+GTKLIBS     = `${X11BASE}/bin/gtk-config --libs`
-+GTKCFLAGS   = `${X11BASE}/bin/gtk-config --cflags`
++GTKLIBS     = `${X11PREFIX}/bin/gtk-config --libs`
++GTKCFLAGS   = `${X11PREFIX}/bin/gtk-config --cflags`
  
  all: $(OBJS)
  	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)