- Move x11-toolkits/py-kiwi to x11-toolkits/py-kiwi-gtk

- Sort USE_PYTHON
- Convert to options target helper
- Bump PORTREVISION for dependent ports

devel/gazpacho/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	gazpacho
 PORTVERSION=	0.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME/sources/gazpacho/0.7
 
@@ -13,8 +13,8 @@ COMMENT=	GUI builder for the GTK+ toolkit
 LICENSE=	LGPL21+ # source mentions LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi
-BUILD_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi
+BUILD_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi-gtk
+RUN_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi-gtk
 
 USES=		desktop-file-utils gettext python
 USE_GNOME=	pygtk2

x11-toolkits/Makefile

@@ -210,7 +210,7 @@
     SUBDIR += py-gtksourceview
     SUBDIR += py-gui
     SUBDIR += py-kivy
-    SUBDIR += py-kiwi
+    SUBDIR += py-kiwi-gtk
     SUBDIR += py-qt4-gui
     SUBDIR += py-qt5-gui
     SUBDIR += py-qt5-quick

x11-toolkits/py-kiwi-gtk/Makefile

@@ -1,11 +1,10 @@
 # Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
 
-PORTNAME=	kiwi
+PORTNAME=	kiwi-gtk
 PORTVERSION=	1.9.38
-DISTVERSIONPREFIX=	gtk-
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	CHEESESHOP/source/${DISTNAME:C/(.).*/\1/}/${PORTNAME}-gtk
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
@@ -13,20 +12,21 @@ COMMENT=	Framework and a set of enhanced widgets based on PyGTK
 
 LICENSE=	LGPL21
 
-NO_ARCH=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		gettext python uniquefiles:dirs
+NO_ARCH=	yes
 USE_GNOME=	libglade2 pygtk2
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist distutils
+USES=		gettext python uniquefiles:dirs
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}