Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 May 2004 21:57:13 +0200 (CEST)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/66647: Sqlrelay's API: chase the upgrade of databases/sqlrelay.
Message-ID:  <20040514195713.C5E5B75FE@graf.pompo.net>
Resent-Message-ID: <200405142010.i4EKAMLE063822@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         66647
>Category:       ports
>Synopsis:       Sqlrelay's API: chase the upgrade of databases/sqlrelay.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 14 13:10:22 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.10-BETA i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.10-BETA FreeBSD 4.10-BETA #0: Sat Apr 10 15:25:53 CEST 2004 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	When upgrading databases/sqlrelay to 0.34.3, the following ports
	must be upgraded.

	Remark: databases/ruby-dbd_sqlrelay and databases/ruby-sqlrelay
	have been merged, and databases/ruby-dbd_sqlrelay must be removed.

>How-To-Repeat:
	N/A.

>Fix:
	To be coordinated with PR ports/66646.

	Remove databases/ruby-dbd_sqlrelay.

--- java-sqlrelay.diff begins here ---
diff -urN databases/java-sqlrelay.orig/Makefile databases/java-sqlrelay/Makefile
--- databases/java-sqlrelay.orig/Makefile	Wed Feb  4 20:16:23 2004
+++ databases/java-sqlrelay/Makefile	Thu May 13 22:19:07 2004
@@ -7,7 +7,6 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	java-
@@ -17,19 +16,23 @@
 COMMENT=	Java classes to access to SQL Relay
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
-BUILD_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
-LIB_DEPENDS=	sqlrclient.0:${SQLRELAY_PORTDIR}
-RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
-
-JDK_VERSION?=		1.1.8
+LIB_DEPENDS=	sqlrclient-${SQLRELAY_PORTVERSION}.1:${SQLRELAY_PORTDIR}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src/api/java
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+USE_JAVA=	1.2+
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
-		--with-java-prefix="${LOCALBASE}/jdk${JDK_VERSION}"
+		--with-java-prefix="${JAVA_HOME}"
+CONFIGURE_ENV=	PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
+		PTHREADLIBS="${PTHREAD_LIBS}"
+
+PLIST_SUB=	JARDIR=share/java/classes/com/firstworks/sqlrelay	\
+		JAVAJARDIR=share/java/classes
 
 .include "${.CURDIR}/../sqlrelay/Makefile.common"
 
diff -urN databases/java-sqlrelay.orig/pkg-plist databases/java-sqlrelay/pkg-plist
--- databases/java-sqlrelay.orig/pkg-plist	Wed Nov 13 00:03:45 2002
+++ databases/java-sqlrelay/pkg-plist	Thu May 13 22:21:05 2004
@@ -1,4 +1,7 @@
-share/java/classes/SQLRConnection.class
-share/java/classes/SQLRCursor.class
-share/java/classes/libSQLRConnection.so
-share/java/classes/libSQLRCursor.so
+%%JARDIR%%/SQLRConnection.class
+%%JARDIR%%/SQLRCursor.class
+%%JARDIR%%/libSQLRConnection.so
+%%JARDIR%%/libSQLRCursor.so
+@dirrm %%JARDIR%%
+@dirrm %%JAVAJARDIR%%/com/firstworks
+@unexec rmdir %D/%%JAVAJARDIR%%/com 2>/dev/null || true
--- java-sqlrelay.diff ends here ---

--- p5-sqlrelay.diff begins here ---
diff -urN databases/p5-sqlrelay.orig/Makefile databases/p5-sqlrelay/Makefile
--- databases/p5-sqlrelay.orig/Makefile	Thu May 13 22:38:10 2004
+++ databases/p5-sqlrelay/Makefile	Thu May 13 23:02:08 2004
@@ -17,16 +17,19 @@
 COMMENT=	Perl5 modules to access to SQL Relay, including a DBD interface
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
-LIB_DEPENDS=	sqlrclient.0:${SQLRELAY_PORTDIR}
+LIB_DEPENDS=	sqlrclient-${SQLRELAY_PORTVERSION}.1:${SQLRELAY_PORTDIR}
 
 USE_PERL5=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	Makefile.master
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 		--with-perl-prefix="/usr"
+CONFIGURE_ENV=	PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
+		PTHREADLIBS="${PTHREAD_LIBS}"
 
 MAN3=		DBD::SQLRelay.3 \
 		Firstworks::SQLRConnection.3 \
@@ -39,6 +42,7 @@
 	${MKDIR} ${WRKDIR}
 	${LN} -fs `${SQLRELAY_WRKSRC_CMD}` ${WRKSRC}
 	${RM} -f ${WRKSRC}/config.cache
