Take maintainership;

Use autoconf to generate configure script.
Remove redundant bits which were probably needed for older versions of sqlrelay.

5 files changed, 68 insertions, 81 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index f19157e48c3b..f2fd2faf9a3d 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -11,28 +11,26 @@ CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sqlrelay
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A persistent DB connection pooling/proxying/load balancing system
 
 LIB_DEPENDS=	rudiments.0:${PORTSDIR}/devel/rudiments
 
-USE_ICONV=	yes
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
-		PTHREADLIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
-		--disable-tcl \
-		--disable-java \
-		--disable-perl \
-		--disable-php \
-		--disable-python \
-		--disable-ruby \
-		--disable-zope
+USE_REINPLACE=		yes
+USE_GMAKE=		yes
+USE_AUTOCONF_VER=	259
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV} \
+			CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
+			--disable-tcl \
+			--disable-java \
+			--disable-perl \
+			--disable-php \
+			--disable-python \
+			--disable-ruby \
+			--disable-zope
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS=	VERSION="${PORTVERSION:R}"
 INSTALLS_SHLIB=	yes
 
 POSTGRESQL_PORT?=	databases/postgresql7
@@ -143,7 +141,7 @@ post-patch:
 	${REINPLACE_CMD} -E \
 		-e 's,/usr/local[[:>:]],${PREFIX},g;' \
 		-e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \
-			${WRKSRC}/configure
+			${WRKSRC}/acsite.m4
 	${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 df00abfcac58..1e2705288d01 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -8,7 +8,7 @@ SQLRELAY_WRKSRC_CMD=	cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
 
 SQLRELAY_CONFIGURE_ARGS=	\
 		--localstatedir="${LOCALBASE}" \
-		--with-rudiments-prefix="${LOCALBASE}" \
-		--with-libstdcpp-path="/usr/lib" \
-		--with-libxml-prefix="${WRKDIR}/prefixes/libxml" \
-		--with-libiconv-prefix="${LOCALBASE}"
+		--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
new file mode 100644
index 000000000000..6179dfbbd2a6
--- /dev/null
+++ b/databases/sqlrelay/files/patch-acsite.m4
@@ -0,0 +1,37 @@
+--- acsite.m4.orig	Thu Aug  5 10:04:21 2004
++++ acsite.m4	Sat Sep 11 21:58:33 2004
+@@ -396,7 +396,7 @@
+ dnl sets the substitution variable PTHREADLIBS
+ AC_DEFUN([FW_CHECK_PTHREAD],
+ [
+-
++if ( test -z "$PTHREADINCLUDES" -a -z "$PTHREADLIBS" ); then
+ HAVE_PTHREAD=""
+ PTHREADINCLUDES=""
+ PTHREADLIBS=""
+@@ -440,7 +440,9 @@
+ 		PTHREADLIBS="-pthread"
+ 	fi
+ fi
+-
++else
++	HAVE_PTHREAD="yes"
++fi
+ FW_INCLUDES(pthreads,[$PTHREADINCLUDES])
+ FW_LIBS(pthreads,[$PTHREADLIBS])
+ 
+@@ -2149,13 +2151,7 @@
+ 			FW_CHECK_FILE("$JAVAPATH/include/jni.h",[JAVAINCLUDES=\"-I$JAVAPATH/include\"])
+ 			if ( test -n "$JAVAINCLUDES" )
+ 			then
+-				for i in `ls -d $JAVAPATH/include/*`
+-				do
+-					if ( test -d "$i" )
+-					then
+-						JAVAINCLUDES="$JAVAINCLUDES -I$i"
+-					fi
+-				done
++				JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
+ 			fi
+ 		fi
+ 		
diff --git a/databases/sqlrelay/files/patch-configure b/databases/sqlrelay/files/patch-configure
deleted file mode 100644
index 7aaa80a61944..000000000000
--- a/databases/sqlrelay/files/patch-configure
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.orig	Thu Aug  5 10:05:11 2004
-+++ configure	Fri Aug 27 16:45:11 2004
-@@ -19412,8 +19412,8 @@
- 
- 
- HAVE_PTHREAD=""
--PTHREADINCLUDES=""
--PTHREADLIBS=""
-+#PTHREADINCLUDES=""
-+#PTHREADLIBS=""
- 
- if ( test "$cross_compiling" = "yes" )
- then
-@@ -19447,8 +19447,8 @@
- STATIC=""
- HEADERSANDLIBSPATH=""
- 
--eval "PTHREADINCLUDES=\"\""
--eval "PTHREADLIBS=\"\""
-+#eval "PTHREADINCLUDES=\"\""
-+#eval "PTHREADLIBS=\"\""
- eval "PTHREADLIBPATH=\"\""
- eval "PTHREADSTATIC=\"\""
- if ( test -n "" )
-@@ -20073,8 +20073,8 @@
- INCLUDESTRING=`echo $INCLUDESTRING | sed -e "s|-I/usr/include$||g" -e "s|-I/usr/include ||g"`
- LIBSTRING=`echo $LIBSTRING | sed -e "s|-L/usr/lib$||g" -e "s|-L/lib$||g" -e "s|-L/usr/lib ||g" -e "s|-L/lib ||g"`
- 
--eval "PTHREADINCLUDES=\"$INCLUDESTRING\""
--eval "PTHREADLIBS=\"$LIBSTRING\""
-+#eval "PTHREADINCLUDES=\"$INCLUDESTRING\""
-+#eval "PTHREADLIBS=\"$LIBSTRING\""
- eval "PTHREADLIBPATH=\"$LIBPATH\""
- eval "PTHREADSTATIC=\"$STATIC\""
- if ( test -n "" )
-@@ -34699,13 +34699,7 @@
- 
- 			if ( test -n "$JAVAINCLUDES" )
- 			then
--				for i in `ls -d $JAVAPATH/include/*`
--				do
--					if ( test -d "$i" )
--					then
--						JAVAINCLUDES="$JAVAINCLUDES -I$i"
--					fi
--				done
-+			JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
- 			fi
- 		fi
- 
-@@ -38362,7 +38356,7 @@
- #define SQLR_VERSION "$SQLR_VERSION"
- _ACEOF
- 
--SONAME_VERSION_INFO="1:0:0"
-+SONAME_VERSION_INFO="0:0:0"
- 
- 
- 
diff --git a/databases/sqlrelay/files/patch-configure.in b/databases/sqlrelay/files/patch-configure.in
new file mode 100644
index 000000000000..573749fdf30c
--- /dev/null
+++ b/databases/sqlrelay/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- 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)