- Enable staging

- Use GCC (does not build with clang)
- Use new options format

2 files changed, 61 insertions, 80 deletions

diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 25aadce08326..cdc07b05f5a8 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yzis
 PORTVERSION=	1.0.a.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors
 MASTER_SITES=	http://labs.freehackers.org/attachments/download/45/ \
 		http://contribs.martymac.org/FreeBSD-ports/distfiles/
@@ -29,51 +29,32 @@ CMAKE_ARGS+=	-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DENABLE_QYZIS:BOOL=ON \
 		-DENABLE_LIBYZISRUNNER:BOOL=OFF \
 		-DENABLE_TESTS:BOOL=OFF
+USE_GCC=	any
 
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	KYZIS NYZIS
+OPTIONS_DEFINE=	KYZIS NYZIS DOCS
+OPTIONS_SUB=	yes
 KYZIS_DESC=	Build kyzis and Yzis kpart
+KYZIS_USE=	KDE4=kdehier,kdeprefix,kdelibs,automoc4 QT4=phonon
+KYZIS_CMAKE_ON=	-DENABLE_KYZIS:BOOL=ON -DENABLE_KPART_YZIS:BOOL=ON
+KYZIS_CMAKE_OFF=	-DENABLE_KYZIS:BOOL=OFF -DENABLE_KPART_YZIS:BOOL=OFF
 NYZIS_DESC=	Build nyzis (ncurses frontend)
+NYZIS_CPPFLAGS=	-D_XOPEN_SOURCE_EXTENDED
+NYZIS_CMAKE_ON=	-DENABLE_NYZIS:BOOL=ON
+NYZIS_CMAKE_OFF=	-DENABLE_NYZIS:BOOL=OFF
+DOCS_BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
+		doxygen:${PORTSDIR}/devel/doxygen
+DOCS_CMAKE_ON=	-DENABLE_DOCUMENTATION:BOOL=ON
+DOCS_CMAKE_OFF=	-DENABLE_DOCUMENTATION:BOOL=OFF
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKYZIS}
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
-USE_QT4+=	phonon
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MNYZIS}
-CPPFLAGS+=	-D_XOPEN_SOURCE_EXTENDED # ncurses/widec support
-CMAKE_ARGS+=	-DENABLE_NYZIS:BOOL=ON
-PLIST_SUB+=	PL_NYZIS=""
-.else
-CMAKE_ARGS+=	-DENABLE_NYZIS:BOOL=OFF
-PLIST_SUB+=	PL_NYZIS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MKYZIS}
-CMAKE_ARGS+=	-DENABLE_KYZIS:BOOL=ON \
-		-DENABLE_KPART_YZIS:BOOL=ON
-PLIST_SUB+=	PL_KYZIS=""
-PLIST_SUB+=	PL_QYZIS="@comment "
-.else
-CMAKE_ARGS+=	-DENABLE_KYZIS:BOOL=OFF \
-		-DENABLE_KPART_YZIS:BOOL=OFF
-PLIST_SUB+=	PL_KYZIS="@comment "
-PLIST_SUB+=	PL_QYZIS=""
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
-		doxygen:${PORTSDIR}/devel/doxygen
-CMAKE_ARGS+=	-DENABLE_DOCUMENTATION:BOOL=ON
+PLIST_SUB+=	QYZIS="@comment "
 .else
-CMAKE_ARGS+=	-DENABLE_DOCUMENTATION:BOOL=OFF
+PLIST_SUB+=	QYZIS=""
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/yzis/pkg-plist b/editors/yzis/pkg-plist
index 4582bdc267ba..7ad0dc020c61 100644
--- a/editors/yzis/pkg-plist
+++ b/editors/yzis/pkg-plist
@@ -1,54 +1,54 @@
 bin/qyzis
-%%PL_NYZIS%%bin/nyzis
-%%PL_KYZIS%%bin/kyzis
-%%PL_KYZIS%%lib/kde4/yzispart.so
-%%PL_KYZIS%%@dirrmtry lib/kde4
+%%NYZIS%%bin/nyzis
+%%KYZIS%%bin/kyzis
+%%KYZIS%%lib/kde4/yzispart.so
+%%KYZIS%%@dirrmtry lib/kde4
 lib/libyzis.so.0.0.0
 lib/libyzis.so.0
 lib/libyzis.so
 share/applnk/Editors/qyzis.desktop
 @dirrmtry share/applnk/Editors
 @dirrmtry share/applnk