+	${RM} -fr ${WRKSRC}/src/api/perl/CVS
 
 do-build:
 	for dir in ${WRKSRC}/src/api/perl/*; do \
--- p5-sqlrelay.diff ends here ---

--- php-sqlrelay.diff begins here ---
diff -urN databases/php-sqlrelay.orig/Makefile databases/php-sqlrelay/Makefile
--- databases/php-sqlrelay.orig/Makefile	Wed Feb  4 20:16:29 2004
+++ databases/php-sqlrelay/Makefile	Thu May 13 22:31:25 2004
@@ -7,7 +7,6 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	php-
@@ -17,19 +16,22 @@
 COMMENT=	PHP modules to access to SQL Relay
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
-BUILD_DEPENDS=	php-config:${PORTSDIR}/www/mod_php4
-LIB_DEPENDS=	sqlrclient.0:${SQLRELAY_PORTDIR}
-RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
+BUILD_DEPENDS=	php-config:${PHP_PORT}
+LIB_DEPENDS=	sqlrclient-${SQLRELAY_PORTVERSION}.1:${SQLRELAY_PORTDIR}
 
 USE_PYTHON=	yes
+USE_PHP=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src/api/php
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 		--with-php-prefix="${LOCALBASE}"
+CONFIGURE_ENV=	PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
+		PTHREADLIBS="${PTHREAD_LIBS}"
 
 .include "${.CURDIR}/../sqlrelay/Makefile.common"
 
diff -urN databases/php-sqlrelay.orig/pkg-message databases/php-sqlrelay/pkg-message
--- databases/php-sqlrelay.orig/pkg-message	Thu Jan  1 01:00:00 1970
+++ databases/php-sqlrelay/pkg-message	Thu May 13 20:45:52 2004
@@ -0,0 +1,12 @@
+************************************************************************
+Do not forget to configure your php.ini file:
+
+add the line:
+
+extension=sql_relay.so
+
+in the section "Dynamic Extensions".
+
+Then restart your web server and consult the output of phpinfo():
+sql_relay shoukd be listed in the section "Additional Modules.
+************************************************************************
--- php-sqlrelay.diff ends here ---

--- py-sqlrelay.diff begins here ---
diff -urN databases/py-sqlrelay.orig/Makefile databases/py-sqlrelay/Makefile
--- databases/py-sqlrelay.orig/Makefile	Wed Feb  4 20:16:32 2004
+++ databases/py-sqlrelay/Makefile	Fri May 14 19:37:18 2004
@@ -7,7 +7,6 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +16,7 @@
 COMMENT=	Python modules to access to SQL Relay
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
-LIB_DEPENDS=	sqlrclient.0:${SQLRELAY_PORTDIR}
+LIB_DEPENDS=	sqlrclient-${SQLRELAY_PORTVERSION}.1:${SQLRELAY_PORTDIR}
 
 USE_PYTHON=	yes
 
@@ -25,9 +24,13 @@
 BUILD_WRKSRC=	${WRKSRC}/src/api/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 		--with-python-prefix="${LOCALBASE}"
+CONFIGURE_ENV=	PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
+		PTHREADLIBS="${PTHREAD_LIBS}"
+USE_REINPLACE=	yes
 
 .include "${.CURDIR}/../sqlrelay/Makefile.common"
 
@@ -37,8 +40,11 @@
 	${RM} -f ${WRKSRC}/config.cache
 
 post-patch:
-	${PERL} -i -p \
-		-e 's,"1\.5" "1\.6" "2\.0" "2\.1",${PYTHON_VERSION:S/^python//},g;' \
+	${REINPLACE_CMD} -e	\
+	's,"1\.5" "1\.6" "2\.0" "2\.1" "2\.2" "2\.3",${PYTHON_VERSION:S/^python//},g;' \
 			${WRKSRC}/configure
+
+post-install:
+	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/query.py ${PREFIX}/bin
 
 .include <bsd.port.mk>
--- py-sqlrelay.diff ends here ---

--- ruby-sqlrelay.diff begins here ---
diff -urN databases/ruby-sqlrelay.orig/Makefile databases/ruby-sqlrelay/Makefile
--- databases/ruby-sqlrelay.orig/Makefile	Sat Feb  7 22:32:03 2004
+++ databases/ruby-sqlrelay/Makefile	Fri May 14 00:33:35 2004
@@ -7,7 +7,6 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	databases ruby
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -17,20 +16,19 @@
 COMMENT=	A Ruby module to access to SQL Relay
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
-LIB_DEPENDS=	sqlrclient.0:${SQLRELAY_PORTDIR}
+LIB_DEPENDS=	sqlrclient-${SQLRELAY_PORTVERSION}.1:${SQLRELAY_PORTDIR}
 
-PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/sqlrelay.so
 USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
-RUBY_EXTCONF_SUBDIRS=	src/api/ruby
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src/api/ruby
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 		--with-ruby-prefix="${LOCALBASE}"
-INSTALL_TARGET=	site-install
+CONFIGURE_ENV=	PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
+		PTHREADLIBS="${PTHREAD_LIBS}"
 
 .include "${.CURDIR}/../sqlrelay/Makefile.common"
 
@@ -38,5 +36,13 @@
 	${MKDIR} ${WRKDIR}
 	${LN} -fs `${SQLRELAY_WRKSRC_CMD}` ${WRKSRC}
 	${RM} -f ${WRKSRC}/config.cache
+
+do-build:
+	cd ${BUILD_WRKSRC} &&	\
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+
+do-install:
+	cd ${INSTALL_WRKSRC} &&	\
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 
 .include <bsd.port.mk>
diff -urN databases/ruby-sqlrelay.orig/pkg-plist databases/ruby-sqlrelay/pkg-plist
--- databases/ruby-sqlrelay.orig/pkg-plist	Thu Jan  1 01:00:00 1970
+++ databases/ruby-sqlrelay/pkg-plist	Fri May 14 00:28:38 2004
@@ -0,0 +1,4 @@
+%%RUBY_SITEARCHLIBDIR%%/sqlrelay.so
+%%RUBY_SITELIBDIR%%/DBD/SQLRelay/SQLRelay.rb
+@dirrm %%RUBY_SITELIBDIR%%/DBD/SQLRelay
+@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true
--- ruby-sqlrelay.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040514195713.C5E5B75FE>