View | Details | Raw Unified | Return to bug 210750 | Differences between
and this patch

Collapse All | Expand All

(-)wt/Makefile (-40 / +54 lines)
Lines 19-44 Link Here
19
GH_ACCOUNT=	kdeforche
19
GH_ACCOUNT=	kdeforche
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
USE_XORG+=x11
21
USE_XORG+=x11
22
USES=		cmake:outsource pkgconfig ssl
22
USES=		cmake:outsource ninja pkgconfig
23
CMAKE_ARGS+=	-DCONFIGDIR:STRING=${LOCALBASE}/etc/wt \
23
CMAKE_ARGS+=	-DCONFIGDIR:STRING=${LOCALBASE}/etc/wt \
24
	-DGM_PREFIX:STRING=${LOCALBASE} \
24
	-DGM_PREFIX:STRING=${LOCALBASE} \
25
	-DPNG_PREFIX:STRING=${LOCALBASE} \
25
	-DPNG_PREFIX:STRING=${LOCALBASE} \
26
	-DSSL_PREFIX:STRING=/usr \
27
	-DZLIB_PREFIX:STRING=/usr \
26
	-DZLIB_PREFIX:STRING=/usr \
28
	-DCONNECTOR_ISAPI:BOOL=OFF \
27
	-DCONNECTOR_ISAPI:BOOL=OFF \
29
	-DWEBUSER:STRING=www \
28
	-DWEBUSER:STRING=www \
30
	-DWEBGROUP:STRING=www \
29
	-DWEBGROUP:STRING=www \
31
	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick \
30
	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick
32
	-DENABLE_SSL:BOOL=ON
33
31
34
NO_OPTIONS_SORT=	yes
32
NO_OPTIONS_SORT=	yes
35
OPTIONS_DEFINE=	\
33
OPTIONS_DEFINE=	\
36
	DOCS \
34
	DOXYGEN \
37
	EXAMPLES \
35
	EXAMPLES \
38
	TESTS \
36
	TESTS \
39
	RESOURCES \
37
	RESOURCES \
40
	CMAKE_MODULE \
38
	CMAKE_MODULE \
41
	CPP11 \
39
	CPP11 \
40
	SSL \
42
	HARU \
41
	HARU \
43
	PANGO \
42
	PANGO \
44
	EXT \
43
	EXT \
Lines 50-63 Link Here
50
	RESOURCES \
49
	RESOURCES \
51
	CMAKE_MODULE \
50
	CMAKE_MODULE \
52
	CPP11 \
51
	CPP11 \
52
	SSL \
53
	HARU \
53
	HARU \
54
	PANGO \
54
	PANGO \
55
	OPENGL \
55
	OPENGL \
56
	LIBWTTEST
56
	LIBWTTEST
