From danny@ricin.com  Sat Aug  6 00:52:10 2005
Return-Path: <danny@ricin.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 87AD016A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Aug 2005 00:52:10 +0000 (GMT)
	(envelope-from danny@ricin.com)
Received: from smtpq2.home.nl (smtpq2.home.nl [213.51.128.197])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ECC8F43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Aug 2005 00:52:09 +0000 (GMT)
	(envelope-from danny@ricin.com)
Received: from [213.51.128.132] (port=57570 helo=smtp1.home.nl)
	by smtpq2.home.nl with esmtp (Exim 4.30)
	id 1E1Cv3-0008IA-A0
	for FreeBSD-gnats-submit@freebsd.org; Sat, 06 Aug 2005 02:52:09 +0200
Received: from cp464173-a.dbsch1.nb.home.nl ([84.27.215.228]:59343)
	by smtp1.home.nl with smtp (Exim 4.30)
	id 1E1Cv2-0008Jt-2X
	for FreeBSD-gnats-submit@freebsd.org; Sat, 06 Aug 2005 02:52:08 +0200
Received: by cp464173-a.dbsch1.nb.home.nl (sSMTP sendmail emulation); Sat,  6 Aug 2005 02:50:12 +0200
Message-Id: <20050806005209.ECC8F43D45@mx1.FreeBSD.org>
Date: Sat,  6 Aug 2005 02:50:12 +0200
From: "Danny Pansters" <danny@ricin.com>
Reply-To: Danny Pansters <danny@ricin.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: devel/py-sip: update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84599
>Category:       ports
>Synopsis:       devel/py-sip: update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vsevolod
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 06 01:00:37 GMT 2005
>Closed-Date:    Wed Aug 31 07:42:11 GMT 2005
>Last-Modified:  Wed Aug 31 07:42:11 GMT 2005
>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@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@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%%
-@dirrm share/sip
+%%DOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
--- py-sip.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vsevolod  
Responsible-Changed-By: vsevolod 
Responsible-Changed-When: Sat Aug 6 13:36:45 GMT 2005 
Responsible-Changed-Why:  
I'll handle this. But note that now ports tree is frozen. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84599 

From: Danny Pansters <danny@ricin.com>
To: bug-followup@freebsd.org,
 danny@ricin.com
Cc:  
Subject: Re: ports/84599: devel/py-sip: update
Date: Wed, 31 Aug 2005 02:02:27 +0000

 Please close, superseded by
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=85505
State-Changed-From-To: open->closed 
State-Changed-By: vsevolod 
State-Changed-When: Wed Aug 31 07:41:48 GMT 2005 
State-Changed-Why:  
Closed by originator request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84599 
>Unformatted:
