- USE_GITHUB

- Remove/shorten overlong OPT_DESCR
- Use option helpers
- Other Cosmetic fixes

No functional changes, so no PORTREVISION bump

Based on suggestions by:	danfe, gerald

2 files changed, 73 insertions, 144 deletions

diff --git a/www/wt/Makefile b/www/wt/Makefile
index 9476907f5f4e..83bc406133eb 100644
--- a/www/wt/Makefile
+++ b/www/wt/Makefile
@@ -4,8 +4,6 @@
 PORTNAME=	wt
 PORTVERSION=	3.3.6
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/archive/${PORTVERSION}/ \
-		http://github.com/${GH_ACCOUNT}/${PORTNAME}/archive/${PORTVERSION}/
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Widget-centric C++ library for developing web applications
@@ -13,7 +11,25 @@ COMMENT=	Widget-centric C++ library for developing web applications
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libboost_system.so:devel/boost-libs \
+		libGraphicsMagick.so:graphics/GraphicsMagick
+
+USE_GITHUB=	yes
 GH_ACCOUNT=	kdeforche
+USE_LDCONFIG=	yes
+USE_XORG+=x11
+USES=		cmake:outsource pkgconfig ssl
+CMAKE_ARGS+=	-DCONFIGDIR:STRING=${LOCALBASE}/etc/wt \
+	-DGM_PREFIX:STRING=${LOCALBASE} \
+	-DPNG_PREFIX:STRING=${LOCALBASE} \
+	-DSSL_PREFIX:STRING=/usr \
+	-DZLIB_PREFIX:STRING=/usr \
+	-DCONNECTOR_ISAPI:BOOL=OFF \
+	-DWEBUSER:STRING=www \
+	-DWEBGROUP:STRING=www \
+	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick \
+	-DENABLE_SSL:BOOL=ON
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=	\
@@ -30,8 +46,6 @@ OPTIONS_DEFINE=	\
 	LIBWTTEST \
 	OPENGL
 OPTIONS_DEFAULT=	\
-	DOCS \
-	EXAMPLES \
 	TESTS \
 	RESOURCES \
 	CMAKE_MODULE \
@@ -41,19 +55,16 @@ OPTIONS_DEFAULT=	\
 	OPENGL \
 	LIBWTTEST
 OPTIONS_GROUP=	CONNECTOR DBO WSTRING
+OPTIONS_SUB=	yes
 
-DOCS_DESC=		Build and/or install documentation
-EXAMPLES_DESC=		Build and install examples (binaries and source, implies SQLITE3 and WTHTTP)
+EXAMPLES_DESC=		Install examples (implies SQLITE3 and WTHTTP)
 TESTS_DESC=		Build Wt tests
 RESOURCES_DESC=		Install resources directory
-CMAKE_MODULE_DESC=	Install FindWt.cmake in systemwide cmake dir (in addition to CMAKE_INSTALL_PREFIX/cmake)
+CMAKE_MODULE_DESC=	Install FindWt.cmake in systemwide cmake dir
 CPP11_DESC=		Compile Wt in C++11 mode (Clang or GCC 4.6+)
