ports/85505: [maintainer] devel/py-sip: update to 4.3 release

[Danny Pansters]

>Number:         85505
>Category:       ports
>Synopsis:       [maintainer] devel/py-sip: update to 4.3 release
>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 Aug 31 00:00:27 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Danny Pansters
>Release:        FreeBSD 6.0-BETA1 i386
>Organization:
>Environment:
System: FreeBSD desktop.homenet 6.0-BETA1 FreeBSD 6.0-BETA1 #0: Sat Jul 23 17:59:45 CEST 2005 root at desktop.homenet:/usr/obj/usr/src/sys/DESKTOP i386


	
>Description:
	- Update sip to new release (has some API changes, py-qt/py-kde must be updated and rebuilt also).
	- End of snapshot tracking.
	- Introduce port options.
>How-To-Repeat:
	
>Fix:
	- Port at http://freebsd.ricin.com/ports/devel/py-sip
	- i386 package at http://freebsd.ricin.com/packages/All/py24-sip-4.3.tbz
	- Diff below, against <category>/<portname>.old

--- py-sip.diff begins here ---
diff -ruN devel/py-sip.old/Makefile devel/py-sip/Makefile
--- devel/py-sip.old/Makefile	Sun Aug 21 00:14:01 2005
+++ devel/py-sip/Makefile	Tue Aug 30 22:37:43 2005
@@ -2,16 +2,16 @@
 # Date created:		Tue Oct  8 09:51:22 SAST 2002
 # Whom:			nbm
 #
-# $FreeBSD: ports/devel/py-sip/Makefile,v 1.22 2005/08/15 18:46:36 pav Exp $
+# $FreeBSD: ports/devel/py-sip/Makefile,v 1.21 2005/07/13 10:52:02 mich Exp $
 
 PORTNAME=	sip
-PORTVERSION=	4.2.1
-PORTREVISION=	3
+PORTVERSION=	4.3
+PORTREVISION=	
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	sip-snapshot-20050709
+DISTNAME=	sip-${PORTVERSION}
 
 MAINTAINER=	danny at ricin.com
 COMMENT=	Python to C and C++ bindings generator
@@ -19,28 +19,47 @@
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_PYTHON=	yes
-USE_QT_VER=	3
 
+OPTIONS=	DEBUG "Build with debugging symbols" off \
+		DOCS "Install documentation" on \
+		QT "Enable Qt support" on
+
+DATADIR=	${PREFIX}/share/py-${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
+		-e ${PYTHON_INCLUDEDIR} -v ${DATADIR}
 
 .include <bsd.port.pre.mk>
 
+.if defined(NOPORTDOCS) || defined(WITHOUT_DOCS)
+PLIST_SUB+=	DOCS="@comment "
+.else
+PLIST_SUB+=	DOCS=""
+.endif
+.if defined(WITH_DEBUG)
+ARGS+=		-u
+.endif
+.if defined(WITHOUT_QT)
+ARGS+=		-x
+.else
+BUILD_DEPENDS+=	moc:${PORTSDIR}/x11-toolkits/qt33
+RUN_DEPENDS+=	moc:${PORTSDIR}/x11-toolkits/qt33
+.endif
+
 do-configure:
-	@( cd ${WRKSRC} && ${SETENV} QTDIR=${X11BASE} \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
-		${PYTHON_CMD} configure.py \
-		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
-		-e ${PYTHON_INCLUDEDIR} -v ${DATADIR} )
+	( cd ${WRKSRC} && ${SETENV} QTDIR=${X11BASE} QMAKESPEC=${SPEC} \
+		${PYTHON_CMD} configure.py ${ARGS} )
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@( ${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA} \
-		doc/default.css doc/sipref.txt NEWS LICENSE ${DOCSDIR} && \
-		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} )
+.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
+	( ${MKDIR} -m 0755 ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA} \
+		doc/default.css doc/sipref.txt NEWS LICENSE ${DOCSDIR} )
 .endif
-	@# pyqt/pykde use this
-	@${MKDIR} ${DATADIR}
-	@${PYTHON_CMD} -c "import sipconfig"
-	@${PYTHON_CMD} -O -c "import sipconfig"
+	( ${MKDIR} -m 0755 ${DATADIR} && \
+		${PYTHON_CMD} -c "import sipconfig" && \
+		${PYTHON_CMD} -O -c "import sipconfig" )
 
 .include <bsd.port.post.mk>
diff -ruN devel/py-sip.old/distinfo devel/py-sip/distinfo
--- devel/py-sip.old/distinfo	Wed Jul 13 10:52:02 2005
+++ devel/py-sip/distinfo	Tue Aug 30 22:37:54 2005
@@ -1,2 +1,2 @@
-MD5 (sip-snapshot-20050709.tar.gz) = b62003eca919132beda0678c8d899c2d
-SIZE (sip-snapshot-20050709.tar.gz) = 283545
+MD5 (sip-4.3.tar.gz) = 2ebaf5d068e19ce31cab75f4685c5092
+SIZE (sip-4.3.tar.gz) = 332435
diff -ruN devel/py-sip.old/pkg-plist devel/py-sip/pkg-plist
--- devel/py-sip.old/pkg-plist	Sun Aug 21 00:14:01 2005
+++ devel/py-sip/pkg-plist	Sat Aug 20 22:43:31 2005
@@ -1,13 +1,13 @@
 bin/sip
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
+%%DOCS%%%%DOCSDIR%%/NEWS
+%%DOCS%%%%DOCSDIR%%/LICENSE
+%%DOCS%%%%DOCSDIR%%/default.css
+%%DOCS%%%%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%%
+%%DOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/share/sip
- at dirrm share/sip
+ at dirrm %%DATADIR%%
--- py-sip.diff ends here ---


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