57
OPTIONS_GROUP=	CONNECTOR DBO WSTRING
57
OPTIONS_GROUP=	CONNECTORS DBO WSTRING
58
OPTIONS_SUB=	yes
58
OPTIONS_SUB=	yes
59
59
60
EXAMPLES_DESC=		Install examples (implies SQLITE3 and WTHTTP)
60
EXAMPLES_DESC=		Install examples (implies SQLITE3, WTHTTP)
61
TESTS_DESC=		Build Wt tests
61
TESTS_DESC=		Build Wt tests
62
RESOURCES_DESC=		Install resources directory
62
RESOURCES_DESC=		Install resources directory
63
CMAKE_MODULE_DESC=	Install FindWt.cmake in systemwide cmake dir
63
CMAKE_MODULE_DESC=	Install FindWt.cmake in systemwide cmake dir
Lines 66-76 Link Here
66
EXT_DESC=		Build Wt Ext library with JavaScript-only widgets
66
EXT_DESC=		Build Wt Ext library with JavaScript-only widgets
67
LIBWTTEST_DESC=		Build Wt::Test for automated (integration/unit) tests
67
LIBWTTEST_DESC=		Build Wt::Test for automated (integration/unit) tests
68
68
69
OPTIONS_GROUP_CONNECTOR=	FCGI WTHTTP
69
OPTIONS_GROUP_CONNECTORS=	FCGI WTHTTP
70
OPTIONS_DEFAULT +=	FCGI WTHTTP
70
OPTIONS_DEFAULT +=		FCGI WTHTTP
71
CONNECTOR_DESC=		Connector
71
CONNECTORS_DESC=		Connectors
72
FCGI_DESC=		Build FastCGI connector
72
FCGI_DESC=			Build FastCGI connector
73
WTHTTP_DESC=		Build Wt stand-alone httpd connector
73
WTHTTP_DESC=			Build Wt stand-alone httpd connector
74
74
75
OPTIONS_GROUP_DBO=	SQLITE3 POSTGRES FIREBIRD MYSQL
75
OPTIONS_GROUP_DBO=	SQLITE3 POSTGRES FIREBIRD MYSQL
76
OPTIONS_DEFAULT +=	SQLITE3
76
OPTIONS_DEFAULT +=	SQLITE3
Lines 89-124 Link Here
89
89
90
CMAKE_MODULE_CMAKE_ON=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=ON
90
CMAKE_MODULE_CMAKE_ON=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=ON
91
CMAKE_MODULE_CMAKE_OFF=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=OFF
91
CMAKE_MODULE_CMAKE_OFF=	-DINSTALL_FINDWT_CMAKE_FILE:BOOL=OFF
92
DOCS_CMAKE_ON=		-DBUILD_DOCS:BOOL=ON
92
CPP11_CMAKE_ON=		-DWT_CPP_11_MODE:STRING=-std=c++0x
93
DOCS_CMAKE_OFF=		-DBUILD_DOCS:BOOL=OFF
93
DOXYGEN_CMAKE_ON=	-DBUILD_DOCS:BOOL=ON
94
FCGI_CMAKE_ON=		-DCONNECTOR_FCGI:BOOL=ON
94
DOXYGEN_CMAKE_OFF	-DBUILD_DOCS:BOOL=OFF
95
EXAMPLES_CMAKE_ON=	-DBUILD_EXAMPLES:BOOL=ON \
96
			-DINSTALL_EXAMPLES:BOOL=ON
97
EXAMPLES_CMAKE_OFF=	-DBUILD_EXAMPLES:BOOL=OFF \
98
			-DINSTALL_EXAMPLES:BOOL=OFF
99
FCGI_CMAKE_ON=		-DCONNECTOR_FCGI:BOOL=ON \
100
			-DFCGI_PREFIX:STRING=${LOCALBASE}
95
FCGI_CMAKE_OFF=		-DCONNECTOR_FCGI:BOOL=OFF
101
FCGI_CMAKE_OFF=		-DCONNECTOR_FCGI:BOOL=OFF
96
FIREBIRD_CMAKE_ON=	-DENABLE_FIREBIRD:BOOL=ON
102
FIREBIRD_CMAKE_ON=	-DENABLE_FIREBIRD:BOOL=ON \
103
			-DFIREBIRD_PREFIX:STRING=${LOCALBASE}
97
FIREBIRD_CMAKE_OFF=	-DENABLE_FIREBIRD:BOOL=OFF
104
FIREBIRD_CMAKE_OFF=	-DENABLE_FIREBIRD:BOOL=OFF
98
EXT_CMAKE_ON=		-DENABLE_EXT:BOOL=ON
105
EXT_CMAKE_ON=		-DENABLE_EXT:BOOL=ON
99
EXT_CMAKE_OFF=		-DENABLE_EXT:BOOL=OFF
106
EXT_CMAKE_OFF=		-DENABLE_EXT:BOOL=OFF
100
HARU_CMAKE_ON=		-DENABLE_HARU:BOOL=ON
107
HARU_CMAKE_ON=		-DENABLE_HARU:BOOL=ON \
108
			-DHARU_PREFIX:STRING=${LOCALBASE}