-HARU_DESC=		Enable Haru Free PDF Library, which is used to provide support for painting to PDF (WPdfImage)
-PANGO_DESC=		Enable Pango Library, which is used for improved font support (WPdfImage and WRasterImage)
-EXT_DESC=		Build Wt Ext library with JavaScript-only widgets (http://extjs.com/) DEPRECATED
-QT4_DESC=		Build Qt4 interworking library (libwtwithqt)
+HARU_DESC=		Enable Haru Free PDF Library
+EXT_DESC=		Build Wt Ext library with JavaScript-only widgets
 LIBWTTEST_DESC=		Build Wt::Test for automated (integration/unit) tests
-OPENGL_DESC=		Build Wt with support for server-side opengl rendering
 
 OPTIONS_GROUP_CONNECTOR=	FCGI WTHTTP
 OPTIONS_DEFAULT +=	FCGI WTHTTP
@@ -71,50 +82,57 @@ MYSQL_DESC=		Build Wt with MariaDB or MySQL support
 
 OPTIONS_GROUP_WSTRING=	NO_STD_LOCALE NO_STD_WSTRING
 WSTRING_DESC=		Wt::WString
-NO_STD_LOCALE_DESC=	Build Wt to run on a system without std::locale support
-NO_STD_WSTRING_DESC=	Build Wt to run on a system without std::wstring support
+NO_STD_LOCALE_DESC=	Build for a system without std::locale support
+NO_STD_WSTRING_DESC=	Build for a system without std::wstring support
 
 EXAMPLES_IMPLIES=	SQLITE3 WTHTTP
 
-USE_LDCONFIG=	yes
-USES=		cmake:outsource pkgconfig ssl
-USE_XORG+=x11
-MAKE_JOBS_SAFE=	yes
-
-LIB_DEPENDS+=	libpng.so:graphics/png \
-		libboost_system.so:devel/boost-libs \
-		libGraphicsMagick.so:graphics/GraphicsMagick
-
-CMAKE_ARGS+=	-DCONFIGDIR:STRING=${LOCALBASE}/etc/wt \
-	-DFCGI_PREFIX:STRING=${LOCALBASE} \
-	-DFIREBIRD_PREFIX:STRING=${LOCALBASE} \
-	-DGM_PREFIX:STRING=${LOCALBASE} \
-	-DHARU_PREFIX:STRING=${LOCALBASE} \
-	-DMYSQL_PREFIX:STRING=${LOCALBASE} \
-	-DPNG_PREFIX:STRING=${LOCALBASE} \
-	-DPOSTGRES_PREFIX:STRING=${LOCALBASE} \
-	-DSQLITE3_PREFIX:STRING=${LOCALBASE} \
-	-DSSL_PREFIX:STRING=/usr \
-	-DZLIB_PREFIX:STRING=/usr \
-	-DCONNECTOR_ISAPI:BOOL=OFF \
-	-DWEBUSER:STRING=www \
-	-DWEBGROUP:STRING=www \
-	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick \
-	-DENABLE_SSL:BOOL=ON
+CMAKE_MODULE_CMAKE_ON=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=ON
+CMAKE_MODULE_CMAKE_OFF=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=OFF
+DOCS_CMAKE_ON=		-DBUILD_DOCS:BOOL=ON
+DOCS_CMAKE_OFF=		-DBUILD_DOCS:BOOL=OFF
+FCGI_CMAKE_ON=		-DCONNECTOR_FCGI:BOOL=ON
+FCGI_CMAKE_OFF=		-DCONNECTOR_FCGI:BOOL=OFF
+FIREBIRD_CMAKE_ON=	-DENABLE_FIREBIRD:BOOL=ON
+FIREBIRD_CMAKE_OFF=	-DENABLE_FIREBIRD:BOOL=OFF
+EXT_CMAKE_ON=		-DENABLE_EXT:BOOL=ON
+EXT_CMAKE_OFF=		-DENABLE_EXT:BOOL=OFF
+HARU_CMAKE_ON=		-DENABLE_HARU:BOOL=ON
+HARU_CMAKE_OFF=		-DENABLE_HARU:BOOL=OFF
+LIBWTTEST_CMAKE_ON=	-DENABLE_LIBWTTEST:BOOL=ON
+LIBWTTEST_CMAKE_OFF=	-DENABLE_LIBWTTEST:BOOL=OFF
+MYSQL_CMAKE_ON=		-DENABLE_MYSQL:BOOL=ON
+MYSQL_CMAKE_OFF=	-DENABLE_MYSQL:BOOL=OFF
+NO_STD_LOCALE_CMAKE_ON=	-DWT_NO_STD_LOCALE:BOOL=ON
+NO_STD_LOCALE_CMAKE_OFF=-DWT_NO_STD_LOCALE:BOOL=OFF
+NO_STD_WSTRING_CMAKE_ON=	-DWT_NO_STD_WSTRING:BOOL=ON
+NO_STD_WSTRING_CMAKE_OFF=	-DWT_NO_STD_WSTRING:BOOL=OFF
+OPENGL_CMAKE_ON=	-DENABLE_OPENGL:BOOL=ON
+OPENGL_CMAKE_OFF=	-DENABLE_OPENGL:BOOL=OFF
+PANGO_CMAKE_ON=		-DENABLE_PANGO:BOOL=ON
+PANGO_CMAKE_OFF=	-DENABLE_PANGO:BOOL=OFF
+POSTGRES_CMAKE_ON=	-DENABLE_POSTGRES:BOOL=ON
+POSTGRES_CMAKE_OFF=	-DENABLE_POSTGRES:BOOL=OFF
+QT4_CMAKE_ON=		-DENABLE_QT4:BOOL=ON
+QT4_CMAKE_OFF=		-DENABLE_QT4:BOOL=OFF
+RESOURCES_CMAKE_ON=	-DINSTALL_RESOURCES:BOOL=ON
+RESOURCES_CMAKE_OFF=	-DINSTALL_RESOURCES:BOOL=OFF
+SQLITE_CMAKE_ON=	-DENABLE_SQLITE:BOOL=ON
+SQLITE_CMAKE_OFF=	-DENABLE_SQLITE:BOOL=OFF
+TESTS_CMAKE_ON=		-DBUILD_TESTS:BOOL=ON
+TESTS_CMAKE_OFF=	-DBUILD_TESTS:BOOL=OFF
+WTHTTP_CMAKE_ON=	-DCONNECTOR_HTTP:BOOL=ON
+WTHTTP_CMAKE_OFF=	-DCONNECTOR_HTTP:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
 		doxygen:devel/doxygen
-CMAKE_ARGS+=	-DBUILD_DOCS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DBUILD_DOCS:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=ON -DINSTALL_EXAMPLES:BOOL=ON
-PLIST_SUB+=	EXAMPLES=""
 .if ${PORT_OPTIONS:MSQLITE3} \
 	|| ${PORT_OPTIONS:MPOSTGRES} \
 	|| ${PORT_OPTIONS:MFIREBIRD} \
@@ -136,34 +154,11 @@ PLIST_SUB+=	QT4_EXAMPLES="@comment "
 .endif
 .else
 CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=OFF -DINSTALL_EXAMPLES:BOOL=OFF
-PLIST_SUB+=	EXAMPLES="@comment "
 PLIST_SUB+=	DBO_EXAMPLES="@comment "
 PLIST_SUB+=	DBO_SQLITE3_EXAMPLES="@comment "
 PLIST_SUB+=	QT4_EXAMPLES="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MTESTS}
-CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MRESOURCES}
-CMAKE_ARGS+=	-DINSTALL_RESOURCES:BOOL=ON
-PLIST_SUB+=	RESOURCES=""
-.else
-CMAKE_ARGS+=	-DINSTALL_RESOURCES:BOOL=OFF
-PLIST_SUB+=	RESOURCES="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCMAKE_MODULE}
-CMAKE_ARGS+=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=ON
-PLIST_SUB+=	CMAKE_MODULE=""
-.else
-CMAKE_ARGS+=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=OFF
-PLIST_SUB+=	CMAKE_MODULE="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MCPP11}
 USES+=		compiler:c++11-lib
 CMAKE_ARGS+=	-DWT_CPP_11_MODE:STRING=-std=c++0x
