Remove some unneeded patches and other bits so USES=autoreconf can be

removed (avoids a problem with upcoming devel/libtool update)

PR:		194068

7 files changed, 38 insertions, 91 deletions

diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile
index af973fa..ebf8190 100644
--- a/databases/py-sqlrelay/Makefile
+++ b/databases/py-sqlrelay/Makefile
@@ -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 Relay
 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>
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 774d30b..92e18a8 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -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 pooling/proxying/load balancing system
 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;'
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 93db51f..6bccc6e 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -9,6 +9,3 @@ SQLRELAY_WRKSRC_CMD=	cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
 SQLRELAY_CONFIGURE_ARGS=	\
 		--localstatedir=/var \
 		--with-rudiments-prefix="${LOCALBASE}"
-SQLRELAY_CONFIGURE_ENV=		\
-		PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
-		PTHREADLIBS="${PTHREAD_LIBS}"
diff --git a/databases/sqlrelay/files/patch-acsite.m4 b/databases/sqlrelay/files/patch-acsite.m4
deleted file mode 100644
index 1b31b56..0000000
--- a/databases/sqlrelay/files/patch-acsite.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- acsite.m4.orig	2013-09-21 13:33:47.000000000 +0200
-+++ acsite.m4	2013-10-28 19:18:27.846799325 +0100
-@@ -680,6 +680,7 @@
- 	AC_MSG_RESULT(no)
- fi
- 
-+if ( test -z "$PTHREADINCLUDES" -a -z "$PTHREADLIBS" ); then
- HAVE_PTHREAD=""
- PTHREADINCLUDES=""
- PTHREADLIB=""
-@@ -808,7 +809,9 @@
- 		fi
- 	done
- fi
--
-+else
-+	HAVE_PTHREAD="yes"
-+fi
- FW_INCLUDES(pthreads,[$PTHREADINCLUDES])
- FW_LIBS(pthreads,[$PTHREADLIB])
- 
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index e5c0b21..fe64504 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -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
diff --git a/databases/sqlrelay/files/patch-configure.in b/databases/sqlrelay/files/patch-configure.in
deleted file mode 100644
index 573749f..0000000
--- a/databases/sqlrelay/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Thu Aug  5 09:58:10 2004
-+++ configure.in	Sat Sep 11 21:58:57 2004
-@@ -671,7 +671,7 @@
- dnl if interfaces added, removed, or changed, c:r:a -> c+1:0:a
- dnl if interfaces added,                      c:r:a -> c:r:a+1
- dnl if interfaces removed,                    c:r:a -> c:r:0
--SONAME_VERSION_INFO="1:0:0"
-+SONAME_VERSION_INFO="0:0:0"
- AC_SUBST(SONAME_VERSION_INFO)
- AC_SUBST(STATICLINK)
- AC_PREFIX_DEFAULT(/usr/local/firstworks)
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 380971c..af3a801 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -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