- Update to 4.7

Submitted by:	Danny Pansters <danny@ricin.com> (Maintainer via privat mail)

3 files changed, 32 insertions, 32 deletions

diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 0c28f37c4bd1..76e04320a97b 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	sip
-PORTVERSION=	4.6
+PORTVERSION=	4.7
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/sip4/ \
@@ -18,43 +18,43 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python to C and C++ bindings generator
 
-USE_PYTHON=	2.3+
+USE_PYTHON=	2.5+
 
-OPTIONS=	DEBUG "Build with debugging symbols" off \
-		DOCS "Install documentation" on
+OPTIONS=	DEBUG "Build with debugging symbols" off
 
 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
-ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
-		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR}
+ARGS=		-b ${PREFIX}/bin -d ${PYTHON_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
 
 do-configure:
-	( cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${ARGS} )
+	cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${ARGS}
+
+post-configure:
+	for item in sipgen siplib; do\
+		${REINPLACE_CMD} -e 's|CC = gcc|CC = ${CC}|'\
+		-e 's|CXX = g++|CXX = ${CXX}|'\
+		-e 's|LINK = g++|LINK = ${CXX}|'\
+		${WRKSRC}/$${item}/Makefile; done
 
 post-install:
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
-	( ${MKDIR} -m 0755 ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA} \
-		doc/default.css doc/sipref.txt doc/sipref.html \
-		NEWS LICENSE ${DOCSDIR} )
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA}\
+		doc/default.css doc/sipref.txt doc/sipref.html\
+		NEWS LICENSE ${DOCSDIR}
 .endif
-	( ${MKDIR} -m 0755 ${DATADIR} && \
-		cd ${PYTHONPREFIX_SITELIBDIR} && \
-		${PYTHON_CMD} -c "import sipconfig" && \
-		${PYTHON_CMD} -O -c "import sipconfig" && \
-		${PYTHON_CMD} -c "import sipdistutils" && \
-		${PYTHON_CMD} -O -c "import sipdistutils" )
+	${MKDIR} ${DATADIR} &&\
+		cd ${PYTHON_SITELIBDIR} &&\
+		${PYTHON_CMD} -c "import sipconfig" &&\
+		${PYTHON_CMD} -O -c "import sipconfig" &&\
+		${PYTHON_CMD} -c "import sipdistutils" &&\
+		${PYTHON_CMD} -O -c "import sipdistutils"
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 1315827c7c74..0cbc4530b926 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-MD5 (sip-4.6.tar.gz) = 2f57b65de36e85067b3bdf5830315460
-SHA256 (sip-4.6.tar.gz) = d17d5a32e627d9e3230812b33d0d24c67d02d554c1302b0caa8d8559bd4a186c
-SIZE (sip-4.6.tar.gz) = 428932
+MD5 (sip-4.7.tar.gz) = 1403ae2973b8ee4d1a69492b7f6833b8
+SHA256 (sip-4.7.tar.gz) = f5da79bac7029a7990fb31f10268a04928f97ecb6be8e844b9c95c2a9423f09b
+SIZE (sip-4.7.tar.gz) = 439236
diff --git a/devel/py-sip/pkg-plist b/devel/py-sip/pkg-plist
index 05d117bb7898..a08c18c34912 100644
--- a/devel/py-sip/pkg-plist
+++ b/devel/py-sip/pkg-plist
@@ -1,9 +1,9 @@
 bin/sip
-%%DOCS%%%%DOCSDIR%%/NEWS
-%%DOCS%%%%DOCSDIR%%/LICENSE
-%%DOCS%%%%DOCSDIR%%/default.css
-%%DOCS%%%%DOCSDIR%%/sipref.html
-%%DOCS%%%%DOCSDIR%%/sipref.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/default.css
+%%PORTDOCS%%%%DOCSDIR%%/sipref.html
+%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
 %%PYTHON_INCLUDEDIR%%/sip.h
 %%PYTHON_SITELIBDIR%%/sip.so
 %%PYTHON_SITELIBDIR%%/sipconfig.py
@@ -12,6 +12,6 @@ bin/sip
 %%PYTHON_SITELIBDIR%%/sipdistutils.py
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyc
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyo
-%%DOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/%%DATADIR%%
 @dirrm %%DATADIR%%