-%%PL_KYZIS%%share/apps/yzispart/yzispart.rc
-%%PL_KYZIS%%@dirrm share/apps/yzispart
-%%PL_KYZIS%%@dirrmtry share/apps
-%%PL_KYZIS%%share/kde4/services/yzispart.desktop
-%%PL_KYZIS%%@dirrmtry share/kde4/services
-%%PL_KYZIS%%@dirrmtry share/kde4
-%%PL_QYZIS%%share/icons/hicolor/128x128/apps/qyzis.png
-%%PL_QYZIS%%share/icons/hicolor/32x32/apps/qyzis.png
-%%PL_QYZIS%%share/icons/hicolor/64x64/apps/qyzis.png
-%%PL_QYZIS%%share/icons/hicolor/16x16/apps/qyzis.png
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/128x128/apps
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/128x128
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/32x32/apps
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/32x32
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/64x64/apps
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/64x64
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/16x16/apps
-%%PL_QYZIS%%@dirrmtry share/icons/hicolor/16x16
-%%PL_KYZIS%%share/icons/crystalsvg/128x128/apps/l10n/hicolor/qyzis.png
-%%PL_KYZIS%%share/icons/crystalsvg/32x32/apps/l10n/hicolor/qyzis.png
-%%PL_KYZIS%%share/icons/crystalsvg/64x64/apps/l10n/hicolor/qyzis.png
-%%PL_KYZIS%%share/icons/crystalsvg/16x16/apps/l10n/hicolor/qyzis.png
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/128x128/apps/l10n/hicolor
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/128x128/apps/l10n
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/128x128/apps
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/128x128
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/32x32/apps/l10n/hicolor
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/32x32/apps/l10n
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/32x32/apps
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/32x32
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/64x64/apps/l10n/hicolor
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/64x64/apps/l10n
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/64x64/apps
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/64x64
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/16x16/apps/l10n/hicolor
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/16x16/apps/l10n
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/16x16/apps
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg/16x16
-%%PL_KYZIS%%@dirrmtry share/icons/crystalsvg
-@dirrmtry share/icons/hicolor
+%%KYZIS%%share/apps/yzispart/yzispart.rc
+%%KYZIS%%@dirrm share/apps/yzispart
+%%KYZIS%%@dirrmtry share/apps
+%%KYZIS%%share/kde4/services/yzispart.desktop
+%%KYZIS%%@dirrmtry share/kde4/services
+%%KYZIS%%@dirrmtry share/kde4
+%%QYZIS%%share/icons/hicolor/128x128/apps/qyzis.png
+%%QYZIS%%share/icons/hicolor/32x32/apps/qyzis.png
+%%QYZIS%%share/icons/hicolor/64x64/apps/qyzis.png
+%%QYZIS%%share/icons/hicolor/16x16/apps/qyzis.png
+%%QYZIS%%@dirrmtry share/icons/hicolor/128x128/apps
+%%QYZIS%%@dirrmtry share/icons/hicolor/128x128
+%%QYZIS%%@dirrmtry share/icons/hicolor/32x32/apps
+%%QYZIS%%@dirrmtry share/icons/hicolor/32x32
+%%QYZIS%%@dirrmtry share/icons/hicolor/64x64/apps
+%%QYZIS%%@dirrmtry share/icons/hicolor/64x64
+%%QYZIS%%@dirrmtry share/icons/hicolor/16x16/apps
+%%QYZIS%%@dirrmtry share/icons/hicolor/16x16
+%%QYZIS%%@dirrmtry share/icons/hicolor
+%%KYZIS%%share/icons/crystalsvg/128x128/apps/l10n/hicolor/qyzis.png
+%%KYZIS%%share/icons/crystalsvg/32x32/apps/l10n/hicolor/qyzis.png
+%%KYZIS%%share/icons/crystalsvg/64x64/apps/l10n/hicolor/qyzis.png
+%%KYZIS%%share/icons/crystalsvg/16x16/apps/l10n/hicolor/qyzis.png
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/128x128/apps/l10n/hicolor
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/128x128/apps/l10n
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/128x128/apps
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/128x128
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/32x32/apps/l10n/hicolor
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/32x32/apps/l10n
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/32x32/apps
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/32x32
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/64x64/apps/l10n/hicolor
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/64x64/apps/l10n
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/64x64/apps
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/64x64
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/16x16/apps/l10n/hicolor
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/16x16/apps/l10n
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/16x16/apps
+%%KYZIS%%@dirrmtry share/icons/crystalsvg/16x16
+%%KYZIS%%@dirrmtry share/icons/crystalsvg
 @dirrmtry share/icons
 share/yzis/syntax/language.dtd
 share/yzis/syntax/syntax.template