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

Collapse All | Expand All

(-)i/x11-toolkits/wxgtk31/Makefile (-4 / +18 lines)
Lines 4-10 PORTNAME= wx Link Here
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	3.1.1
5
DISTVERSION=	3.1.1
6
CATEGORIES=	x11-toolkits
6
CATEGORIES=	x11-toolkits
7
PKGNAMESUFFIX=	31-gtk2
7
PKGNAMESUFFIX=	31-${FLAVOR}
8
8
9
MAINTAINER=	yuri@FreeBSD.org
9
MAINTAINER=	yuri@FreeBSD.org
10
COMMENT=	GUI toolkit (wxWidgets) with GTK+ bindings
10
COMMENT=	GUI toolkit (wxWidgets) with GTK+ bindings
Lines 12-17 COMMENT= GUI toolkit (wxWidgets) with GTK+ bindings Link Here
12
LICENSE=	GPLv2+
12
LICENSE=	GPLv2+
13
LICENSE_FILE=	${WRKSRC}/docs/gpl.txt
13
LICENSE_FILE=	${WRKSRC}/docs/gpl.txt
14
14
15
FLAVORS=	gtk2 gtk3
16
FLAVOR?=	${FLAVORS:[1]}
17
15
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
18
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
16
		libfontconfig.so:x11-fonts/fontconfig \
19
		libfontconfig.so:x11-fonts/fontconfig \
17
		libfreetype.so:print/freetype2 \
20
		libfreetype.so:print/freetype2 \
Lines 29-35 GH_PROJECT= wxWidgets Link Here
29
GNU_CONFIGURE=	yes
32
GNU_CONFIGURE=	yes
30
USE_XORG=	x11 sm xxf86vm xtst
33
USE_XORG=	x11 sm xxf86vm xtst
31
USE_GL=		gl glu
34
USE_GL=		gl glu
32
USE_GNOME=	cairo gdkpixbuf2 gtk20
35
USE_GNOME=	cairo gdkpixbuf2
33
USE_LDCONFIG=	yes
36
USE_LDCONFIG=	yes
34
USE_CXXSTD=	c++11
37
USE_CXXSTD=	c++11
35
CONFIGURE_ARGS=	--with-libpng=sys \
38
CONFIGURE_ARGS=	--with-libpng=sys \
Lines 38-44 CONFIGURE_ARGS= --with-libpng=sys \ Link Here
38
		--with-zlib=sys \
41
		--with-zlib=sys \
39
		--with-expat=sys \
42
		--with-expat=sys \
40
		--with-opengl \
43
		--with-opengl \
41
		--with-gtk \
42
		--without-gnomevfs \
44
		--without-gnomevfs \
43
		--disable-epollloop \
45
		--disable-epollloop \
44
		--disable-joystick \
46
		--disable-joystick \
Lines 51-56 CONFIGURE_ARGS= --with-libpng=sys \ Link Here
51
		--enable-compat30
53
		--enable-compat30
52
CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
54
CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
53
		ac_cv_header_sys_inotify_h=no
55
		ac_cv_header_sys_inotify_h=no
56
PLIST_SUB=	FLAVOR="${FLAVOR}"
54
57
55
OPTIONS_DEFINE=		GSTREAMER MSPACK NLS WEBKIT
58
OPTIONS_DEFINE=		GSTREAMER MSPACK NLS WEBKIT
56
OPTIONS_DEFAULT=	GSTREAMER MSPACK WEBKIT
59
OPTIONS_DEFAULT=	GSTREAMER MSPACK WEBKIT
Lines 66-72 MSPACK_CONFIGURE_WITH= libmspack Link Here
66
MSPACK_LIB_DEPENDS=		libmspack.so:archivers/libmspack
69
MSPACK_LIB_DEPENDS=		libmspack.so:archivers/libmspack
67
70
68
WEBKIT_CONFIGURE_ENABLE=	webview
71
WEBKIT_CONFIGURE_ENABLE=	webview
69
WEBKIT_LIB_DEPENDS=		libwebkitgtk-1.0.so:www/webkit-gtk2
72
73
.if ${FLAVOR} == gtk2
74
CONFIGURE_ARGS+=	--with-gtk=2
75
USE_GNOME+=		gtk20
76
PLIST_SUB+=		GTK2="" GTK3="@comment "
77
WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
78
.else
79
CONFIGURE_ARGS+=	--with-gtk=3
80
USE_GNOME+=		gtk30
81
PLIST_SUB+=		GTK2="@comment " GTK3=""
82
WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
83
.endif
70
84
71
.include <bsd.port.pre.mk>
85
.include <bsd.port.pre.mk>
72
86
(-)i/x11-toolkits/wxgtk31/files/patch-Makefile.in (+8 lines)
Lines 8-13 Link Here
8
 INSTALL_DATA = @INSTALL_DATA@
8
 INSTALL_DATA = @INSTALL_DATA@
9
 INSTALL_DIR = @INSTALL_DIR@
9
 INSTALL_DIR = @INSTALL_DIR@
