View | Details | Raw Unified | Return to bug 101613
Collapse All | Expand All

(-)Mk/bsd.port.mk (+3 lines)
Lines 426-431 Link Here
426
#				  or http://www.FreeBSD.org/gnome/docs/porting.html
426
#				  or http://www.FreeBSD.org/gnome/docs/porting.html
427
#				  for more details.
427
#				  for more details.
428
##
428
##
429
# USE_WX		- If set, this port uses the WxWidgets library and related
430
#				  components. See bsd.wx.mk for more details.
431
##
429
# USE_KDEBASE_VER
432
# USE_KDEBASE_VER
430
#				- Set to 3 to use the KDE windowing system.
433
#				- Set to 3 to use the KDE windowing system.
431
#				  Implies inclusion of bsd.kde.mk.
434
#				  Implies inclusion of bsd.kde.mk.
(-)Mk/bsd.wx.mk (-111 / +78 lines)
Lines 14-20 Link Here
14
# components (with run and/or build dependencies). It can be used after and/or
14
# components (with run and/or build dependencies). It can be used after and/or
15
# before bsd.port.pre.mk, but Python components will only work if Python
15
# before bsd.port.pre.mk, but Python components will only work if Python
16
# variables (e.g. USE_PYTHON) are defined before it (this is a bsd.python.mk
16
# variables (e.g. USE_PYTHON) are defined before it (this is a bsd.python.mk
17
# limitation).
17
# limitation), at least it is manually included.
18
# USE_WX		- Set to the list of WxWidgets versions that can be used by
18
# USE_WX		- Set to the list of WxWidgets versions that can be used by
19
#				  the port. The syntax allows the following elements:
19
#				  the port. The syntax allows the following elements:
20
#				  - Single version (e.g. "2.4").
20
#				  - Single version (e.g. "2.4").
Lines 29-35 Link Here
29
# WX_COMPS		- Set to the list of WxWidgets components the port uses.
29
# WX_COMPS		- Set to the list of WxWidgets components the port uses.
30
#				  Several components can be specified separated by spaces. By
30
#				  Several components can be specified separated by spaces. By
31
#				  default it will have the value of "wx". Suffixes in the form
31
#				  default it will have the value of "wx". Suffixes in the form
32
#				  "_xxx" may be added to the components to determine the
32
#				  ":xxx" may be added to the components to determine the
33
#				  dependency type.
33
#				  dependency type.
34
#				  The available components are:
34
#				  The available components are:
35
#				  wx			- The WxWidgets library.
35
#				  wx			- The WxWidgets library.
Lines 41-60 Link Here
41
#				  build			- Requires component for building.
41
#				  build			- Requires component for building.
42
#				  lib			- Requires component for building and running.
42
#				  lib			- Requires component for building and running.
43
#				  run			- Requires component for running.
43
#				  run			- Requires component for running.
44
#				  If no suffix is present then "lib" will be used.
44
#				  If no suffix is present then "run" will be used for "python"
45
#				  and "lib" for others.
45
# WX_CONF_ARGS	- Set to "absolute" or "relative" if the port needs configure
46
# WX_CONF_ARGS	- Set to "absolute" or "relative" if the port needs configure
46
#				  arguments in addition to the WX_CONFIG environment variable.
47
#				  arguments in addition to the WX_CONFIG environment variable.
47
#				  It determines the type of parameters that have to be passed
48
#				  It determines the type of parameters that have to be passed
48
#				  to the configure script. In the first case it adds
49
#				  to the configure script. In the first case it adds
49
#				  "--with-wx-config=${WX_CONFIG}" (absolute path of WX_CONFIG),
50
#				  "--with-wx-config=${WX_CONFIG}" (absolute path of
50
#				  and in second one "--with-wx=${X11BASE}" and
51
#				  WX_CONFIG), and in second one "--with-wx=${X11BASE}" plus
51
#				  "--with-wx-config=${WX_CONFIG:T} (prefix and name).
52
#				  "--with-wx-config=${WX_CONFIG:T} (prefix and name).
52
# WX_UNICODE	- Set to "yes" (or anything) if the port needs the Unicode
53
# WX_PREMK		- Define to determine version and define WX_CONFIG/WX_VERSION
53
#				  version of the WxWidgets library and/or contributed
54
#				  after <bsd.port.pre.mk> (in case the port needs to manually run
54
#				  libraries.
55
#				  the script).
56
# WX_UNICODE	- Define if the port needs the Unicode version of the
57
#				  WxWidgets library and/or contributed libraries.
55
#				  NOTE: this should NOT be used for ports that can be compiled
58
#				  NOTE: this should NOT be used for ports that can be compiled
56
#				  with Unicode or not, but for the ones that require it. The
59
#				  with Unicode or not, but for the ones that require it.
57
#				  first case is handled by the user variable WITH_UNICODE.
60
# WANT_UNICODE	- Define if the port prefers Unicode, but doesn't require it.
58
# WANT_WX		- Set to "yes" or a valid single version (no ranges, etc).
61
# WANT_WX		- Set to "yes" or a valid single version (no ranges, etc).
59
#				  In both cases it will detect the installed WxWidgets
62
#				  In both cases it will detect the installed WxWidgets
60
#				  components and add them to the variable HAVE_WX. If a
63
#				  components and add them to the variable HAVE_WX. If a
Lines 70-92 Link Here
70
#
73
#
71
# The following variables are intended for the user and can be defined in
74
# The following variables are intended for the user and can be defined in
72
# make.conf.
75
# make.conf.
73
# WITH_UNICODE	- If the variable is defined and both the running FreeBSD
76
# WITH_UNICODE	- Define if you prefer the Unicode version when available.
74
#				  version and the selected WxWidgets version support Unicode,
77
# WITHOUT_UNICODE	- Define if you prefer the non Unicode version (this
75
#				  then the Unicode version of WxWidgets is used.
78
#					  variable disables WITH_UNICODE and WANT_UNICODE).
76
# WITH_WX_VER	- If the variable is defined the version it contains will be
79
# WITH_WX_VER	- Define to the list of prefered versions in reverse order.
77
#				  used as the default for ports that support multiple
78
#				  WxWidgets versions. It can contain multiple versions, and
79
#				  the last possible one will be used.
80
#
80
#
81
# The following variables are defined by this file, to be read from the port.
81
# The following variables are defined by this file, to be read from the port.
82
# WX_UNICODE	- If this variable is not defined by the port (which means it
82
# WX_UNICODE	- If this variable is not defined by the port (which means it
83
#				  requires the Unicode version of WxWidgets), it will be
83
#				  requires the Unicode version of WxWidgets), it will be
84
#				  defined in the case the Unicode version is used (enabled by
84
#				  defined in the case the Unicode version is used (enabled by
85
#				  the user through WITH_UNICODE).
85
#				  WITH_UNICODE or WANT_UNICODE).
86
# WX_VERSION	- The WxWidgets version that is going to be used.
86
# WX_VERSION	- The WxWidgets version that is going to be used.
87
# HAVE_WX		- The list of WxWidgets components installed, if WANT_WX was
87
# HAVE_WX		- The list of WxWidgets components installed, if WANT_WX was
88
#				  defined. The components will have version suffix if it was
88
#				  defined. The components will have version suffix if it was
89
#				  set to "yes").
89
#				  set to "yes".
90
#
90
#
91
# Examples:
91
# Examples:
92
# - A port that needs WxWidgets 2.6 and contributed libraries with Unicode.
92
# - A port that needs WxWidgets 2.6 and contributed libraries with Unicode.
Lines 96-106 Link Here
96
# - A port that needs WxPython 2.4 for running.
96
# - A port that needs WxPython 2.4 for running.
97
#	USE_PYTHON=	yes
97
#	USE_PYTHON=	yes
98
#	USE_WX=		2.4
98
#	USE_WX=		2.4
99
#	WX_COMPS=	python_run
99
#	WX_COMPS=	python
100
# - A port that needs WxPython 2.4 or 2.6 for building.
100
# - A port that needs WxPython 2.4 or 2.6 for building.
101
#	USE_PYTHON=	yes
101
#	USE_PYTHON=	yes
102
#	USE_WX=		2.4 2.6
102
#	USE_WX=		2.4 2.6
103
#	WX_COMPS=	python_build
103
#	WX_COMPS=	python:build
104
# - A port that needs WxWidgets version 2.4 or higher and contributed
104
# - A port that needs WxWidgets version 2.4 or higher and contributed
105
#	libraries.
105
#	libraries.
106
#	USE_WX=		2.4+
106
#	USE_WX=		2.4+
Lines 108-118 Link Here
108
# - A port that needs WxWidgets of any version other than 2.4.
108
# - A port that needs WxWidgets of any version other than 2.4.
109
#	USE_WX_NOT=	2.4
109
#	USE_WX_NOT=	2.4
110
#
110
#
111
# Notes:
112
# - The version is processed on each inclusion, so USE_WX, USE_WX_NOT and
113
#	WX_UNICODE can be modified before and after including bsd.port.pre.mk.
114
#	After determining the version and Unicode, WX_CONFIG will be defined.
115
#
116
111
117
WX_Include_MAINTAINER=	alepulver@FreeBSD.org
112
WX_Include_MAINTAINER=	alepulver@FreeBSD.org
118
113
Lines 129-148 Link Here
129
# _WX_DEP_TYPES_ALL		- List of valid dependency types.
124
# _WX_DEP_TYPES_ALL		- List of valid dependency types.
130
# _WX_VERS_ALL			- List of supported versions.
125
# _WX_VERS_ALL			- List of supported versions.
131
# _WX_VERS_UC_ALL		- List of Unicode capable versions.
126
# _WX_VERS_UC_ALL		- List of Unicode capable versions.
132
# _WX_CHANGE_VARS		- List of variables allowed to change between pre and
127
# _WX_VERS_LISTS		- Reverse lists preference order.
133
#						  post inclusions (related to version).
134
# _WX_LISTS_ORDER		- Reverse lists preference order.
135
# _WX_AUTO_VARS			- Variables defined sometimes that may have to be
136
#						  redefined later.
137
#
128
#
138
129
139
_WX_COMPS_ALL=			wx contrib python mozilla svg
130
_WX_COMPS_ALL=			wx contrib python mozilla svg
140
_WX_DEP_TYPES_ALL=		build lib run
131
_WX_DEP_TYPES_ALL=		build lib run
141
_WX_VERS_ALL=			2.4 2.6
132
_WX_VERS_ALL=			2.4 2.6
142
_WX_VERS_UC_ALL=		2.6
133
_WX_VERS_UC_ALL=		2.6
143
_WX_CHANGE_VARS=		USE_WX USE_WX_NOT WX_UNICODE
134
_WX_VERS_LISTS=			WANT_WX_VER WITH_WX_VER
144
_WX_LISTS_ORDER=		_WX_VER_FINAL WANT_WX_VER WITH_WX_VER
145
_WX_AUTO_VARS=			USE_WX WX_CONFIG
146
135
147
#
136
#
148
# Variables used to determine what is needed:
137
# Variables used to determine what is needed:
Lines 150-204 Link Here
150
# _WX_LIB_comp_ver		- Name of the shared library (optional).
139
# _WX_LIB_comp_ver		- Name of the shared library (optional).
151
# _WX_SHVER_comp_ver	- Shared library version (optional).
140
# _WX_SHVER_comp_ver	- Shared library version (optional).
152
# _WX_FILE_comp_ver		- File installed by that component.
141
# _WX_FILE_comp_ver		- File installed by that component.
142
# _WX_DEPTYPE_comp_ver	- Default dependency type (optional).
153
#
143
#
154
144
155
_WX_PORT_wx_2.4=		wxgtk24
145
_WX_PORT_wx_2.4=		x11-toolkits/wxgtk24
156
_WX_LIB_wx_2.4=			wx_gtk2-2.4
146
_WX_LIB_wx_2.4=			wx_gtk2-2.4
157
147
158
_WX_PORT_contrib_2.4=	wxgtk24-contrib
148
_WX_PORT_contrib_2.4=	x11-toolkits/wxgtk24-contrib
159
_WX_LIB_contrib_2.4=	wx_gtk2_canvas-2.4
149
_WX_LIB_contrib_2.4=	wx_gtk2_canvas-2.4
160
150
161
_WX_PORT_python_2.4=	py-wxPython24
151
_WX_PORT_python_2.4=	x11-toolkits/py-wxPython24
162
_WX_FILE_python_2.4=	${PYTHON_SITELIBDIR}/wx/__init__.py
152
_WX_FILE_python_2.4=	${PYTHON_SITELIBDIR}/wx/__init__.py
163
153
164
_WX_PORT_mozilla_2.4=	wxmozilla
154
_WX_PORT_mozilla_2.4=	x11-toolkits/wxmozilla
165
_WX_LIB_mozilla_2.4=	wxmozilla_gtk2-2.4
155
_WX_LIB_mozilla_2.4=	wxmozilla_gtk2-2.4
166
156
167
_WX_PORT_wx_2.6=		wxgtk26${_WX_UCL}
157
_WX_PORT_wx_2.6=		x11-toolkits/wxgtk26${_WX_UCL}
168
_WX_LIB_wx_2.6=			wx_base${_WX_UC}-2.6
158
_WX_LIB_wx_2.6=			wx_base${_WX_UC}-2.6
169
159
170
_WX_PORT_contrib_2.6=	wxgtk26${_WX_UCL}-contrib
160
_WX_PORT_contrib_2.6=	x11-toolkits/wxgtk26${_WX_UCL}-contrib
171
_WX_LIB_contrib_2.6=	wx_gtk2${_WX_UC}_animate-2.6
161
_WX_LIB_contrib_2.6=	wx_gtk2${_WX_UC}_animate-2.6
172
162
173
_WX_PORT_python_2.6=	py-wxPython26${_WX_UCL}
163
_WX_PORT_python_2.6=	x11-toolkits/py-wxPython26${_WX_UCL}
174
_WX_FILE_python_2.6=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py
164
_WX_FILE_python_2.6=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py
175
165
176
_WX_PORT_svg_2.6=		wxsvg
166
_WX_PORT_svg_2.6=		x11-toolkits/wxsvg
177
_WX_LIB_svg_2.6=		wxsvg
167
_WX_LIB_svg_2.6=		wxsvg
178
168
179
# Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
169
# Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
170
# Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
180
171
181
.for comp in ${_WX_COMPS_ALL}
172
.for comp in ${_WX_COMPS_ALL}
173
_WX_COMP=				${comp}
182
.	for ver in ${_WX_VERS_ALL}
174
.	for ver in ${_WX_VERS_ALL}
183
.		if defined(_WX_LIB_${comp}_${ver})
175
.		if defined(_WX_LIB_${comp}_${ver})
184
_WX_SHVER_${comp}_${ver}=	0
176
_WX_SHVER_${comp}_${ver}=	0
185
_WX_FILE_${comp}_${ver}=	${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
177
_WX_FILE_${comp}_${ver}=	${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
186
.		endif
178
.		endif
179
.		if ${_WX_COMP} == "python"
180
_WX_DEPTYPE_${comp}_${ver}=	run
181
.		else
182
_WX_DEPTYPE_${comp}_${ver}=	lib
183
.		endif
187
.	endfor
184
.	endfor
188
.endfor
185
.endfor
189
186
190
.endif		# !_WX_Defined_Done
187
.endif		# !_WX_Defined_Done
191
188
192
#
189
#
190
# Check if the user/port wants Unicode.
191
#
192
193
.if ${OSVERSION} >= 500000 && (!defined(WITHOUT_UNICODE) && \
194
    (defined(WITH_UNICODE) || defined(WANT_UNICODE)))
195
_WX_UC_AVAILABLE=			yes
196
.else
197
.undef _WX_UC_AVAILABLE
198
.endif
199
200
#
193
# Check for present components.
201
# Check for present components.
194
#
202
#
195
203
196
.if !defined(AFTERPORTMK) && defined(WANT_WX)
204
.if defined(WANT_WX) && !defined(AFTERPORTMK)
197
205
198
# Check if Unicode will be used.
206
# Check if Unicode will be used.
199
207
200
.	for __WANT_WX in ${WANT_WX}
208
.	for __WANT_WX in ${WANT_WX}
201
.		if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 && \
209
.		if defined(_WX_UC_AVAILABLE) && \
202
		   (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${WANT_WX:L} == "yes")
210
		   (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${WANT_WX:L} == "yes")
203
_WX_WANT_UNICODE=		yes
211
_WX_WANT_UNICODE=		yes
204
.		endif
212
.		endif
Lines 250-296 Link Here
250
.endif		# ! AFTERPORTMK && WANT_WX
258
.endif		# ! AFTERPORTMK && WANT_WX
251
259
252
#
260
#
253
# Check if the version has changed between inclusions.
254
#
255
256
.if defined(_WX_Version_Done)
257
.	undef _WX_HAS_CHANGED
258
259
.	for var in ${_WX_CHANGE_VARS}
260
.		if (defined(${var}) && !defined(_WX_OLD_${var})) || \
261
		   (!defined(${var}) && defined(_WX_OLD_${var})) || \
262
		   (defined(_WX_OLD_${var}) && ${_WX_OLD_${var}} != ${${var}})
263
_WX_HAS_CHANGED=		yes
264
.		endif
265
.	endfor
266
.endif		# _WX_Version_Done
267
268
#
269
# Select WxWidgets version.
261
# Select WxWidgets version.
270
#
262
#
271
263
272
.if (!defined(_WX_Version_Done) || defined(_WX_HAS_CHANGED)) && \
264
.if !defined(_WX_Version_Done) && (!defined(BEFOREPORTMK) || \
273
	(defined(USE_WX) || defined(USE_WX_NOT))
265
    (defined(WX_PREMK) && !defined(AFTERPORTMK) && \
266
    (defined(USE_WX) || defined(USE_WX_NOT))))
274
_WX_Version_Done=		yes
267
_WX_Version_Done=		yes
275
268
276
# Handle automatic variables.
277
278
.for var in ${_WX_AUTO_VARS}
279
.	if defined(_WX_${var}_DEFINED)
280
.		undef ${var}
281
.	endif
282
.	if !defined(${var})
283
_WX_${var}_DEFINED=		yes
284
.	endif
285
.endfor
286
287
# Reset old variable values.
288
289
.if defined(_WX_HAS_CHANGED)
290
.	undef _WX_VER
291
.	undef _WX_IGNORE
292
.endif
293
294
# Set defaults (if one isn't present).
269
# Set defaults (if one isn't present).
295
270
296
USE_WX?=				${_WX_VERS_ALL}
271
USE_WX?=				${_WX_VERS_ALL}
Lines 349-355 Link Here
349
# Check for a null version.
324
# Check for a null version.
350
325
351
.if empty(_WX_VER_MERGED)
326
.if empty(_WX_VER_MERGED)
352
_WX_IGNORE?=			selected a null or invalid WxWidgets version
327
IGNORE?=				selected a null or invalid WxWidgets version
353
.endif
328
.endif
354
329
355
#
330
#
Lines 365-373 Link Here
365
.	endif
340
.	endif
366
.endfor
341
.endfor
367
342
368
# Requested by the user (optional).
343
# Requested by the user or port (optional).
369
344
370
.if defined(WITH_UNICODE) && ${OSVERSION} >= 500000
345
.if defined(_WX_UC_AVAILABLE)
371
.	for ver in ${_WX_VER_UC}
346
.	for ver in ${_WX_VER_UC}
372
.		if ${_WX_VERS_UC_ALL:M${ver}} != ""
347
.		if ${_WX_VERS_UC_ALL:M${ver}} != ""
373
WX_UNICODE=				yes
348
WX_UNICODE=				yes
Lines 379-387 Link Here
379
354
380
.if defined(WX_UNICODE)
355
.if defined(WX_UNICODE)
381
.	if ${OSVERSION} < 500000
356
.	if ${OSVERSION} < 500000
382
_WX_IGNORE?=			requires FreeBSD versions >= 5.X (because of Unicode)
357
IGNORE?=				requires FreeBSD versions >= 5.X (because of Unicode)
383
.	elif empty(_WX_VER_UC)
358
.	elif empty(_WX_VER_UC)
384
_WX_IGNORE?=			selected a WxWidgets version which does not support Unicode: ${_WX_VER_MERGED}
359
IGNORE?=				selected a WxWidgets version which does not support Unicode: ${_WX_VER_MERGED}
385
.	endif
360
.	endif
386
.endif
361
.endif
387
362
Lines 410-416 Link Here
410
# 3) _WX_VER_FINAL		- Available versions.
385
# 3) _WX_VER_FINAL		- Available versions.
411
#
386
#
412
387
413
.for list in ${_WX_LISTS_ORDER}
388
.for list in _WX_VER_FINAL ${_WX_VERS_LISTS}
414
.	if defined(${list})
389
.	if defined(${list})
415
.		for ver in ${${list}}
390
.		for ver in ${${list}}
416
.			if ${_WX_VER_FINAL:M${ver}} != ""
391
.			if ${_WX_VER_FINAL:M${ver}} != ""
Lines 427-452 Link Here
427
WX_VERSION=				${_WX_VER}
402
WX_VERSION=				${_WX_VER}
428
WX_CONFIG?=				${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
403
WX_CONFIG?=				${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
429
404
430
# Define old values for detecting changes.
405
.endif		# !_WX_Version_Done && (!BEFOREPORTMK || \
431
406
#			(WX_PREMK && !AFTERPORTMK && (USE_WX || USE_WX_NOT)))
432
.for var in ${_WX_CHANGE_VARS}
433
.	if defined(${var})
434
_WX_OLD_${var}:=		${${var}}
435
.	endif
436
.endfor
437
438
.endif		# ! _WX_Version_Done || _WX_HAS_CHANGED
439
407
440
#
408
#
441
# Process components list and add dependencies, variables, etc.
409
# Process components list and add dependencies, variables, etc.
442
#
410
#
443
411
444
.if !defined(BEFOREPORTMK)
412
.if !defined(BEFOREPORTMK)
445
# Error check.
446
447
.if defined(_WX_IGNORE)
448
IGNORE?=				${_WX_IGNORE}
449
.endif
450
413
451
#
414
#
452
# Component parsing.
415
# Component parsing.
Lines 466-475 Link Here
466
429
467
_WX_COMPS_FINAL=		#
430
_WX_COMPS_FINAL=		#
468
.for comp in ${WX_COMPS}
431
.for comp in ${WX_COMPS}
469
_WX_COMP=				${comp:C/_([[:alpha:]]+)$//}
432
_WX_COMP=				${comp:C/:([[:alpha:]]+)$//}
470
_WX_DEP_TYPE=			${comp:C/.+_([[:alpha:]]+)$/\1/}
471
.	if ${_WX_COMP} == ${comp}
433
.	if ${_WX_COMP} == ${comp}
472
_WX_DEP_TYPE=			lib
434
_WX_DEP_TYPE=			${_WX_DEPTYPE_${comp}_${_WX_VER}}
435
.	else
436
_WX_DEP_TYPE=			${comp:C/.+:([[:alpha:]]+)$/\1/}
473
.	endif
437
.	endif
474
_WX_COMP_NEW=			${_WX_COMP}_${_WX_DEP_TYPE}
438
_WX_COMP_NEW=			${_WX_COMP}_${_WX_DEP_TYPE}
475
.	for __WX_COMP in ${_WX_COMP}
439
.	for __WX_COMP in ${_WX_COMP}
Lines 501-516 Link Here
501
.for comp in ${_WX_COMPS_FINAL}
465
.for comp in ${_WX_COMPS_FINAL}
502
_WX_COMP=				${comp:C/_([[:alpha:]]+)$//}
466
_WX_COMP=				${comp:C/_([[:alpha:]]+)$//}
503
_WX_DEP_TYPE=			${comp:C/.+_([[:alpha:]]+)$/\1/}
467
_WX_DEP_TYPE=			${comp:C/.+_([[:alpha:]]+)$/\1/}
504
.	if ${_WX_DEP_TYPE} == "lib"
468
# XXX Need a .for loop here so the variable is expanded before the assignment.
505
.		if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
469
.	for comp_part in ${_WX_COMP}
506
LIB_DEPENDS+=			${_WX_LIB_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
470
.		if ${_WX_DEP_TYPE} == "lib"
471
.			if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
472
LIB_DEPENDS+=			${_WX_LIB_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
473
.			else
474
BUILD_DEPENDS+=			${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
475
RUN_DEPENDS+=			${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
476
.			endif
507
.		else
477
.		else
508
BUILD_DEPENDS+=			${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
478
${_WX_DEP_TYPE:U}_DEPENDS+=	${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
509
RUN_DEPENDS+=			${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
510
.		endif
479
.		endif
511
.	else
480
.	endfor
512
${_WX_DEP_TYPE:U}_DEPENDS+=	${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
513
.	endif
514
.endfor
481
.endfor
515
482
516
#
483
#
(-)audio/audacity/Makefile (-3 / +2 lines)
Lines 15-27 Link Here
15
COMMENT=	Audacity is a GUI editor for digital audio waveforms
15
COMMENT=	Audacity is a GUI editor for digital audio waveforms
16
16
17
BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
17
BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
18
LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
19
18
20
WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
19
WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
21
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
22
USE_GMAKE=	yes
21
USE_GMAKE=	yes
23
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
24
USE_GETTEXT=	yes
23
USE_GETTEXT=	yes
24
USE_WX=		2.6
25
25
26
MAN1=		audacity.1
26
MAN1=		audacity.1
27
MANCOMPRESSED=	yes
27
MANCOMPRESSED=	yes
Lines 38-45 Link Here
38
38
39
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
39
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
40
		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
40
		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
41
		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
41
		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}"
42
		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.6-config
43
42
44
.if !defined(NOPORTDOCS)
43
.if !defined(NOPORTDOCS)
45
MAKE_ENV=	DOC=yes
44
MAKE_ENV=	DOC=yes
(-)audio/mbox/Makefile (-3 / +3 lines)
Lines 12-28 Link Here
12
MAINTAINER=	ports@FreeBSD.org
12
MAINTAINER=	ports@FreeBSD.org
13
COMMENT=	Program intended to help with organizing your music files
13
COMMENT=	Program intended to help with organizing your music files
14
14
15
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 \
15
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
16
		${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
17
		${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
16
		${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
18
		lame:${PORTSDIR}/audio/lame \
17
		lame:${PORTSDIR}/audio/lame \
19
		oggenc:${PORTSDIR}/audio/vorbis-tools \
18
		oggenc:${PORTSDIR}/audio/vorbis-tools \
20
		mplayer:${PORTSDIR}/multimedia/mplayer
19
		mplayer:${PORTSDIR}/multimedia/mplayer
21
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
22
20
23
USE_PYTHON=	yes
21
USE_PYTHON=	yes
24
USE_PYDISTUTILS=yes
22
USE_PYDISTUTILS=yes
25
USE_BZIP2=	yes
23
USE_BZIP2=	yes
24
USE_WX=		2.4
25
WX_COMPS=	python
26
WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
26
WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
27
27
28
.include <bsd.port.mk>
28
.include <bsd.port.mk>
(-)audio/picard/Makefile (-2 / +3 lines)
Lines 15-25 Link Here
15
15
16
RUN_DEPENDS=	\
16
RUN_DEPENDS=	\
17
		${PYTHON_SITELIBDIR}/tunepimp/__init__.py:${PORTSDIR}/audio/py-libtunepimp \
17
		${PYTHON_SITELIBDIR}/tunepimp/__init__.py:${PORTSDIR}/audio/py-libtunepimp \
18
		${PYTHON_SITELIBDIR}/musicbrainz.py:${PORTSDIR}/audio/py-musicbrainz \
18
		${PYTHON_SITELIBDIR}/musicbrainz.py:${PORTSDIR}/audio/py-musicbrainz
19
		${PYTHON_SITELIBDIR}/wx-2.6-gtk2-unicode/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26-unicode
20
19
21
USE_PYTHON=	yes
20
USE_PYTHON=	yes
22
USE_PYDISTUTILS=yes
21
USE_PYDISTUTILS=yes
22
USE_WX=		2.6
23
WX_COMPS=	python
23
24
24
SOURCEFILE=	${DISTNAME}${EXTRACT_SUFX}
25
SOURCEFILE=	${DISTNAME}${EXTRACT_SUFX}
25
PICARD_MODULES=	browser lib ui
26
PICARD_MODULES=	browser lib ui
(-)audio/py-karaoke/Makefile (-2 / +3 lines)
Lines 17-29 Link Here
17
COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
17
COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
18
18
19
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
19
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
20
		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \
20
		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
21
		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
22
21
23
USE_ZIP=	yes
22
USE_ZIP=	yes
24
23
25
USE_PYTHON=	yes
24
USE_PYTHON=	yes
26
USE_PYDISTUTILS=	yes
25
USE_PYDISTUTILS=	yes
27
USE_PYTHON_PREFIX=	yes
26
USE_PYTHON_PREFIX=	yes
27
USE_WX=		2.4
28
WX_COMPS=	python
28
29
29
.include <bsd.port.mk>
30
.include <bsd.port.mk>
(-)biology/L-Breeder/Makefile (-4 / +2 lines)
Lines 16-23 Link Here
16
MAINTAINER=	dyeske@yahoo.com
16
MAINTAINER=	dyeske@yahoo.com
17
COMMENT=	Allows you to display and breed L-system forms
17
COMMENT=	Allows you to display and breed L-system forms
18
18
19
LIB_DEPENDS=	wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
19
LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
20
		glut.4:${PORTSDIR}/graphics/libglut
21
20
22
NO_WRKSUBDIR=	yes
21
NO_WRKSUBDIR=	yes
23
BUILD_WRKSRC=	${WRKSRC}/Unix
22
BUILD_WRKSRC=	${WRKSRC}/Unix
Lines 26-33 Link Here
26
USE_X_PREFIX=	yes
25
USE_X_PREFIX=	yes
27
USE_GL=		yes
26
USE_GL=		yes
28
USE_GMAKE=	yes
27
USE_GMAKE=	yes
29
28
USE_WX=		2.4
30
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
31
29
32
.if defined(WITH_OPTIMIZED_CFLAGS)
30
.if defined(WITH_OPTIMIZED_CFLAGS)
33
CFLAGS+=	-O3 -ffast-math
31
CFLAGS+=	-O3 -ffast-math
(-)biology/treeviewx/Makefile (-4 / +2 lines)
Lines 15-26 Link Here
15
MAINTAINER=	fernan@iib.unsam.edu.ar
15
MAINTAINER=	fernan@iib.unsam.edu.ar
16
COMMENT=	A phylogenetic tree viewer
16
COMMENT=	A phylogenetic tree viewer
17
17
18
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
19
		wx_gtk2_dcsvg-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24-contrib
20
21
USE_GMAKE=	yes
18
USE_GMAKE=	yes
22
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
23
CONFIGURE_ENV=	WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config"
20
USE_WX=		2.4
21
WX_COMPS=	contrib
24
22
25
PLIST_FILES=	bin/tv
23
PLIST_FILES=	bin/tv
26
24
(-)cad/kicad/Makefile (-6 / +1 lines)
Lines 22-29 Link Here
22
MAINTAINER=		thierry@FreeBSD.org
22
MAINTAINER=		thierry@FreeBSD.org
23
COMMENT=		Schematic and PCB editing software
23
COMMENT=		Schematic and PCB editing software
24
24
25
LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
26
27
.if !defined(NOPORTDOCS)
25
.if !defined(NOPORTDOCS)
28
DISTFILES+=	doc_components-${DOCVERSION}.tgz:dat
26
DISTFILES+=	doc_components-${DOCVERSION}.tgz:dat
29
DOCVERSION=	2006-06-26
27
DOCVERSION=	2006-06-26
Lines 36-45 Link Here
36
USE_GETTEXT=	yes
34
USE_GETTEXT=	yes
37
USE_GMAKE=	yes
35
USE_GMAKE=	yes
38
USE_GL=		yes
36
USE_GL=		yes
39
37
USE_WX=		2.6
40
MAKE_ENV=	WX_CONFIG=${WX_CONFIG}
41
42
WX_CONFIG=	wxgtk2-2.6-config
43
38
44
INSTDIR=	${PORTNAME}
39
INSTDIR=	${PORTNAME}
45
PLIST_SUB=	INSTDIR=${INSTDIR} OPSYS=${OPSYS}
40
PLIST_SUB=	INSTDIR=${INSTDIR} OPSYS=${OPSYS}
(-)chinese/BBMan/Makefile (-3 / +2 lines)
Lines 16-24 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	BBMan is a BBS client for X Window System
17
COMMENT=	BBMan is a BBS client for X Window System
18
18
19
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
20
21
USE_ZIP=	yes
19
USE_ZIP=	yes
20
USE_WX=		2.4
22
WRKSRC=		${WRKDIR}/${PORTNAME}
21
WRKSRC=		${WRKDIR}/${PORTNAME}
23
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
24
23
Lines 35-41 Link Here
35
.endif
34
.endif
36
35
37
do-build:
36
do-build:
38
		cd ${WRKSRC} && ${CXX} main.cpp `wxgtk2-2.4-config --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
37
		cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
39
38
40
do-install:
39
do-install:
41
		${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${PREFIX}/bin/BBMan
40
		${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${PREFIX}/bin/BBMan
(-)comms/trustedqsl/Makefile (-2 / +2 lines)
Lines 16-26 Link Here
16
MAINTAINER=	db@db.net
16
MAINTAINER=	db@db.net
17
COMMENT=	Amateur Radio Station electronic trusted logbook
17
COMMENT=	Amateur Radio Station electronic trusted logbook
18
18
19
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
19
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
20
		wx_base-2.6:${PORTSDIR}/x11-toolkits/wxgtk26
21
20
22
USE_PERL5=	yes
21
USE_PERL5=	yes
23
USE_GETOPT_LONG=	yes
22
USE_GETOPT_LONG=	yes
23
USE_WX=		2.6
24
INSTALLS_SHLIB=	yes
24
INSTALLS_SHLIB=	yes
25
MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
25
MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
26
26
(-)comms/trustedqsl/files/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# $FreeBSD: ports/comms/trustedqsl/files/Makefile,v 1.3 2006/05/09 21:16:56 az Exp $
1
# $FreeBSD: ports/comms/trustedqsl/files/Makefile,v 1.3 2006/05/09 21:16:56 az Exp $
2
2
3
all:
3
all:
4
	(cd tqsllib-2.0;./configure --with-wxwindows=${X11BASE}/bin/wxgtk2-2.6-config;make;make converter;make gen_crq;make load_cert;make station_loc)
4
	(cd tqsllib-2.0;./configure --with-wxwindows=${WX_CONFIG};make;make converter;make gen_crq;make load_cert;make station_loc)
5
	(cd TrustedQSL-1.11;make)
5
	(cd TrustedQSL-1.11;make)
6
6
7
install:
7
install:
(-)comms/trustedqsl/files/Makefile.TrustedQSL-1.11 (-2 / +2 lines)
Lines 5-12 Link Here
5
LIBS=-lz -lexpat -lcrypto
5
LIBS=-lz -lexpat -lcrypto
6
INCDIR = -I$(TQSLINC)
6
INCDIR = -I$(TQSLINC)
7
BUILD = unofficial
7
BUILD = unofficial
8
WXFLAGS=`wxgtk2-2.6-config --cflags`
8
WXFLAGS=`${WX_CONFIG} --cflags`
9
WXLIBS=`wxgtk2-2.6-config --libs`
9
WXLIBS=`${WX_CONFIG} --libs`
10
DEFS = -DHAVE_CONFIG_H
10
DEFS = -DHAVE_CONFIG_H
11
CXXFLAGS +=  $(DEFS) $(INCDIR)  -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1  $(WXFLAGS)
11
CXXFLAGS +=  $(DEFS) $(INCDIR)  -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1  $(WXFLAGS)
12
12
(-)databases/pgadmin3/Makefile (-8 / +2 lines)
Lines 24-39 Link Here
24
24
25
USE_WX=		2.6
25
USE_WX=		2.6
26
WX_COMPS=	wx contrib
26
WX_COMPS=	wx contrib
27
WX_UNICODE=	yes
28
WX_CONF_ARGS=	relative
27
WX_CONF_ARGS=	relative
28
WX_UNICODE=	yes
29
29
30
post-install:
30
post-install:
31
	@${CAT} ${PKGMESSAGE}
31
	@${CAT} ${PKGMESSAGE}
32
32
33
.include <bsd.port.pre.mk>
33
.include <bsd.port.mk>
34
35
.if ${OSVERSION} < 500000
36
IGNORE=		cannot install: requires wchar_t
37
.endif
38
39
.include <bsd.port.post.mk>
(-)databases/pgadmin3-12/Makefile (-17 / +5 lines)
Lines 16-23 Link Here
16
COMMENT=	PostgreSQL database design and management system
16
COMMENT=	PostgreSQL database design and management system
17
17
18
USE_PGSQL=	yes
18
USE_PGSQL=	yes
19
USE_WX=		2.6
20
WX_COMPS=	contrib
21
WX_CONF_ARGS=	relative
19
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
20
CONFIGURE_ARGS=	--with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}
21
CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
23
CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
22
CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
24
CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
23
CONFLICTS=	pgadmin3-1.[456789]*
25
CONFLICTS=	pgadmin3-1.[456789]*
Lines 25-50 Link Here
25
27
26
.include <bsd.port.pre.mk>
28
.include <bsd.port.pre.mk>
27
29
28
.if ${OSVERSION} < 500000
30
.if defined(WX_UNICODE)
29
WITHOUT_UNICODE=	yes
30
.endif
31
32
pre-everything::
33
.if !defined(WITHOUT_UNICODE)
34
	@${ECHO_MSG} "You can build non-Unicode version by defining WITHOUT_UNICODE."
35
.endif
36
37
.if !defined(WITHOUT_UNICODE)
38
LIB_DEPENDS+=	wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
39
WX_CONFIG=	wxgtk2u-2.6-config
40
PKGNAMESUFFIX=	-unicode
31
PKGNAMESUFFIX=	-unicode
41
PKGMESSAGE=	${PKGDIR}/pkg-message-unicode
32
PKGMESSAGE=	${PKGDIR}/pkg-message-unicode
42
33
43
post-install:
34
post-install:
44
	@${CAT} ${PKGMESSAGE}
35
	@${CAT} ${PKGMESSAGE}
45
.else
36
.endif
46
LIB_DEPENDS+=	wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
47
WX_CONFIG=	wxgtk2-2.6-config
48
.endif # WITHOUT_UNICODE
49
37
50
.include <bsd.port.post.mk>
38
.include <bsd.port.post.mk>
(-)databases/pydbdesigner/Makefile (-2 / +2 lines)
Lines 14-24 Link Here
14
MAINTAINER=	xride@x12.dk
14
MAINTAINER=	xride@x12.dk
15
COMMENT=	Graphical designer for relational databases
15
COMMENT=	Graphical designer for relational databases
16
16
17
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
18
19
EXTRACT_AFTER_ARGS=	| ${TAR} --exclude CVS -xf -
17
EXTRACT_AFTER_ARGS=	| ${TAR} --exclude CVS -xf -
20
18
21
USE_PYTHON=	2.2+
19
USE_PYTHON=	2.2+
20
USE_WX=		2.4
21
WX_COMPS=	python
22
REINPLACE_ARGS=	-i ""
22
REINPLACE_ARGS=	-i ""
23
WRKSRC=		${WRKDIR}/PyDBDesigner
23
WRKSRC=		${WRKDIR}/PyDBDesigner
24
24
(-)deskutils/cycle/Makefile (-2 / +2 lines)
Lines 15-24 Link Here
15
MAINTAINER=	danfe@FreeBSD.org
15
MAINTAINER=	danfe@FreeBSD.org
16
COMMENT=	A calendar program for women
16
COMMENT=	A calendar program for women
17
17
18
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
19
20
USE_BZIP2=	yes
18
USE_BZIP2=	yes
21
USE_PYTHON_RUN=	yes
19
USE_PYTHON_RUN=	yes
20
USE_WX=		2.6
21
WX_COMPS=	python
22
NO_BUILD=	yes
22
NO_BUILD=	yes
23
23
24
MAN1=		${PORTNAME}.1
24
MAN1=		${PORTNAME}.1
(-)deskutils/xchm/Makefile (-3 / +3 lines)
Lines 14-25 Link Here
14
MAINTAINER=	pav@FreeBSD.org
14
MAINTAINER=	pav@FreeBSD.org
15
COMMENT=	Windows HTML Help (.chm) viewer for UNIX
15
COMMENT=	Windows HTML Help (.chm) viewer for UNIX
16
16
17
LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib \
17
LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
18
		wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
19
18
19
USE_WX=		2.6
20
WX_CONF_ARGS=	absolute
20
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
21
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
22
CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2u-2.6-config
23
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
23
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
24
24
25
post-patch:
25
post-patch:
(-)devel/agide/Makefile (-2 / +3 lines)
Lines 16-23 Link Here
16
COMMENT=	A-A-P GUI IDE: a framework for software development
16
COMMENT=	A-A-P GUI IDE: a framework for software development
17
17
18
RUN_DEPENDS=	${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \
18
RUN_DEPENDS=	${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \
19
		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim \
19
		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim
20
		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
21
20
22
MAN1=		agide.1
21
MAN1=		agide.1
23
22
Lines 26-31 Link Here
26
25
27
USE_ZIP=	yes
26
USE_ZIP=	yes
28
USE_PYTHON=	yes
27
USE_PYTHON=	yes
28
USE_WX=		2.4
29
WX_COMPS=	python
29
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
30
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
30
31
31
pre-install:
32
pre-install:
(-)devel/boaconstructor/Makefile (-2 / +2 lines)
Lines 16-27 Link Here
16
MAINTAINER=	filippo.natali@gmail.com
16
MAINTAINER=	filippo.natali@gmail.com
17
COMMENT=	A cross platform RAD GUI Building IDE for wxPython
17
COMMENT=	A cross platform RAD GUI Building IDE for wxPython
18
18
19
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
20
21
WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}
19
WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}
22
20
23
USE_ZIP=	yes
21
USE_ZIP=	yes
24
USE_PYTHON=	yes
22
USE_PYTHON=	yes
23
USE_WX=		2.6
24
WX_COMPS=	python
25
DATADIR=	${PREFIX}/share/Boa
25
DATADIR=	${PREFIX}/share/Boa
26
26
27
do-build:
27
do-build:
(-)devel/codeblocks/Makefile (-5 / +16 lines)
Lines 17-27 Link Here
17
COMMENT=	Open source, cross-platform, free C/C++ IDE
17
COMMENT=	Open source, cross-platform, free C/C++ IDE
18
18
19
BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
19
BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
20
LIB_DEPENDS=	wx_gtk2_xrc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
21
20
22
WRKSRC=		${WRKDIR}/${DISTNAME}/src
21
WRKSRC=		${WRKDIR}/${DISTNAME}/src
23
22
24
USE_GMAKE=	yes
23
USE_GMAKE=	yes
24
USE_WX=		2.6
25
WX_PREMK=	yes
25
INSTALLS_SHLIB=	yes
26
INSTALLS_SHLIB=	yes
26
27
27
TARGETS=	tinyXML scintilla sdk wxDockit src console_runner doc
28
TARGETS=	tinyXML scintilla sdk wxDockit src console_runner doc
Lines 35-43 Link Here
35
36
36
.include <bsd.port.pre.mk>
37
.include <bsd.port.pre.mk>
37
38
38
.if ${OSVERSION} < 500000
39
BROKEN=		Code::Blocks is currently not supported for FreeBSD versions prior to FreeBSD 5
40
.endif
41
.if ${ARCH} == ia64 && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000
39
.if ${ARCH} == ia64 && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000
42
BROKEN=		Code::Blocks is currently not supported on IA64 FreeBSD 6
40
BROKEN=		Code::Blocks is currently not supported on IA64 FreeBSD 6
43
.endif
41
.endif
Lines 52-58 Link Here
52
	${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
50
	${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
53
	@(${CAT} ${WRKSRC}/update | ${TR} -d "\r" > ${WRKSRC}/update.sh)
51
	@(${CAT} ${WRKSRC}/update | ${TR} -d "\r" > ${WRKSRC}/update.sh)
54
52
55
pre-build:
53
pre-patch:
56
	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
54
	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
57
55
58
.for t in ${TARGETS}
56
.for t in ${TARGETS}
Lines 66-71 Link Here
66
. endfor
64
. endfor
67
.endfor
65
.endfor
68
66
67
.if exists(${WX_CONFIG})
68
LIB_WXXRC!=	${WX_CONFIG} --libs xrc
69
.endif
70
71
pre-build:
72
	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|; \
73
		s|%%LIB_WXXRC%%|${LIB_WXXRC:M*xrc*:C/^-l//}|; \
74
		s|%%PREFIX%%|${PREFIX}|' \
75
		${WRKSRC}/CodeBlocks-unix.cbp \
76
		${WRKSRC}/Makefile \
77
		${WRKSRC}/src/app.cpp \
78
		${WRKSRC}/templates/unix/wxwidgets.cbp
79
69
post-build:
80
post-build:
70
	@(${FIND} -E ${WRKSRC} -type f -iregex ".*\.(orig|bak)" -exec ${RM} {} \;)
81
	@(${FIND} -E ${WRKSRC} -type f -iregex ".*\.(orig|bak)" -exec ${RM} {} \;)
71
	@${CHMOD} +x ${WRKSRC}/update.sh
82
	@${CHMOD} +x ${WRKSRC}/update.sh
(-)devel/codeblocks/files/Makefile (-35 / +35 lines)
Lines 11-23 Link Here
11
include ./gcc.defs
11
include ./gcc.defs
12
12
13
### Variables used in this Makefile
13
### Variables used in this Makefile
14
LIB_WXXRC=wx_gtk2_xrc-2.6
14
LIB_WXXRC=%%LIB_WXXRC%%
15
15
16
### Compiler/linker options
16
### Compiler/linker options
17
tinyXML_GLOBAL_CFLAGS=
17
tinyXML_GLOBAL_CFLAGS=
18
tinyXML_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
18
tinyXML_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
19
tinyXML_GLOBAL_LDFLAGS=
19
tinyXML_GLOBAL_LDFLAGS=
20
tinyXML_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
20
tinyXML_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
21
tinyXML_GLOBAL_INCS= -I/usr/include
21
tinyXML_GLOBAL_INCS= -I/usr/include
22
tinyXML_PROJECT_INCS= -Isdk/wxscintilla/include
22
tinyXML_PROJECT_INCS= -Isdk/wxscintilla/include
23
tinyXML_GLOBAL_LIBDIRS= -L/usr/lib
23
tinyXML_GLOBAL_LIBDIRS= -L/usr/lib
Lines 25-33 Link Here
25
tinyXML_GLOBAL_LIBS=
25
tinyXML_GLOBAL_LIBS=
26
tinyXML_PROJECT_LIBS=
26
tinyXML_PROJECT_LIBS=
27
scintilla_GLOBAL_CFLAGS=
27
scintilla_GLOBAL_CFLAGS=
28
scintilla_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
28
scintilla_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
29
scintilla_GLOBAL_LDFLAGS=
29
scintilla_GLOBAL_LDFLAGS=
30
scintilla_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
30
scintilla_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
31
scintilla_GLOBAL_INCS= -I/usr/include
31
scintilla_GLOBAL_INCS= -I/usr/include
32
scintilla_PROJECT_INCS= -Isdk/wxscintilla/include
32
scintilla_PROJECT_INCS= -Isdk/wxscintilla/include
33
scintilla_GLOBAL_LIBDIRS= -L/usr/lib
33
scintilla_GLOBAL_LIBDIRS= -L/usr/lib
Lines 35-43 Link Here
35
scintilla_GLOBAL_LIBS=
35
scintilla_GLOBAL_LIBS=
36
scintilla_PROJECT_LIBS=
36
scintilla_PROJECT_LIBS=
37
sdk_GLOBAL_CFLAGS=
37
sdk_GLOBAL_CFLAGS=
38
sdk_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
38
sdk_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
39
sdk_GLOBAL_LDFLAGS=
39
sdk_GLOBAL_LDFLAGS=
40
sdk_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
40
sdk_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
41
sdk_GLOBAL_INCS= -I/usr/include
41
sdk_GLOBAL_INCS= -I/usr/include
42
sdk_PROJECT_INCS= -Isdk/wxscintilla/include
42
sdk_PROJECT_INCS= -Isdk/wxscintilla/include
43
sdk_GLOBAL_LIBDIRS= -L/usr/lib
43
sdk_GLOBAL_LIBDIRS= -L/usr/lib
Lines 45-53 Link Here
45
sdk_GLOBAL_LIBS=
45
sdk_GLOBAL_LIBS=
46
sdk_PROJECT_LIBS=
46
sdk_PROJECT_LIBS=
47
wxDockit_GLOBAL_CFLAGS=
47
wxDockit_GLOBAL_CFLAGS=
48
wxDockit_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
48
wxDockit_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
49
wxDockit_GLOBAL_LDFLAGS=
49
wxDockit_GLOBAL_LDFLAGS=
50
wxDockit_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
50
wxDockit_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
51
wxDockit_GLOBAL_INCS= -I/usr/include
51
wxDockit_GLOBAL_INCS= -I/usr/include
52
wxDockit_PROJECT_INCS= -Isdk/wxscintilla/include
52
wxDockit_PROJECT_INCS= -Isdk/wxscintilla/include
53
wxDockit_GLOBAL_LIBDIRS= -L/usr/lib
53
wxDockit_GLOBAL_LIBDIRS= -L/usr/lib
Lines 55-63 Link Here
55
wxDockit_GLOBAL_LIBS=
55
wxDockit_GLOBAL_LIBS=
56
wxDockit_PROJECT_LIBS=
56
wxDockit_PROJECT_LIBS=
57
src_GLOBAL_CFLAGS=
57
src_GLOBAL_CFLAGS=
58
src_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
58
src_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
59
src_GLOBAL_LDFLAGS=
59
src_GLOBAL_LDFLAGS=
60
src_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
60
src_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
61
src_GLOBAL_INCS= -I/usr/include
61
src_GLOBAL_INCS= -I/usr/include
62
src_PROJECT_INCS= -Isdk/wxscintilla/include
62
src_PROJECT_INCS= -Isdk/wxscintilla/include
63
src_GLOBAL_LIBDIRS= -L/usr/lib
63
src_GLOBAL_LIBDIRS= -L/usr/lib
Lines 65-73 Link Here
65
src_GLOBAL_LIBS=
65
src_GLOBAL_LIBS=
66
src_PROJECT_LIBS=
66
src_PROJECT_LIBS=
67
plugin_Astyle_GLOBAL_CFLAGS=
67
plugin_Astyle_GLOBAL_CFLAGS=
68
plugin_Astyle_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
68
plugin_Astyle_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
69
plugin_Astyle_GLOBAL_LDFLAGS=
69
plugin_Astyle_GLOBAL_LDFLAGS=
70
plugin_Astyle_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
70
plugin_Astyle_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
71
plugin_Astyle_GLOBAL_INCS= -I/usr/include
71
plugin_Astyle_GLOBAL_INCS= -I/usr/include
72
plugin_Astyle_PROJECT_INCS= -Isdk/wxscintilla/include
72
plugin_Astyle_PROJECT_INCS= -Isdk/wxscintilla/include
73
plugin_Astyle_GLOBAL_LIBDIRS= -L/usr/lib
73
plugin_Astyle_GLOBAL_LIBDIRS= -L/usr/lib
Lines 75-83 Link Here
75
plugin_Astyle_GLOBAL_LIBS=
75
plugin_Astyle_GLOBAL_LIBS=
76
plugin_Astyle_PROJECT_LIBS=
76
plugin_Astyle_PROJECT_LIBS=
77
plugin_CompilerGCC_GLOBAL_CFLAGS=
77
plugin_CompilerGCC_GLOBAL_CFLAGS=
78
plugin_CompilerGCC_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
78
plugin_CompilerGCC_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
79
plugin_CompilerGCC_GLOBAL_LDFLAGS=
79
plugin_CompilerGCC_GLOBAL_LDFLAGS=
80
plugin_CompilerGCC_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
80
plugin_CompilerGCC_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
81
plugin_CompilerGCC_GLOBAL_INCS= -I/usr/include
81
plugin_CompilerGCC_GLOBAL_INCS= -I/usr/include
82
plugin_CompilerGCC_PROJECT_INCS= -Isdk/wxscintilla/include
82
plugin_CompilerGCC_PROJECT_INCS= -Isdk/wxscintilla/include
83
plugin_CompilerGCC_GLOBAL_LIBDIRS= -L/usr/lib
83
plugin_CompilerGCC_GLOBAL_LIBDIRS= -L/usr/lib
Lines 85-93 Link Here
85
plugin_CompilerGCC_GLOBAL_LIBS=
85
plugin_CompilerGCC_GLOBAL_LIBS=
86
plugin_CompilerGCC_PROJECT_LIBS=
86
plugin_CompilerGCC_PROJECT_LIBS=
87
plugin_DebuggerGDB_GLOBAL_CFLAGS=
87
plugin_DebuggerGDB_GLOBAL_CFLAGS=
88
plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
88
plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
89
plugin_DebuggerGDB_GLOBAL_LDFLAGS=
89
plugin_DebuggerGDB_GLOBAL_LDFLAGS=
90
plugin_DebuggerGDB_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
90
plugin_DebuggerGDB_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
91
plugin_DebuggerGDB_GLOBAL_INCS= -I/usr/include
91
plugin_DebuggerGDB_GLOBAL_INCS= -I/usr/include
92
plugin_DebuggerGDB_PROJECT_INCS= -Isdk/wxscintilla/include
92
plugin_DebuggerGDB_PROJECT_INCS= -Isdk/wxscintilla/include
93
plugin_DebuggerGDB_GLOBAL_LIBDIRS= -L/usr/lib
93
plugin_DebuggerGDB_GLOBAL_LIBDIRS= -L/usr/lib
Lines 95-103 Link Here
95
plugin_DebuggerGDB_GLOBAL_LIBS=
95
plugin_DebuggerGDB_GLOBAL_LIBS=
96
plugin_DebuggerGDB_PROJECT_LIBS=
96
plugin_DebuggerGDB_PROJECT_LIBS=
97
plugin_CodeCompletion_GLOBAL_CFLAGS=
97
plugin_CodeCompletion_GLOBAL_CFLAGS=
98
plugin_CodeCompletion_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
98
plugin_CodeCompletion_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
99
plugin_CodeCompletion_GLOBAL_LDFLAGS=
99
plugin_CodeCompletion_GLOBAL_LDFLAGS=
100
plugin_CodeCompletion_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
100
plugin_CodeCompletion_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
101
plugin_CodeCompletion_GLOBAL_INCS= -I/usr/include
101
plugin_CodeCompletion_GLOBAL_INCS= -I/usr/include
102
plugin_CodeCompletion_PROJECT_INCS= -Isdk/wxscintilla/include
102
plugin_CodeCompletion_PROJECT_INCS= -Isdk/wxscintilla/include
103
plugin_CodeCompletion_GLOBAL_LIBDIRS= -L/usr/lib
103
plugin_CodeCompletion_GLOBAL_LIBDIRS= -L/usr/lib
Lines 105-113 Link Here
105
plugin_CodeCompletion_GLOBAL_LIBS=
105
plugin_CodeCompletion_GLOBAL_LIBS=
106
plugin_CodeCompletion_PROJECT_LIBS=
106
plugin_CodeCompletion_PROJECT_LIBS=
107
plugin_ClassWizard_GLOBAL_CFLAGS=
107
plugin_ClassWizard_GLOBAL_CFLAGS=
108
plugin_ClassWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
108
plugin_ClassWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
109
plugin_ClassWizard_GLOBAL_LDFLAGS=
109
plugin_ClassWizard_GLOBAL_LDFLAGS=
110
plugin_ClassWizard_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
110
plugin_ClassWizard_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
111
plugin_ClassWizard_GLOBAL_INCS= -I/usr/include
111
plugin_ClassWizard_GLOBAL_INCS= -I/usr/include
112
plugin_ClassWizard_PROJECT_INCS= -Isdk/wxscintilla/include
112
plugin_ClassWizard_PROJECT_INCS= -Isdk/wxscintilla/include
113
plugin_ClassWizard_GLOBAL_LIBDIRS= -L/usr/lib
113
plugin_ClassWizard_GLOBAL_LIBDIRS= -L/usr/lib
Lines 115-123 Link Here
115
plugin_ClassWizard_GLOBAL_LIBS=
115
plugin_ClassWizard_GLOBAL_LIBS=
116
plugin_ClassWizard_PROJECT_LIBS=
116
plugin_ClassWizard_PROJECT_LIBS=
117
plugin_DefMimeHandler_GLOBAL_CFLAGS=
117
plugin_DefMimeHandler_GLOBAL_CFLAGS=
118
plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
118
plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
119
plugin_DefMimeHandler_GLOBAL_LDFLAGS=
119
plugin_DefMimeHandler_GLOBAL_LDFLAGS=
120
plugin_DefMimeHandler_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
120
plugin_DefMimeHandler_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
121
plugin_DefMimeHandler_GLOBAL_INCS= -I/usr/include
121
plugin_DefMimeHandler_GLOBAL_INCS= -I/usr/include
122
plugin_DefMimeHandler_PROJECT_INCS= -Isdk/wxscintilla/include
122
plugin_DefMimeHandler_PROJECT_INCS= -Isdk/wxscintilla/include
123
plugin_DefMimeHandler_GLOBAL_LIBDIRS= -L/usr/lib
123
plugin_DefMimeHandler_GLOBAL_LIBDIRS= -L/usr/lib
Lines 125-133 Link Here
125
plugin_DefMimeHandler_GLOBAL_LIBS=
125
plugin_DefMimeHandler_GLOBAL_LIBS=
126
plugin_DefMimeHandler_PROJECT_LIBS=
126
plugin_DefMimeHandler_PROJECT_LIBS=
127
plugin_PluginsWizard_GLOBAL_CFLAGS=
127
plugin_PluginsWizard_GLOBAL_CFLAGS=
128
plugin_PluginsWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
128
plugin_PluginsWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
129
plugin_PluginsWizard_GLOBAL_LDFLAGS=
129
plugin_PluginsWizard_GLOBAL_LDFLAGS=
130
plugin_PluginsWizard_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
130
plugin_PluginsWizard_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
131
plugin_PluginsWizard_GLOBAL_INCS= -I/usr/include
131
plugin_PluginsWizard_GLOBAL_INCS= -I/usr/include
132
plugin_PluginsWizard_PROJECT_INCS= -Isdk/wxscintilla/include
132
plugin_PluginsWizard_PROJECT_INCS= -Isdk/wxscintilla/include
133
plugin_PluginsWizard_GLOBAL_LIBDIRS= -L/usr/lib
133
plugin_PluginsWizard_GLOBAL_LIBDIRS= -L/usr/lib
Lines 135-143 Link Here
135
plugin_PluginsWizard_GLOBAL_LIBS=
135
plugin_PluginsWizard_GLOBAL_LIBS=
136
plugin_PluginsWizard_PROJECT_LIBS=
136
plugin_PluginsWizard_PROJECT_LIBS=
137
plugin_ToDo_GLOBAL_CFLAGS=
137
plugin_ToDo_GLOBAL_CFLAGS=
138
plugin_ToDo_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
138
plugin_ToDo_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
139
plugin_ToDo_GLOBAL_LDFLAGS=
139
plugin_ToDo_GLOBAL_LDFLAGS=
140
plugin_ToDo_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
140
plugin_ToDo_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
141
plugin_ToDo_GLOBAL_INCS= -I/usr/include
141
plugin_ToDo_GLOBAL_INCS= -I/usr/include
142
plugin_ToDo_PROJECT_INCS= -Isdk/wxscintilla/include
142
plugin_ToDo_PROJECT_INCS= -Isdk/wxscintilla/include
143
plugin_ToDo_GLOBAL_LIBDIRS= -L/usr/lib
143
plugin_ToDo_GLOBAL_LIBDIRS= -L/usr/lib
Lines 145-153 Link Here
145
plugin_ToDo_GLOBAL_LIBS=
145
plugin_ToDo_GLOBAL_LIBS=
146
plugin_ToDo_PROJECT_LIBS=
146
plugin_ToDo_PROJECT_LIBS=
147
plugin_XPManifest_GLOBAL_CFLAGS=
147
plugin_XPManifest_GLOBAL_CFLAGS=
148
plugin_XPManifest_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
148
plugin_XPManifest_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
149
plugin_XPManifest_GLOBAL_LDFLAGS=
149
plugin_XPManifest_GLOBAL_LDFLAGS=
150
plugin_XPManifest_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
150
plugin_XPManifest_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
151
plugin_XPManifest_GLOBAL_INCS= -I/usr/include
151
plugin_XPManifest_GLOBAL_INCS= -I/usr/include
152
plugin_XPManifest_PROJECT_INCS= -Isdk/wxscintilla/include
152
plugin_XPManifest_PROJECT_INCS= -Isdk/wxscintilla/include
153
plugin_XPManifest_GLOBAL_LIBDIRS= -L/usr/lib
153
plugin_XPManifest_GLOBAL_LIBDIRS= -L/usr/lib
Lines 155-163 Link Here
155
plugin_XPManifest_GLOBAL_LIBS=
155
plugin_XPManifest_GLOBAL_LIBS=
156
plugin_XPManifest_PROJECT_LIBS=
156
plugin_XPManifest_PROJECT_LIBS=
157
update_GLOBAL_CFLAGS=
157
update_GLOBAL_CFLAGS=
158
update_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
158
update_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
159
update_GLOBAL_LDFLAGS=
159
update_GLOBAL_LDFLAGS=
160
update_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
160
update_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
161
update_GLOBAL_INCS= -I/usr/include
161
update_GLOBAL_INCS= -I/usr/include
162
update_PROJECT_INCS= -Isdk/wxscintilla/include
162
update_PROJECT_INCS= -Isdk/wxscintilla/include
163
update_GLOBAL_LIBDIRS= -L/usr/lib
163
update_GLOBAL_LIBDIRS= -L/usr/lib
Lines 165-173 Link Here
165
update_GLOBAL_LIBS=
165
update_GLOBAL_LIBS=
166
update_PROJECT_LIBS=
166
update_PROJECT_LIBS=
167
console_runner_GLOBAL_CFLAGS=
167
console_runner_GLOBAL_CFLAGS=
168
console_runner_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
168
console_runner_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
169
console_runner_GLOBAL_LDFLAGS=
169
console_runner_GLOBAL_LDFLAGS=
170
console_runner_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
170
console_runner_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
171
console_runner_GLOBAL_INCS= -I/usr/include
171
console_runner_GLOBAL_INCS= -I/usr/include
172
console_runner_PROJECT_INCS= -Isdk/wxscintilla/include
172
console_runner_PROJECT_INCS= -Isdk/wxscintilla/include
173
console_runner_GLOBAL_LIBDIRS= -L/usr/lib
173
console_runner_GLOBAL_LIBDIRS= -L/usr/lib
Lines 175-183 Link Here
175
console_runner_GLOBAL_LIBS=
175
console_runner_GLOBAL_LIBS=
176
console_runner_PROJECT_LIBS=
176
console_runner_PROJECT_LIBS=
177
doc_GLOBAL_CFLAGS=
177
doc_GLOBAL_CFLAGS=
178
doc_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
178
doc_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
179
doc_GLOBAL_LDFLAGS=
179
doc_GLOBAL_LDFLAGS=
180
doc_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
180
doc_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
181
doc_GLOBAL_INCS= -I/usr/include
181
doc_GLOBAL_INCS= -I/usr/include
182
doc_PROJECT_INCS= -Isdk/wxscintilla/include
182
doc_PROJECT_INCS= -Isdk/wxscintilla/include
183
doc_GLOBAL_LIBDIRS= -L/usr/lib
183
doc_GLOBAL_LIBDIRS= -L/usr/lib
(-)devel/codeblocks/files/patch-CodeBlocks-unix.cbp (-12 / +5 lines)
Lines 1-5 Link Here
1
--- CodeBlocks-unix.cbp.orig	Sun Nov 27 15:12:34 2005
1
--- CodeBlocks-unix.cbp.orig	Sun May 28 18:41:57 2006
2
+++ CodeBlocks-unix.cbp	Sun Nov 27 15:12:46 2005
2
+++ CodeBlocks-unix.cbp	Sun May 28 18:46:43 2006
3
@@ -56,6 +56,7 @@
3
@@ -56,6 +56,7 @@
4
 					<Add option="-DEXPORT_EVENTS"/>
4
 					<Add option="-DEXPORT_EVENTS"/>
5
 					<Add option="-D_USRDLL"/>
5
 					<Add option="-D_USRDLL"/>
Lines 8-14 Link Here
8
 				</Compiler>
8
 				</Compiler>
9
 				<Linker>
9
 				<Linker>
10
 					<Add library="libtxml.a"/>
10
 					<Add library="libtxml.a"/>
11
@@ -339,18 +340,37 @@
11
@@ -339,13 +340,32 @@
12
 					<Add option="-Os"/>
12
 					<Add option="-Os"/>
13
 				</Compiler>
13
 				</Compiler>
14
 			</Target>
14
 			</Target>
Lines 29-54 Link Here
29
+			</Target>
29
+			</Target>
30
 			<Environment>
30
 			<Environment>
31
-				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.4"/>
31
-				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.4"/>
32
+				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.6"/>
32
+				<Variable name="LIB_WXXRC" value="%%LIB_WXXRC%%"/>
33
 			</Environment>
33
 			</Environment>
34
 		</Build>
34
 		</Build>
35
 		<Compiler>
35
 		<Compiler>
36
 			<Add option="-Wall"/>
36
 			<Add option="-Wall"/>
37
 			<Add option="-g"/>
37
 			<Add option="-g"/>
38
-			<Add option="`wx-config --cflags`"/>
39
+			<Add option="-pipe"/>
38
+			<Add option="-pipe"/>
40
+			<Add option="-fno-pcc-struct-return"/>
39
+			<Add option="-fno-pcc-struct-return"/>
41
+			<Add option="-fno-rtti"/>
40
+			<Add option="-fno-rtti"/>
42
+			<Add option="-fmessage-length=0"/>
41
+			<Add option="-fmessage-length=0"/>
43
+			<Add option="`wxgtk2-2.6-config --cflags`"/>
42
 			<Add option="`wx-config --cflags`"/>
44
 			<Add directory="sdk/wxscintilla/include"/>
43
 			<Add directory="sdk/wxscintilla/include"/>
45
 		</Compiler>
44
 		</Compiler>
46
 		<Linker>
47
-			<Add option="`wx-config --libs`"/>
48
+			<Add option="`wxgtk2-2.6-config --libs`"/>
49
 			<Add directory="sdk/tinyxml"/>
50
 		</Linker>
51
 		<Unit filename="devel/share/CodeBlocks/images/codecompletion/README.txt">
52
@@ -1052,12 +1072,78 @@
45
@@ -1052,12 +1072,78 @@
53
 			<Option link="0"/>
46
 			<Option link="0"/>
54
 			<Option target="plugin_CompilerGCC"/>
47
 			<Option target="plugin_CompilerGCC"/>
(-)devel/codeblocks/files/patch-src-app.cpp (-1 / +1 lines)
Lines 4-10 Link Here
4
 DDEServer* g_DDEServer = 0L;
4
 DDEServer* g_DDEServer = 0L;
5
 #endif
5
 #endif
6
 
6
 
7
+#define APP_PREFIX "/usr/local"
7
+#define APP_PREFIX "%%PREFIX%%"
8
+
8
+
9
 IMPLEMENT_APP(CodeBlocksApp)
9
 IMPLEMENT_APP(CodeBlocksApp)
10
 
10
 
(-)devel/codeblocks/files/patch-templates-unix-wxwidgets.cbp (-15 lines)
Lines 1-15 Link Here
1
--- templates/unix/wxwidgets.cbp.orig	Sun Nov 27 15:36:22 2005
2
+++ templates/unix/wxwidgets.cbp	Sun Nov 27 15:36:55 2005
3
@@ -14,10 +14,10 @@
4
 			<Add option="-Winvalid-pch"/>
5
 			<Add option="-include &quot;wx_pch.h&quot;"/>
6
 			<Add option="-DUSE_PCH"/>
7
-			<Add option="`wx-config --cflags`"/>
8
+			<Add option="`wxgtk2-2.6-config --cflags`"/>
9
 		</Compiler>
10
 		<Linker>
11
-			<Add option="`wx-config --libs`"/>
12
+			<Add option="`wxgtk2-2.6-config --libs`"/>
13
 		</Linker>
14
 	</Project>
15
 </CodeBlocks_project_file>
(-)devel/datadesigner/Makefile (-4 / +3 lines)
Lines 16-31 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	Database Schema Designer
17
COMMENT=	Database Schema Designer
18
18
19
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
19
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
20
		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
21
20
22
USE_GNOME=	libxml2 libxslt
21
USE_GNOME=	libxml2 libxslt
23
USE_ICONV=	yes
22
USE_ICONV=	yes
23
USE_WX=		2.4
24
WX_CONF_ARGS=	absolute
24
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
25
WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
26
CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
26
CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
27
		LDFLAGS="-L${LOCALBASE}/lib"
27
		LDFLAGS="-L${LOCALBASE}/lib"
28
CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
29
28
30
.if !defined(WITHOUT_NLS)
29
.if !defined(WITHOUT_NLS)
31
USE_GETTEXT=	yes
30
USE_GETTEXT=	yes
(-)devel/drpython/Makefile (-2 / +2 lines)
Lines 16-26 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	Highly customizable cross-platform ide to aid programming in Python
17
COMMENT=	Highly customizable cross-platform ide to aid programming in Python
18
18
19
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
20
21
USE_ZIP=	yes
19
USE_ZIP=	yes
22
USE_PYTHON=	yes
20
USE_PYTHON=	yes
23
USE_PYDISTUTILS=	yes
21
USE_PYDISTUTILS=	yes
22
USE_WX=		2.6
23
WX_COMPS=	python
24
24
25
post-install:
25
post-install:
26
	@${ECHO} '#!/bin/sh' > ${WRKDIR}/drpython.sh
26
	@${ECHO} '#!/bin/sh' > ${WRKDIR}/drpython.sh
(-)devel/ecos-tools/Makefile (-3 / +3 lines)
Lines 16-25 Link Here
16
MAINTAINER=	tg@FreeBSD.org
16
MAINTAINER=	tg@FreeBSD.org
17
COMMENT=	Configuration tools for the eCos embedded OS
17
COMMENT=	Configuration tools for the eCos embedded OS
18
18
19
LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84 \
19
LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
20
		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
21
20
22
USE_BZIP2=	yes
21
USE_BZIP2=	yes
22
USE_WX=		2.4
23
WRKSRC=		${WRKDIR}/infra-build
23
WRKSRC=		${WRKDIR}/infra-build
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
CONFIGURE_SCRIPT=	../ecos/host/configure
25
CONFIGURE_SCRIPT=	../ecos/host/configure
Lines 31-37 Link Here
31
31
32
ECOSSRCDIR=	${WRKDIR}/ecos/host
32
ECOSSRCDIR=	${WRKDIR}/ecos/host
33
CFGTOOL_WRKSRC=	${WRKDIR}/configtool-build
33
CFGTOOL_WRKSRC=	${WRKDIR}/configtool-build
34
CFGTOOL_MAKE_ENV=	WXDIR=${X11BASE} WX_CONFIG=wxgtk2-2.4-config \
34
CFGTOOL_MAKE_ENV=	WX_CONFIG=${WX_CONFIG} \
35
			ECOSSRCDIR=${ECOSSRCDIR} \
35
			ECOSSRCDIR=${ECOSSRCDIR} \
36
			INSTALLDIR=${PREFIX}
36
			INSTALLDIR=${PREFIX}
37
CFGTOOL_MAKEFILE=	${ECOSSRCDIR}/tools/configtool/standalone/wxwin/makefile.gnu
37
CFGTOOL_MAKEFILE=	${ECOSSRCDIR}/tools/configtool/standalone/wxwin/makefile.gnu
(-)devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu (-2 / +2 lines)
Lines 36-43 Link Here
36
   PROGRAM=configtool
36
   PROGRAM=configtool
37
-  CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags`
37
-  CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags`
38
-  LDFLAGS=`$(WXDIR)/bin/wx-config --libs`
38
-  LDFLAGS=`$(WXDIR)/bin/wx-config --libs`
39
+  CPPFLAGS=`$(WXDIR)/bin/$(WX_CONFIG) --cppflags`
39
+  CPPFLAGS=`$(WX_CONFIG) --cppflags`
40
+  LDFLAGS=`$(WXDIR)/bin/$(WX_CONFIG) --libs`
40
+  LDFLAGS=`$(WX_CONFIG) --libs`
41
   EXTRAOBJECTS=
41
   EXTRAOBJECTS=
42
 endif
42
 endif
43
 
43
 
(-)devel/klassmodeler/Makefile (-3 / +1 lines)
Lines 16-29 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	A tool for visually creating and documenting classes
17
COMMENT=	A tool for visually creating and documenting classes
18
18
19
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
20
21
USE_ZIP=	yes
19
USE_ZIP=	yes
22
WRKSRC=		${WRKDIR}/${PORTNAME}
20
WRKSRC=		${WRKDIR}/${PORTNAME}
23
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
24
USE_GNOME=	gnometarget
21
USE_GNOME=	gnometarget
25
USE_AUTOTOOLS=	libtool:15
22
USE_AUTOTOOLS=	libtool:15
26
CONFIGURE_ENV=	WXWINDOWS="yes"
23
CONFIGURE_ENV=	WXWINDOWS="yes"
24
USE_WX=		2.4
27
25
28
PLIST_FILES=	bin/klassmodeler
26
PLIST_FILES=	bin/klassmodeler
29
27
(-)devel/rapidsvn/Makefile (-13 / +4 lines)
Lines 15-45 Link Here
15
COMMENT=	Cross-platform GUI front-end for the Subversion revision system
15
COMMENT=	Cross-platform GUI front-end for the Subversion revision system
16
16
17
BUILD_DEPENDS=	apr-1-config:${PORTSDIR}/devel/apr-svn \
17
BUILD_DEPENDS=	apr-1-config:${PORTSDIR}/devel/apr-svn \
18
		${WXCONFIG}:${PORTSDIR}/x11-toolkits/${WXPORT} \
19
		neon-config:${PORTSDIR}/www/neon \
18
		neon-config:${PORTSDIR}/www/neon \
20
		${SVNDEP}:${PORTSDIR}/devel/subversion \
19
		${SVNDEP}:${PORTSDIR}/devel/subversion \
21
		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
20
		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
22
21
23
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
23
USE_WX=		2.4-2.6
24
WX_COMPS=	wx:build
25
WX_CONF_ARGS=	absolute
24
USE_AUTOTOOLS=	autoconf:259 libtool:15
26
USE_AUTOTOOLS=	autoconf:259 libtool:15
25
CONFIGURE_ARGS=	--with-wx-config=${WXCONFIG} \
27
CONFIGURE_ARGS=--with-apr-config=apr-1-config \
26
	--with-apr-config=apr-1-config \
27
	--with-apu-config=apu-1-config \
28
	--with-apu-config=apu-1-config \
28
	--with-docbook-xsl=${LOCALBASE}/share/xsl/docbook
29
	--with-docbook-xsl=${LOCALBASE}/share/xsl/docbook
29
CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
30
CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
30
INSTALLS_SHLIB=	yes
31
INSTALLS_SHLIB=	yes
31
MAN1=		rapidsvn.1
32
MAN1=		rapidsvn.1
32
33
33
.if exists(${X11BASE}/bin/wxgtk2-2.6-config)
34
WXPORT=		wxgtk26
35
WXCONFIG=	wxgtk2-2.6-config
36
.elif exists(${X11BASE}/bin/wxgtk2u-2.6-config)
37
WXPORT=		wxgtk26-unicode
38
WXCONFIG=	wxgtk2u-2.6-config
39
.else
40
WXPORT=		wxgtk24
41
WXCONFIG=	wxgtk2-2.4-config
42
.endif
43
SVNDEP=		${LOCALBASE}/include/subversion-1/svn_types.h
34
SVNDEP=		${LOCALBASE}/include/subversion-1/svn_types.h
44
35
45
.include <bsd.port.mk>
36
.include <bsd.port.mk>
(-)devel/wxGlade/Makefile (-8 / +2 lines)
Lines 14-30 Link Here
14
MAINTAINER=	alepulver@FreeBSD.org
14
MAINTAINER=	alepulver@FreeBSD.org
15
COMMENT=	GUI builder for wxPython/wxWindows written in Python
15
COMMENT=	GUI builder for wxPython/wxWindows written in Python
16
16
17
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
18
19
.if defined(WITH_UNICODE)
20
WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
21
.else
22
WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
23
.endif
24
25
WRKSRC=		${WRKDIR}/wxGlade-${PORTVERSION}
17
WRKSRC=		${WRKDIR}/wxGlade-${PORTVERSION}
26
18
27
USE_PYTHON=	yes
19
USE_PYTHON=	yes
20
USE_WX=		2.6
21
WX_COMPS=	python
28
22
29
do-build:
23
do-build:
30
	@(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD} 'exec ${PYTHON_CMD} \
24
	@(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD} 'exec ${PYTHON_CMD} \
(-)editors/poedit/Makefile (-30 / +6 lines)
Lines 17-29 Link Here
17
COMMENT=	Gettext catalogs (.po files) editor
17
COMMENT=	Gettext catalogs (.po files) editor
18
18
19
BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
19
BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
20
LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell \
20
LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
21
		db${LIB_SUFFIX}:${PORTSDIR}/databases/db${WITH_BDB_VER}
22
21
23
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
23
USE_BDB=	yes
24
USE_GETTEXT=	yes
24
USE_GETTEXT=	yes
25
USE_GMAKE=	yes
25
USE_GMAKE=	yes
26
USE_GNOME=	gnometarget
26
USE_GNOME=	gnometarget
27
USE_WX=		2.4-2.6
28
WX_CONF_ARGS=	absolute
27
GNU_CONFIGURE=	yes
29
GNU_CONFIGURE=	yes
28
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
30
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
29
31
Lines 33-68 Link Here
33
35
34
MAN1=		poedit.1
36
MAN1=		poedit.1
35
37
36
.if defined(WITH_BDB2) || defined(WITH_DB2)
37
WITH_BDB_VER=	2
38
.elif defined(WITH_BDB3) || defined(WITH_DB3)
39
WITH_BDB_VER=	3
40
.elif defined(WITH_BDB4) || defined(WITH_DB4)
41
WITH_BDB_VER=	4
42
.elif defined(WITH_BDB41) || defined(WITH_DB41)
43
WITH_BDB_VER=	41
44
.elif defined(WITH_BDB42) || defined(WITH_DB42)
45
WITH_BDB_VER=	42
46
LIB_SUFFIX=	-4.2
47
.elif defined(WITH_BDB43) || defined(WITH_DB43)
48
WITH_BDB_VER=	43
49
LIB_SUFFIX=	-4.3
50
.endif
51
WITH_BDB_VER?=	4
52
LIB_SUFFIX?=	${WITH_BDB_VER}
53
54
.if defined(WITH_WXGTK24)
55
LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
56
CONFIGURE_ARGS+=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
57
.else
58
LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
59
CONFIGURE_ARGS+=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
60
.endif
61
62
post-patch:
38
post-patch:
63
	@${REINPLACE_CMD} -e \
39
	@${REINPLACE_CMD} -e \
64
		's/for version in .*;/for version in ${WITH_BDB_VER};/ ; \
40
		's/for version in .*;/for version in ${BDB_VER};/ ; \
65
		 s/-ldb-$$version/-ldb${LIB_SUFFIX}/' ${WRKSRC}/configure
41
		 s/-ldb-$$version/-l${BDB_LIB_NAME}/' ${WRKSRC}/configure
66
	@${REINPLACE_CMD} -e \
42
	@${REINPLACE_CMD} -e \
67
		'/^SUBDIRS/s/ install / /' ${WRKSRC}/Makefile.in
43
		'/^SUBDIRS/s/ install / /' ${WRKSRC}/Makefile.in
68
44
(-)editors/spe/Makefile (-8 / +2 lines)
Lines 16-25 Link Here
16
MAINTAINER=	nivit@email.it
16
MAINTAINER=	nivit@email.it
17
COMMENT=	Stani's Python Editor
17
COMMENT=	Stani's Python Editor
18
18
19
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
20
21
USE_PYTHON=	yes
19
USE_PYTHON=	yes
22
USE_PYDISTUTILS=	yes
20
USE_PYDISTUTILS=	yes
21
USE_WX=		2.6
22
WX_COMPS=	python
23
23
24
OPTIONS=	ENCRYPTED_DEBUG "Enable encrypted debug in SPE" off
24
OPTIONS=	ENCRYPTED_DEBUG "Enable encrypted debug in SPE" off
25
25
Lines 46-57 Link Here
46
46
47
.include <bsd.port.pre.mk>
47
.include <bsd.port.pre.mk>
48
48
49
.if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
50
WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
51
.else
52
WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
53
.endif
54
55
.if defined(WITH_ENCRYPTED_DEBUG)
49
.if defined(WITH_ENCRYPTED_DEBUG)
56
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
50
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
57
.endif
51
.endif
(-)ftp/ftpcube/Makefile (-1 / +2 lines)
Lines 16-22 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	A graphical FTP Client
17
COMMENT=	A graphical FTP Client
18
18
19
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
20
.if defined(PACKAGE_BUILDING)
19
.if defined(PACKAGE_BUILDING)
21
BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
20
BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
22
		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
21
		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
Lines 24-29 Link Here
24
23
25
USE_PYTHON=	yes
24
USE_PYTHON=	yes
26
USE_PYDISTUTILS=	yes
25
USE_PYDISTUTILS=	yes
26
USE_WX=		2.4
27
WX_COMPS=	python
27
28
28
post-patch:
29
post-patch:
29
	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' ${WRKSRC}/setup.cfg
30
	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' ${WRKSRC}/setup.cfg
(-)games/abridge/Makefile (-3 / +2 lines)
Lines 14-23 Link Here
14
MAINTAINER=	Janos.Mohacsi@bsd.hu
14
MAINTAINER=	Janos.Mohacsi@bsd.hu
15
COMMENT=	Bridge game
15
COMMENT=	Bridge game
16
16
17
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
17
USE_WX=		2.4
18
18
WX_CONF_ARGS=	absolute
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
21
20
22
MAN1=		abridge.1
21
MAN1=		abridge.1
23
PLIST_FILES=	bin/abridge
22
PLIST_FILES=	bin/abridge
(-)games/blokish/Makefile (-3 / +2 lines)
Lines 16-27 Link Here
16
MAINTAINER=	amdmi3@mail.ru
16
MAINTAINER=	amdmi3@mail.ru
17
COMMENT=	Clone of the strategy board game 'Blokus'
17
COMMENT=	Clone of the strategy board game 'Blokus'
18
18
19
LIB_DEPENDS=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
20
21
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
22
USE_GMAKE=	yes
20
USE_GMAKE=	yes
23
USE_X_PREFIX=	yes
21
USE_X_PREFIX=	yes
24
USE_GL=		yes
22
USE_GL=		yes
23
USE_WX=		2.6
25
24
26
CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
25
CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
27
		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
26
		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
Lines 39-44 Link Here
39
.endif
38
.endif
40
39
41
post-patch:
40
post-patch:
42
	@${REINPLACE_CMD} -e 's|wx-config|wxgtk2-2.6-config|' ${WRKSRC}/makefile.in ${WRKSRC}/configure
41
	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' ${WRKSRC}/makefile.in ${WRKSRC}/configure
43
42
44
.include <bsd.port.post.mk>
43
.include <bsd.port.post.mk>
(-)games/scorched3d/Makefile (-8 / +5 lines)
Lines 16-27 Link Here
16
MAINTAINER=		guy@device.dyndns.org
16
MAINTAINER=		guy@device.dyndns.org
17
COMMENT=		Scorched is a game based loosely on the classic DOS game
17
COMMENT=		Scorched is a game based loosely on the classic DOS game
18
18
19
BUILD_DEPENDS=		${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
19
BUILD_DEPENDS=		openal-config:${PORTSDIR}/audio/openal
20
			wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
20
RUN_DEPENDS=		openal-config:${PORTSDIR}/audio/openal
21
			openal-config:${PORTSDIR}/audio/openal
22
RUN_DEPENDS=		${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
23
			wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
24
			openal-config:${PORTSDIR}/audio/openal
25
LIB_DEPENDS=		alut.1:${PORTSDIR}/audio/freealut
21
LIB_DEPENDS=		alut.1:${PORTSDIR}/audio/freealut
26
22
27
SCORCH_VERSION=		39.1
23
SCORCH_VERSION=		39.1
Lines 34-46 Link Here
34
USE_GL=			yes
30
USE_GL=			yes
35
USE_GMAKE=		yes
31
USE_GMAKE=		yes
36
USE_AUTOTOOLS=	automake:15 autoconf:253
32
USE_AUTOTOOLS=	automake:15 autoconf:253
33
USE_WX=		2.6
34
WX_CONF_ARGS=	absolute
37
35
38
WRKSRC=			${WRKDIR}/scorched
36
WRKSRC=			${WRKDIR}/scorched
39
AUTOMAKE_ARGS=		--foreign
37
AUTOMAKE_ARGS=		--foreign
40
CONFIGURE_ARGS=		--program-prefix='' \
38
CONFIGURE_ARGS=		--program-prefix='' \
41
			--prefix=${PREFIX}/games/scorched3d \
39
			--prefix=${PREFIX}/games/scorched3d \
42
			--datadir=${PREFIX}/games/scorched3d \
40
			--datadir=${PREFIX}/games/scorched3d
43
			--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
44
.if defined(WITH_MYSQL)
41
.if defined(WITH_MYSQL)
45
CONFIGURE_ARGS+=	--with-mysql
42
CONFIGURE_ARGS+=	--with-mysql
46
.endif
43
.endif
(-)graphics/comical/Makefile (-3 / +2 lines)
Lines 15-26 Link Here
15
MAINTAINER=	john@mcaree.org
15
MAINTAINER=	john@mcaree.org
16
COMMENT=	A sequential image viewer
16
COMMENT=	A sequential image viewer
17
17
18
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
19
20
USE_GMAKE=	yes
18
USE_GMAKE=	yes
19
USE_WX=		2.4
20
WX_CONF_ARGS=	absolute
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
23
CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
24
23
25
.include <bsd.port.pre.mk>
24
.include <bsd.port.pre.mk>
26
25
(-)graphics/hugin/Makefile (-4 / +3 lines)
Lines 20-40 Link Here
20
		png:${PORTSDIR}/graphics/png \
20
		png:${PORTSDIR}/graphics/png \
21
		jpeg:${PORTSDIR}/graphics/jpeg \
21
		jpeg:${PORTSDIR}/graphics/jpeg \
22
		fftw:${PORTSDIR}/math/fftw \
22
		fftw:${PORTSDIR}/math/fftw \
23
		wx_gtk2_xrc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
24
		boost_date_time:${PORTSDIR}/devel/boost
23
		boost_date_time:${PORTSDIR}/devel/boost
25
RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
24
RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
26
		PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
25
		PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
27
26
28
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
29
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
28
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
30
CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
31
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \
29
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \
32
		LDFLAGS="-L${LOCALBASE}/lib"
30
		LDFLAGS="-L${LOCALBASE}/lib"
33
USE_GMAKE=	yes
31
USE_GMAKE=	yes
34
USE_ICONV=	yes
32
USE_ICONV=	yes
33
USE_WX=		2.6
34
WX_CONF_ARGS=	absolute
35
35
36
DOCSDIR=	${PREFIX}/share/hugin/xrc/data
36
DOCSDIR=	${PREFIX}/share/hugin/xrc/data
37
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
38
37
39
.if defined(WITHOUT_NLS)
38
.if defined(WITHOUT_NLS)
40
CONFIGURE_ARGS+=--disable-nls
39
CONFIGURE_ARGS+=--disable-nls
Lines 45-51 Link Here
45
.endif
44
.endif
46
45
47
post-patch:
46
post-patch:
48
	@${REINPLACE_CMD} -e 's|-wxrc|-${X11BASE}/bin/wxrc-gtk2-2.6|' \
47
	@${REINPLACE_CMD} -e 's|-wxrc|-${WX_CONFIG:S/wx/wxrc/}|' \
49
		${WRKSRC}/src/hugin/xrc/Makefile.in
48
		${WRKSRC}/src/hugin/xrc/Makefile.in
50
49
51
.include <bsd.port.mk>
50
.include <bsd.port.mk>
(-)graphics/multivideo/Makefile (-4 / +1 lines)
Lines 16-34 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	An image sequence viewer
17
COMMENT=	An image sequence viewer
18
18
19
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
20
21
WRKSRC=		${WRKDIR}/${PORTNAME}
19
WRKSRC=		${WRKDIR}/${PORTNAME}
22
20
23
USE_BZIP2=	yes
21
USE_BZIP2=	yes
24
USE_GMAKE=	yes
22
USE_GMAKE=	yes
23
USE_WX=		2.4
25
MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
24
MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
26
ALL_TARGET=	default
25
ALL_TARGET=	default
27
26
28
PLIST_FILES=	bin/multivideo
27
PLIST_FILES=	bin/multivideo
29
28
30
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
31
32
post-patch:
29
post-patch:
33
	@${REINPLACE_CMD} -e 's|g++|\$$\(CXX)|g ; \
30
	@${REINPLACE_CMD} -e 's|g++|\$$\(CXX)|g ; \
34
		 s|-O2 -g -Wall -W|\$$\(CXXFLAGS\)|g ; \
31
		 s|-O2 -g -Wall -W|\$$\(CXXFLAGS\)|g ; \
(-)graphics/wxsvg/Makefile (-4 / +1 lines)
Lines 14-26 Link Here
14
MAINTAINER=	ahze@FreeBSD.org
14
MAINTAINER=	ahze@FreeBSD.org
15
COMMENT=	C++ library to create, manipulate, and render SVG files
15
COMMENT=	C++ library to create, manipulate, and render SVG files
16
16
17
BUILD_DEPENDS=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
18
RUN_DEPENDS=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
19
20
INSTALLS_SHLIB=	yes
17
INSTALLS_SHLIB=	yes
21
WX_CONFIG=	wxgtk2-2.6-config
22
USE_AUTOTOOLS=	libtool:15
18
USE_AUTOTOOLS=	libtool:15
23
USE_GNOME=	libartlgpl2
19
USE_GNOME=	libartlgpl2
20
USE_WX=		2.6
24
21
25
.include <bsd.port.pre.mk>
22
.include <bsd.port.pre.mk>
26
23
(-)graphics/xaralx/Makefile (-6 / +4 lines)
Lines 18-38 Link Here
18
USE_BZIP2=	yes
18
USE_BZIP2=	yes
19
USE_X_PREFIX=	yes
19
USE_X_PREFIX=	yes
20
20
21
#WXDEP=	${X11BASE}/libwx_baseu-2.6.so.0.3.1
22
WXDEP=	wxgtk2-unicode>=2.6.3
23
BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config \
21
BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config \
24
		${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
25
		xml2-config:${PORTSDIR}/textproc/libxml2 \
22
		xml2-config:${PORTSDIR}/textproc/libxml2 \
26
		zip:${PORTSDIR}/archivers/zip
23
		zip:${PORTSDIR}/archivers/zip
27
RUN_DEPENDS+=	${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
28
LIB_DEPENDS+=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc \
24
LIB_DEPENDS+=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc \
29
		xml2.5:${PORTSDIR}/textproc/libxml2
25
		xml2.5:${PORTSDIR}/textproc/libxml2
30
26
31
USE_AUTOTOOLS=	autoconf:259:env aclocal:19:env automake:19:env libtool:15:env
27
USE_AUTOTOOLS=	autoconf:259:env aclocal:19:env automake:19:env libtool:15:env
32
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
33
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
29
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
34
CONFIGURE_ARGS+=	--with-wx-config=wxgtk2u-2.6-config \
30
CONFIGURE_ARGS+=	--program-suffix=${PKGNAMESUFFIX}
35
		--program-suffix=${PKGNAMESUFFIX}
36
# we're using dlmalloc because the stock libc does not have malloc_usable_size()
31
# we're using dlmalloc because the stock libc does not have malloc_usable_size()
37
CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -ldlmalloc"
32
CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -ldlmalloc"
38
33
Lines 40-45 Link Here
40
MAKE_ENV?=	INCLUDES="-I${LOCALBASE}/include/dlmalloc"
35
MAKE_ENV?=	INCLUDES="-I${LOCALBASE}/include/dlmalloc"
41
36
42
USE_GCC=	3.4+
37
USE_GCC=	3.4+
38
USE_WX=		2.6
39
WX_CONF_ARGS=	absolute
40
WX_UNICODE=	yes
43
41
44
MAN1=	xaralx${PKGNAMESUFFIX}.1
42
MAN1=	xaralx${PKGNAMESUFFIX}.1
45
43
(-)graphics/zphoto/Makefile (-5 / +3 lines)
Lines 21-29 Link Here
21
.if !defined (WITHOUT_AVIPLAY)
21
.if !defined (WITHOUT_AVIPLAY)
22
LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
22
LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
23
.endif
23
.endif
24
.if defined (WITH_WXGTK2)
25
LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
26
.endif
27
.if !defined (WITHOUT_ZIP)
24
.if !defined (WITHOUT_ZIP)
28
RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
25
RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
29
.endif
26
.endif
Lines 32-39 Link Here
32
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
29
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
33
	       	CPPFLAGS="-I${LOCALBASE}/include \
30
	       	CPPFLAGS="-I${LOCALBASE}/include \
34
		${PTHREAD_CFLAGS}"
31
		${PTHREAD_CFLAGS}"
35
.if defined (WITH_WXGTK2)
32
.if defined (WITH_WX)
36
CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.4-config
33
USE_WX=		2.4
34
WX_CONF_ARGS=	absolute
37
PLIST_FILES+=	bin/wxzphoto
35
PLIST_FILES+=	bin/wxzphoto
38
.else
36
.else
39
CONFIGURE_ARGS+=	--disable-wx
37
CONFIGURE_ARGS+=	--disable-wx
(-)mail/mahogany/Makefile (-4 / +3 lines)
Lines 15-23 Link Here
15
MAINTAINER=		ports@FreeBSD.org
15
MAINTAINER=		ports@FreeBSD.org
16
COMMENT=		An X11 mail and news client
16
COMMENT=		An X11 mail and news client
17
17
18
LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
19
20
USE_X_PREFIX=		yes
18
USE_X_PREFIX=		yes
19
USE_WX=		2.4
20
WX_CONF_ARGS=	absolute
21
GNU_CONFIGURE=		yes
21
GNU_CONFIGURE=		yes
22
USE_GMAKE=		yes
22
USE_GMAKE=		yes
23
ALL_TARGET=		all locales
23
ALL_TARGET=		all locales
Lines 25-32 Link Here
25
25
26
MAN1=			M.1 mahogany.1
26
MAN1=			M.1 mahogany.1
27
27
28
CONFIGURE_ARGS=		--with-python=none \
28
CONFIGURE_ARGS=		--with-python=none
29
			--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
30
CONFIGURE_ENV=		OSTYPE=${OPSYS} CFLAGS="${CFLAGS}"
29
CONFIGURE_ENV=		OSTYPE=${OPSYS} CFLAGS="${CFLAGS}"
31
30
32
.include <bsd.port.pre.mk>
31
.include <bsd.port.pre.mk>
(-)math/fityk/Makefile (-3 / +3 lines)
Lines 16-31 Link Here
16
COMMENT=	Free peak fitting software
16
COMMENT=	Free peak fitting software
17
17
18
BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
18
BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
19
LIB_DEPENDS=	boost_thread.3:${PORTSDIR}/devel/boost \
19
LIB_DEPENDS=	boost_thread.3:${PORTSDIR}/devel/boost
20
		wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
21
RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
20
RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
22
21
23
USE_BZIP2=	yes
22
USE_BZIP2=	yes
24
USE_GNOME=	gnometarget gtk20
23
USE_GNOME=	gnometarget gtk20
25
USE_GMAKE=	yes
24
USE_GMAKE=	yes
25
USE_WX=		2.6
26
WX_CONF_ARGS=	absolute
26
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
27
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28
CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
29
29
30
MAN1=		fityk.1
30
MAN1=		fityk.1
31
PLIST_FILES=	bin/cfityk \
31
PLIST_FILES=	bin/cfityk \
(-)math/gambit/Makefile (-5 / +2 lines)
Lines 15-28 Link Here
15
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	A library of tools for doing computation in game theory
16
COMMENT=	A library of tools for doing computation in game theory
17
17
18
LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
19
20
USE_X_PREFIX=	yes
18
USE_X_PREFIX=	yes
19
USE_WX=		2.6
21
USE_GNOME=	gnometarget gtk20
20
USE_GNOME=	gnometarget gtk20
22
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
23
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
22
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
24
		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
25
MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
26
INSTALLS_SHLIB=	yes
23
INSTALLS_SHLIB=	yes
27
24
28
CPPFLAGS=	${PTHREAD_CFLAGS}
25
CPPFLAGS=	${PTHREAD_CFLAGS}
(-)math/graphthing/Makefile (-3 / +2 lines)
Lines 14-28 Link Here
14
MAINTAINER=	arved@FreeBSD.org
14
MAINTAINER=	arved@FreeBSD.org
15
COMMENT=	A tool that allows you to create, manipulate and study graphs
15
COMMENT=	A tool that allows you to create, manipulate and study graphs
16
16
17
LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
18
19
USE_BZIP2=	yes
17
USE_BZIP2=	yes
20
USE_GNOME=	gnometarget gtk20
18
USE_GNOME=	gnometarget gtk20
21
USE_BISON=	yes
19
USE_BISON=	yes
22
USE_GMAKE=	yes
20
USE_GMAKE=	yes
21
USE_WX=		2.6
22
WX_CONF_ARGS=	absolute
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
24
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
25
CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
26
MAKEFILE=	GNUmakefile
25
MAKEFILE=	GNUmakefile
27
26
28
PLIST_FILES=	bin/graphthing bin/gt
27
PLIST_FILES=	bin/graphthing bin/gt
(-)math/wxMaxima/Makefile (-4 / +3 lines)
Lines 14-28 Link Here
14
MAINTAINER=	nivit@email.it
14
MAINTAINER=	nivit@email.it
15
COMMENT=	A wxWidgets GUI for the computer algebra system maxima
15
COMMENT=	A wxWidgets GUI for the computer algebra system maxima
16
16
17
LIB_DEPENDS=	wx_baseu-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
18
RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
17
RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
19
18
20
USE_GETTEXT=	yes
19
USE_GETTEXT=	yes
21
USE_GNOME=	libxml2
20
USE_GNOME=	libxml2
22
WXGTK_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
21
USE_WX=		2.6
22
WX_CONF_ARGS=	absolute
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--with-wx-config=${WXGTK_CONFIG} \
24
CONFIGURE_ARGS=	--program-prefix=
25
		--program-prefix=
26
25
27
post-install:
26
post-install:
28
	@${CAT} ${PKGMESSAGE}
27
	@${CAT} ${PKGMESSAGE}
(-)misc/diary-hercules/Makefile (-2 / +3 lines)
Lines 14-24 Link Here
14
MAINTAINER=	infofarmer@FreeBSD.org
14
MAINTAINER=	infofarmer@FreeBSD.org
15
COMMENT=	A personal workout diary program for bodybuilders
15
COMMENT=	A personal workout diary program for bodybuilders
16
16
17
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-unicode/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26-unicode \
17
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sqlite/__init__.py:${PORTSDIR}/databases/py-PySQLite11
18
		${PYTHON_SITELIBDIR}/sqlite/__init__.py:${PORTSDIR}/databases/py-PySQLite11
19
18
20
USE_GETTEXT=	yes
19
USE_GETTEXT=	yes
21
USE_PYTHON=	2.3+
20
USE_PYTHON=	2.3+
22
USE_PYDISTUTILS=	yes
21
USE_PYDISTUTILS=	yes
22
USE_WX=		2.6
23
WX_COMPS=	python
23
24
24
.include <bsd.port.mk>
25
.include <bsd.port.mk>
(-)misc/documancer/Makefile (-3 / +3 lines)
Lines 18-29 Link Here
18
18
19
BUILD_DEPENDS=	wget:${PORTSDIR}/ftp/wget \
19
BUILD_DEPENDS=	wget:${PORTSDIR}/ftp/wget \
20
		swish-e:${PORTSDIR}/www/swish-e
20
		swish-e:${PORTSDIR}/www/swish-e
21
LIB_DEPENDS=	wxmozilla_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxmozilla
21
RUN_DEPENDS=	${BUILD_DEPENDS}
22
RUN_DEPENDS=	${BUILD_DEPENDS} \
23
		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
24
22
25
USE_PYTHON=	2.4
23
USE_PYTHON=	2.4
26
USE_PERL5=	yes
24
USE_PERL5=	yes
25
USE_WX=		2.4
26
WX_COMPS=	mozilla python
27
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
28
CONFIGURE_ARGS=	--libdir=${PREFIX}/share
28
CONFIGURE_ARGS=	--libdir=${PREFIX}/share
29
29
(-)multimedia/mkvtoolnix/Makefile (-9 / +6 lines)
Lines 61-73 Link Here
61
PLIST_FILES+=	%%DATADIR%%/images/${file}
61
PLIST_FILES+=	%%DATADIR%%/images/${file}
62
.endfor
62
.endfor
63
63
64
WXGTK_CONFIG=	wxgtk2u-2.6-config
65
66
.include <bsd.port.pre.mk>
64
.include <bsd.port.pre.mk>
67
65
68
.ifndef(WITHOUT_WXGTK)
66
.ifndef(WITHOUT_WX)
69
LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
67
USE_WX=		2.6
70
71
MAN1+=		mmg.1
68
MAN1+=		mmg.1
72
PLIST_FILES+=	bin/mmg
69
PLIST_FILES+=	bin/mmg
73
.endif
70
.endif
Lines 78-87 Link Here
78
.endif
75
.endif
79
76
80
pre-everything::
77
pre-everything::
81
.ifndef(WITHOUT_WXGTK)
78
.ifndef(WITHOUT_WX)
82
	@${ECHO_MSG} "===>"
79
	@${ECHO_MSG} "===>"
83
	@${ECHO_MSG} "===> You can disable wxGTK2 support by defining"
80
	@${ECHO_MSG} "===> You can disable wxWidgets support by defining"
84
	@${ECHO_MSG} "===>  WITHOUT_WXGTK"
81
	@${ECHO_MSG} "===>  WITHOUT_WX"
85
	@${ECHO_MSG} "===>"
82
	@${ECHO_MSG} "===>"
86
.endif
83
.endif
87
84
Lines 90-96 Link Here
90
	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
87
	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
91
		-n 10 ${REINPLACE_CMD} -E -e \
88
		-n 10 ${REINPLACE_CMD} -E -e \
92
		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
89
		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
93
	@${REINPLACE_CMD} -e 's|wx-config|${WXGTK_CONFIG}|' \
90
	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' \
94
		${WRKSRC}/configure
91
		${WRKSRC}/configure
95
	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
92
	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
96
		${WRKSRC}/src/common/os.cpp
93
		${WRKSRC}/src/common/os.cpp
(-)multimedia/tovid/Makefile (-2 / +3 lines)
Lines 37-47 Link Here
37
		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
37
		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
38
RUN_DEPENDS=	\
38
RUN_DEPENDS=	\
39
		${BUILD_DEPENDS} \
39
		${BUILD_DEPENDS} \
40
		bash:${PORTSDIR}/shells/bash \
40
		bash:${PORTSDIR}/shells/bash
41
		${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
42
41
43
USE_PYTHON=	yes
42
USE_PYTHON=	yes
44
USE_PYDISTUTILS=	yes
43
USE_PYDISTUTILS=	yes
44
USE_WX=		2.6
45
WX_COMPS=	python
45
GNU_CONFIGURE=	yes
46
GNU_CONFIGURE=	yes
46
47
47
MAN1=	idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \
48
MAN1=	idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \
(-)multimedia/vlc/Makefile (-14 / +3 lines)
Lines 57-71 Link Here
57
MAN1=		vlc.1 \
57
MAN1=		vlc.1 \
58
		vlc-config.1
58
		vlc-config.1
59
59
60
.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
61
WX_CONFIG=	wxgtk2-2.4-config
62
WXGTK2_PORT=	wxgtk24
63
.else
64
WX_CONFIG=	wxgtk2-2.6-config
65
WXGTK2_PORT=	wxgtk26
66
CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
67
.endif
68
69
.include <bsd.port.pre.mk>
60
.include <bsd.port.pre.mk>
70
61
71
.if ${OSVERSION} < 500035
62
.if ${OSVERSION} < 500035
Lines 146-152 Link Here
146
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
137
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
147
LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
138
LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
148
CONFIGURE_ARGS+=--enable-skins2
139
CONFIGURE_ARGS+=--enable-skins2
149
WITH_WXGTK=	yes
140
.undef WITHOUT_WX
150
.else
141
.else
151
CONFIGURE_ARGS+=--disable-skins2
142
CONFIGURE_ARGS+=--disable-skins2
152
.endif
143
.endif
Lines 158-168 Link Here
158
CONFIGURE_ARGS+=--disable-loader
149
CONFIGURE_ARGS+=--disable-loader
159
.endif
150
.endif
160
151
161
.if !defined(WITHOUT_WXGTK)
152
.if !defined(WITHOUT_WX)
162
BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
153
USE_WX=		2.6
163
RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
164
CONFIGURE_ARGS+=--enable-wxwidgets
154
CONFIGURE_ARGS+=--enable-wxwidgets
165
CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
166
.else
155
.else
167
CONFIGURE_ARGS+=--disable-wxwidgets
156
CONFIGURE_ARGS+=--disable-wxwidgets
168
.endif
157
.endif
(-)multimedia/vlc/Makefile.inc (-12 / +6 lines)
Lines 22-35 Link Here
22
#  This Interface supports a skinned gtk2.0 interface
22
#  This Interface supports a skinned gtk2.0 interface
23
#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
23
#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
24
#
24
#
25
# WITHOUT_WXGTK=yes
25
# WITHOUT_WX=yes
26
#  WxWindows/Gtk 2.x Interface
26
#  WxWidgets Interface
27
#  This is the default and most supported
28
#  x11 interface
29
#
30
# WITH_WXGTK_VER=[2.4|2.6]
31
#  Choose a WxGTK version you want to use.
32
#  Defaults to 26
33
#
27
#
34
# Audio Knobs:
28
# Audio Knobs:
35
#
29
#
Lines 285-295 Link Here
285
	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
279
	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
286
	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
280
	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
287
.endif
281
.endif
288
.if !defined(WITHOUT_WXGTK)
282
.if !defined(WITHOUT_WX)
289
	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
283
	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
290
	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
284
	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
291
.endif
285
.endif
292
.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
286
.if !defined(WITHOUT_WX) || defined(WITH_SKINS)
293
	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
287
	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
294
.endif
288
.endif
295
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
289
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Lines 350-356 Link Here
350
.endif
344
.endif
351
	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
345
	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
352
	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
346
	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
353
.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
347
.if defined(WITH_SKINS) || !defined(WITHOUT_WX)
354
	if [ ! -d ${PREFIX}/share/applications ]; then \
348
	if [ ! -d ${PREFIX}/share/applications ]; then \
355
		${MKDIR} ${PREFIX}/share/applications ; \
349
		${MKDIR} ${PREFIX}/share/applications ; \
356
	fi
350
	fi
Lines 361-367 Link Here
361
	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
355
	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
362
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
356
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
363
.endif
357
.endif
364
.if !defined(WITHOUT_WXGTK)
358
.if !defined(WITHOUT_WX)
365
	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
359
	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
366
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
360
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
367
.endif
361
.endif
(-)multimedia/vlc-devel/Makefile (-14 / +3 lines)
Lines 63-77 Link Here
63
MAN1=		vlc.1 \
63
MAN1=		vlc.1 \
64
		vlc-config.1
64
		vlc-config.1
65
65
66
.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
67
WX_CONFIG=	wxgtk2-2.4-config
68
WXGTK2_PORT=	wxgtk24
69
.else
70
WX_CONFIG=	wxgtk2-2.6-config
71
WXGTK2_PORT=	wxgtk26
72
CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
73
.endif
74
75
.include <bsd.port.pre.mk>
66
.include <bsd.port.pre.mk>
76
67
77
.if ${PERL_LEVEL} < 500800
68
.if ${PERL_LEVEL} < 500800
Lines 148-154 Link Here
148
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
139
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
149
LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
140
LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
150
CONFIGURE_ARGS+=--enable-skins2
141
CONFIGURE_ARGS+=--enable-skins2
151
WITH_WXGTK=	yes
142
.undef WITHOUT_WX
152
.else
143
.else
153
CONFIGURE_ARGS+=--disable-skins2
144
CONFIGURE_ARGS+=--disable-skins2
154
.endif
145
.endif
Lines 160-170 Link Here
160
CONFIGURE_ARGS+=--disable-loader
151
CONFIGURE_ARGS+=--disable-loader
161
.endif
152
.endif
162
153
163
.if !defined(WITHOUT_WXGTK)
154
.if !defined(WITHOUT_WX)
164
BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
155
USE_WX=		2.6
165
RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
166
CONFIGURE_ARGS+=--enable-wxwidgets
156
CONFIGURE_ARGS+=--enable-wxwidgets
167
CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
168
.else
157
.else
169
CONFIGURE_ARGS+=--disable-wxwidgets
158
CONFIGURE_ARGS+=--disable-wxwidgets
170
.endif
159
.endif
(-)multimedia/vlc-devel/Makefile.inc (-12 / +6 lines)
Lines 22-35 Link Here
22
#  This Interface supports a skinned gtk2.0 interface
22
#  This Interface supports a skinned gtk2.0 interface
23
#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
23
#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
24
#
24
#
25
# WITHOUT_WXGTK=yes
25
# WITHOUT_WX=yes
26
#  WxWindows/Gtk 2.x Interface
26
#  WxWidgets Interface
27
#  This is the default and most supported
28
#  x11 interface
29
#
30
# WITH_WXGTK_VER=[2.4|2.6]
31
#  Choose a WxGTK version you want to use.
32
#  Defaults to 26
33
#
27
#
34
# Audio Knobs:
28
# Audio Knobs:
35
#
29
#
Lines 285-295 Link Here
285
	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
279
	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
286
	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
280
	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
287
.endif
281
.endif
288
.if !defined(WITHOUT_WXGTK)
282
.if !defined(WITHOUT_WX)
289
	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
283
	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
290
	${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
284
	${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
291
.endif
285
.endif
292
.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
286
.if !defined(WITHOUT_WX) || defined(WITH_SKINS)
293
	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
287
	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
294
.endif
288
.endif
295
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
289
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Lines 350-356 Link Here
350
.endif
344
.endif
351
	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
345
	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
352
	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
346
	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
353
.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
347
.if defined(WITH_SKINS) || !defined(WITHOUT_WX)
354
	if [ ! -d ${PREFIX}/share/applications ]; then \
348
	if [ ! -d ${PREFIX}/share/applications ]; then \
355
		${MKDIR} ${PREFIX}/share/applications ; \
349
		${MKDIR} ${PREFIX}/share/applications ; \
356
	fi
350
	fi
Lines 361-367 Link Here
361
	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
355
	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
362
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
356
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
363
.endif
357
.endif
364
.if !defined(WITHOUT_WXGTK)
358
.if !defined(WITHOUT_WX)
365
	${INSTALL_DATA} ${FILESDIR}/vlc.desktop ${PREFIX}/share/applications
359
	${INSTALL_DATA} ${FILESDIR}/vlc.desktop ${PREFIX}/share/applications
366
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
360
	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
367
.endif
361
.endif
(-)net/boinc-client/Makefile (-3 / +3 lines)
Lines 39-52 Link Here
39
.include <bsd.port.pre.mk>
39
.include <bsd.port.pre.mk>
40
40
41
.if !defined(WITHOUT_X11)
41
.if !defined(WITHOUT_X11)
42
CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
42
USE_WX=		2.6
43
WX_CONF_ARGS=	absolute
43
.else
44
.else
44
CONFIGURE_ARGS+=	--with-wx-config=false
45
CONFIGURE_ARGS+=--with-wx-config=false
45
.endif
46
.endif
46
47
47
.if !defined(WITHOUT_X11)
48
.if !defined(WITHOUT_X11)
48
LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv \
49
LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv \
49
		wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \
50
		jpeg:${PORTSDIR}/graphics/jpeg \
50
		jpeg:${PORTSDIR}/graphics/jpeg \
51
		glut:${PORTSDIR}/graphics/libglut
51
		glut:${PORTSDIR}/graphics/libglut
52
.endif
52
.endif
(-)net/py-mp-random/Makefile (-2 / +2 lines)
Lines 16-25 Link Here
16
MAINTAINER=	randomimage-widget@mirrorproject.com
16
MAINTAINER=	randomimage-widget@mirrorproject.com
17
COMMENT=	Display random Mirror Project images on your desktop
17
COMMENT=	Display random Mirror Project images on your desktop
18
18
19
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython24
20
21
USE_PYTHON=	yes
19
USE_PYTHON=	yes
22
USE_X_PREFIX=	yes
20
USE_X_PREFIX=	yes
21
USE_WX=		2.4
22
WX_COMPS=	python
23
NO_BUILD=	yes
23
NO_BUILD=	yes
24
24
25
pre-install:
25
pre-install:
(-)net-p2p/amule1/Makefile (-4 / +3 lines)
Lines 18-25 Link Here
18
18
19
DEPRECATED=	use net-p2p/amule2 if you are running OSVERSION > 500000
19
DEPRECATED=	use net-p2p/amule2 if you are running OSVERSION > 500000
20
20
21
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
21
LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
22
		curl.3:${PORTSDIR}/ftp/curl
23
22
24
LATEST_LINK=	aMule1
23
LATEST_LINK=	aMule1
25
CONFLICTS=	aMule-2.* aMule-devel-[0-9]*
24
CONFLICTS=	aMule-2.* aMule-devel-[0-9]*
Lines 29-39 Link Here
29
USE_GETTEXT=	yes
28
USE_GETTEXT=	yes
30
USE_GNOME=	gnomehier gnomehack gnomeprefix
29
USE_GNOME=	gnomehier gnomehack gnomeprefix
31
USE_GMAKE=	yes
30
USE_GMAKE=	yes
31
USE_WX=		2.4
32
WX_CONF_ARGS=	absolute
32
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
33
CONFIGURE_ARGS=	--without-included-gettext \
34
CONFIGURE_ARGS=	--without-included-gettext \
34
		--with-libintl-prefix=${LOCALBASE} \
35
		--with-libintl-prefix=${LOCALBASE} \
35
		--with-libiconv-prefix=${LOCALBASE} \
36
		--with-libiconv-prefix=${LOCALBASE} \
36
		--with-wx-config=${WX_CONFIG} \
37
		--with-wxbase-config=${WX_CONFIG} \
37
		--with-wxbase-config=${WX_CONFIG} \
38
		--with-curl-config=${CURL_CONFIG} \
38
		--with-curl-config=${CURL_CONFIG} \
39
		--program-transform-name="s/ed2k/amule-ed2k-handler/"
39
		--program-transform-name="s/ed2k/amule-ed2k-handler/"
Lines 44-50 Link Here
44
OPTIONS=	OPTIMIZE "Build with optimization" on \
44
OPTIONS=	OPTIMIZE "Build with optimization" on \
45
		STATIC "Enable static linking" off
45
		STATIC "Enable static linking" off
46
46
47
WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
48
CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
47
CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
49
48
50
.include <bsd.port.pre.mk>
49
.include <bsd.port.pre.mk>
(-)net-p2p/amule2/Makefile (-4 / +3 lines)
Lines 15-22 Link Here
15
MAINTAINER=	boris@tagnet.ru
15
MAINTAINER=	boris@tagnet.ru
16
COMMENT=	The all-platform eMule p2p client
16
COMMENT=	The all-platform eMule p2p client
17
17
18
LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
18
LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
19
		curl.3:${PORTSDIR}/ftp/curl
20
#		gd.4:${PORTSDIR}/graphics/gd
19
#		gd.4:${PORTSDIR}/graphics/gd
21
#		png.5:${PORTSDIR}/graphics/png
20
#		png.5:${PORTSDIR}/graphics/png
22
21
Lines 28-33 Link Here
28
USE_GNOME=	gnomehier gnomehack gnomeprefix
27
USE_GNOME=	gnomehier gnomehack gnomeprefix
29
USE_GMAKE=	yes
28
USE_GMAKE=	yes
30
USE_GETTEXT=	yes
29
USE_GETTEXT=	yes
30
USE_WX=		2.6
31
WX_CONF_ARGS=	absolute
31
GNU_CONFIGURE=	yes
32
GNU_CONFIGURE=	yes
32
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
33
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
33
CONFIGURE_ARGS=	--disable-debug \
34
CONFIGURE_ARGS=	--disable-debug \
Lines 35-41 Link Here
35
		--without-included-gettext \
36
		--without-included-gettext \
36
		--with-libintl-prefix=${LOCALBASE} \
37
		--with-libintl-prefix=${LOCALBASE} \
37
		--with-libiconv-prefix=${LOCALBASE} \
38
		--with-libiconv-prefix=${LOCALBASE} \
38
		--with-wx-config=${WX_CONFIG} \
39
		--with-curl-config=${CURL_CONFIG} \
39
		--with-curl-config=${CURL_CONFIG} \
40
		--enable-embedded_crypto \
40
		--enable-embedded_crypto \
41
		--enable-monolithic
41
		--enable-monolithic
Lines 53-59 Link Here
53
		ALC "Compile aMule Link Creator (+GUI)" on \
53
		ALC "Compile aMule Link Creator (+GUI)" on \
54
		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off
54
		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off
55
55
56
WX_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
57
CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
56
CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
58
57
59
.include <bsd.port.pre.mk>
58
.include <bsd.port.pre.mk>
(-)net-p2p/mute-net/Makefile (-3 / +1 lines)
Lines 29-37 Link Here
29
PATCH_WRKSRC=	${WRKDIR}/${RELEASE_DIRECTORY}
29
PATCH_WRKSRC=	${WRKDIR}/${RELEASE_DIRECTORY}
30
30
31
.ifndef(WITHOUT_GUI)
31
.ifndef(WITHOUT_GUI)
32
LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
32
USE_WX=		2.4
33
34
WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
35
.endif
33
.endif
36
34
37
#
35
#
(-)net-p2p/py-bittornado/Makefile (-1 / +2 lines)
Lines 47-53 Link Here
47
47
48
# required for GUI
48
# required for GUI
49
.ifndef(WITHOUT_GUI)
49
.ifndef(WITHOUT_GUI)
50
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
50
USE_WX=		2.4
51
WX_COMPS=	python
51
PLIST_SUB+=	GUI=''
52
PLIST_SUB+=	GUI=''
52
EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
53
EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
53
.else
54
.else
(-)net-p2p/py-kenosis-bittorrent/Makefile (-1 / +2 lines)
Lines 47-53 Link Here
47
47
48
# required for GUI
48
# required for GUI
49
.ifndef(WITHOUT_GUI)
49
.ifndef(WITHOUT_GUI)
50
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
50
USE_WX=		2.4
51
WX_COMPS=	python
51
52
52
EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
53
EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
53
54
(-)net-p2p/pyslsk/Makefile (-11 / +3 lines)
Lines 14-22 Link Here
14
MAINTAINER=	shoesoft@gmx.net
14
MAINTAINER=	shoesoft@gmx.net
15
COMMENT=	Client for SoulSeek filesharing system
15
COMMENT=	Client for SoulSeek filesharing system
16
16
17
BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
18
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
19
20
.if !defined(WITHOUT_VORBIS)
17
.if !defined(WITHOUT_VORBIS)
21
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
18
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
22
.endif
19
.endif
Lines 27-38 Link Here
27
24
28
USE_PYTHON=	yes
25
USE_PYTHON=	yes
29
USE_PYDISTUTILS=yes
26
USE_PYDISTUTILS=yes
27
USE_WX=		2.6
28
WX_COMPS=	python
30
29
31
.include <bsd.port.pre.mk>
30
.include <bsd.port.mk>
32
33
pre-install:
34
.if exists(${PYTHON_SITELIBDIR}/wx/__init__.py)
35
BROKEN=	"pyslsk only works with py-wxPython >= 2.6, please deinstall old version first"
36
.endif
37
38
.include <bsd.port.post.mk>
(-)net-p2p/xmule/Makefile (-6 / +4 lines)
Lines 17-24 Link Here
17
COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library
17
COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library
18
18
19
BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
19
BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
20
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
20
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
21
		wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
22
RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
21
RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
23
22
24
USE_GETTEXT=	yes
23
USE_GETTEXT=	yes
Lines 28-41 Link Here
28
		gnomehack \
27
		gnomehack \
29
		gnomeprefix
28
		gnomeprefix
30
USE_GMAKE=	yes
29
USE_GMAKE=	yes
30
USE_WX=		2.6
31
WX_CONF_ARGS=	absolute
31
GNU_CONFIGURE=	yes
32
GNU_CONFIGURE=	yes
32
CONFIGURE_ARGS=	--without-included-gettext \
33
CONFIGURE_ARGS=	--without-included-gettext \
33
		--with-cryptopp-prefix=${LOCALBASE} \
34
		--with-cryptopp-prefix=${LOCALBASE} \
34
		--with-gtk-prefix=${X11BASE} \
35
		--with-gtk-prefix=${X11BASE} \
35
		--with-libiconv-prefix=${LOCALBASE} \
36
		--with-libiconv-prefix=${LOCALBASE} \
36
		--with-libintl-prefix=${LOCALBASE} \
37
		--with-libintl-prefix=${LOCALBASE} \
37
		--enable-debug \
38
		--enable-debug
38
		--with-wx-config=${WX_CONFIG}
39
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
39
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
40
		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
40
		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
41
MAKE_ARGS=	-e
41
MAKE_ARGS=	-e
Lines 44-51 Link Here
44
# for debugging purposes
44
# for debugging purposes
45
STRIP=
45
STRIP=
46
46
47
WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.6-config
48
49
FILES_ATOLL_PATCH=	src/Preferences.cpp \
47
FILES_ATOLL_PATCH=	src/Preferences.cpp \
50
			src/otherfunctions.cpp
48
			src/otherfunctions.cpp
51
FILES_STDINT_PATCH=	\
49
FILES_STDINT_PATCH=	\
(-)science/py-scipy/Makefile (-2 / +3 lines)
Lines 20-32 Link Here
20
20
21
BUILD_DEPENDS=	${PYNUMERIC} \
21
BUILD_DEPENDS=	${PYNUMERIC} \
22
		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
22
		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
23
		f2py:${PORTSDIR}/lang/f2py \
23
		f2py:${PORTSDIR}/lang/f2py
24
		${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
25
LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
24
LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
26
		atlas.1:${PORTSDIR}/math/atlas
25
		atlas.1:${PORTSDIR}/math/atlas
27
26
28
USE_PYTHON=	2.3+
27
USE_PYTHON=	2.3+
29
USE_PYDISTUTILS=	yes
28
USE_PYDISTUTILS=	yes
29
USE_WX=		2.4
30
WX_COMPS=	python
30
31
31
post-patch:
32
post-patch:
32
	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
33
	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
(-)security/hashish/Makefile (-3 / +2 lines)
Lines 18-30 Link Here
18
COMMENT=	GUI file and string hashing utility
18
COMMENT=	GUI file and string hashing utility
19
19
20
BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
20
BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
21
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
22
21
22
USE_WX=		2.4
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
24
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
25
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
26
		LDFLAGS="-L${LOCALBASE}/lib" \
26
		LDFLAGS="-L${LOCALBASE}/lib"
27
		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config"
28
USE_GMAKE=	yes
27
USE_GMAKE=	yes
29
PLIST_FILES=	bin/hashish
28
PLIST_FILES=	bin/hashish
30
29
(-)security/newpki-client/Makefile (-3 / +2 lines)
Lines 15-30 Link Here
15
COMMENT=	C++ PKI client from newpki project
15
COMMENT=	C++ PKI client from newpki project
16
16
17
LIB_DEPENDS=	newpki.2:${PORTSDIR}/security/newpki-lib \
17
LIB_DEPENDS=	newpki.2:${PORTSDIR}/security/newpki-lib \
18
		xml2:${PORTSDIR}/textproc/libxml2 \
18
		xml2:${PORTSDIR}/textproc/libxml2
19
		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
20
19
21
WRKSRC=		${WRKDIR}/${PORTNAME}-2.0.0
20
WRKSRC=		${WRKDIR}/${PORTNAME}-2.0.0
22
21
23
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
24
USE_OPENSSL=	yes
23
USE_OPENSSL=	yes
25
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
26
USE_GNOME=	gnometarget
24
USE_GNOME=	gnometarget
27
USE_GMAKE=	yes
25
USE_GMAKE=	yes
26
USE_WX=		2.4
28
27
29
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
28
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
30
		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib" \
29
		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib" \
(-)security/newpki-client/files/patch-configure (-2 / +2 lines)
Lines 55-62 Link Here
55
 
55
 
56
-WXCXX=`wx-config --cxxflags`
56
-WXCXX=`wx-config --cxxflags`
57
-WXLIB=`wx-config --libs`
57
-WXLIB=`wx-config --libs`
58
+WXCXX=`${WXCONFIG} --cxxflags`
58
+WXCXX=`${WX_CONFIG} --cxxflags`
59
+WXLIB=`${WXCONFIG} --libs`
59
+WXLIB=`${WX_CONFIG} --libs`
60
 
60
 
61
 CPPFLAGS="$WXCXX -DWXINTL_NO_GETTEXT_MACRO $CPPFLAGS"
61
 CPPFLAGS="$WXCXX -DWXINTL_NO_GETTEXT_MACRO $CPPFLAGS"
62
 LIBS="$WXLIB -lnewpki $LIBS"
62
 LIBS="$WXLIB -lnewpki $LIBS"
(-)sysutils/bacula-server/Makefile (-2 / +1 lines)
Lines 118-126 Link Here
118
.endif
118
.endif
119
# Build wx-console
119
# Build wx-console
120
.if defined(WITH_WXCONSOLE)
120
.if defined(WITH_WXCONSOLE)
121
USE_WX=			2.4
121
CONFIGURE_ARGS+=	--enable-wx-console
122
CONFIGURE_ARGS+=	--enable-wx-console
122
LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
123
CONFIGURE_ENV+=		WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config
124
PLIST_SUB+=		WXCONS=""
123
PLIST_SUB+=		WXCONS=""
125
.else
124
.else
126
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
125
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
(-)sysutils/bacula-server-devel/Makefile (-2 / +1 lines)
Lines 115-123 Link Here
115
.endif
115
.endif
116
# Build wx-console
116
# Build wx-console
117
.if defined(WITH_WXCONSOLE)
117
.if defined(WITH_WXCONSOLE)
118
USE_WX=			2.4
118
CONFIGURE_ARGS+=	--enable-wx-console
119
CONFIGURE_ARGS+=	--enable-wx-console
119
LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
120
CONFIGURE_ENV+=		WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config
121
PLIST_SUB+=		WXCONS=""
120
PLIST_SUB+=		WXCONS=""
122
.else
121
.else
123
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
122
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
(-)textproc/py-dsv/Makefile (-1 / +2 lines)
Lines 17-23 Link Here
17
COMMENT=	A Python module to parse or write delimeter-separated (e.g. CSV) files
17
COMMENT=	A Python module to parse or write delimeter-separated (e.g. CSV) files
18
18
19
.if defined(WITH_GUI)
19
.if defined(WITH_GUI)
20
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
20
USE_WX=		2.4
21
WX_COMPS=	python
21
.endif
22
.endif
22
23
23
USE_PYTHON=	yes
24
USE_PYTHON=	yes
(-)x11-fm/jaffm/Makefile (-13 / +2 lines)
Lines 14-22 Link Here
14
MAINTAINER=	shaun@FreeBSD.org
14
MAINTAINER=	shaun@FreeBSD.org
15
COMMENT=	A lightweight file manager inspired by MacOS Finder
15
COMMENT=	A lightweight file manager inspired by MacOS Finder
16
16
17
WXGTK_VER?=	2.6
18
19
USE_BZIP2=	yes
17
USE_BZIP2=	yes
18
USE_WX=		2.4-2.6
20
USE_X_PREFIX=	yes
19
USE_X_PREFIX=	yes
21
ALL_TARGET=	${PORTNAME}
20
ALL_TARGET=	${PORTNAME}
22
21
Lines 24-42 Link Here
24
23
25
.include <bsd.port.pre.mk>
24
.include <bsd.port.pre.mk>
26
25
27
.if ${WXGTK_VER} == "2.4" || \
28
    (exists(${X11BASE}/bin/wxgtk2-2.4-config) && \
29
    !exists(${X11BASE}/bin/wxgtk2-2.6-config))
30
LIB_DEPENDS+=	wx_gtk2_core-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
31
WXGTK_VER=	2.4
32
.else
33
LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
34
WXGTK_VER=	2.6
35
.endif
36
37
post-patch:
26
post-patch:
38
	@${REINPLACE_CMD} -e 's#^PREFIX=.*#PREFIX=${PREFIX}#' \
27
	@${REINPLACE_CMD} -e 's#^PREFIX=.*#PREFIX=${PREFIX}#' \
39
		-e 's#$$(shell wx-config \(.*\))#`${X11BASE}/bin/wxgtk2-${WXGTK_VER}-config \1`#' \
28
		-e 's#$$(shell wx-config \(.*\))#`${WX_CONFIG} \1`#' \
40
		-e 's#^FLAGS=-ggdb#FLAGS=${CFLAGS}#' \
29
		-e 's#^FLAGS=-ggdb#FLAGS=${CFLAGS}#' \
41
		${WRKSRC}/Makefile
30
		${WRKSRC}/Makefile
42
31
(-)x11-toolkits/py-SciParam/Makefile (-2 / +2 lines)
Lines 19-29 Link Here
19
MAINTAINER=	ports@FreeBSD.org
19
MAINTAINER=	ports@FreeBSD.org
20
COMMENT=	Scientific Parameter Dialogs in wxPython based user interfaces
20
COMMENT=	Scientific Parameter Dialogs in wxPython based user interfaces
21
21
22
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
23
24
USE_BZIP2=	yes
22
USE_BZIP2=	yes
25
USE_PYTHON=	yes
23
USE_PYTHON=	yes
26
USE_PYDISTUTILS=	yes
24
USE_PYDISTUTILS=	yes
25
USE_WX=		2.4
26
WX_COMPS=	python
27
27
28
.if !defined(NOPORTDOCS)
28
.if !defined(NOPORTDOCS)
29
DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
29
DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
(-)x11-toolkits/py-wxPython24/Makefile (-3 / +1 lines)
Lines 26-31 Link Here
26
USE_PYTHON=	yes
26
USE_PYTHON=	yes
27
USE_PYDISTUTILS=yes
27
USE_PYDISTUTILS=yes
28
PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}"
28
PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}"
29
USE_WX=		2.4
29
DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
30
DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
30
31
31
post-build:
32
post-build:
Lines 52-60 Link Here
52
BROKEN=		"Does not build on ia64"
53
BROKEN=		"Does not build on ia64"
53
.endif
54
.endif
54
55
55
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
56
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
57
58
CONFIGURE_ARGS+=	--enable-gtk2
56
CONFIGURE_ARGS+=	--enable-gtk2
59
PYDISTUTILS_BUILDARGS+=	WXPORT=gtk2
57
PYDISTUTILS_BUILDARGS+=	WXPORT=gtk2
60
PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS}
58
PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS}
(-)x11-toolkits/py-wxPython26/Makefile (-20 / +7 lines)
Lines 29-34 Link Here
29
			WX_CONFIG="${WX_CONFIG}" \
29
			WX_CONFIG="${WX_CONFIG}" \
30
			WXPORT="${WXPORT}"
30
			WXPORT="${WXPORT}"
31
PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
31
PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
32
USE_WX=		2.6
33
WX_COMPS=	contrib
34
WX_PREMK=	yes
32
DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
35
DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
33
WXPORT=		gtk2
36
WXPORT=		gtk2
34
37
Lines 64-90 Link Here
64
.include <bsd.port.pre.mk>
67
.include <bsd.port.pre.mk>
65
68
66
# are we ready for unicode?
69
# are we ready for unicode?
67
.if defined(WITH_UNICODE)
70
.if defined(WITH_WXPYTHON_UNICODE)
68
. if ${OSVERSION} < 500000
71
. if ${OSVERSION} < 500000
69
IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
72
IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
70
. endif
73
. endif
71
.endif
74
.endif
72
75
73
# build dependencies
74
.if defined(WITH_UNICODE)
75
BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
76
77
WX_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
78
.else
79
BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
80
81
WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
82
.endif
83
84
# wx version
76
# wx version
85
.if exists(${WX_CONFIG})
77
.if exists(${WX_CONFIG})
86
WX_VERSION!=	${WX_CONFIG} --release
78
WX_VERSION!=	${WX_CONFIG} --release
87
88
PLIST_SUB+=	WX_VERSION=${WX_VERSION}
79
PLIST_SUB+=	WX_VERSION=${WX_VERSION}
89
.endif
80
.endif
90
81
Lines 104-112 Link Here
104
			INSTALL_MULTIVERSION=0
95
			INSTALL_MULTIVERSION=0
105
INSTALLS_SHLIB=	yes
96
INSTALLS_SHLIB=	yes
106
97
107
. if defined(WITH_UNICODE)
98
. if defined(WITH_WXPYTHON_UNICODE)
108
LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
99
WX_UNICODE=	yes
109
		wx_gtk2u_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
110
100
111
PKGNAMESUFFIX=	-unicode
101
PKGNAMESUFFIX=	-unicode
112
102
Lines 114-124 Link Here
114
			UNICODE=1
104
			UNICODE=1
115
WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
105
WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
116
. else
106
. else
117
LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
118
		wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
119
120
WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
107
WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
121
. endif # defined(WITH_UNICODE)
108
. endif # defined(WITH_WXPYTHON_UNICODE)
122
109
123
# plist substitutions and library dirs
110
# plist substitutions and library dirs
124
PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
111
PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
(-)x11-toolkits/py-wxPython26-common/Makefile (-2 lines)
Lines 13-18 Link Here
13
13
14
PLIST=	${.CURDIR}/pkg-plist
14
PLIST=	${.CURDIR}/pkg-plist
15
15
16
LIB_DEPENDS+=  wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
17
18
.include "${MASTERDIR}/Makefile"
16
.include "${MASTERDIR}/Makefile"
(-)x11-toolkits/py-wxPython26-unicode/Makefile (-1 / +1 lines)
Lines 5-11 Link Here
5
# $FreeBSD: ports/x11-toolkits/py-wxPython26-unicode/Makefile,v 1.1 2005/10/02 08:21:42 lioux Exp $
5
# $FreeBSD: ports/x11-toolkits/py-wxPython26-unicode/Makefile,v 1.1 2005/10/02 08:21:42 lioux Exp $
6
#
6
#
7
7
8
WITH_UNICODE=	yes
8
WITH_WXPYTHON_UNICODE=	yes
9
9
10
MASTERDIR=	${.CURDIR}/../py-wxPython26
10
MASTERDIR=	${.CURDIR}/../py-wxPython26
11
11
(-)x11-toolkits/ruby-wx/Makefile (-4 / +3 lines)
Lines 17-28 Link Here
17
MAINTAINER=	ports@FreeBSD.org
17
MAINTAINER=	ports@FreeBSD.org
18
COMMENT=	Ruby bindings for wxWindows (aka wxWidgets)
18
COMMENT=	Ruby bindings for wxWindows (aka wxWidgets)
19
19
20
LIB_DEPENDS=	wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk24 \
21
		wx_gtk2_xrc-2.4:${PORTSDIR}/x11-toolkits/wxgtk24-contrib
22
23
USE_ICONV=	yes
20
USE_ICONV=	yes
24
USE_RUBY=	yes
21
USE_RUBY=	yes
25
USE_RUBY_EXTCONF=	yes
22
USE_RUBY_EXTCONF=	yes
23
USE_WX=		2.4
24
WX_COMPS=	contrib
26
25
27
.include <bsd.port.pre.mk>
26
.include <bsd.port.pre.mk>
28
27
Lines 36-42 Link Here
36
post-patch:
35
post-patch:
37
	@${FIND} ${WRKSRC} -name *.t | ${XARGS} ${REINPLACE_CMD} -e 's|
||'
36
	@${FIND} ${WRKSRC} -name *.t | ${XARGS} ${REINPLACE_CMD} -e 's|
||'
38
	@${REINPLACE_CMD} -E 's/ html(processor|window).o//' ${WRKSRC}/depend
37
	@${REINPLACE_CMD} -E 's/ html(processor|window).o//' ${WRKSRC}/depend
39
	@${REINPLACE_CMD} -e 's/wx-config/wxgtk2-2.4-config/' ${WRKSRC}/extconf.rb
38
	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG:T}|' ${WRKSRC}/extconf.rb
40
39
41
.if !defined(NOPORTDOCS)
40
.if !defined(NOPORTDOCS)
42
post-install:
41
post-install:
(-)x11-toolkits/wxgtk24-contrib/Makefile (-1 / +1 lines)
Lines 10-18 Link Here
10
MAINTAINER=	fjoe@FreeBSD.org
10
MAINTAINER=	fjoe@FreeBSD.org
11
COMMENT=	The wxWidgets GUI toolkit contributed libraries
11
COMMENT=	The wxWidgets GUI toolkit contributed libraries
12
12
13
USE_WX=		2.4
13
WXGTK_FLAVOR=	gtk2-contrib
14
WXGTK_FLAVOR=	gtk2-contrib
14
MASTERDIR=	${.CURDIR}/../wxgtk24
15
MASTERDIR=	${.CURDIR}/../wxgtk24
15
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
16
16
17
BUILD_WRKSRC=	${WRKSRC}/contrib/src
17
BUILD_WRKSRC=	${WRKSRC}/contrib/src
18
INSTALL_WRKSRC=	${BUILD_WRKSRC}
18
INSTALL_WRKSRC=	${BUILD_WRKSRC}
(-)x11-toolkits/wxgtk26/Makefile (-20 / +9 lines)
Lines 66-71 Link Here
66
.endif # *-common
66
.endif # *-common
67
67
68
.if ${WXGTK_FLAVOR:M*-contrib*} != ""
68
.if ${WXGTK_FLAVOR:M*-contrib*} != ""
69
USE_WX=		2.6
69
BUILD_WRKSRC=	${WRKSRC}/contrib
70
BUILD_WRKSRC=	${WRKSRC}/contrib
70
INSTALL_WRKSRC=	${BUILD_WRKSRC}
71
INSTALL_WRKSRC=	${BUILD_WRKSRC}
71
72
Lines 73-109 Link Here
73
RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
74
RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
74
75
75
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
76
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
76
LIB_DEPENDS+=	wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
77
WX_UNICODE=	yes
77
.else
78
LIB_DEPENDS+=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
79
.endif
78
.endif
80
79
81
pre-configure:
80
pre-configure:
82
	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
81
	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
83
		-e "s|@CXXFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cxxflags`|" \
82
		-e "s|@CXXFLAGS@|${CFLAGS} `${WX_CONFIG} --cxxflags`|" \
84
		-e "s|@CFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cflags`|" \
83
		-e "s|@CFLAGS@|${CFLAGS} `${WX_CONFIG} --cflags`|" \
85
		-e "s|@CPPFLAGS@||"
84
		-e "s|@CPPFLAGS@||"
86
85
87
.endif # !gtk2-contrib-common
86
.endif # !gtk2-contrib-common
88
.endif # *-contrib*
87
.endif # *-contrib*
89
88
90
post-patch:
91
	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
92
		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
93
			${WRKSRC}/configure
94
95
.include <bsd.port.pre.mk>
96
97
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
89
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
98
.if ${OSVERSION} < 500000
99
IGNORE=	systems prior to FreeBSD 5.0 currently out of support
100
.else
101
CONFIGURE_ARGS+=--enable-unicode
90
CONFIGURE_ARGS+=--enable-unicode
102
.endif
91
.endif
103
92
104
WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
93
post-patch:
105
.else
94
	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
106
WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
95
		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
107
.endif # *-unicode*
96
			${WRKSRC}/configure
108
97
109
.include <bsd.port.post.mk>
98
.include <bsd.port.mk>
(-)x11-toolkits/wxmozilla/Makefile (-6 / +4 lines)
Lines 16-31 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	Embedding Mozilla in wxWidgets
17
COMMENT=	Embedding Mozilla in wxWidgets
18
18
19
BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
20
LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
21
RUN_DEPENDS=	${BUILD_DEPENDS}
22
23
USE_PYTHON=	yes
19
USE_PYTHON=	yes
24
USE_GNOME=	gnomehack gnometarget
20
USE_GNOME=	gnomehack gnometarget
25
USE_GECKO=	mozilla
21
USE_GECKO=	mozilla
26
WXGTK_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
27
USE_AUTOTOOLS=	libtool:15
22
USE_AUTOTOOLS=	libtool:15
28
CONFIGURE_ARGS=	--with-wx-config=${WXGTK_CONFIG} --enable-python
23
CONFIGURE_ARGS=	--enable-python
24
USE_WX=		2.4
25
WX_COMPS=	python
26
WX_CONF_ARGS=	absolute
29
INSTALLS_SHLIB=	yes
27
INSTALLS_SHLIB=	yes
30
28
31
.include <bsd.port.pre.mk>
29
.include <bsd.port.pre.mk>

Return to bug 101613