ports/60580: upgrade ports/devel/py-sip to 3.9

[Ying-Chieh Liao]

>Number:         60580
>Category:       ports
>Synopsis:       upgrade ports/devel/py-sip to 3.9
>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:   Thu Dec 25 19:50:14 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Liao
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD FreeBSD.csie.NCTU.edu.tw 4.9-STABLE FreeBSD 4.9-STABLE #8: Wed Oct 29 10:04:27 CST 2003 root at FreeBSD.csie.NCTU.edu.tw:/big/usr.obj/big/freebsd/pub/branches/4.0-stable/src/sys/FREEBSD i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	


Index: py-sip/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- py-sip/Makefile	24 Aug 2003 06:19:35 -0000	1.4
+++ py-sip/Makefile	26 Dec 2003 03:39:27 -0000
@@ -5,20 +5,26 @@
 # $FreeBSD: ports/devel/py-sip/Makefile,v 1.4 2003/08/24 06:19:35 krion Exp $
 
 PORTNAME=	sip
-PORTVERSION=	3.8
+PORTVERSION=	3.9
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=
+DISTFILES=	# empty
 
 MAINTAINER=	eugos at gmx.net
 COMMENT=	Python convenience link to sip library
 
-LIB_DEPENDS=	sip.10:${PORTSDIR}/devel/sip
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/sip:configure
+LIB_DEPENDS=	sip.11:${PORTSDIR}/devel/sip
 
 USE_PYTHON=	yes
-NO_BUILD=	yes
+
+do-build:
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${PORTSDIR}/devel/sip/work/sip-3.9/sipconfig.py ${WRKSRC}
+	@(cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/sipconfig.py-patch)
 
 do-install:
-	${LN} -s ${LOCALBASE}/lib/libsip.so ${PYTHONPREFIX_SITELIBDIR}/libsip.so
+	${INSTALL_DATA} ${WRKSRC}/sipconfig.py ${PYTHON_SITELIBDIR}
+	${LN} -fs ${LOCALBASE}/lib/libsip.so ${PYTHONPREFIX_SITELIBDIR}/libsip.so
 
 .include <bsd.port.mk>
Index: py-sip/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/py-sip/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- py-sip/pkg-plist	13 Aug 2003 09:37:52 -0000	1.2
+++ py-sip/pkg-plist	26 Dec 2003 03:39:27 -0000
@@ -1 +1,2 @@
 %%PYTHON_SITELIBDIR%%/libsip.so
+%%PYTHON_SITELIBDIR%%/sipconfig.py
Index: py-sip/files/sipconfig.py-patch
===================================================================
RCS file: py-sip/files/sipconfig.py-patch
diff -N py-sip/files/sipconfig.py-patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ py-sip/files/sipconfig.py-patch	26 Dec 2003 03:39:27 -0000
@@ -0,0 +1,22 @@
+--- sipconfig.py.orig	Fri Dec 26 11:35:55 2003
++++ sipconfig.py	Fri Dec 26 11:37:45 2003
+@@ -202,8 +202,8 @@
+         self.package = pkg
+ 
+         self.patches['@BLX_DEFINES@'] = 'SIP_MAKE_MODULE_DLL'
+-        self.patches['@BLX_INCLUDEPATH@'] = '. /usr/ports/devel/sip/work/headers /usr/local/include/python2.3'
+-        self.patches['@BLX_LIBS@'] = '-L/usr/ports/devel/sip/work/modules -lsip'
++        self.patches['@BLX_INCLUDEPATH@'] = '. /usr/local/include/sip /usr/local/include/python2.3'
++        self.patches['@BLX_LIBS@'] = '-L/usr/local/lib -lsip'
+ 
+         self.default_bin_dir = '/usr/local/bin'
+         self.default_mod_dir = '/usr/local/lib/python2.3/site-packages'
+@@ -218,7 +218,7 @@
+         self.qt_lib = 'qt-mt'
+ 
+         self.sip_version = 0x030900
+-        self.sip_bin = '/usr/ports/devel/sip/work/binaries/sip'
++        self.sip_bin = '/usr/local/bin/sip'
+ 
+         self.make_bin = 'make'
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: