From 64cbdafd50a893fcb6ce61fd43536eeaa6512063 Mon Sep 17 00:00:00 2001 From: Sergey Skvortsov Date: Mon, 2 Nov 2009 15:55:09 +0000 Subject: - Update to 0.41 - Add WANT_GNOME [1] - Be PREFIX-neutral [2] Changes: PR: ports/137491 [1], ports/138912 [1], ports/139472 [2], Submitted by: Pavel Gubin [1], Anatoly Borodin [1], Sahil Tandon [2] --- databases/sqlrelay/Makefile | 9 +++++++-- databases/sqlrelay/Makefile.common | 2 +- databases/sqlrelay/distinfo | 6 +++--- databases/sqlrelay/files/patch-init-Makefile | 13 ------------- databases/sqlrelay/pkg-plist | 18 ++++-------------- 5 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 databases/sqlrelay/files/patch-init-Makefile (limited to 'databases/sqlrelay') diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 3ffc741cc450..5eb04b7b6eb3 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -16,7 +16,8 @@ COMMENT= A persistent DB connection pooling/proxying/load balancing system LIB_DEPENDS= rudiments.1:${PORTSDIR}/devel/rudiments -USE_GMAKE= yes +WANT_GNOME= yes +USE_GMAKE= yes USE_AUTOTOOLS= autoconf:262 libtool:22 CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} \ CPPFLAGS="-I${LOCALBASE}/include" @@ -129,11 +130,15 @@ PLIST_SUB= IF_SQLITE=${IF_SQLITE} \ IF_INTERBASE=${IF_INTERBASE} \ IF_GTK=${IF_GTK} -MAN1= fields.1 query.1 query.py.1 sqlr-config-gtk.1 sqlrsh.1 +MAN1= fields.1 query.1 query.py.1 sqlrsh.1 MAN8= sqlr-connection.8 sqlr-cachemanager.8 sqlr-ipclean.8 \ sqlr-listener.8 sqlr-scaler.8 sqlr-start.8 sqlr-stop.8 post-patch: + ${REINPLACE_CMD} -E \ + -e 's,(freebsd.*)/usr/local(.*rc.d),\1${PREFIX}\2/sqlrelay.sh-sample,' \ + -e 's,(freebsd/sqlrelay )(.*etc),\1$$(sysconfdir)/sqlrelay-sample,' \ + ${WRKSRC}/init/Makefile ${REINPLACE_CMD} -E \ -e 's,/usr/local[[:>:]],${PREFIX},g;' \ -e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \ diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index 46cd338284a5..66d68fe2a320 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.39.4 +SQLRELAY_PORTVERSION= 0.41 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index ea375c1e7014..4665189ca74e 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,3 +1,3 @@ -MD5 (sqlrelay-0.39.4.tar.gz) = c55cf4bfe3f2851c31e319896c65aa89 -SHA256 (sqlrelay-0.39.4.tar.gz) = b49ce78616f2ef518551ae62a2ff680194e3ca85cadd793307b0433f8c2b31e8 -SIZE (sqlrelay-0.39.4.tar.gz) = 1928039 +MD5 (sqlrelay-0.41.tar.gz) = 1fc458f84249fe90064a2be4b55dc4c6 +SHA256 (sqlrelay-0.41.tar.gz) = 15c112e14bce437e4ad553cb4e7cd7c588268dcf0a9e8becd79dffd55a48d38b +SIZE (sqlrelay-0.41.tar.gz) = 1779122 diff --git a/databases/sqlrelay/files/patch-init-Makefile b/databases/sqlrelay/files/patch-init-Makefile deleted file mode 100644 index bee228d80884..000000000000 --- a/databases/sqlrelay/files/patch-init-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- init/Makefile.orig Mon May 9 01:50:51 2005 -+++ init/Makefile Mon May 9 01:56:03 2005 -@@ -44,8 +44,8 @@ - endif - ifeq ($(UNAME),FreeBSD) - $(MKINSTALLDIRS) $(initroot)/usr/local/etc/rc.d -- $(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d -- $(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/etc -+ $(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d/sqlrelay.sh-sample -+ $(INSTALL) -m 644 freebsd/sqlrelay $(sysconfdir)/sqlrelay-sample - endif - ifeq ($(UNAME),SCO_SV) - $(MKINSTALLDIRS) $(initroot)/etc/init.d diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist index ef609666677f..2c100bb17c93 100644 --- a/databases/sqlrelay/pkg-plist +++ b/databases/sqlrelay/pkg-plist @@ -8,25 +8,15 @@ bin/sqlrclient-config bin/sqlrclientwrapper-config %%IF_GTK%%bin/sqlr-config-gtk %%IF_FREETDS%%bin/sqlr-connection-freetds -%%IF_FREETDS%%bin/sqlr-connection-freetds-debug %%IF_MSQL%%bin/sqlr-connection-msql -%%IF_MSQL%%bin/sqlr-connection-msql-debug %%IF_MYSQL%%bin/sqlr-connection-mysql -%%IF_MYSQL%%bin/sqlr-connection-mysql-debug %%IF_ODBC%%bin/sqlr-connection-odbc -%%IF_ODBC%%bin/sqlr-connection-odbc-debug %%IF_POSTGRESQL%%bin/sqlr-connection-postgresql -%%IF_POSTGRESQL%%bin/sqlr-connection-postgresql-debug %%IF_SQLITE%%bin/sqlr-connection-sqlite -%%IF_SQLITE%%bin/sqlr-connection-sqlite-debug %%IF_INTERBASE%%bin/sqlr-connection-interbase -%%IF_INTERBASE%%bin/sqlr-connection-interbase-debug bin/sqlr-connection-router -bin/sqlr-connection-router-debug bin/sqlr-listener -bin/sqlr-listener-debug bin/sqlr-status -bin/sqlr-status-debug bin/sqlr-scaler bin/sqlr-start bin/sqlr-stop @@ -62,6 +52,10 @@ lib/libmysql50sqlrelay.so.0 lib/libmysql50sqlrelay.so lib/libmysql50sqlrelay.la lib/libmysql50sqlrelay.a +lib/libmysql51sqlrelay.so.0 +lib/libmysql51sqlrelay.so +lib/libmysql51sqlrelay.la +lib/libmysql51sqlrelay.a lib/libsqlrclient.a lib/libsqlrclient.la lib/libsqlrclient.so @@ -78,10 +72,6 @@ lib/libsqlrconnection.a lib/libsqlrconnection.la lib/libsqlrconnection.so lib/libsqlrconnection.so.0 -lib/libsqlrconnection_debug.a -lib/libsqlrconnection_debug.la -lib/libsqlrconnection_debug.so -lib/libsqlrconnection_debug.so.0 lib/libsqlrutil.a lib/libsqlrutil.la lib/libsqlrutil.so -- cgit v1.2.3