From owner-freebsd-ports Mon Jul 26 12:11:11 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id D6CAC14F27 for ; Mon, 26 Jul 1999 12:11:06 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA21757; Mon, 26 Jul 1999 12:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from dominik.saargate.de (dominik.saargate.de [212.88.132.246]) by hub.freebsd.org (Postfix) with ESMTP id 3F20014CC2 for ; Mon, 26 Jul 1999 12:03:45 -0700 (PDT) (envelope-from domi@dominik.saargate.de) Received: (from domi@localhost) by dominik.saargate.de (8.9.3/8.9.3) id UAA98759; Mon, 26 Jul 1999 20:04:41 +0200 (CEST) (envelope-from domi) Message-Id: <199907261804.UAA98759@dominik.saargate.de> Date: Mon, 26 Jul 1999 20:04:41 +0200 (CEST) From: domi@saargate.de Reply-To: domi@saargate.de To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/12820: gtksql update 0.2 -> 0.3 with some changes Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 12820 >Category: ports >Synopsis: gtksql update 0.2 -> 0.3 with some changes >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 26 12:10:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Dominik Brettnacher >Release: FreeBSD 3.2-STABLE i386 >Organization: >Environment: >Description: an update for gtksql from version 0.2 to 0.3 * maintainership has changed (the old maintainer, andy@icc.surw.chel.su gave "Ok" to this) * gtk 1.2.x is now used instead of 1.0.x * the use can choose between MySQL support and PostgreSQL support, or he can use both of them >How-To-Repeat: >Fix: diff -uNr gtksql.old/Makefile gtksql/Makefile --- gtksql.old/Makefile Mon Jul 26 19:59:52 1999 +++ gtksql/Makefile Mon Jul 26 19:41:03 1999 @@ -1,21 +1,47 @@ # New ports collection makefile for: gtksql -# Version required: 0.2 +# Version required: 0.3 # Date created: 19 November 1998 # Whom: Andrey Zakhvatov # # $Id: Makefile,v 1.1.1.1 1999/03/20 05:28:38 taoka Exp $ # -DISTNAME= gtksql-0.2 +DISTNAME= gtksql-0.3 CATEGORIES= databases MASTER_SITES= http://www.multimania.com/bbrox/GtkSQL/ -MAINTAINER= andy@icc.surw.chel.su +MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \ - pq.2:${PORTSDIR}/databases/postgresql +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +IS_INTERACTIVE= yes USE_X_PREFIX= yes + +fetch-depends: +.if defined(USE_MYSQL) +LIB_DEPENDS += mysqlclient.6:${PORTSDIR}/databases/mysql322-client +.endif +.if defined(USE_PGSQL) +LIB_DEPENDS += pq.2:${PORTSDIR}/databases/postgresql +.endif + +.if !defined(USE_MYSQL) && !defined(USE_PGSQL) + @ ${ECHO} "You must specify which database to use, possible are:" + @ ${ECHO} + @ ${ECHO} "make USE_MYSQL=yes (for MySQL support)" + @ ${ECHO} "make USE_PGSQL=yes (for PostgreSQL support)" + @ ${ECHO} "make USE_MYSQL=yes USE_PGSQL=yes (for both MySQL and PostgreSQL support)" + @ ${FALSE} +.endif + +do-configure: +.if defined(USE_MYSQL) + @ ${PERL} -i -pe "s/^#MYSQL/MYSQL/g" ${WRKDIR}/${DISTNAME}/Makefile +.endif +.if defined(USE_PGSQL) + @ ${PERL} -i -pe "s/^#PGSQL/PGSQL/g" ${WRKDIR}/${DISTNAME}/Makefile +.endif do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin diff -uNr gtksql.old/files/md5 gtksql/files/md5 --- gtksql.old/files/md5 Mon Jul 26 19:59:52 1999 +++ gtksql/files/md5 Mon Jul 26 19:20:33 1999 @@ -1 +1 @@ -MD5 (gtksql-0.2.tar.gz) = 74cdab5745874b5bdcef21398e95c066 +MD5 (gtksql-0.3.tar.gz) = 8f7a0a565e761fb649240cb46d6dd9cb diff -uNr gtksql.old/patches/patch-aa gtksql/patches/patch-aa --- gtksql.old/patches/patch-aa Mon Jul 26 19:59:52 1999 +++ gtksql/patches/patch-aa Mon Jul 26 19:41:52 1999 @@ -1,53 +1,34 @@ ---- Makefile.orig Sat Mar 20 13:36:17 1999 -+++ Makefile Sat Mar 20 13:36:17 1999 -@@ -1,8 +1,23 @@ -+# -+# C compiler -+# -+CC?= gcc -+ -+# -+# Local packages -+# -+LOCALBASE?= /usr/local -+ -+# -+# Installation prefix -+# -+PREFIX?= $(LOCALBASE) -+ - # Here, what you need for Pgsql --PGSQLIBS = -L/usr/local/pgsql/lib -lpq --PGSQLCFLAGS = -I/usr/local/pgsql/include -+PGSQLIBS = -L$(LOCALBASE)/pgsql/lib -lpq -lcrypt -+PGSQLCFLAGS = -I$(LOCALBASE)/pgsql/include - # Your favorite compilation options here :-) --MCFLAGS = -Wall -O -g -+CFLAGS?= -Wall -O -g - - # The database modules you want to be built - DBOBJS = postgres.o -@@ -12,19 +27,19 @@ - MOBJS = main.o queries.o dialogs.o tables.o common.o export.o status.o +--- Makefile.orig Mon Jul 26 19:30:44 1999 ++++ Makefile Mon Jul 26 19:41:39 1999 +@@ -4,14 +4,14 @@ - OBJS = $(MOBJS) $(DBOBJS) --CFLAGS = $(MCFLAGS) $(DBFLAGS) -+CFLAGS+= $(DBFLAGS) + # 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 +-PGSQLOBJS = postgres.o ++#PGSQLIBS = -L/usr/local/pgsql/lib -lpq ++#PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL ++#PGSQLOBJS = postgres.o + + # Here, what you need for MySQL +-MYSQLIBS = -L/usr/lib/mysql -lmysqlclient +-MYSQLCFLAGS = -I/usr/include/mysql -DUSE_MYSQL +-MYSQLOBJS = mysql.o ++#MYSQLIBS = -L/usr/local/lib/mysql -lmysqlclient ++#MYSQLCFLAGS = -I/usr/local/include/mysql -DUSE_MYSQL ++#MYSQLOBJS = mysql.o + + # Nothing to change below this point... + DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS) +@@ -24,8 +24,8 @@ + OBJS = $(MOBJS) $(DBSQLOBJS) + CFLAGS = $(MCFLAGS) $(DBSQLFLAGS) -GTKLIBS = `gtk-config --libs` -GTKCFLAGS = `gtk-config --cflags` -+GTKLIBS = `gtk10-config --libs` -+GTKCFLAGS = `gtk10-config --cflags` ++GTKLIBS = `gtk12-config --libs` ++GTKCFLAGS = `gtk12-config --cflags` all: $(OBJS) -- gcc -o gtksql $(OBJS) $(PGSQLIBS) $(GTKLIBS) $(CFLAGS) -+ $(CC) -o gtksql $(OBJS) $(PGSQLIBS) $(GTKLIBS) $(CFLAGS) - - clean: - rm *.o gtksql - - install: all -- cp gtksql $(DESTDIR)usr/bin/ -+ cp gtksql $(PREFIX)/bin - - .c.o: + gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) diff -uNr gtksql.old/pkg/COMMENT gtksql/pkg/COMMENT --- gtksql.old/pkg/COMMENT Mon Jul 26 19:59:52 1999 +++ gtksql/pkg/COMMENT Mon Jul 26 19:19:05 1999 @@ -1 +1 @@ -Graphical query tool for PostgreSQL +Graphical query tool for PostgreSQL and/or MySQL diff -uNr gtksql.old/pkg/DESCR gtksql/pkg/DESCR --- gtksql.old/pkg/DESCR Mon Jul 26 19:59:52 1999 +++ gtksql/pkg/DESCR Mon Jul 26 19:19:14 1999 @@ -1,4 +1,4 @@ -GtkSQL is a graphical query tool for PostgreSQL. You can work on +GtkSQL is a graphical query tool for PostgreSQL/MySQL. You can work on multiple queries simultaneously: * send the current query to the database >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message