4 files changed, 26 insertions, 29 deletions

diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index b32b61b09506..93a3127aff03 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITES_SIP} ${MASTER_SITE_LOCAL}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${SIP_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
 
 USE_PYTHON=	2.5+
@@ -22,8 +22,8 @@ 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 ${PYTHON_SITELIBDIR}\
-		-e ${PYTHON_INCLUDEDIR} -v ${DATADIR}
+ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\
+		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR}
 
 .include "files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
@@ -46,11 +46,11 @@ post-configure:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA}\
-		doc/default.css doc/sipref.txt doc/sipref.html\
+		doc/sipref.txt doc/sipref.html\
 		NEWS LICENSE ${DOCSDIR}
 .endif
 	${MKDIR} ${DATADIR} &&\
-		cd ${PYTHON_SITELIBDIR} &&\
+		cd ${PYTHONPREFIX_SITELIBDIR} &&\
 		${PYTHON_CMD} -c "import sipconfig" &&\
 		${PYTHON_CMD} -O -c "import sipconfig" &&\
 		${PYTHON_CMD} -c "import sipdistutils" &&\
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index da1223c1f954..1dfe3d8c44ba 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-MD5 (sip-4.7.4.tar.gz) = 3bae6d0fb931fe2ddcd6f6c1da245afa
-SHA256 (sip-4.7.4.tar.gz) = 85921cbfe97c2aea13106e493f99259904bcdad379844ac14ad89061c442a13c
-SIZE (sip-4.7.4.tar.gz) = 447300
+MD5 (sip-4.7.9.tar.gz) = 597d7ff7edb42a18421c806ffd18a136
+SHA256 (sip-4.7.9.tar.gz) = 7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
+SIZE (sip-4.7.9.tar.gz) = 471372
diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk
index 758b16468a37..9f79aafa79cf 100644
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@@ -1,30 +1,28 @@
 BSD_PYQT_MK_VERSION=	20080504
 
-PYQT_MAINTAINER=	danny@ricin.com
+PYQT_MAINTAINER=	kde@FreeBSD.org
 
 MASTER_SITE_RIVERBANK=	http://www.riverbankcomputing.com/static/Downloads/
 MASTER_SITE_RICIN=	http://freebsd.ricin.com/ports/distfiles/
 
-MASTER_SITES_SIP=	${MASTER_SITE_RIVERBANK}sip4/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYQT3=	${MASTER_SITE_RIVERBANK}PyQt3/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYQT4=	${MASTER_SITE_RIVERBANK}PyQt4/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYKDE3=	${MASTER_SITE_RIVERBANK}PyKDE3/ ${MASTER_SITE_RICIN}
-MASTER_SITES_PYKDE4=	${MASTER_SITE_RIVERBANK}PyKDE4/ ${MASTER_SITE_RICIN}
-MASTER_SITES_QSCI1=	${MASTER_SITE_RIVERBANK}QScintilla1/ ${MASTER_SITE_RICIN}
-MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/ ${MASTER_SITE_RICIN}
+MASTER_SITES_SIP=	${MASTER_SITE_RIVERBANK}sip4/
+MASTER_SITES_PYQT3=	${MASTER_SITE_RIVERBANK}PyQt3/
+MASTER_SITES_PYQT4=	${MASTER_SITE_RIVERBANK}PyQt4/
+MASTER_SITES_PYKDE3=	${MASTER_SITE_RIVERBANK}PyKDE3/
+MASTER_SITES_PYKDE4=	${MASTER_SITE_RIVERBANK}PyKDE4/
+MASTER_SITES_QSCI1=	${MASTER_SITE_RIVERBANK}QScintilla1/
+MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/
 
-SIP_VERSION=		4.7.4
-PYQT3_VERSION=		3.17.4
-PYQT4_VERSION=		4.3.3
-PYKDE3_VERSION=		3.16.1
-PYKDE4_VERSION=		4.0.2-1
+SIP_VERSION=		4.7.9
+PYQT3_VERSION=		3.17.6
+PYQT4_VERSION=		4.4.4
+PYKDE3_VERSION=		3.16.2
 QSCI1_VERSION=		1.7.1
-QSCI2_VERSION=		2.2
+QSCI2_VERSION=		2.3.2
 
 SIP_DISTNAME=		sip-${SIP_VERSION}
 PYQT3_DISTNAME=		PyQt-x11-gpl-${PYQT3_VERSION}
 PYQT4_DISTNAME=		PyQt-x11-gpl-${PYQT4_VERSION}
 PYKDE3_DISTNAME=	PyKDE-${PYKDE3_VERSION}
-PYKDE4_DISTNAME=	PyKDE4-${PYKDE4_VERSION}
 QSCI1_DISTNAME=		QScintilla-1.71-gpl-${QSCI1_VERSION}
 QSCI2_DISTNAME=		QScintilla-gpl-${QSCI2_VERSION}
diff --git a/devel/py-sip/pkg-plist b/devel/py-sip/pkg-plist
index 9db269c6add9..65f3f38b4aa4 100644
--- a/devel/py-sip/pkg-plist
+++ b/devel/py-sip/pkg-plist
@@ -1,9 +1,4 @@
 bin/sip
-%%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 +7,10 @@ bin/sip
 %%PYTHON_SITELIBDIR%%/sipdistutils.py
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyc
 %%PYTHON_SITELIBDIR%%/sipdistutils.pyo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/sipref.html
+%%PORTDOCS%%%%DOCSDIR%%/sipref.txt
 @exec mkdir -p %D/%%DATADIR%%
 @dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%