Fri Jan 29 17:05:46 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.42 -r1.43 pkgsrc/databases/gtksql/Makefile
diff -r1.11 -r1.12 pkgsrc/databases/gtksql/distinfo
diff -r1.12 -r1.13 pkgsrc/databases/gtksql/patches/patch-aa
cvs diff -r1.42 -r1.43 pkgsrc/databases/gtksql/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/gtksql/Attic/Makefile 2008/03/13 17:38:48 1.42
+++ pkgsrc/databases/gtksql/Attic/Makefile 2010/01/29 17:05:46 1.43
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: Makefile,v 1.42 2008/03/13 17:38:48 joerg Exp $ 1# $NetBSD: Makefile,v 1.43 2010/01/29 17:05:46 joerg Exp $
2# 2#
3 3
4DISTNAME= gtksql-0.3 4DISTNAME= gtksql-0.3
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= http://membres.lycos.fr/bbrox/GtkSQL/ 7MASTER_SITES= http://membres.lycos.fr/bbrox/GtkSQL/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://membres.lycos.fr/bbrox/GtkSQL/ 10HOMEPAGE= http://membres.lycos.fr/bbrox/GtkSQL/
11COMMENT= Query tool for PostgreSQL written with GTK 11COMMENT= Query tool for PostgreSQL written with GTK
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
 15INSTALLATION_DIRS+= bin
 16
13USE_X11BASE= yes 17USE_X11BASE= yes
14MAKE_ENV+= MCFLAGS=${CFLAGS:M*:Q} PGSQL_PREFIX=${PGSQL_PREFIX:Q} 18MAKE_ENV+= MCFLAGS=${CFLAGS:M*:Q} PGSQL_PREFIX=${PGSQL_PREFIX:Q}
15 19
16.include "../../mk/pgsql.buildlink3.mk" 20.include "../../mk/pgsql.buildlink3.mk"
17.include "../../x11/gtk/buildlink3.mk" 21.include "../../x11/gtk/buildlink3.mk"
18 22
19.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/databases/gtksql/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/gtksql/Attic/distinfo 2006/03/20 19:51:40 1.11
+++ pkgsrc/databases/gtksql/Attic/distinfo 2010/01/29 17:05:46 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2006/03/20 19:51:40 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2010/01/29 17:05:46 joerg Exp $
2 2
3SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c 3SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c
4RMD160 (gtksql-0.3.tar.gz) = e05cb980ce29c44b37eaafc43e9161fb281b2a9d 4RMD160 (gtksql-0.3.tar.gz) = e05cb980ce29c44b37eaafc43e9161fb281b2a9d
5Size (gtksql-0.3.tar.gz) = 50557 bytes 5Size (gtksql-0.3.tar.gz) = 50557 bytes
6SHA1 (patch-aa) = 01961207b8bcb6a60da2224a8bf07160d660c0c6 6SHA1 (patch-aa) = e7c521a660c8f48fbb1a3cd6fdfacd54b50aecc3
7SHA1 (patch-ab) = 0d194dd153e3d3ce34b0f0d805ae0d83408de33b 7SHA1 (patch-ab) = 0d194dd153e3d3ce34b0f0d805ae0d83408de33b
cvs diff -r1.12 -r1.13 pkgsrc/databases/gtksql/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/gtksql/patches/Attic/patch-aa 2006/03/20 19:51:40 1.12
+++ pkgsrc/databases/gtksql/patches/Attic/patch-aa 2010/01/29 17:05:46 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.12 2006/03/20 19:51:40 joerg Exp $ 1$NetBSD: patch-aa,v 1.13 2010/01/29 17:05:46 joerg Exp $
2 2
3--- Makefile.orig Sat Jun 5 06:05:36 1999 3--- Makefile.orig Sat Jun 5 06:05:36 1999
4+++ Makefile 4+++ Makefile
5@@ -1,17 +1,17 @@ 5@@ -1,17 +1,17 @@
6 # Your favorite compilation options here :-) 6 # Your favorite compilation options here :-)
7-MCFLAGS = -Wall -O -g  7-MCFLAGS = -Wall -O -g
8-LDFLAGS = -lcrypt 8-LDFLAGS = -lcrypt
9+#MCFLAGS = -Wall -O -g  9+#MCFLAGS = -Wall -O -g
10+LDFLAGS += -lcrypt 10+LDFLAGS += -lcrypt
11  11
12 # Comment out the variables for the databases that you do not want 12 # Comment out the variables for the databases that you do not want
13 # Here, what you need for PostgreSQL 13 # Here, what you need for PostgreSQL
14-PGSQLIBS = -L/usr/local/pgsql/lib -lpq 14-PGSQLIBS = -L/usr/local/pgsql/lib -lpq
@@ -29,18 +29,18 @@ $NetBSD: patch-aa,v 1.12 2006/03/20 19:5 @@ -29,18 +29,18 @@ $NetBSD: patch-aa,v 1.12 2006/03/20 19:5
29 DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS) 29 DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
30@@ -28,13 +28,13 @@ GTKLIBS = `gtk-config --libs` 30@@ -28,13 +28,13 @@ GTKLIBS = `gtk-config --libs`
31 GTKCFLAGS = `gtk-config --cflags` 31 GTKCFLAGS = `gtk-config --cflags`
32  32
33 all: $(OBJS) 33 all: $(OBJS)
34- gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) 34- gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
35+ ${CC} -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) 35+ ${CC} -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
36  36
37 clean: 37 clean:
38 rm -f *.o gtksql 38 rm -f *.o gtksql
39  39
40 install: all 40 install: all
41- cp gtksql $(DESTDIR)usr/bin/ 41- cp gtksql $(DESTDIR)usr/bin/
42+ ${BSD_INSTALL_PROGRAM} gtksql ${PREFIX}/bin 42+ ${BSD_INSTALL_PROGRAM} gtksql ${DESTDIR}${PREFIX}/bin
43  43
44 .c.o:  44 .c.o:
45- gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o 45- gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
46+ ${CC} $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o 46+ ${CC} $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o