diff options
| author | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /databases | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz | |
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly
PR: 19623
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/gtksql/Makefile | 5 | ||||
| -rw-r--r-- | databases/gtksql/files/patch-aa | 33 | ||||
| -rw-r--r-- | databases/gtksql/pkg-plist | 1 |
3 files changed, 29 insertions, 10 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index be3ed04..f7e19ba 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -25,7 +25,10 @@ LIB_DEPENDS += mysqlclient.6:${PORTSDIR}/databases/mysql322-client LIB_DEPENDS += pq.2:${PORTSDIR}/databases/postgresql .endif +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" pre-patch: .if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) @@ -49,7 +52,7 @@ do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/gtksql -.for file in COPYING Changelog README +.for file in Changelog README @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql .endfor .endif diff --git a/databases/gtksql/files/patch-aa b/databases/gtksql/files/patch-aa index dcf697d..dd92f95 100644 --- a/databases/gtksql/files/patch-aa +++ b/databases/gtksql/files/patch-aa @@ -1,6 +1,10 @@ ---- Makefile.orig Mon Jul 26 19:30:44 1999 -+++ Makefile Mon Jul 26 19:41:39 1999 -@@ -4,14 +4,14 @@ +--- Makefile.orig Sat Jun 5 22:05:36 1999 ++++ Makefile Sat Jul 1 16:10:57 2000 +@@ -1,17 +1,17 @@ + # Your favorite compilation options here :-) +-MCFLAGS = -Wall -O -g ++#MCFLAGS = -Wall -O -g + LDFLAGS = -lcrypt # Comment out the variables for the databases that you do not want # Here, what you need for PostgreSQL @@ -21,14 +25,27 @@ # Nothing to change below this point... DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS) -@@ -24,8 +24,8 @@ +@@ -22,13 +22,13 @@ + config.o mytoolbar.o + OBJS = $(MOBJS) $(DBSQLOBJS) - CFLAGS = $(MCFLAGS) $(DBSQLFLAGS) +-CFLAGS = $(MCFLAGS) $(DBSQLFLAGS) ++CFLAGS += $(MCFLAGS) $(DBSQLFLAGS) -GTKLIBS = `gtk-config --libs` -GTKCFLAGS = `gtk-config --cflags` -+GTKLIBS = `gtk12-config --libs` -+GTKCFLAGS = `gtk12-config --cflags` ++GTKLIBS = `$(GTK_CONFIG) --libs` ++GTKCFLAGS = `$(GTK_CONFIG) --cflags` all: $(OBJS) - gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) +- gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) ++ $(CC) -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) + + clean: + rm -f *.o gtksql +@@ -37,4 +37,4 @@ + cp gtksql $(DESTDIR)usr/bin/ + + .c.o: +- gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o ++ $(CC) $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o diff --git a/databases/gtksql/pkg-plist b/databases/gtksql/pkg-plist index d1a8c39..7672689 100644 --- a/databases/gtksql/pkg-plist +++ b/databases/gtksql/pkg-plist @@ -1,5 +1,4 @@ bin/gtksql -share/doc/gtksql/COPYING share/doc/gtksql/Changelog share/doc/gtksql/README @dirrm share/doc/gtksql |
