ports/50502: gtksql fixes: PERL/REINPLACE, postgres, LOCALBASE

[Dominik Brettnacher]

>Number:         50502
>Category:       ports
>Synopsis:       gtksql fixes: PERL/REINPLACE, postgres, LOCALBASE
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 31 13:10:13 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dominik Brettnacher
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD dominik.saargate.de 4.6-STABLE FreeBSD 4.6-STABLE #2: Mon Aug 5 10:22:12 CEST 2002 domi at dominik.saargate.de:/usr/obj/usr/src/sys/DOMINIK i386


>Description:

three things:

1. the port now uses REINPLACE_CMD instead of perl
2. the MySQL and Postgres dependencies are now LOCALBASE-clean
3. PGSQLCFLAGS is updated to track changes in the Postgres tree

(thanks to Mike Meyer <mwm at mired.org>)

>How-To-Repeat:
>Fix:


diff -urN /usr/ports/databases/gtksql/Makefile gtksql/Makefile
--- /usr/ports/databases/gtksql/Makefile	Sat Feb 22 12:18:40 2003
+++ gtksql/Makefile	Mon Mar 31 23:03:07 2003
@@ -20,6 +20,7 @@
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 POSTGRESQL_PORT?=	databases/postgresql7
 
 .include <bsd.port.pre.mk>
@@ -47,10 +48,10 @@
 
 do-configure:
 .if defined(HAVE_MYSQL)
-	@${PERL} -i -pe "s/^#MYSQL/MYSQL/g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s/^#MYSQL/MYSQL/g" ${WRKSRC}/Makefile
 .endif
 .if defined(HAVE_PGSQL)
-	@${PERL} -i -pe "s/^#PGSQL/PGSQL/g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s/^#PGSQL/PGSQL/g" ${WRKSRC}/Makefile
 .endif
 
 do-install:
diff -urN /usr/ports/databases/gtksql/files/patch-aa gtksql/files/patch-aa
--- /usr/ports/databases/gtksql/files/patch-aa	Sun Feb  2 11:21:00 2003
+++ gtksql/files/patch-aa	Mon Mar 31 22:59:32 2003
@@ -11,16 +11,16 @@
 -PGSQLIBS    = -L/usr/local/pgsql/lib -lpq
 -PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
 -PGSQLOBJS   = postgres.o
-+#PGSQLIBS    = -L/usr/local/lib -lpq
-+#PGSQLCFLAGS = -I/usr/local/include/pgsql -DUSE_POSTGRESQL
++#PGSQLIBS    = -L$(LOCALBASE)/lib -lpq
++#PGSQLCFLAGS = -I$(LOCALBASE)/include/postgresql/internal -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
++#MYSQLIBS    = -L$(LOCALBASE)/lib/mysql -lmysqlclient
++#MYSQLCFLAGS = -I$(LOCALBASE)/include/mysql -DUSE_MYSQL
 +#MYSQLOBJS   = mysql.o
  
  # Nothing to change below this point...
>Release-Note:
>Audit-Trail:
>Unformatted: