ports/78319: [MAINTAINER] devel/py-sip: update to 4.2

[Danny Pansters]

>Number:         78319
>Category:       ports
>Synopsis:       [MAINTAINER] devel/py-sip: update to 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 02 16:40:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Danny Pansters
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD workstation.homenet 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Feb 19 05:07:49 CET 2005
>Description:
- Update to 4.2 (unfetchable from master site -- pointyhat)

Removed file(s):
- files/patch-aa (not needed with the way this port works)

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- py24-sip-4.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/py-sip/Makefile /usr/ports/devel/py-sip.new/Makefile
--- /usr/ports/devel/py-sip/Makefile	Sat Feb 19 03:14:18 2005
+++ /usr/ports/devel/py-sip.new/Makefile	Wed Mar  2 12:37:07 2005
@@ -5,8 +5,8 @@
 # $FreeBSD: ports/devel/py-sip/Makefile,v 1.15 2005/01/10 22:04:32 lofi Exp $
 
 PORTNAME=	sip
-PORTVERSION=	4.1.1
-PORTREVISION=	2
+PORTVERSION=	4.2
+PORTREVISION=
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,15 +19,24 @@
 USE_PYTHON=	yes
 USE_QT_VER=	3
 
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+
 .include <bsd.port.pre.mk>
 
 do-configure:
-	@(cd ${WRKSRC} && ${SETENV} QTDIR=${X11BASE} \
+	@( cd ${WRKSRC} && ${SETENV} QTDIR=${X11BASE} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
-		${PYTHON_CMD} configure.py -b ${PREFIX}/bin \
-		-d ${PYTHONPREFIX_SITELIBDIR} -v ${PREFIX}/share/sip)
+		${PYTHON_CMD} configure.py \
+		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
+		-e ${PYTHON_INCLUDEDIR} -v ${PREFIX}/share/sip )
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@( ${MKDIR} ${DOCSDIR} && cd ${WRKSRC}/doc && \
+		${INSTALL_DATA} default.css sipref.html sipref.txt ${DOCSDIR} \
+		&& ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} )
+.endif
+	@${PYTHON_CMD} -c "import sipconfig"
 	@${PYTHON_CMD} -O -c "import sipconfig"
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/devel/py-sip/distinfo /usr/ports/devel/py-sip.new/distinfo
--- /usr/ports/devel/py-sip/distinfo	Sat Feb 19 03:14:18 2005
+++ /usr/ports/devel/py-sip.new/distinfo	Tue Mar  1 21:55:35 2005
@@ -1,2 +1,2 @@
-MD5 (sip-4.1.1.tar.gz) = f9dc81a7726305af114fede6c4107ce6
-SIZE (sip-4.1.1.tar.gz) = 296512
+MD5 (sip-4.2.tar.gz) = b884cc15228a166c9d6fc88aaaeccc96
+SIZE (sip-4.2.tar.gz) = 312926
diff -ruN --exclude=CVS /usr/ports/devel/py-sip/files/patch-aa /usr/ports/devel/py-sip.new/files/patch-aa
--- /usr/ports/devel/py-sip/files/patch-aa	Sat Jul  3 09:21:07 2004
+++ /usr/ports/devel/py-sip.new/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- configure.py.orig	Sat Jul  3 00:17:35 2004
-+++ configure.py	Sat Jul  3 00:18:18 2004
-@@ -688,7 +688,7 @@
-     sipconfig.ParentMakefile(
-         configuration=cfg,
-         subdirs=["sipgen", "siplib"],
--        installs=("sipconfig.py", cfg.sip_mod_dir)
-+        installs=(["sipconfig.py", "sipconfig.pyc"], cfg.sip_mod_dir)
-     ).generate()
- 
-     sipconfig.inform("Creating sip code generator Makefile...")
diff -ruN --exclude=CVS /usr/ports/devel/py-sip/pkg-plist /usr/ports/devel/py-sip.new/pkg-plist
--- /usr/ports/devel/py-sip/pkg-plist	Sat Feb 19 03:14:18 2005
+++ /usr/ports/devel/py-sip.new/pkg-plist	Tue Mar  1 23:02:54 2005
@@ -1,6 +1,10 @@
 bin/sip
+%%PORTDOCS%%%%DOCSDIR%%/default.css
+%%PORTDOCS%%%%DOCSDIR%%/sipref.html
+%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
 %%PYTHON_INCLUDEDIR%%/sip.h
 %%PYTHON_SITELIBDIR%%/sip.so
 %%PYTHON_SITELIBDIR%%/sipconfig.py
 %%PYTHON_SITELIBDIR%%/sipconfig.pyc
 %%PYTHON_SITELIBDIR%%/sipconfig.pyo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- py24-sip-4.2.patch ends here ---

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