101
HARU_CMAKE_OFF=		-DENABLE_HARU:BOOL=OFF
109
HARU_CMAKE_OFF=		-DENABLE_HARU:BOOL=OFF
102
LIBWTTEST_CMAKE_ON=	-DENABLE_LIBWTTEST:BOOL=ON
110
LIBWTTEST_CMAKE_ON=	-DENABLE_LIBWTTEST:BOOL=ON
103
LIBWTTEST_CMAKE_OFF=	-DENABLE_LIBWTTEST:BOOL=OFF
111
LIBWTTEST_CMAKE_OFF=	-DENABLE_LIBWTTEST:BOOL=OFF
104
MYSQL_CMAKE_ON=		-DENABLE_MYSQL:BOOL=ON
112
MYSQL_CMAKE_ON=		-DENABLE_MYSQL:BOOL=ON \
113
			-DMYSQL_PREFIX:STRING=${LOCALBASE}
105
MYSQL_CMAKE_OFF=	-DENABLE_MYSQL:BOOL=OFF
114
MYSQL_CMAKE_OFF=	-DENABLE_MYSQL:BOOL=OFF
106
NO_STD_LOCALE_CMAKE_ON=	-DWT_NO_STD_LOCALE:BOOL=ON
115
NO_STD_LOCALE_CMAKE_ON=		-DWT_NO_STD_LOCALE:BOOL=ON
107
NO_STD_LOCALE_CMAKE_OFF=-DWT_NO_STD_LOCALE:BOOL=OFF
116
NO_STD_LOCALE_CMAKE_OFF=	-DWT_NO_STD_LOCALE:BOOL=OFF
108
NO_STD_WSTRING_CMAKE_ON=	-DWT_NO_STD_WSTRING:BOOL=ON
117
NO_STD_WSTRING_CMAKE_ON=	-DWT_NO_STD_WSTRING:BOOL=ON
109
NO_STD_WSTRING_CMAKE_OFF=	-DWT_NO_STD_WSTRING:BOOL=OFF
118
NO_STD_WSTRING_CMAKE_OFF=	-DWT_NO_STD_WSTRING:BOOL=OFF
110
OPENGL_CMAKE_ON=	-DENABLE_OPENGL:BOOL=ON
119
OPENGL_CMAKE_ON=	-DENABLE_OPENGL:BOOL=ON
111
OPENGL_CMAKE_OFF=	-DENABLE_OPENGL:BOOL=OFF
120
OPENGL_CMAKE_OFF=	-DENABLE_OPENGL:BOOL=OFF
112
PANGO_CMAKE_ON=		-DENABLE_PANGO:BOOL=ON
121
PANGO_CMAKE_ON=		-DENABLE_PANGO:BOOL=ON
113
PANGO_CMAKE_OFF=	-DENABLE_PANGO:BOOL=OFF
122
PANGO_CMAKE_OFF=	-DENABLE_PANGO:BOOL=OFF
114
POSTGRES_CMAKE_ON=	-DENABLE_POSTGRES:BOOL=ON
123
POSTGRES_CMAKE_ON=	-DENABLE_POSTGRES:BOOL=ON \
124
			-DPOSTGRES_PREFIX:STRING=${LOCALBASE}
115
POSTGRES_CMAKE_OFF=	-DENABLE_POSTGRES:BOOL=OFF
125
POSTGRES_CMAKE_OFF=	-DENABLE_POSTGRES:BOOL=OFF
116
QT4_CMAKE_ON=		-DENABLE_QT4:BOOL=ON
126
QT4_CMAKE_ON=		-DENABLE_QT4:BOOL=ON
117
QT4_CMAKE_OFF=		-DENABLE_QT4:BOOL=OFF
127
QT4_CMAKE_OFF=		-DENABLE_QT4:BOOL=OFF
118
RESOURCES_CMAKE_ON=	-DINSTALL_RESOURCES:BOOL=ON
128
RESOURCES_CMAKE_ON=	-DINSTALL_RESOURCES:BOOL=ON
119
RESOURCES_CMAKE_OFF=	-DINSTALL_RESOURCES:BOOL=OFF
129
RESOURCES_CMAKE_OFF=	-DINSTALL_RESOURCES:BOOL=OFF
120
SQLITE_CMAKE_ON=	-DENABLE_SQLITE:BOOL=ON
130
SQLITE3_CMAKE_ON=	-DENABLE_SQLITE:BOOL=ON \
121
SQLITE_CMAKE_OFF=	-DENABLE_SQLITE:BOOL=OFF
131
			-DSQLITE3_PREFIX:STRING=${LOCALBASE}