@@ -171,64 +166,26 @@ CMAKE_ARGS+=	-DWT_CPP_11_MODE:STRING=-std=c++0x
 
 .if ${PORT_OPTIONS:MHARU}
 LIB_DEPENDS+=	libhpdf.so:print/libharu
-CMAKE_ARGS+=	-DENABLE_HARU:BOOL=ON
-.else
-CMAKE_ARGS+=	-DENABLE_HARU:BOOL=OFF
+CMAKE_ARGS+=	-DHARU_PREFIX:STRING=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MPANGO}
 USE_GNOME+=	pango
-CMAKE_ARGS+=	-DENABLE_PANGO:BOOL=ON
-.else
-CMAKE_ARGS+=	-DENABLE_PANGO:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MEXT}
-CMAKE_ARGS+=	-DENABLE_EXT:BOOL=ON
-PLIST_SUB+=	EXT=""
-.else
-CMAKE_ARGS+=	-DENABLE_EXT:BOOL=OFF
-PLIST_SUB+=	EXT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT4=		corelib moc_build
-CMAKE_ARGS+=	-DENABLE_QT4:BOOL=ON
-.else
-CMAKE_ARGS+=	-DENABLE_QT4:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLIBWTTEST}
-CMAKE_ARGS+=	-DENABLE_LIBWTTEST:BOOL=ON
-PLIST_SUB+=	LIBWTTEST=""
-.else
-CMAKE_ARGS+=	-DENABLE_LIBWTTEST:BOOL=OFF
-PLIST_SUB+=	LIBWTTEST="@comment "
+USE_QT4=	corelib moc_build
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		gl glew
-CMAKE_ARGS+=	-DENABLE_OPENGL:BOOL=ON
-.else
-CMAKE_ARGS+=	-DENABLE_OPENGL:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MFCGI}
-LIB_DEPENDS+=	libfcgi.so:www/fcgi
-LIB_DEPENDS+=	libfcgi++.so:www/fcgi
-CMAKE_ARGS+=	-DCONNECTOR_FCGI:BOOL=ON
-PLIST_SUB+=	FCGI=""
-.else
-CMAKE_ARGS+=	-DCONNECTOR_FCGI:BOOL=OFF
-PLIST_SUB+=	FCGI="@comment "
-.endif
+LIB_DEPENDS+=	libfcgi.so:www/fcgi \
+		libfcgi++.so:www/fcgi
 