10
 ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
10
 ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
11
@@ -54,6 +55,7 @@
12
 TOOLKIT = @TOOLKIT@
13
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
14
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
15
+TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
16
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
17
 EXTRALIBS = @EXTRALIBS@
18
 EXTRALIBS_XML = @EXTRALIBS_XML@
11
@@ -15214,9 +15215,9 @@
19
@@ -15214,9 +15215,9 @@
12
 
20
 
13
 install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
21
 install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
(-)i/x11-toolkits/wxgtk31/pkg-plist (-44 / +45 lines)
Lines 1-5 Link Here
1
bin/wx-config
1
bin/wx%%FLAVOR%%u-3.1-config
2
bin/wxrc-gtk2u-3.1
2
bin/wxrc-%%FLAVOR%%u-3.1
3
include/wx-3.1/wx/aboutdlg.h
3
include/wx-3.1/wx/aboutdlg.h
4
include/wx-3.1/wx/accel.h
4
include/wx-3.1/wx/accel.h
5
include/wx-3.1/wx/access.h
5
include/wx-3.1/wx/access.h
Lines 29-35 include/wx-3.1/wx/aui/dockart.h Link Here
29
include/wx-3.1/wx/aui/floatpane.h
29
include/wx-3.1/wx/aui/floatpane.h
30
include/wx-3.1/wx/aui/framemanager.h
30
include/wx-3.1/wx/aui/framemanager.h
31
include/wx-3.1/wx/aui/tabart.h
31
include/wx-3.1/wx/aui/tabart.h
32
include/wx-3.1/wx/aui/tabartgtk.h
32
%%GTK2%%include/wx-3.1/wx/aui/tabartgtk.h
33
include/wx-3.1/wx/aui/tabmdi.h
33
include/wx-3.1/wx/aui/tabmdi.h
34
include/wx-3.1/wx/bannerwindow.h
34
include/wx-3.1/wx/bannerwindow.h
35
include/wx-3.1/wx/base64.h
35
include/wx-3.1/wx/base64.h
Lines 183-189 include/wx-3.1/wx/generic/dvrenderers.h Link Here
183
include/wx-3.1/wx/generic/fdrepdlg.h
183
include/wx-3.1/wx/generic/fdrepdlg.h
184
include/wx-3.1/wx/generic/filectrlg.h
184
include/wx-3.1/wx/generic/filectrlg.h
185
include/wx-3.1/wx/generic/filepickerg.h
185
include/wx-3.1/wx/generic/filepickerg.h
186
include/wx-3.1/wx/generic/fontdlgg.h
186
%%GTK2%%include/wx-3.1/wx/generic/fontdlgg.h
187
include/wx-3.1/wx/generic/fswatcher.h
187
include/wx-3.1/wx/generic/fswatcher.h
188
include/wx-3.1/wx/generic/grid.h
188
include/wx-3.1/wx/generic/grid.h
189
include/wx-3.1/wx/generic/gridctrl.h
189
include/wx-3.1/wx/generic/gridctrl.h
Lines 728-773 lib/libwx_baseu_net-3.1.so.1.0.0 Link Here
728
lib/libwx_baseu_xml-3.1.so
728
lib/libwx_baseu_xml-3.1.so
729
lib/libwx_baseu_xml-3.1.so.1
729
lib/libwx_baseu_xml-3.1.so.1
730
lib/libwx_baseu_xml-3.1.so.1.0.0
730
lib/libwx_baseu_xml-3.1.so.1.0.0
731
lib/libwx_gtk2u_adv-3.1.so
731
lib/libwx_%%FLAVOR%%u_adv-3.1.so
732
lib/libwx_gtk2u_adv-3.1.so.1
732
lib/libwx_%%FLAVOR%%u_adv-3.1.so.1
733
lib/libwx_gtk2u_adv-3.1.so.1.0.0
733
lib/libwx_%%FLAVOR%%u_adv-3.1.so.1.0.0
734
lib/libwx_gtk2u_aui-3.1.so
734
lib/libwx_%%FLAVOR%%u_aui-3.1.so
735
lib/libwx_gtk2u_aui-3.1.so.1
735
lib/libwx_%%FLAVOR%%u_aui-3.1.so.1
736
lib/libwx_gtk2u_aui-3.1.so.1.0.0
736
lib/libwx_%%FLAVOR%%u_aui-3.1.so.1.0.0
737
lib/libwx_gtk2u_core-3.1.so
737
lib/libwx_%%FLAVOR%%u_core-3.1.so
738
lib/libwx_gtk2u_core-3.1.so.1
738
lib/libwx_%%FLAVOR%%u_core-3.1.so.1
739
lib/libwx_gtk2u_core-3.1.so.1.0.0
739
lib/libwx_%%FLAVOR%%u_core-3.1.so.1.0.0
740
lib/libwx_gtk2u_gl-3.1.so
740
lib/libwx_%%FLAVOR%%u_gl-3.1.so
741
lib/libwx_gtk2u_gl-3.1.so.1
741
lib/libwx_%%FLAVOR%%u_gl-3.1.so.1
742
lib/libwx_gtk2u_gl-3.1.so.1.0.0
742
lib/libwx_%%FLAVOR%%u_gl-3.1.so.1.0.0
743
lib/libwx_gtk2u_html-3.1.so
743
lib/libwx_%%FLAVOR%%u_html-3.1.so
744
lib/libwx_gtk2u_html-3.1.so.1
744
lib/libwx_%%FLAVOR%%u_html-3.1.so.1
745
lib/libwx_gtk2u_html-3.1.so.1.0.0
745
lib/libwx_%%FLAVOR%%u_html-3.1.so.1.0.0
746
%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so
746
%%GSTREAMER%%lib/libwx_%%FLAVOR%%u_media-3.1.so
747
%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so.1
747
%%GSTREAMER%%lib/libwx_%%FLAVOR%%u_media-3.1.so.1
748
%%GSTREAMER%%lib/libwx_gtk2u_media-3.1.so.1.0.0
748
%%GSTREAMER%%lib/libwx_%%FLAVOR%%u_media-3.1.so.1.0.0
749
lib/libwx_gtk2u_propgrid-3.1.so
749
lib/libwx_%%FLAVOR%%u_propgrid-3.1.so
750
lib/libwx_gtk2u_propgrid-3.1.so.1
750
lib/libwx_%%FLAVOR%%u_propgrid-3.1.so.1
751
lib/libwx_gtk2u_propgrid-3.1.so.1.0.0
751
lib/libwx_%%FLAVOR%%u_propgrid-3.1.so.1.0.0
752
lib/libwx_gtk2u_qa-3.1.so
752
lib/libwx_%%FLAVOR%%u_qa-3.1.so
753
lib/libwx_gtk2u_qa-3.1.so.1
753
lib/libwx_%%FLAVOR%%u_qa-3.1.so.1
754
lib/libwx_gtk2u_qa-3.1.so.1.0.0
754
lib/libwx_%%FLAVOR%%u_qa-3.1.so.1.0.0
755
lib/libwx_gtk2u_ribbon-3.1.so
755
lib/libwx_%%FLAVOR%%u_ribbon-3.1.so
756
lib/libwx_gtk2u_ribbon-3.1.so.1
756
lib/libwx_%%FLAVOR%%u_ribbon-3.1.so.1
757
lib/libwx_gtk2u_ribbon-3.1.so.1.0.0
757
lib/libwx_%%FLAVOR%%u_ribbon-3.1.so.1.0.0
758
lib/libwx_gtk2u_richtext-3.1.so
758
lib/libwx_%%FLAVOR%%u_richtext-3.1.so
759
lib/libwx_gtk2u_richtext-3.1.so.1
759
lib/libwx_%%FLAVOR%%u_richtext-3.1.so.1
760
lib/libwx_gtk2u_richtext-3.1.so.1.0.0
760
lib/libwx_%%FLAVOR%%u_richtext-3.1.so.1.0.0
761
lib/libwx_gtk2u_stc-3.1.so
761
lib/libwx_%%FLAVOR%%u_stc-3.1.so
762
lib/libwx_gtk2u_stc-3.1.so.1
762
lib/libwx_%%FLAVOR%%u_stc-3.1.so.1
763
lib/libwx_gtk2u_stc-3.1.so.1.0.0
763
lib/libwx_%%FLAVOR%%u_stc-3.1.so.1.0.0
764
%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so
764
%%WEBKIT%%lib/libwx_%%FLAVOR%%u_webview-3.1.so
765
%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so.1
765
%%WEBKIT%%lib/libwx_%%FLAVOR%%u_webview-3.1.so.1
766
%%WEBKIT%%lib/libwx_gtk2u_webview-3.1.so.1.0.0
766
%%WEBKIT%%lib/libwx_%%FLAVOR%%u_webview-3.1.so.1.0.0
767
lib/libwx_gtk2u_xrc-3.1.so
767
lib/libwx_%%FLAVOR%%u_xrc-3.1.so
768
lib/libwx_gtk2u_xrc-3.1.so.1
768
lib/libwx_%%FLAVOR%%u_xrc-3.1.so.1
769
lib/libwx_gtk2u_xrc-3.1.so.1.0.0
769
lib/libwx_%%FLAVOR%%u_xrc-3.1.so.1.0.0
770
lib/wx/include/gtk2-unicode-3.1/wx/setup.h
770
%%GTK3%%%%WEBKIT%%lib/wx/3.1.1/web-extensions/webkit2_extu-3.1.1.so
771
lib/wx/include/%%FLAVOR%%-unicode-3.1/wx/setup.h
771
share/aclocal/wxwin31.m4
772
share/aclocal/wxwin31.m4
772
share/bakefile/presets/wx31.bkl
773
share/bakefile/presets/wx31.bkl
773
share/bakefile/presets/wx31_presets.py
774
share/bakefile/presets/wx31_presets.py

Return to bug 228904