Attachment 174019 Details for Bug 210750 – A new patch with a few fixes

[patch] A new patch with a few fixes

wt-changes.diff (text/plain), 7.31 KB, created by Mohammad S. Babaei on 2016-08-24 17:26:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mohammad S. Babaei

Created: 2016-08-24 17:26:59 UTC

Size: 7.31 KB

patch

obsolete

>diff -urN wt-orig/Makefile wt/Makefile
>--- wt-orig/Makefile	2016-08-21 01:34:16.000000000 +0430
>+++ wt/Makefile	2016-08-24 21:23:38.265293000 +0430
>@@ -19,26 +19,25 @@
> GH_ACCOUNT=	kdeforche
> USE_LDCONFIG=	yes
> USE_XORG+=x11
>-USES=		cmake:outsource pkgconfig ssl
>+USES=		cmake:outsource ninja pkgconfig
> 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
>+	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick
> 
> NO_OPTIONS_SORT=	yes
> OPTIONS_DEFINE=	\
>-	DOCS \
>+	DOXYGEN \
> 	EXAMPLES \
> 	TESTS \
> 	RESOURCES \
> 	CMAKE_MODULE \
> 	CPP11 \
>+	SSL \
> 	HARU \
> 	PANGO \
> 	EXT \
>@@ -50,14 +49,15 @@
> 	RESOURCES \
> 	CMAKE_MODULE \
> 	CPP11 \
>+	SSL \
> 	HARU \
> 	PANGO \
> 	OPENGL \
> 	LIBWTTEST
>-OPTIONS_GROUP=	CONNECTOR DBO WSTRING
>+OPTIONS_GROUP=	CONNECTORS DBO WSTRING
> OPTIONS_SUB=	yes
> 
>-EXAMPLES_DESC=		Install examples (implies SQLITE3 and WTHTTP)
>+EXAMPLES_DESC=		Install examples (implies SQLITE3, WTHTTP)
> TESTS_DESC=		Build Wt tests
> RESOURCES_DESC=		Install resources directory
> CMAKE_MODULE_DESC=	Install FindWt.cmake in systemwide cmake dir
>@@ -66,11 +66,11 @@
> EXT_DESC=		Build Wt Ext library with JavaScript-only widgets
> LIBWTTEST_DESC=		Build Wt::Test for automated (integration/unit) tests
> 
>-OPTIONS_GROUP_CONNECTOR=	FCGI WTHTTP
>-OPTIONS_DEFAULT +=	FCGI WTHTTP
>-CONNECTOR_DESC=		Connector
>-FCGI_DESC=		Build FastCGI connector
>-WTHTTP_DESC=		Build Wt stand-alone httpd connector
>+OPTIONS_GROUP_CONNECTORS=	FCGI WTHTTP
>+OPTIONS_DEFAULT +=		FCGI WTHTTP
>+CONNECTORS_DESC=		Connectors
>+FCGI_DESC=			Build FastCGI connector
>+WTHTTP_DESC=			Build Wt stand-alone httpd connector
> 
> OPTIONS_GROUP_DBO=	SQLITE3 POSTGRES FIREBIRD MYSQL
> OPTIONS_DEFAULT +=	SQLITE3
>@@ -89,36 +89,50 @@
> 
> 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
>+CPP11_CMAKE_ON=		-DWT_CPP_11_MODE:STRING=-std=c++0x
>+DOXYGEN_CMAKE_ON=	-DBUILD_DOCS:BOOL=ON
>+DOXYGEN_CMAKE_OFF	-DBUILD_DOCS:BOOL=OFF
>+EXAMPLES_CMAKE_ON=	-DBUILD_EXAMPLES:BOOL=ON \
>+			-DINSTALL_EXAMPLES:BOOL=ON
>+EXAMPLES_CMAKE_OFF=	-DBUILD_EXAMPLES:BOOL=OFF \
>+			-DINSTALL_EXAMPLES:BOOL=OFF
>+FCGI_CMAKE_ON=		-DCONNECTOR_FCGI:BOOL=ON \
>+			-DFCGI_PREFIX:STRING=${LOCALBASE}
> FCGI_CMAKE_OFF=		-DCONNECTOR_FCGI:BOOL=OFF
>-FIREBIRD_CMAKE_ON=	-DENABLE_FIREBIRD:BOOL=ON
>+FIREBIRD_CMAKE_ON=	-DENABLE_FIREBIRD:BOOL=ON \
>+			-DFIREBIRD_PREFIX:STRING=${LOCALBASE}
> 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_ON=		-DENABLE_HARU:BOOL=ON \
>+			-DHARU_PREFIX:STRING=${LOCALBASE}
> 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_ON=		-DENABLE_MYSQL:BOOL=ON \
>+			-DMYSQL_PREFIX:STRING=${LOCALBASE}
> 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_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_ON=	-DENABLE_POSTGRES:BOOL=ON \
>+			-DPOSTGRES_PREFIX:STRING=${LOCALBASE}
> 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
>+SQLITE3_CMAKE_ON=	-DENABLE_SQLITE:BOOL=ON \
>+			-DSQLITE3_PREFIX:STRING=${LOCALBASE}
>+SQLITE3_CMAKE_OFF=	-DENABLE_SQLITE:BOOL=OFF
>+SSL_CMAKE_ON=		-DENABLE_SSL:BOOL=ON \
>+			-DSSL_PREFIX:STRING=/usr
>+SSL_CMAKE_OFF=		-DENABLE_SSL:BOOL=OFF
> TESTS_CMAKE_ON=		-DBUILD_TESTS:BOOL=ON
> TESTS_CMAKE_OFF=	-DBUILD_TESTS:BOOL=OFF
> WTHTTP_CMAKE_ON=	-DCONNECTOR_HTTP:BOOL=ON
>@@ -126,13 +140,12 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MDOCS}
>+.if ${PORT_OPTIONS:MDOXYGEN}
> BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
> 		doxygen:devel/doxygen
> .endif
> 
> .if ${PORT_OPTIONS:MEXAMPLES}
>-CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=ON -DINSTALL_EXAMPLES:BOOL=ON
> .if ${PORT_OPTIONS:MSQLITE3} \
> 	|| ${PORT_OPTIONS:MPOSTGRES} \
> 	|| ${PORT_OPTIONS:MFIREBIRD} \
>@@ -152,21 +165,28 @@
> .else
> PLIST_SUB+=	QT4_EXAMPLES="@comment "
> .endif
>+.if ${PORT_OPTIONS:MSSL}
>+PLIST_SUB+=	SSL_EXAMPLES=""
>+.else
>+PLIST_SUB+=	SSL_EXAMPLES="@comment "
>+.endif
> .else
>-CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=OFF -DINSTALL_EXAMPLES:BOOL=OFF
> PLIST_SUB+=	DBO_EXAMPLES="@comment "
> PLIST_SUB+=	DBO_SQLITE3_EXAMPLES="@comment "
> PLIST_SUB+=	QT4_EXAMPLES="@comment "
>+PLIST_SUB+=	SSL_EXAMPLES="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MCPP11}
>-USES+=		compiler:c++11-lib
>-CMAKE_ARGS+=	-DWT_CPP_11_MODE:STRING=-std=c++0x
>+USES+=	compiler:c++11-lib
>+.endif
>+
>+.if ${PORT_OPTIONS:MSSL}
>+USES+=	ssl
> .endif
> 
> .if ${PORT_OPTIONS:MHARU}
> LIB_DEPENDS+=	libhpdf.so:print/libharu
>-CMAKE_ARGS+=	-DHARU_PREFIX:STRING=${LOCALBASE}
> .endif
> 
> .if ${PORT_OPTIONS:MPANGO}
>@@ -178,14 +198,12 @@
> .endif
> 
> .if ${PORT_OPTIONS:MOPENGL}
>-USE_GL=		gl glew
>+USE_GL=	gl glew
> .endif
> 
> .if ${PORT_OPTIONS:MFCGI}
> LIB_DEPENDS+=	libfcgi.so:www/fcgi \
> 		libfcgi++.so:www/fcgi
>-
>-CMAKE_ARGS+=	-DFCGI_PREFIX:STRING=${LOCALBASE}
> .endif
> 
> .if ${PORT_OPTIONS:MSQLITE3} \
>@@ -200,23 +218,19 @@
> .endif
> 
> .if ${PORT_OPTIONS:MSQLITE3}
>-USES+=		sqlite:3
>-CMAKE_ARGS+=	-DSQLITE3_PREFIX:STRING=${LOCALBASE}
>+USES+=	sqlite:3
> .endif
> 
> .if ${PORT_OPTIONS:MPOSTGRES}
>-USE_PGSQL=	yes
>-CMAKE_ARGS+=	-DPOSTGRES_PREFIX:STRING=${LOCALBASE}
>+USES+=	pgsql
> .endif
> 
> .if ${PORT_OPTIONS:MFIREBIRD}
>-USE_FIREBIRD=	yes
>-CMAKE_AGS+=	-DFIREBIRD_PREFIX:STRING=${LOCALBASE}
>+USES+=	firebird
> .endif
> 
> .if ${PORT_OPTIONS:MMYSQL}
>-USE_MYSQL=	yes
>-CMAKE_ARGS+=	-DMYSQL_PREFIX:STRING=${LOCALBASE}
>+USES+=	mysql
> .endif
> 
> post-stage:
>diff -urN wt-orig/pkg-plist wt/pkg-plist
>--- wt-orig/pkg-plist	2016-08-18 01:49:42.000000000 +0430
>+++ wt/pkg-plist	2016-08-24 21:13:05.447275000 +0430
>@@ -551,8 +551,8 @@
> %%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/CMakeLists.txt
> %%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/README.md
> %%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/SslClientAuth.C
>-%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth
>-%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth.wt
>+%%SSL_EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth
>+%%SSL_EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth.wt
> %%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/css/style.css
> %%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/model/Session.C
> %%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/model/Session.h

Flags:

info: maintainer-approval+

Actions: View | Diff

Attachments on bug 210750: 172026 | 173163 | 173164 | 173168 | 174019