132
SQLITE3_CMAKE_OFF=	-DENABLE_SQLITE:BOOL=OFF
133
SSL_CMAKE_ON=		-DENABLE_SSL:BOOL=ON \
134
			-DSSL_PREFIX:STRING=/usr
135
SSL_CMAKE_OFF=		-DENABLE_SSL:BOOL=OFF
122
TESTS_CMAKE_ON=		-DBUILD_TESTS:BOOL=ON
136
TESTS_CMAKE_ON=		-DBUILD_TESTS:BOOL=ON
123
TESTS_CMAKE_OFF=	-DBUILD_TESTS:BOOL=OFF
137
TESTS_CMAKE_OFF=	-DBUILD_TESTS:BOOL=OFF
124
WTHTTP_CMAKE_ON=	-DCONNECTOR_HTTP:BOOL=ON
138
WTHTTP_CMAKE_ON=	-DCONNECTOR_HTTP:BOOL=ON
Lines 126-138 Link Here
126
140
127
.include <bsd.port.options.mk>
141
.include <bsd.port.options.mk>
128
142
129
.if ${PORT_OPTIONS:MDOCS}
143
.if ${PORT_OPTIONS:MDOXYGEN}
130
BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
144
BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
131
		doxygen:devel/doxygen
145
		doxygen:devel/doxygen
132
.endif
146
.endif
133
147
134
.if ${PORT_OPTIONS:MEXAMPLES}
148
.if ${PORT_OPTIONS:MEXAMPLES}
135
CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=ON -DINSTALL_EXAMPLES:BOOL=ON
136
.if ${PORT_OPTIONS:MSQLITE3} \
149
.if ${PORT_OPTIONS:MSQLITE3} \
137
	|| ${PORT_OPTIONS:MPOSTGRES} \
150
	|| ${PORT_OPTIONS:MPOSTGRES} \
138
	|| ${PORT_OPTIONS:MFIREBIRD} \
151
	|| ${PORT_OPTIONS:MFIREBIRD} \