-.if ${PORT_OPTIONS:MWTHTTP}
-CMAKE_ARGS+=	-DCONNECTOR_HTTP:BOOL=ON
-PLIST_SUB+=	WTHTTP=""
-.else
-CMAKE_ARGS+=	-DCONNECTOR_HTTP:BOOL=OFF
-PLIST_SUB+=	WTHTTP="@comment "
+CMAKE_ARGS+=	-DFCGI_PREFIX:STRING=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE3} \
@@ -244,50 +201,22 @@ PLIST_SUB+=	DBO="@comment "
 
 .if ${PORT_OPTIONS:MSQLITE3}
 USES+=		sqlite:3
-CMAKE_ARGS+=	-DENABLE_SQLITE:BOOL=ON
-PLIST_SUB+=	SQLITE3=""
-.else
-CMAKE_ARGS+=	-DENABLE_SQLITE:BOOL=OFF
-PLIST_SUB+=	SQLITE3="@comment "
+CMAKE_ARGS+=	-DSQLITE3_PREFIX:STRING=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGRES}
 USE_PGSQL=	yes
-CMAKE_ARGS+=	-DENABLE_POSTGRES:BOOL=ON
-PLIST_SUB+=	POSTGRES=""
-.else
-CMAKE_ARGS+=	-DENABLE_POSTGRES:BOOL=OFF
-PLIST_SUB+=	POSTGRES="@comment "
+CMAKE_ARGS+=	-DPOSTGRES_PREFIX:STRING=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MFIREBIRD}
 USE_FIREBIRD=	yes
-CMAKE_ARGS+=	-DENABLE_FIREBIRD:BOOL=ON
-PLIST_SUB+=	FIREBIRD=""
-.else
-CMAKE_ARGS+=	-DENABLE_FIREBIRD:BOOL=OFF
-PLIST_SUB+=	FIREBIRD="@comment "
+CMAKE_AGS+=	-DFIREBIRD_PREFIX:STRING=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-CMAKE_ARGS+=	-DENABLE_MYSQL:BOOL=ON
-PLIST_SUB+=	MYSQL=""
-.else
-CMAKE_ARGS+=	-DENABLE_MYSQL:BOOL=OFF
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNO_STD_LOCALE}
-CMAKE_ARGS+=	-DWT_NO_STD_LOCALE:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWT_NO_STD_LOCALE:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MNO_STD_WSTRING}
-CMAKE_ARGS+=	-DWT_NO_STD_WSTRING:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWT_NO_STD_WSTRING:BOOL=OFF
+CMAKE_ARGS+=	-DMYSQL_PREFIX:STRING=${LOCALBASE}
 .endif
 
 post-stage:
diff --git a/www/wt/distinfo b/www/wt/distinfo
index 0b80106db0f9..427c5eef439f 100644
--- a/www/wt/distinfo
+++ b/www/wt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471468688
-SHA256 (wt-3.3.6.tar.gz) = 8f82576076deb1d72cfb8ff42cf7ffb3553a45da32123b2a3cf36e66040678ab
-SIZE (wt-3.3.6.tar.gz) = 7952106
+TIMESTAMP = 1471474081
+SHA256 (kdeforche-wt-3.3.6_GH0.tar.gz) = 8f82576076deb1d72cfb8ff42cf7ffb3553a45da32123b2a3cf36e66040678ab
+SIZE (kdeforche-wt-3.3.6_GH0.tar.gz) = 7952106