Honor CFLAGS and CC settings from the environment, complete the conversion

to use buildlink.mk files, and truly mark as USE_BUILDLINK_ONLY.

3 files changed, 24 insertions, 20 deletions

diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 306e4e07164..86a50a3fcb7 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/08/14 17:13:02 abs Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/23 21:44:12 jlam Exp $
 #
 
 DISTNAME=		gtksql-0.3
@@ -12,14 +12,10 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.multimania.com/bbrox/GtkSQL/
 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=	# defined
+MAKE_ENV+=		MCFLAGS="${CFLAGS}"
 
-USE_BUILDLINK_ONLY=	yes
-
+.include "../../databases/postgresql-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gtksql/distinfo b/databases/gtksql/distinfo
index bc9e5bc2b83..0312cef964d 100644
--- a/databases/gtksql/distinfo
+++ b/databases/gtksql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/08/14 17:13:02 abs Exp $
+$NetBSD: distinfo,v 1.4 2001/08/23 21:44:12 jlam Exp $
 
 SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c
 Size (gtksql-0.3.tar.gz) = 50557 bytes
-SHA1 (patch-aa) = 3dcdcf910ca3761f42681e51c4006618c18c2ed2
+SHA1 (patch-aa) = 4f0e00c4df5d1cc42a77d97171b419613231bb9a
diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa
index 0d4c6412059..1e3857830f0 100644
--- a/databases/gtksql/patches/patch-aa
+++ b/databases/gtksql/patches/patch-aa
@@ -1,15 +1,20 @@
-$NetBSD: patch-aa,v 1.6 2001/08/14 17:13:02 abs Exp $
+$NetBSD: patch-aa,v 1.7 2001/08/23 21:44:12 jlam Exp $
 
 --- Makefile.orig	Sat Jun  5 09:05:36 1999
-+++ Makefile	Fri Apr  7 20:44:08 2000
-@@ -4,14 +4,14 @@
++++ Makefile
+@@ -1,17 +1,17 @@
+ # Your favorite compilation options here :-)
+-MCFLAGS  = -Wall -O -g 
+-LDFLAGS  =  -lcrypt
++#MCFLAGS  = -Wall -O -g 
++LDFLAGS  +=  -lcrypt
  
  # Comment out the variables for the databases that you do not want
  # Here, what you need for PostgreSQL
 -PGSQLIBS    = -L/usr/local/pgsql/lib -lpq
 -PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
 +PGSQLIBS    = -L${LOCALBASE}/lib -lpq
-+PGSQLCFLAGS = -I${LOCALBASE}/include/pgsql -DUSE_POSTGRESQL
++PGSQLCFLAGS = -I${BUILDLINK_DIR}/include/pgsql -DUSE_POSTGRESQL
  PGSQLOBJS   = postgres.o
  
  # Here, what you need for MySQL
@@ -22,18 +27,20 @@ $NetBSD: patch-aa,v 1.6 2001/08/14 17:13:02 abs Exp $
  
  # Nothing to change below this point...
  DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
-@@ -24,8 +24,8 @@
+@@ -24,17 +24,17 @@
  OBJS    = $(MOBJS) $(DBSQLOBJS)
  CFLAGS  = $(MCFLAGS) $(DBSQLFLAGS)
  
 -GTKLIBS     = `gtk-config --libs`
 -GTKCFLAGS   = `gtk-config --cflags`
-+GTKLIBS     = `${X11PREFIX}/bin/gtk-config --libs`
-+GTKCFLAGS   = `${X11PREFIX}/bin/gtk-config --cflags`
++GTKLIBS     = `${GTK_CONFIG} --libs`
++GTKCFLAGS   = `${GTK_CONFIG} --cflags`
  
  all: $(OBJS)
- 	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
-@@ -34,7 +34,7 @@
+-	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
++	${CC} -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
+ 
+ clean:
  	rm -f *.o gtksql
  
  install: all
@@ -41,4 +48,5 @@ $NetBSD: patch-aa,v 1.6 2001/08/14 17:13:02 abs Exp $
 +	${BSD_INSTALL_PROGRAM} gtksql ${PREFIX}/bin
  
  .c.o: 
- 	gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
+-	gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
++	${CC} $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o