Lines 152-172 Link Here
152
.else
165
.else
153
PLIST_SUB+=	QT4_EXAMPLES="@comment "
166
PLIST_SUB+=	QT4_EXAMPLES="@comment "
154
.endif
167
.endif
168
.if ${PORT_OPTIONS:MSSL}
169
PLIST_SUB+=	SSL_EXAMPLES=""
170
.else
171
PLIST_SUB+=	SSL_EXAMPLES="@comment "
172
.endif
155
.else
173
.else
156
CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=OFF -DINSTALL_EXAMPLES:BOOL=OFF
157
PLIST_SUB+=	DBO_EXAMPLES="@comment "
174
PLIST_SUB+=	DBO_EXAMPLES="@comment "
158
PLIST_SUB+=	DBO_SQLITE3_EXAMPLES="@comment "
175
PLIST_SUB+=	DBO_SQLITE3_EXAMPLES="@comment "
159
PLIST_SUB+=	QT4_EXAMPLES="@comment "
176
PLIST_SUB+=	QT4_EXAMPLES="@comment "
177
PLIST_SUB+=	SSL_EXAMPLES="@comment "
160
.endif
178
.endif
161
179
162
.if ${PORT_OPTIONS:MCPP11}
180
.if ${PORT_OPTIONS:MCPP11}
163
USES+=		compiler:c++11-lib
181
USES+=	compiler:c++11-lib
164
CMAKE_ARGS+=	-DWT_CPP_11_MODE:STRING=-std=c++0x
182
.endif
183
184
.if ${PORT_OPTIONS:MSSL}
185
USES+=	ssl
165
.endif
186
.endif
166
187
167
.if ${PORT_OPTIONS:MHARU}
188
.if ${PORT_OPTIONS:MHARU}
168
LIB_DEPENDS+=	libhpdf.so:print/libharu
189
LIB_DEPENDS+=	libhpdf.so:print/libharu
169
CMAKE_ARGS+=	-DHARU_PREFIX:STRING=${LOCALBASE}
170
.endif
190
.endif
171
191
172
.if ${PORT_OPTIONS:MPANGO}
192
.if ${PORT_OPTIONS:MPANGO}
Lines 178-191 Link Here
178
.endif
198
.endif
179
199
180
.if ${PORT_OPTIONS:MOPENGL}
200
.if ${PORT_OPTIONS:MOPENGL}
181
USE_GL=		gl glew
201
USE_GL=	gl glew
182
.endif
202
.endif
183
203
184
.if ${PORT_OPTIONS:MFCGI}
204
.if ${PORT_OPTIONS:MFCGI}
185
LIB_DEPENDS+=	libfcgi.so:www/fcgi \
205
LIB_DEPENDS+=	libfcgi.so:www/fcgi \
186
		libfcgi++.so:www/fcgi
206
		libfcgi++.so:www/fcgi
187
188
CMAKE_ARGS+=	-DFCGI_PREFIX:STRING=${LOCALBASE}
189
.endif
207
.endif
190
208
191
.if ${PORT_OPTIONS:MSQLITE3} \
209
.if ${PORT_OPTIONS:MSQLITE3} \
Lines 200-222 Link Here
200
.endif
218
.endif
201
219
202
.if ${PORT_OPTIONS:MSQLITE3}
220
.if ${PORT_OPTIONS:MSQLITE3}
203
USES+=		sqlite:3
221
USES+=	sqlite:3
204
CMAKE_ARGS+=	-DSQLITE3_PREFIX:STRING=${LOCALBASE}
205
.endif
222
.endif
206
223
207
.if ${PORT_OPTIONS:MPOSTGRES}
224
.if ${PORT_OPTIONS:MPOSTGRES}
208
USE_PGSQL=	yes
225
USES+=	pgsql
209
CMAKE_ARGS+=	-DPOSTGRES_PREFIX:STRING=${LOCALBASE}
210
.endif
226
.endif
211
227
212
.if ${PORT_OPTIONS:MFIREBIRD}
228
.if ${PORT_OPTIONS:MFIREBIRD}
213
USE_FIREBIRD=	yes
229
USES+=	firebird
214
CMAKE_AGS+=	-DFIREBIRD_PREFIX:STRING=${LOCALBASE}
215
.endif
230
.endif
216
231
217
.if ${PORT_OPTIONS:MMYSQL}
232
.if ${PORT_OPTIONS:MMYSQL}
218
USE_MYSQL=	yes
233
USES+=	mysql
219
CMAKE_ARGS+=	-DMYSQL_PREFIX:STRING=${LOCALBASE}
220
.endif
234
.endif
221
235
222
post-stage:
236
post-stage:
(-)wt/pkg-plist (-2 / +2 lines)
Lines 551-558 Link Here
551
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/CMakeLists.txt
551
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/CMakeLists.txt
552
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/README.md
552
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/README.md
553
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/SslClientAuth.C
553
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/SslClientAuth.C
554
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth
554
%%SSL_EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth
555
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth.wt
555
%%SSL_EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/client-ssl-auth.wt
556
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/css/style.css
556
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/css/style.css
557
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/model/Session.C
557
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/model/Session.C
558
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/model/Session.h
558
%%EXAMPLES%%lib/Wt/examples/feature/client-ssl-auth/model/Session.h

Return to bug 210750