ports/84599: devel/py-sip: update

[Danny Pansters]

>Number:         84599
>Category:       ports
>Synopsis:       devel/py-sip: update
>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:   Sat Aug 06 01:00:37 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 to new snapshot (older not available from master anymore)
	* Use options for docs (respects NOPORTDOCS if set)
	* Change DATADIR to share/py-sip and have that be used by py-qt, py-kde

>How-To-Repeat:
	N/A
>Fix:

	

--- py-sip.diff begins here ---
diff -ruN devel/py-sip/Makefile devel/py-sip.new/Makefile
--- devel/py-sip/Makefile	Wed Jul 13 12:52:02 2005
+++ devel/py-sip.new/Makefile	Wed Aug  3 12:11:49 2005
@@ -6,12 +6,12 @@
 
 PORTNAME=	sip
 PORTVERSION=	4.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/ \
+MASTER_SITES=	http://www.river-bank.demon.co.uk/download/snapshots/sip/ \
 		http://freebsd.ricin.com/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	sip-snapshot-20050709
+DISTNAME=	sip-snapshot-20050727
 
 MAINTAINER=	danny at ricin.com
 COMMENT=	Python to C and C++ bindings generator
@@ -21,26 +21,36 @@
 USE_PYTHON=	yes
 USE_QT_VER=	3
 
+OPTIONS=	DOCS "Install documentation" 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++
 
 .include <bsd.port.pre.mk>
 
+.if defined(NOPORTDOCS) || defined(WITHOUT_DOCS)
+PLIST_SUB+=	DOCS="@comment "
+.else
+PLIST_SUB+=	DOCS=""
+.endif
+
 do-configure:
-	@( cd ${WRKSRC} && ${SETENV} QTDIR=${X11BASE} \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
+	( cd ${WRKSRC} && \
+		${SETENV} QTDIR=${X11BASE} QMAKESPEC=${SPEC} \
 		${PYTHON_CMD} configure.py \
 		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
 		-e ${PYTHON_INCLUDEDIR} -v ${DATADIR} )
 
 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/distinfo devel/py-sip.new/distinfo
--- devel/py-sip/distinfo	Wed Jul 13 12:52:02 2005
+++ devel/py-sip.new/distinfo	Sun Jul 31 04:34:51 2005
@@ -1,2 +1,2 @@
-MD5 (sip-snapshot-20050709.tar.gz) = b62003eca919132beda0678c8d899c2d
-SIZE (sip-snapshot-20050709.tar.gz) = 283545
+MD5 (sip-snapshot-20050727.tar.gz) = 96497c4806963dbd2cd6e4ed0741d4a8
+SIZE (sip-snapshot-20050727.tar.gz) = 284223
diff -ruN devel/py-sip/pkg-plist devel/py-sip.new/pkg-plist
--- devel/py-sip/pkg-plist	Wed Jul 13 12:52:02 2005
+++ devel/py-sip.new/pkg-plist	Tue Aug  2 11:59:29 2005
@@ -1,12 +1,12 @@
 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%%
- at dirrm share/sip
+%%DOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%
--- py-sip.diff ends here ---


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