devel/shiboken: update to 1.2.2

- Support stage
- Take maintainership

4 files changed, 11 insertions, 28 deletions

diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
index fcc1099e3d7c..3e918ebc8a92 100644
--- a/devel/shiboken/Makefile
+++ b/devel/shiboken/Makefile
@@ -2,30 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	shiboken
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.pyside.org/files/
+MASTER_SITES=	https://download.qt-project.org/official_releases/pyside/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	wg@FreeBSD.org
 COMMENT=	C++ code generator for CPython extensions
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BROKEN=		Unfetchable
-
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libxslt.so:${PORTSDIR}/textproc/libxslt
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 
-USE_QT4=	gui qmake_build qtestlib moc_build \
+USE_QT4=	corelib qmake_build qtestlib moc_build network \
 		uic_build rcc_build xml xmlpatterns
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
@@ -34,11 +30,10 @@ ALL_TARGET=	all
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
-MAN1=	shiboken.1
+PLIST_FILES+=	man/man1/shiboken.1.gz
 .else
 CMAKE_ARGS=	-DNO_INSTALL_MANPAGES:BOOL="ON"
 .endif
@@ -48,8 +43,8 @@ BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 ALL_TARGET+=	doc
 post-install:
 	if [ -d ${WRKSRC}/doc/html ]; then \
-		${MKDIR} ${DOCSDIR} && \
-		cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${DOCSDIR}; \
+		${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+		cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}; \
 	fi
 .endif
 
diff --git a/devel/shiboken/distinfo b/devel/shiboken/distinfo
index 2c250c510e71..d2b96facc9e4 100644
--- a/devel/shiboken/distinfo
+++ b/devel/shiboken/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shiboken-1.1.1.tar.bz2) = 1cedad65d5d12e1b81a487b6aa7a1cb0a494934cb39c34f3cffcbc6c645d7e3f
-SIZE (shiboken-1.1.1.tar.bz2) = 1065920
+SHA256 (shiboken-1.2.2.tar.bz2) = 7625bbcf1fe313fd910c6b8c9cf49ac5495499f9d00867115a2f1f2a69fce5c4
+SIZE (shiboken-1.2.2.tar.bz2) = 1073776
diff --git a/devel/shiboken/files/patch-doc__conf.py.in b/devel/shiboken/files/patch-doc__conf.py.in
deleted file mode 100644
index 5d4d8f5e466e..000000000000
--- a/devel/shiboken/files/patch-doc__conf.py.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/conf.py.in.orig	2013-12-25 19:56:52.000000000 +0200
-+++ doc/conf.py.in	2013-12-25 19:57:00.000000000 +0200
-@@ -22,7 +22,7 @@
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.refcounting', 'sphinx.ext.coverage']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.coverage']
- 
- rst_epilog = """
- .. |project| replace:: Shiboken
diff --git a/devel/shiboken/pkg-plist b/devel/shiboken/pkg-plist
index eade728d6c69..817fd1c80ecc 100644
--- a/devel/shiboken/pkg-plist
+++ b/devel/shiboken/pkg-plist
@@ -25,6 +25,7 @@ lib/libshiboken-%%PYTHON_VERSION%%.so
 lib/libshiboken-%%PYTHON_VERSION%%.so.1
 lib/libshiboken-%%PYTHON_VERSION%%.so.%%PORTVERSION%%
 libdata/pkgconfig/shiboken.pc
+%%PYTHON_SITELIBDIR%%/shiboken.so
 %%PORTDOCS%%%%DOCSDIR%%/.buildinfo
 %%PORTDOCS%%%%DOCSDIR%%/.doctrees/codeinjectionsemantics.doctree
 %%PORTDOCS%%%%DOCSDIR%%/.doctrees/commandlineoptions.doctree
@@ -68,8 +69,6 @@ libdata/pkgconfig/shiboken.pc
 %%PORTDOCS%%%%DOCSDIR%%/_static/fakebar.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/file.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/logo_indt.jpg
-%%PORTDOCS%%%%DOCSDIR%%/_static/logo_openbossa.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/logo_python.jpg
 %%PORTDOCS%%%%DOCSDIR%%/_static/logo_qt.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/minus.png