diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-04-05 07:16:18 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-04-05 07:16:18 +0000 |
| commit | 77a99f40eb1ce4ca90190cf9d4c5f10e33858bbf (patch) | |
| tree | 258645958e121bac2cede7be0289063470456020 /databases/gtksql | |
| parent | Update ports misc/xrmap to 2.26 (diff) | |
gtksql fixes: PERL/REINPLACE, postgres, LOCALBASE
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
PR: ports/50502
Submitted by: Dominik Brettnacher <domi@saargate.de>
Notes
Notes:
svn path=/head/; revision=78266
Diffstat (limited to 'databases/gtksql')
| -rw-r--r-- | databases/gtksql/Makefile | 5 | ||||
| -rw-r--r-- | databases/gtksql/files/patch-aa | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index c2da0ba7ce4b..7ccb9db41c22 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -20,6 +20,7 @@ WITH_MYSQL= yes USE_X_PREFIX= yes USE_GTK= yes +USE_REINPLACE= yes POSTGRESQL_PORT?= databases/postgresql7 .include <bsd.port.pre.mk> @@ -47,10 +48,10 @@ pre-patch: 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 --git a/databases/gtksql/files/patch-aa b/databases/gtksql/files/patch-aa index a75bec6e00e4..e73f3c071a19 100644 --- a/databases/gtksql/files/patch-aa +++ b/databases/gtksql/files/patch-aa @@ -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... |