diff options
-rw-r--r-- | x11/wxGTK30/DESCR | 2 | ||||
-rw-r--r-- | x11/wxGTK30/Makefile | 41 | ||||
-rw-r--r-- | x11/wxGTK30/PLIST | 121 | ||||
-rw-r--r-- | x11/wxGTK30/PLIST.cocoa | 151 | ||||
-rw-r--r-- | x11/wxGTK30/PLIST.gtk2 | 111 | ||||
-rw-r--r-- | x11/wxGTK30/buildlink3.mk | 10 | ||||
-rw-r--r-- | x11/wxGTK30/distinfo | 10 | ||||
-rw-r--r-- | x11/wxGTK30/patches/manual-bakefile.diff | 38 | ||||
-rw-r--r-- | x11/wxGTK30/patches/manual-regen.diff | 40 |
9 files changed, 346 insertions, 178 deletions
diff --git a/x11/wxGTK30/DESCR b/x11/wxGTK30/DESCR index f1291de4f36..b7d159f12fa 100644 --- a/x11/wxGTK30/DESCR +++ b/x11/wxGTK30/DESCR @@ -1,4 +1,4 @@ -A GTK+-based implementation of the wxWidgets cross-platform GUI library. +The wxWidgets cross-platform GUI library. wxWidgets is a set of libraries that allows C++ applications to compile and run on several different types of computer, with minimal source code changes. diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index b364df1abf1..1f8a396c36a 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,29 +1,28 @@ -# $NetBSD: Makefile,v 1.13 2016/02/16 03:40:44 dbj Exp $ +# $NetBSD: Makefile,v 1.14 2016/02/17 10:16:05 dbj Exp $ VERSION= 3.0.2 -PKGREVISION= 4 +PKGREVISION= 5 DISTNAME= wxWidgets-${VERSION} PKGNAME= wxGTK30-${VERSION} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} EXTRACT_SUFX= .tar.bz2 +PATCHFILES= ${DISTNAME}-libtool.2.diff.bz2 +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_DIST_STRIP.${DISTNAME}-libtool.2.diff.bz2= -p1 + MAINTAINER= dbj@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ -COMMENT= GTK-based implementation of the wxWidgets GUI library +COMMENT= wxWidgets GUI library # LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows LICENSE= gnu-lgpl-v2 -PATCHFILES= ${DISTNAME}-libtool.diff.bz2 -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_DIST_STRIP.${DISTNAME}-libtool.diff.bz2= -p1 - USE_TOOLS+= pkg-config msgfmt USE_LIBTOOL= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_GNU_CONFIGURE_HOST= no -CONFIGURE_ARGS+= --with-gtk=2 CONFIGURE_ARGS+= --with-libpng=sys CONFIGURE_ARGS+= --with-libjpeg=sys CONFIGURE_ARGS+= --with-libtiff=sys @@ -38,7 +37,7 @@ CONFIGURE_ARGS+= --disable-visibility CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/wx-3.0 CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/wx-3.0 -DOCDIR= share/wx-3.0/doc/wxGTK +DOCDIR= share/wx-3.0/doc/wxWidgets INSTALL_MAKE_FLAGS+= LN_S="ln -fs" @@ -56,9 +55,22 @@ SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' .include "../../mk/bsd.prefs.mk" +PLIST_SRC+= ${PLIST_SRC_DFLT} PLIST_VARS+= notdarwin -.if ${OPSYS} != "Darwin" +.if ${OPSYS} == "Darwin" +# Without this, it will choose -macox-version-min=10.5 and +# hard code constants in the header files to match. +# Then any other packages that use it +# will fail unless they also set -macosx-version-min=10.5 +CONFIGURE_ARGS+= --with-macosx-version-min=no + +PLIST_SRC+= PLIST.cocoa +CONFIGURE_ARGS+= --with-osx_cocoa +.else PLIST.notdarwin= yes + +PLIST_SRC+= PLIST.gtk2 +CONFIGURE_ARGS+= --with-gtk=2 .endif .if ${OPSYS} == "SunOS" @@ -88,12 +100,9 @@ post-install: ${LN} -sf ../libexec/wx-3.0/wxrc-3.0 ${DESTDIR}${PREFIX}/bin/wxrc-3.0 ${LN} -sf ../libexec/wx-3.0/wx-config ${DESTDIR}${PREFIX}/bin/wx-config-3.0 -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" @@ -102,8 +111,12 @@ post-install: .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.if ${OPSYS} != "Darwin" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" - +.endif .include "../../mk/bsd.pkg.mk" diff --git a/x11/wxGTK30/PLIST b/x11/wxGTK30/PLIST index 991b7aec7ea..ff4fe4a918d 100644 --- a/x11/wxGTK30/PLIST +++ b/x11/wxGTK30/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2016/02/16 03:40:44 dbj Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/02/17 10:16:05 dbj Exp $ bin/wx-config-3.0 bin/wxrc-3.0 include/wx-3.0/wx/aboutdlg.h @@ -27,7 +27,6 @@ include/wx-3.0/wx/aui/dockart.h include/wx-3.0/wx/aui/floatpane.h include/wx-3.0/wx/aui/framemanager.h include/wx-3.0/wx/aui/tabart.h -include/wx-3.0/wx/aui/tabartgtk.h include/wx-3.0/wx/aui/tabmdi.h include/wx-3.0/wx/bannerwindow.h include/wx-3.0/wx/base64.h @@ -188,8 +187,6 @@ include/wx-3.0/wx/generic/gridsel.h include/wx-3.0/wx/generic/headerctrlg.h include/wx-3.0/wx/generic/helpext.h include/wx-3.0/wx/generic/hyperlink.h -include/wx-3.0/wx/generic/icon.h -include/wx-3.0/wx/generic/imaglist.h include/wx-3.0/wx/generic/infobar.h include/wx-3.0/wx/generic/laywin.h include/wx-3.0/wx/generic/listctrl.h @@ -198,7 +195,6 @@ include/wx-3.0/wx/generic/msgdlgg.h include/wx-3.0/wx/generic/notebook.h include/wx-3.0/wx/generic/notifmsg.h include/wx-3.0/wx/generic/numdlgg.h -include/wx-3.0/wx/generic/paletteg.h include/wx-3.0/wx/generic/panelg.h include/wx-3.0/wx/generic/printps.h include/wx-3.0/wx/generic/prntdlgg.h @@ -223,88 +219,6 @@ include/wx-3.0/wx/gifdecod.h include/wx-3.0/wx/glcanvas.h include/wx-3.0/wx/graphics.h include/wx-3.0/wx/grid.h -include/wx-3.0/wx/gtk/accel.h -include/wx-3.0/wx/gtk/animate.h -include/wx-3.0/wx/gtk/anybutton.h -include/wx-3.0/wx/gtk/app.h -include/wx-3.0/wx/gtk/assertdlg_gtk.h -include/wx-3.0/wx/gtk/bitmap.h -include/wx-3.0/wx/gtk/bmpbuttn.h -include/wx-3.0/wx/gtk/bmpcbox.h -include/wx-3.0/wx/gtk/brush.h -include/wx-3.0/wx/gtk/button.h -include/wx-3.0/wx/gtk/calctrl.h -include/wx-3.0/wx/gtk/checkbox.h -include/wx-3.0/wx/gtk/checklst.h -include/wx-3.0/wx/gtk/chkconf.h -include/wx-3.0/wx/gtk/choice.h -include/wx-3.0/wx/gtk/clipbrd.h -include/wx-3.0/wx/gtk/clrpicker.h -include/wx-3.0/wx/gtk/collpane.h -include/wx-3.0/wx/gtk/colordlg.h -include/wx-3.0/wx/gtk/colour.h -include/wx-3.0/wx/gtk/combobox.h -include/wx-3.0/wx/gtk/control.h -include/wx-3.0/wx/gtk/cursor.h -include/wx-3.0/wx/gtk/dataform.h -include/wx-3.0/wx/gtk/dataobj.h -include/wx-3.0/wx/gtk/dataobj2.h -include/wx-3.0/wx/gtk/dataview.h -include/wx-3.0/wx/gtk/dialog.h -include/wx-3.0/wx/gtk/dirdlg.h -include/wx-3.0/wx/gtk/dnd.h -include/wx-3.0/wx/gtk/dvrenderer.h -include/wx-3.0/wx/gtk/dvrenderers.h -include/wx-3.0/wx/gtk/evtloop.h -include/wx-3.0/wx/gtk/evtloopsrc.h -include/wx-3.0/wx/gtk/filectrl.h -include/wx-3.0/wx/gtk/filedlg.h -include/wx-3.0/wx/gtk/filehistory.h -include/wx-3.0/wx/gtk/filepicker.h -include/wx-3.0/wx/gtk/font.h -include/wx-3.0/wx/gtk/fontdlg.h -include/wx-3.0/wx/gtk/fontpicker.h -include/wx-3.0/wx/gtk/frame.h -include/wx-3.0/wx/gtk/gauge.h -include/wx-3.0/wx/gtk/glcanvas.h -include/wx-3.0/wx/gtk/gnome/gvfs.h -include/wx-3.0/wx/gtk/hildon/notifmsg.h -include/wx-3.0/wx/gtk/hyperlink.h -include/wx-3.0/wx/gtk/infobar.h -include/wx-3.0/wx/gtk/listbox.h -include/wx-3.0/wx/gtk/mdi.h -include/wx-3.0/wx/gtk/menu.h -include/wx-3.0/wx/gtk/menuitem.h -include/wx-3.0/wx/gtk/minifram.h -include/wx-3.0/wx/gtk/msgdlg.h -include/wx-3.0/wx/gtk/nonownedwnd.h -include/wx-3.0/wx/gtk/notebook.h -include/wx-3.0/wx/gtk/notifmsg.h -include/wx-3.0/wx/gtk/pen.h -include/wx-3.0/wx/gtk/popupwin.h -include/wx-3.0/wx/gtk/print.h -include/wx-3.0/wx/gtk/radiobox.h -include/wx-3.0/wx/gtk/radiobut.h -include/wx-3.0/wx/gtk/region.h -include/wx-3.0/wx/gtk/scrolbar.h -include/wx-3.0/wx/gtk/scrolwin.h -include/wx-3.0/wx/gtk/slider.h -include/wx-3.0/wx/gtk/spinbutt.h -include/wx-3.0/wx/gtk/spinctrl.h -include/wx-3.0/wx/gtk/statbmp.h -include/wx-3.0/wx/gtk/statbox.h -include/wx-3.0/wx/gtk/statline.h -include/wx-3.0/wx/gtk/stattext.h -include/wx-3.0/wx/gtk/taskbar.h -include/wx-3.0/wx/gtk/textctrl.h -include/wx-3.0/wx/gtk/textentry.h -include/wx-3.0/wx/gtk/tglbtn.h -include/wx-3.0/wx/gtk/toolbar.h -include/wx-3.0/wx/gtk/tooltip.h -include/wx-3.0/wx/gtk/toplevel.h -include/wx-3.0/wx/gtk/webview_webkit.h -include/wx-3.0/wx/gtk/webviewhistoryitem_webkit.h -include/wx-3.0/wx/gtk/window.h include/wx-3.0/wx/hash.h include/wx-3.0/wx/hashmap.h include/wx-3.0/wx/hashset.h @@ -426,8 +340,6 @@ include/wx-3.0/wx/power.h include/wx-3.0/wx/preferences.h include/wx-3.0/wx/print.h include/wx-3.0/wx/printdlg.h -include/wx-3.0/wx/private/pipestream.h -include/wx-3.0/wx/private/streamtempinput.h include/wx-3.0/wx/prntbase.h include/wx-3.0/wx/process.h include/wx-3.0/wx/progdlg.h @@ -577,21 +489,12 @@ include/wx-3.0/wx/unix/apptrait.h include/wx-3.0/wx/unix/chkconf.h include/wx-3.0/wx/unix/evtloop.h include/wx-3.0/wx/unix/evtloopsrc.h -include/wx-3.0/wx/unix/execute.h -include/wx-3.0/wx/unix/fontutil.h ${PLIST.notdarwin}include/wx-3.0/wx/unix/fswatcher_inotify.h include/wx-3.0/wx/unix/fswatcher_kqueue.h -include/wx-3.0/wx/unix/glx11.h -include/wx-3.0/wx/unix/joystick.h -include/wx-3.0/wx/unix/mimetype.h include/wx-3.0/wx/unix/pipe.h -include/wx-3.0/wx/unix/private/pipestream.h -include/wx-3.0/wx/unix/sound.h include/wx-3.0/wx/unix/stackwalk.h include/wx-3.0/wx/unix/stdpaths.h -include/wx-3.0/wx/unix/taskbarx11.h include/wx-3.0/wx/unix/tls.h -include/wx-3.0/wx/unix/utilsx11.h include/wx-3.0/wx/uri.h include/wx-3.0/wx/url.h include/wx-3.0/wx/ustring.h @@ -714,21 +617,7 @@ include/wx-3.0/wx/zstream.h lib/libwx_baseu-3.0.la lib/libwx_baseu_net-3.0.la lib/libwx_baseu_xml-3.0.la -lib/libwx_gtk2u_adv-3.0.la -lib/libwx_gtk2u_aui-3.0.la -lib/libwx_gtk2u_core-3.0.la -lib/libwx_gtk2u_gl-3.0.la -lib/libwx_gtk2u_html-3.0.la -lib/libwx_gtk2u_media-3.0.la -lib/libwx_gtk2u_propgrid-3.0.la -lib/libwx_gtk2u_qa-3.0.la -lib/libwx_gtk2u_ribbon-3.0.la -lib/libwx_gtk2u_richtext-3.0.la -lib/libwx_gtk2u_stc-3.0.la -lib/libwx_gtk2u_xrc-3.0.la lib/libwxregexu-3.0.la -lib/wx/config/gtk2-unicode-3.0 -lib/wx/include/gtk2-unicode-3.0/wx/setup.h libexec/wx-3.0/wx-config libexec/wx-3.0/wxrc libexec/wx-3.0/wxrc-3.0 @@ -738,10 +627,10 @@ share/wx-3.0/bakefile/presets/wx_presets.py share/wx-3.0/bakefile/presets/wx_unix.bkl share/wx-3.0/bakefile/presets/wx_win32.bkl share/wx-3.0/bakefile/presets/wx_xrc.bkl -share/wx-3.0/doc/wxGTK/changes.txt -share/wx-3.0/doc/wxGTK/lgpl.txt -share/wx-3.0/doc/wxGTK/licence.txt -share/wx-3.0/doc/wxGTK/readme.txt +share/wx-3.0/doc/wxWidgets/changes.txt +share/wx-3.0/doc/wxWidgets/lgpl.txt +share/wx-3.0/doc/wxWidgets/licence.txt +share/wx-3.0/doc/wxWidgets/readme.txt share/wx-3.0/locale/ca/LC_MESSAGES/wxstd.mo share/wx-3.0/locale/cs/LC_MESSAGES/wxstd.mo share/wx-3.0/locale/da/LC_MESSAGES/wxstd.mo diff --git a/x11/wxGTK30/PLIST.cocoa b/x11/wxGTK30/PLIST.cocoa new file mode 100644 index 00000000000..122a71a520e --- /dev/null +++ b/x11/wxGTK30/PLIST.cocoa @@ -0,0 +1,151 @@ +include/wx-3.0/wx/generic/animate.h +include/wx-3.0/wx/generic/clrpickerg.h +include/wx-3.0/wx/generic/collpaneg.h +include/wx-3.0/wx/generic/dirdlgg.h +include/wx-3.0/wx/generic/filedlgg.h +include/wx-3.0/wx/generic/fontpickerg.h +include/wx-3.0/wx/generic/region.h +include/wx-3.0/wx/html/webkit.h +include/wx-3.0/wx/osx/accel.h +include/wx-3.0/wx/osx/anybutton.h +include/wx-3.0/wx/osx/app.h +include/wx-3.0/wx/osx/bitmap.h +include/wx-3.0/wx/osx/bmpbuttn.h +include/wx-3.0/wx/osx/brush.h +include/wx-3.0/wx/osx/button.h +include/wx-3.0/wx/osx/carbon/chkconf.h +include/wx-3.0/wx/osx/carbon/evtloop.h +include/wx-3.0/wx/osx/carbon/private.h +include/wx-3.0/wx/osx/carbon/region.h +include/wx-3.0/wx/osx/carbon/statbmp.h +include/wx-3.0/wx/osx/carbon/uma.h +include/wx-3.0/wx/osx/checkbox.h +include/wx-3.0/wx/osx/checklst.h +include/wx-3.0/wx/osx/chkconf.h +include/wx-3.0/wx/osx/choice.h +include/wx-3.0/wx/osx/clipbrd.h +include/wx-3.0/wx/osx/cocoa/chkconf.h +include/wx-3.0/wx/osx/cocoa/dataview.h +include/wx-3.0/wx/osx/cocoa/evtloop.h +include/wx-3.0/wx/osx/cocoa/private.h +include/wx-3.0/wx/osx/colordlg.h +include/wx-3.0/wx/osx/colour.h +include/wx-3.0/wx/osx/combobox.h +include/wx-3.0/wx/osx/control.h +include/wx-3.0/wx/osx/core/colour.h +include/wx-3.0/wx/osx/core/joystick.h +include/wx-3.0/wx/osx/cursor.h +include/wx-3.0/wx/osx/dataform.h +include/wx-3.0/wx/osx/dataobj.h +include/wx-3.0/wx/osx/dataobj2.h +include/wx-3.0/wx/osx/dataview.h +include/wx-3.0/wx/osx/datectrl.h +include/wx-3.0/wx/osx/datetimectrl.h +include/wx-3.0/wx/osx/dc.h +include/wx-3.0/wx/osx/dcclient.h +include/wx-3.0/wx/osx/dcmemory.h +include/wx-3.0/wx/osx/dcprint.h +include/wx-3.0/wx/osx/dcscreen.h +include/wx-3.0/wx/osx/dialog.h +include/wx-3.0/wx/osx/dirdlg.h +include/wx-3.0/wx/osx/dnd.h +include/wx-3.0/wx/osx/dvrenderer.h +include/wx-3.0/wx/osx/dvrenderers.h +include/wx-3.0/wx/osx/evtloop.h +include/wx-3.0/wx/osx/evtloopsrc.h +include/wx-3.0/wx/osx/filedlg.h +include/wx-3.0/wx/osx/font.h +include/wx-3.0/wx/osx/fontdlg.h +include/wx-3.0/wx/osx/frame.h +include/wx-3.0/wx/osx/gauge.h +include/wx-3.0/wx/osx/glcanvas.h +include/wx-3.0/wx/osx/helpxxxx.h +include/wx-3.0/wx/osx/icon.h +include/wx-3.0/wx/osx/imaglist.h +include/wx-3.0/wx/osx/joystick.h +include/wx-3.0/wx/osx/listbox.h +include/wx-3.0/wx/osx/listctrl.h +include/wx-3.0/wx/osx/mdi.h +include/wx-3.0/wx/osx/menu.h +include/wx-3.0/wx/osx/menuitem.h +include/wx-3.0/wx/osx/metafile.h +include/wx-3.0/wx/osx/mimetype.h +include/wx-3.0/wx/osx/minifram.h +include/wx-3.0/wx/osx/msgdlg.h +include/wx-3.0/wx/osx/nonownedwnd.h +include/wx-3.0/wx/osx/notebook.h +include/wx-3.0/wx/osx/palette.h +include/wx-3.0/wx/osx/pen.h +include/wx-3.0/wx/osx/pnghand.h +include/wx-3.0/wx/osx/pngread.h +include/wx-3.0/wx/osx/popupwin.h +include/wx-3.0/wx/osx/printdlg.h +include/wx-3.0/wx/osx/printmac.h +include/wx-3.0/wx/osx/private.h +include/wx-3.0/wx/osx/radiobox.h +include/wx-3.0/wx/osx/radiobut.h +include/wx-3.0/wx/osx/region.h +include/wx-3.0/wx/osx/scrolbar.h +include/wx-3.0/wx/osx/slider.h +include/wx-3.0/wx/osx/sound.h +include/wx-3.0/wx/osx/spinbutt.h +include/wx-3.0/wx/osx/srchctrl.h +include/wx-3.0/wx/osx/statbmp.h +include/wx-3.0/wx/osx/statbox.h +include/wx-3.0/wx/osx/statline.h +include/wx-3.0/wx/osx/stattext.h +include/wx-3.0/wx/osx/statusbr.h +include/wx-3.0/wx/osx/taskbarosx.h +include/wx-3.0/wx/osx/textctrl.h +include/wx-3.0/wx/osx/textentry.h +include/wx-3.0/wx/osx/tglbtn.h +include/wx-3.0/wx/osx/timectrl.h +include/wx-3.0/wx/osx/toolbar.h +include/wx-3.0/wx/osx/tooltip.h +include/wx-3.0/wx/osx/toplevel.h +include/wx-3.0/wx/osx/treectrl.h +include/wx-3.0/wx/osx/uma.h +include/wx-3.0/wx/osx/webview_webkit.h +include/wx-3.0/wx/osx/webviewhistoryitem_webkit.h +include/wx-3.0/wx/osx/window.h +lib/libwx_osx_cocoau_adv-3.0.0.dylib +lib/libwx_osx_cocoau_adv-3.0.dylib +lib/libwx_osx_cocoau_adv-3.0.la +lib/libwx_osx_cocoau_aui-3.0.0.dylib +lib/libwx_osx_cocoau_aui-3.0.dylib +lib/libwx_osx_cocoau_aui-3.0.la +lib/libwx_osx_cocoau_core-3.0.0.dylib +lib/libwx_osx_cocoau_core-3.0.dylib +lib/libwx_osx_cocoau_core-3.0.la +lib/libwx_osx_cocoau_gl-3.0.0.dylib +lib/libwx_osx_cocoau_gl-3.0.dylib +lib/libwx_osx_cocoau_gl-3.0.la +lib/libwx_osx_cocoau_html-3.0.0.dylib +lib/libwx_osx_cocoau_html-3.0.dylib +lib/libwx_osx_cocoau_html-3.0.la +lib/libwx_osx_cocoau_media-3.0.0.dylib +lib/libwx_osx_cocoau_media-3.0.dylib +lib/libwx_osx_cocoau_media-3.0.la +lib/libwx_osx_cocoau_propgrid-3.0.0.dylib +lib/libwx_osx_cocoau_propgrid-3.0.dylib +lib/libwx_osx_cocoau_propgrid-3.0.la +lib/libwx_osx_cocoau_qa-3.0.0.dylib +lib/libwx_osx_cocoau_qa-3.0.dylib +lib/libwx_osx_cocoau_qa-3.0.la +lib/libwx_osx_cocoau_ribbon-3.0.0.dylib +lib/libwx_osx_cocoau_ribbon-3.0.dylib +lib/libwx_osx_cocoau_ribbon-3.0.la +lib/libwx_osx_cocoau_richtext-3.0.0.dylib +lib/libwx_osx_cocoau_richtext-3.0.dylib +lib/libwx_osx_cocoau_richtext-3.0.la +lib/libwx_osx_cocoau_stc-3.0.0.dylib +lib/libwx_osx_cocoau_stc-3.0.dylib +lib/libwx_osx_cocoau_stc-3.0.la +lib/libwx_osx_cocoau_webview-3.0.0.dylib +lib/libwx_osx_cocoau_webview-3.0.dylib +lib/libwx_osx_cocoau_webview-3.0.la +lib/libwx_osx_cocoau_xrc-3.0.0.dylib +lib/libwx_osx_cocoau_xrc-3.0.dylib +lib/libwx_osx_cocoau_xrc-3.0.la +lib/wx/config/osx_cocoa-unicode-3.0 +lib/wx/include/osx_cocoa-unicode-3.0/wx/setup.h diff --git a/x11/wxGTK30/PLIST.gtk2 b/x11/wxGTK30/PLIST.gtk2 new file mode 100644 index 00000000000..452129e35d7 --- /dev/null +++ b/x11/wxGTK30/PLIST.gtk2 @@ -0,0 +1,111 @@ +include/wx-3.0/wx/aui/tabartgtk.h +include/wx-3.0/wx/generic/icon.h +include/wx-3.0/wx/generic/imaglist.h +include/wx-3.0/wx/generic/paletteg.h +include/wx-3.0/wx/gtk/accel.h +include/wx-3.0/wx/gtk/animate.h +include/wx-3.0/wx/gtk/anybutton.h +include/wx-3.0/wx/gtk/app.h +include/wx-3.0/wx/gtk/assertdlg_gtk.h +include/wx-3.0/wx/gtk/bitmap.h +include/wx-3.0/wx/gtk/bmpbuttn.h +include/wx-3.0/wx/gtk/bmpcbox.h +include/wx-3.0/wx/gtk/brush.h +include/wx-3.0/wx/gtk/button.h +include/wx-3.0/wx/gtk/calctrl.h +include/wx-3.0/wx/gtk/checkbox.h +include/wx-3.0/wx/gtk/checklst.h +include/wx-3.0/wx/gtk/chkconf.h +include/wx-3.0/wx/gtk/choice.h +include/wx-3.0/wx/gtk/clipbrd.h +include/wx-3.0/wx/gtk/clrpicker.h +include/wx-3.0/wx/gtk/collpane.h +include/wx-3.0/wx/gtk/colordlg.h +include/wx-3.0/wx/gtk/colour.h +include/wx-3.0/wx/gtk/combobox.h +include/wx-3.0/wx/gtk/control.h +include/wx-3.0/wx/gtk/cursor.h +include/wx-3.0/wx/gtk/dataform.h +include/wx-3.0/wx/gtk/dataobj.h +include/wx-3.0/wx/gtk/dataobj2.h +include/wx-3.0/wx/gtk/dataview.h +include/wx-3.0/wx/gtk/dialog.h +include/wx-3.0/wx/gtk/dirdlg.h +include/wx-3.0/wx/gtk/dnd.h +include/wx-3.0/wx/gtk/dvrenderer.h +include/wx-3.0/wx/gtk/dvrenderers.h +include/wx-3.0/wx/gtk/evtloop.h +include/wx-3.0/wx/gtk/evtloopsrc.h +include/wx-3.0/wx/gtk/filectrl.h +include/wx-3.0/wx/gtk/filedlg.h +include/wx-3.0/wx/gtk/filehistory.h +include/wx-3.0/wx/gtk/filepicker.h +include/wx-3.0/wx/gtk/font.h +include/wx-3.0/wx/gtk/fontdlg.h +include/wx-3.0/wx/gtk/fontpicker.h +include/wx-3.0/wx/gtk/frame.h +include/wx-3.0/wx/gtk/gauge.h +include/wx-3.0/wx/gtk/glcanvas.h +include/wx-3.0/wx/gtk/gnome/gvfs.h +include/wx-3.0/wx/gtk/hildon/notifmsg.h +include/wx-3.0/wx/gtk/hyperlink.h +include/wx-3.0/wx/gtk/infobar.h +include/wx-3.0/wx/gtk/listbox.h +include/wx-3.0/wx/gtk/mdi.h +include/wx-3.0/wx/gtk/menu.h +include/wx-3.0/wx/gtk/menuitem.h +include/wx-3.0/wx/gtk/minifram.h +include/wx-3.0/wx/gtk/msgdlg.h +include/wx-3.0/wx/gtk/nonownedwnd.h +include/wx-3.0/wx/gtk/notebook.h +include/wx-3.0/wx/gtk/notifmsg.h +include/wx-3.0/wx/gtk/pen.h +include/wx-3.0/wx/gtk/popupwin.h +include/wx-3.0/wx/gtk/print.h +include/wx-3.0/wx/gtk/radiobox.h +include/wx-3.0/wx/gtk/radiobut.h +include/wx-3.0/wx/gtk/region.h +include/wx-3.0/wx/gtk/scrolbar.h +include/wx-3.0/wx/gtk/scrolwin.h +include/wx-3.0/wx/gtk/slider.h +include/wx-3.0/wx/gtk/spinbutt.h +include/wx-3.0/wx/gtk/spinctrl.h +include/wx-3.0/wx/gtk/statbmp.h +include/wx-3.0/wx/gtk/statbox.h +include/wx-3.0/wx/gtk/statline.h +include/wx-3.0/wx/gtk/stattext.h +include/wx-3.0/wx/gtk/taskbar.h +include/wx-3.0/wx/gtk/textctrl.h +include/wx-3.0/wx/gtk/textentry.h +include/wx-3.0/wx/gtk/tglbtn.h +include/wx-3.0/wx/gtk/toolbar.h +include/wx-3.0/wx/gtk/tooltip.h +include/wx-3.0/wx/gtk/toplevel.h +include/wx-3.0/wx/gtk/webview_webkit.h +include/wx-3.0/wx/gtk/webviewhistoryitem_webkit.h +include/wx-3.0/wx/gtk/window.h +include/wx-3.0/wx/private/pipestream.h +include/wx-3.0/wx/private/streamtempinput.h +include/wx-3.0/wx/unix/execute.h +include/wx-3.0/wx/unix/fontutil.h +include/wx-3.0/wx/unix/glx11.h +include/wx-3.0/wx/unix/joystick.h +include/wx-3.0/wx/unix/mimetype.h +include/wx-3.0/wx/unix/private/pipestream.h +include/wx-3.0/wx/unix/sound.h +include/wx-3.0/wx/unix/taskbarx11.h +include/wx-3.0/wx/unix/utilsx11.h +lib/libwx_gtk2u_adv-3.0.la +lib/libwx_gtk2u_aui-3.0.la +lib/libwx_gtk2u_core-3.0.la +lib/libwx_gtk2u_gl-3.0.la +lib/libwx_gtk2u_html-3.0.la +lib/libwx_gtk2u_media-3.0.la +lib/libwx_gtk2u_propgrid-3.0.la +lib/libwx_gtk2u_qa-3.0.la +lib/libwx_gtk2u_ribbon-3.0.la +lib/libwx_gtk2u_richtext-3.0.la +lib/libwx_gtk2u_stc-3.0.la +lib/libwx_gtk2u_xrc-3.0.la +lib/wx/config/gtk2-unicode-3.0 +lib/wx/include/gtk2-unicode-3.0/wx/setup.h diff --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk index 4642073191a..4960926590e 100644 --- a/x11/wxGTK30/buildlink3.mk +++ b/x11/wxGTK30/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/02/16 03:37:30 dbj Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2016/02/17 10:16:05 dbj Exp $ BUILDLINK_TREE+= wxGTK30 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxGTK30 WXGTK30_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.wxGTK30+= wxGTK30>=3.0.1 -BUILDLINK_ABI_DEPENDS.wxGTK30+= wxGTK30>=3.0.2nb2 +BUILDLINK_ABI_DEPENDS.wxGTK30+= wxGTK30>=3.0.2nb5 BUILDLINK_PKGSRCDIR.wxGTK30?= ../../x11/wxGTK30 BUILDLINK_INCDIRS.wxGTK30+= include/wx-3.0 @@ -16,14 +16,16 @@ CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.if ${OPSYS} != "Darwin" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" +.endif .endif # WXGTK30_BUILDLINK3_MK BUILDLINK_TREE+= -wxGTK30 diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo index 0ff4c3eff1c..4b242de2109 100644 --- a/x11/wxGTK30/distinfo +++ b/x11/wxGTK30/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 03:28:56 agc Exp $ +$NetBSD: distinfo,v 1.6 2016/02/17 10:16:05 dbj Exp $ -SHA1 (wxWidgets-3.0.2-libtool.diff.bz2) = d0235d8d9ec9c05deefecf8b15ea3d919e82f1d0 -RMD160 (wxWidgets-3.0.2-libtool.diff.bz2) = c144c8484fabd7dcdc669d0618bcbc4af7f07b4a -SHA512 (wxWidgets-3.0.2-libtool.diff.bz2) = b664e457e68e9eaf65d2d2c2f2eb3956346a4472e177a82b42d05c64cb008d26bfdf495d5c16a7516ca90d4b4a4fdf71f5a5740eecf469ee2fe1f663fa685abb -Size (wxWidgets-3.0.2-libtool.diff.bz2) = 202535 bytes +SHA1 (wxWidgets-3.0.2-libtool.2.diff.bz2) = 789f0ff586f36ee88ebd3016d959600e2e8e76dc +RMD160 (wxWidgets-3.0.2-libtool.2.diff.bz2) = a18e8007c4a51796a5178d96550c3596393ea2b1 +SHA512 (wxWidgets-3.0.2-libtool.2.diff.bz2) = af02e74b68625a2315531ddde99fd1ca58f77b7bc73d24c4d6baa1e42efb368314f827976a6702efa39fa4b77b9746ea0009ee17b5911928e6d477c251fee8df +Size (wxWidgets-3.0.2-libtool.2.diff.bz2) = 201508 bytes SHA1 (wxWidgets-3.0.2.tar.bz2) = 6461eab4428c0a8b9e41781b8787510484dea800 RMD160 (wxWidgets-3.0.2.tar.bz2) = a7f404c8a64ca68fa31e408bded4387c2722196b SHA512 (wxWidgets-3.0.2.tar.bz2) = 098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4 diff --git a/x11/wxGTK30/patches/manual-bakefile.diff b/x11/wxGTK30/patches/manual-bakefile.diff index ad6b45ed797..38239e73399 100644 --- a/x11/wxGTK30/patches/manual-bakefile.diff +++ b/x11/wxGTK30/patches/manual-bakefile.diff @@ -1,9 +1,6 @@ -$NetBSD: manual-bakefile.diff,v 1.1 2014/07/21 06:53:24 dbj Exp $ -This is a patch to the bakefile-0.2.9 rules to use libtool. - diff -ru rules.orig/autoconf.bkl rules/autoconf.bkl --- rules.orig/autoconf.bkl 2011-02-02 14:04:25.000000000 -0800 -+++ rules/autoconf.bkl 2013-04-06 21:35:57.000000000 -0700 ++++ rules/autoconf.bkl 2016-02-13 16:51:17.000000000 -0800 @@ -200,82 +200,19 @@ <set var="__linkname1">$(__linkname)</set> @@ -103,13 +100,9 @@ diff -ru rules.orig/autoconf.bkl rules/autoconf.bkl <modify-target target="install_$(id)"> <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command> -Only in rules: autoconf.bkl.orig -Only in rules: autoconf.bkl.rej -Only in rules: autoconf.bkl.save1 -Only in rules: autoconf.bkl.~1~ diff -ru rules.orig/makefile.bkl rules/makefile.bkl --- rules.orig/makefile.bkl 2011-02-02 14:04:25.000000000 -0800 -+++ rules/makefile.bkl 2013-04-06 21:30:45.000000000 -0700 ++++ rules/makefile.bkl 2016-02-13 16:51:17.000000000 -0800 @@ -749,7 +749,7 @@ <define-tag name="install-to" rules="exe"> <modify-target target="install_$(id)"> @@ -140,7 +133,7 @@ diff -ru rules.orig/makefile.bkl rules/makefile.bkl <modify-target target="uninstall_$(id)"> diff -ru rules.orig/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl --- rules.orig/makefile_defs_gnu.bkl 2011-02-02 14:04:25.000000000 -0800 -+++ rules/makefile_defs_gnu.bkl 2013-04-06 21:30:45.000000000 -0700 ++++ rules/makefile_defs_gnu.bkl 2016-02-13 16:51:17.000000000 -0800 @@ -62,12 +62,12 @@ <template id="__commands_templ_C"> @@ -158,7 +151,7 @@ diff -ru rules.orig/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl diff -ru rules.orig/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl --- rules.orig/makefile_defs_unix.bkl 2011-02-02 14:04:25.000000000 -0800 -+++ rules/makefile_defs_unix.bkl 2013-04-06 21:30:45.000000000 -0700 ++++ rules/makefile_defs_unix.bkl 2016-02-13 18:27:40.000000000 -0800 @@ -39,22 +39,23 @@ <set var="DIRSEP">/</set> @@ -189,7 +182,7 @@ diff -ru rules.orig/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl <set var="UNINSTALL_PROGRAM" overwrite="0">$(RM)</set> <set var="UNINSTALL_DATA" overwrite="0">$(RM)</set> -@@ -122,12 +123,12 @@ +@@ -122,24 +123,24 @@ <if cond="FORMAT not in ['gnu','suncc']"> <template id="__commands_templ_C"> <set var="__COMPILE_C_CMD" eval="0"> @@ -204,6 +197,20 @@ diff -ru rules.orig/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl </set> </template> <!-- FIXME: We should allow for a different Objective-C compiler --> + <template id="__commands_templ_OBJC"> + <set var="__COMPILE_OBJC_CMD" eval="0"> +- $(CCC) -c -o $@ $(__objcflags) $(src) ++ $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__objcflags) $(src) + </set> + </template> + <!-- FIXME: We should allow for a different Objective-C++ compiler --> + <template id="__commands_templ_OBJCXX"> + <set var="__COMPILE_OBJCXX_CMD" eval="0"> +- $(CXXC) -c -o $@ $(__objcxxflags) $(src) ++ $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__objcxxflags) $(src) + </set> + </template> + </if> @@ -154,18 +155,16 @@ </set> @@ -219,12 +226,13 @@ diff -ru rules.orig/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl </set> <set var="__LINK_DLL_CMD" eval="0"> - $(__dll_linker) $@ $(__objects_var) $(__ldargs) -+ $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs) ++ $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -shared -o $@ $(__objects_var) $(__ldflags) $(__ldlibs) </set> <set var="__LINK_MODULE_CMD" eval="0"> - $(__module_linker) $@ $(__objects_var) $(__ldargs) -+ $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs) ++ $(LIBTOOL)--mode=link --tag=CC $(__linker) -rpath $(libdir) -module -o $@ $(__objects_var) $(__ldflags) $(__ldlibs) </set> </template> -Only in rules: makefile_defs_unix.bkl.orig +Only in rules: makefile_defs_unix.bkl.~1~ +Only in rules: makefile_defs_unix.bkl.~2~ diff --git a/x11/wxGTK30/patches/manual-regen.diff b/x11/wxGTK30/patches/manual-regen.diff index 54e5212dba7..f5e2af57df0 100644 --- a/x11/wxGTK30/patches/manual-regen.diff +++ b/x11/wxGTK30/patches/manual-regen.diff @@ -1,14 +1,7 @@ -$NetBSD: manual-regen.diff,v 1.1 2014/07/21 06:53:24 dbj Exp $ -To regenerate the libtool patch, get the full wxWidgets tarball, -cd to build/bakefiles, and run - ./bakefile_gen -f autoconf -manual-bakefile.diff contains the necessary patch for the bakefile -ruleset to use libtool. - -diff -ru wxWidgets-3.0.1.dist/build/bakefiles/common.bkl wxWidgets-3.0.1/build/bakefiles/common.bkl ---- wxWidgets-3.0.1.dist/build/bakefiles/common.bkl 2014-06-14 14:48:48.000000000 -0700 -+++ wxWidgets-3.0.1/build/bakefiles/common.bkl 2014-07-20 15:07:09.000000000 -0700 -@@ -706,7 +706,6 @@ +diff -ru wxWidgets-3.0.2.dist/build/bakefiles/common.bkl wxWidgets-3.0.2/build/bakefiles/common.bkl +--- wxWidgets-3.0.2.dist/build/bakefiles/common.bkl 2014-10-06 14:33:44.000000000 -0700 ++++ wxWidgets-3.0.2/build/bakefiles/common.bkl 2016-02-13 18:31:34.000000000 -0800 +@@ -708,7 +708,6 @@ <if cond="FORMAT=='autoconf'"> <res-include>$(RCDEFDIR)</res-include> <res-include>$(TOP_SRCDIR)include</res-include> @@ -16,9 +9,10 @@ diff -ru wxWidgets-3.0.1.dist/build/bakefiles/common.bkl wxWidgets-3.0.1/build/b </if> <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res> -diff -ru wxWidgets-3.0.1.dist/build/bakefiles/config.bkl wxWidgets-3.0.1/build/bakefiles/config.bkl ---- wxWidgets-3.0.1.dist/build/bakefiles/config.bkl 2014-06-14 14:48:48.000000000 -0700 -+++ wxWidgets-3.0.1/build/bakefiles/config.bkl 2014-07-20 15:07:09.000000000 -0700 +Only in wxWidgets-3.0.2/build/bakefiles: common.bkl.orig +diff -ru wxWidgets-3.0.2.dist/build/bakefiles/config.bkl wxWidgets-3.0.2/build/bakefiles/config.bkl +--- wxWidgets-3.0.2.dist/build/bakefiles/config.bkl 2014-10-06 14:33:44.000000000 -0700 ++++ wxWidgets-3.0.2/build/bakefiles/config.bkl 2016-02-13 18:31:34.000000000 -0800 @@ -425,8 +425,6 @@ <option name="EXTRALIBS_SDL"/> <option name="CXXWARNINGS"/> @@ -28,9 +22,9 @@ diff -ru wxWidgets-3.0.1.dist/build/bakefiles/config.bkl wxWidgets-3.0.1/build/b <option name="SAMPLES_RPATH_FLAG"/> <!-- see configure.in; it's required by some samples on Mac OS X --> -diff -ru wxWidgets-3.0.1.dist/build/bakefiles/regex.bkl wxWidgets-3.0.1/build/bakefiles/regex.bkl ---- wxWidgets-3.0.1.dist/build/bakefiles/regex.bkl 2014-06-14 14:48:48.000000000 -0700 -+++ wxWidgets-3.0.1/build/bakefiles/regex.bkl 2014-07-20 15:07:09.000000000 -0700 +diff -ru wxWidgets-3.0.2.dist/build/bakefiles/regex.bkl wxWidgets-3.0.2/build/bakefiles/regex.bkl +--- wxWidgets-3.0.2.dist/build/bakefiles/regex.bkl 2014-10-06 14:33:44.000000000 -0700 ++++ wxWidgets-3.0.2/build/bakefiles/regex.bkl 2016-02-13 18:31:34.000000000 -0800 @@ -26,16 +26,13 @@ <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if> </set> @@ -62,9 +56,9 @@ diff -ru wxWidgets-3.0.1.dist/build/bakefiles/regex.bkl wxWidgets-3.0.1/build/ba + </dll> </makefile> -diff -ru wxWidgets-3.0.1.dist/build/bakefiles/wx.bkl wxWidgets-3.0.1/build/bakefiles/wx.bkl ---- wxWidgets-3.0.1.dist/build/bakefiles/wx.bkl 2014-06-14 14:48:48.000000000 -0700 -+++ wxWidgets-3.0.1/build/bakefiles/wx.bkl 2014-07-20 15:07:09.000000000 -0700 +diff -ru wxWidgets-3.0.2.dist/build/bakefiles/wx.bkl wxWidgets-3.0.2/build/bakefiles/wx.bkl +--- wxWidgets-3.0.2.dist/build/bakefiles/wx.bkl 2014-10-06 14:33:44.000000000 -0700 ++++ wxWidgets-3.0.2/build/bakefiles/wx.bkl 2016-02-13 18:31:34.000000000 -0800 @@ -95,17 +95,11 @@ <command> $(INSTALL_DIR) $(DESTDIR)$(BINDIR) @@ -84,9 +78,9 @@ diff -ru wxWidgets-3.0.1.dist/build/bakefiles/wx.bkl wxWidgets-3.0.1/build/bakef <set var="RCDEFS_H"> <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if> </set> -diff -ru wxWidgets-3.0.1.dist/utils/wxrc/wxrc.bkl wxWidgets-3.0.1/utils/wxrc/wxrc.bkl ---- wxWidgets-3.0.1.dist/utils/wxrc/wxrc.bkl 2014-06-14 14:48:48.000000000 -0700 -+++ wxWidgets-3.0.1/utils/wxrc/wxrc.bkl 2014-07-20 15:07:09.000000000 -0700 +diff -ru wxWidgets-3.0.2.dist/utils/wxrc/wxrc.bkl wxWidgets-3.0.2/utils/wxrc/wxrc.bkl +--- wxWidgets-3.0.2.dist/utils/wxrc/wxrc.bkl 2014-10-06 14:33:44.000000000 -0700 ++++ wxWidgets-3.0.2/utils/wxrc/wxrc.bkl 2016-02-13 18:31:34.000000000 -0800 @@ -21,7 +21,7 @@ <modify-target target="install_wxrc"> <command> |