Date: Fri, 3 Oct 2014 12:05:44 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369885 - in head/databases: py-sqlrelay sqlrelay sqlrelay/files Message-ID: <201410031205.s93C5iX4031416@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Oct 3 12:05:43 2014 New Revision: 369885 URL: https://svnweb.freebsd.org/changeset/ports/369885 QAT: https://qat.redports.org/buildarchive/r369885/ Log: Remove some unneeded patches and other bits so USES=autoreconf can be removed (avoids a problem with upcoming devel/libtool update) PR: 194068 Deleted: head/databases/sqlrelay/files/patch-acsite.m4 head/databases/sqlrelay/files/patch-configure.in Modified: head/databases/py-sqlrelay/Makefile head/databases/sqlrelay/Makefile head/databases/sqlrelay/Makefile.common head/databases/sqlrelay/files/patch-config.mk.in head/databases/sqlrelay/pkg-plist Modified: head/databases/py-sqlrelay/Makefile ============================================================================== --- head/databases/py-sqlrelay/Makefile Fri Oct 3 11:36:24 2014 (r369884) +++ head/databases/py-sqlrelay/Makefile Fri Oct 3 12:05:43 2014 (r369885) @@ -3,6 +3,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= # none PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,33 +15,25 @@ COMMENT= Python modules to access to SQL EXTRACT_DEPENDS= ${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch LIB_DEPENDS= libsqlrclient.so:${SQLRELAY_PORTDIR} -USE_PYTHON= yes -USES= perl5 gmake +USES= gmake perl5 python USE_PERL5= build patch WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/api/python INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ - PTHREADLIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --with-python-prefix="${LOCALBASE}" .include "${.CURDIR}/../sqlrelay/Makefile.common" -.include <bsd.port.pre.mk> - do-extract: ${MKDIR} ${WRKDIR} ${LN} -fs `${SQLRELAY_WRKSRC_CMD}` ${WRKSRC} - ${RM} -f ${WRKSRC}/config.cache post-patch: ${PERL} -i -p \ -e 's,"2\.4" "2\.3" "2\.2" "2\.1",${PYTHON_VERSION:S/^python//},g;' \ ${WRKSRC}/configure - ${CP} ${TEMPLATES}/config.sub ${WRKSRC} - ${CP} ${TEMPLATES}/config.guess ${WRKSRC} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/sqlrelay/Makefile ============================================================================== --- head/databases/sqlrelay/Makefile Fri Oct 3 11:36:24 2014 (r369884) +++ head/databases/sqlrelay/Makefile Fri Oct 3 12:05:43 2014 (r369885) @@ -3,6 +3,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF @@ -12,10 +13,9 @@ COMMENT= Persistent DB connection poolin LIB_DEPENDS= librudiments.so:${PORTSDIR}/devel/rudiments WANT_GNOME= yes -USES= gmake autoreconf libtool +USES= gmake libtool CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ @@ -43,16 +43,16 @@ TOSTRIP= bin/sqlr-start \ bin/sqlr-pwdenc \ bin/sqlr-status \ bin/sqlrsh \ - lib/libsqlrutil.so.0.0.0 \ - lib/libsqlrclient.so.0.0.0 \ - lib/libsqlrclientwrapper.so.0.0.0 \ - lib/libpqsqlrelay.so.0.0.0 \ - lib/libmysql3sqlrelay.so.0.0.0 \ - lib/libmysql40sqlrelay.so.0.0.0 \ - lib/libmysql41sqlrelay.so.0.0.0 \ - lib/libmysql50sqlrelay.so.0.0.0 \ - lib/libmysql51sqlrelay.so.0.0.0 \ - lib/libsqlrserver.so.0.0.0 \ + lib/libsqlrutil.so.1.0.0 \ + lib/libsqlrclient.so.1.0.0 \ + lib/libsqlrclientwrapper.so.1.0.0 \ + lib/libpqsqlrelay.so.1.0.0 \ + lib/libmysql3sqlrelay.so.1.0.0 \ + lib/libmysql40sqlrelay.so.1.0.0 \ + lib/libmysql41sqlrelay.so.1.0.0 \ + lib/libmysql50sqlrelay.so.1.0.0 \ + lib/libmysql51sqlrelay.so.1.0.0 \ + lib/libsqlrserver.so.1.0.0 \ libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \ libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \ libexec/sqlrelay/sqlrlogger_debug.so \ @@ -126,10 +126,6 @@ post-patch: -e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \ -e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \ ${WRKSRC}/init/Makefile - ${REINPLACE_CMD} -E \ - -e 's,/usr/local[[:>:]],${PREFIX},g;' \ - -e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \ - ${WRKSRC}/acsite.m4 @${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e 's#-release \$$\(SQLR_VERSION\)##g;' Modified: head/databases/sqlrelay/Makefile.common ============================================================================== --- head/databases/sqlrelay/Makefile.common Fri Oct 3 11:36:24 2014 (r369884) +++ head/databases/sqlrelay/Makefile.common Fri Oct 3 12:05:43 2014 (r369885) @@ -9,6 +9,3 @@ SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTD SQLRELAY_CONFIGURE_ARGS= \ --localstatedir=/var \ --with-rudiments-prefix="${LOCALBASE}" -SQLRELAY_CONFIGURE_ENV= \ - PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ - PTHREADLIBS="${PTHREAD_LIBS}" Modified: head/databases/sqlrelay/files/patch-config.mk.in ============================================================================== --- head/databases/sqlrelay/files/patch-config.mk.in Fri Oct 3 11:36:24 2014 (r369884) +++ head/databases/sqlrelay/files/patch-config.mk.in Fri Oct 3 12:05:43 2014 (r369885) @@ -9,12 +9,3 @@ libexecdir = @libexecdir@/sqlrelay bindir = @bindir@ localstatedir = @localstatedir@ -@@ -89,7 +89,7 @@ - # rudiments library - RUDIMENTSPATH = @RUDIMENTSPATH@ - RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@ --RUDIMENTSLIBS = @RUDIMENTSLIBS@ -+RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl -lcrypto -lpthread - RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ - - #iconv Modified: head/databases/sqlrelay/pkg-plist ============================================================================== --- head/databases/sqlrelay/pkg-plist Fri Oct 3 11:36:24 2014 (r369884) +++ head/databases/sqlrelay/pkg-plist Fri Oct 3 12:05:43 2014 (r369885) @@ -35,41 +35,43 @@ include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrpwdenc.h lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay.so.0 -lib/libmysql3sqlrelay.so.0.0.0 +lib/libmysql3sqlrelay.so.1 +lib/libmysql3sqlrelay.so.1.0.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay.so.0 -lib/libmysql40sqlrelay.so.0.0.0 +lib/libmysql40sqlrelay.so.1 +lib/libmysql40sqlrelay.so.1.0.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay.so.0 -lib/libmysql41sqlrelay.so.0.0.0 +lib/libmysql41sqlrelay.so.1 +lib/libmysql41sqlrelay.so.1.0.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay.so.0 -lib/libmysql50sqlrelay.so.0.0.0 +lib/libmysql50sqlrelay.so.1 +lib/libmysql50sqlrelay.so.1.0.0 lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay.so.0 -lib/libmysql51sqlrelay.so.0.0.0 +lib/libmysql51sqlrelay.so.1 +lib/libmysql51sqlrelay.so.1.0.0 lib/libpqsqlrelay.so -lib/libpqsqlrelay.so.0 -lib/libpqsqlrelay.so.0.0.0 +lib/libpqsqlrelay.so.1 +lib/libpqsqlrelay.so.1.0.0 lib/libsqlrclient.a lib/libsqlrclient.so -lib/libsqlrclient.so.0 -lib/libsqlrclient.so.0.0.0 +lib/libsqlrclient.so.1 +lib/libsqlrclient.so.1.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so -lib/libsqlrclientwrapper.so.0 -lib/libsqlrclientwrapper.so.0.0.0 +lib/libsqlrclientwrapper.so.1 +lib/libsqlrclientwrapper.so.1.0.0 +%%ODBC%%lib/libsqlrodbc.a %%ODBC%%lib/libsqlrodbc.so -%%ODBC%%lib/libsqlrodbc.so.0 +%%ODBC%%lib/libsqlrodbc.so.1 +%%ODBC%%lib/libsqlrodbc.so.1.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver.so.0 -lib/libsqlrserver.so.0.0.0 +lib/libsqlrserver.so.1 +lib/libsqlrserver.so.1.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil.so.0 -lib/libsqlrutil.so.0.0.0 +lib/libsqlrutil.so.1 +lib/libsqlrutil.so.1.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410031205.s93C5iX4031416>