Date: Sat, 11 Dec 2004 22:17:24 +0100 (CET) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74963: databases/py-sqlrelay & databases/sqlrelay: chase python upgrade. Message-ID: <20041211211724.E68B322B8FB@ws90bj.pompo.net> Resent-Message-ID: <200412112120.iBBLKN5R032393@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74963 >Category: ports >Synopsis: databases/py-sqlrelay & databases/sqlrelay: chase python upgrade. >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Dec 11 21:20:23 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 5.3-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD ws90bj.pompo.net 5.3-STABLE FreeBSD 5.3-STABLE #0: Wed Oct 27 21:46:19 CEST 2004 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-041027 i386 >Description: Since the upgrade of Python to 2.4, py24-sqlrelay-0.35_1 is broken: configure does not find python 2.4. Reported by krion via pointyhat. >How-To-Repeat: cd /usr/ports/databases/py-sqlrelay make >Fix: Please apply the following patches: --- sqlrelay.diff begins here --- diff -urN databases/sqlrelay.orig/files/patch-acsite.m4 databases/sqlrelay/files/patch-acsite.m4 --- databases/sqlrelay.orig/files/patch-acsite.m4 Sat Oct 16 20:59:31 2004 +++ databases/sqlrelay/files/patch-acsite.m4 Sat Dec 11 22:01:43 2004 @@ -1,5 +1,5 @@ ---- acsite.m4.orig Thu Aug 5 10:04:21 2004 -+++ acsite.m4 Sat Sep 11 21:58:33 2004 +--- ./acsite.m4.orig Thu Aug 5 08:04:21 2004 ++++ ./acsite.m4 Sat Dec 11 22:01:02 2004 @@ -396,7 +396,7 @@ dnl sets the substitution variable PTHREADLIBS AC_DEFUN([FW_CHECK_PTHREAD], @@ -20,6 +20,17 @@ FW_INCLUDES(pthreads,[$PTHREADINCLUDES]) FW_LIBS(pthreads,[$PTHREADLIBS]) +@@ -1857,8 +1859,8 @@ + + if ( test -n "$PYTHONPATH" ) + then +- +- for i in "2.3" "2.2" "2.1" "2.0" "1.6" "1.5" ++ ++ for i in "2.4" "2.3" "2.2" "2.1" "2.0" "1.6" "1.5" + do + if ( test -d "$PYTHONPATH/include/python$i" -a -d "$PYTHONPATH/lib/python$i/config" ) + then @@ -2149,13 +2151,7 @@ FW_CHECK_FILE("$JAVAPATH/include/jni.h",[JAVAINCLUDES=\"-I$JAVAPATH/include\"]) if ( test -n "$JAVAINCLUDES" ) --- 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 Sun Sep 26 00:27:59 2004 +++ databases/py-sqlrelay/Makefile Sat Dec 11 22:04:42 2004 @@ -7,7 +7,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= # none PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -43,7 +43,7 @@ post-patch: ${PERL} -i -p \ - -e 's,"1\.5" "1\.6" "2\.0" "2\.1",${PYTHON_VERSION:S/^python//},g;' \ + -e 's,"2\.1" "2\.0" "1\.6" "1\.5",${PYTHON_VERSION:S/^python//},g;' \ ${WRKSRC}/configure ${CP} ${TEMPLATES}/config.sub ${WRKSRC} ${CP} ${TEMPLATES}/config.guess ${WRKSRC} --- py-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?20041211211724.E68B322B8FB>