diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2003-11-04 20:51:32 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2003-11-04 20:51:32 +0000 |
| commit | 204da5ae4cbf51af640f1720ba76ae505ff80847 (patch) | |
| tree | aabe163b4c50735674cd2153bf94a335df44cc9d | |
| parent | c5ffff7232f276be076ae13abbf85b1153be0821 (diff) | |
| download | ports-204da5ae4cbf51af640f1720ba76ae505ff80847.tar.gz ports-204da5ae4cbf51af640f1720ba76ae505ff80847.zip | |
Notes
28 files changed, 855 insertions, 693 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index b60f31009438..5edbe32c075f 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -190,9 +190,15 @@ SUBDIR += whistlerk SUBDIR += wmapp SUBDIR += wxgtk + SUBDIR += wxgtk-common SUBDIR += wxgtk-contrib + SUBDIR += wxgtk-contrib-common SUBDIR += wxgtk-devel SUBDIR += wxgtk-docs + SUBDIR += wxgtk2 + SUBDIR += wxgtk2-contrib + SUBDIR += wxgtk2-unicode + SUBDIR += wxgtk2-unicode-contrib SUBDIR += xbae SUBDIR += xclasses SUBDIR += xenophilia diff --git a/x11-toolkits/wxgtk-common/Makefile b/x11-toolkits/wxgtk-common/Makefile new file mode 100644 index 000000000000..9bd4ddf7a6f6 --- /dev/null +++ b/x11-toolkits/wxgtk-common/Makefile @@ -0,0 +1,16 @@ +# New ports collection makefile for: wxgtk-common +# Date created: November 4, 2003 +# Whom: fjoe@FreeBSD.ORG +# +# $FreeBSD$ +# + +PORTREVISION= 0 + +MAINTAINER= fjoe@FreeBSD.org +COMMENT= The wxWindows GUI toolkit (common files) + +WXGTK_FLAVOR= gtk-common +MASTERDIR= ${.CURDIR}/../wxgtk-devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk-common/pkg-plist b/x11-toolkits/wxgtk-common/pkg-plist new file mode 100644 index 000000000000..ee687e563e8f --- /dev/null +++ b/x11-toolkits/wxgtk-common/pkg-plist @@ -0,0 +1,415 @@ +include/wx/accel.h +include/wx/app.h +include/wx/arrimpl.cpp +include/wx/artprov.h +include/wx/bitmap.h +include/wx/bmpbuttn.h +include/wx/brush.h +include/wx/buffer.h +include/wx/build.h +include/wx/busyinfo.h +include/wx/button.h +include/wx/calctrl.h +include/wx/caret.h +include/wx/checkbox.h +include/wx/checklst.h +include/wx/chkconf.h +include/wx/choicdlg.h +include/wx/choice.h +include/wx/clipbrd.h +include/wx/clntdata.h +include/wx/cmdline.h +include/wx/cmdproc.h +include/wx/cmndata.h +include/wx/colordlg.h +include/wx/colour.h +include/wx/combobox.h +include/wx/confbase.h +include/wx/config.h +include/wx/containr.h +include/wx/control.h +include/wx/cshelp.h +include/wx/ctrlsub.h +include/wx/cursor.h +include/wx/dataobj.h +include/wx/date.h +include/wx/datetime.h +include/wx/datetime.inl +include/wx/datstrm.h +include/wx/db.h +include/wx/dbgrid.h +include/wx/dbkeyg.h +include/wx/dbtable.h +include/wx/dc.h +include/wx/dcbuffer.h +include/wx/dcclient.h +include/wx/dcmemory.h +include/wx/dcprint.h +include/wx/dcps.h +include/wx/dcscreen.h +include/wx/dde.h +include/wx/debug.h +include/wx/defs.h +include/wx/dialog.h +include/wx/dialup.h +include/wx/dir.h +include/wx/dirctrl.h +include/wx/dirdlg.h +include/wx/dnd.h +include/wx/docmdi.h +include/wx/docview.h +include/wx/dragimag.h +include/wx/dynarray.h +include/wx/dynlib.h +include/wx/dynload.h +include/wx/effects.h +include/wx/encconv.h +include/wx/event.h +include/wx/expr.h +include/wx/fdrepdlg.h +include/wx/features.h +include/wx/ffile.h +include/wx/file.h +include/wx/fileconf.h +include/wx/filedlg.h +include/wx/filefn.h +include/wx/filename.h +include/wx/filesys.h +include/wx/font.h +include/wx/fontdlg.h +include/wx/fontenc.h +include/wx/fontenum.h +include/wx/fontmap.h +include/wx/fontutil.h +include/wx/frame.h +include/wx/fs_inet.h +include/wx/fs_mem.h +include/wx/fs_zip.h +include/wx/gauge.h +include/wx/gdicmn.h +include/wx/gdiobj.h +include/wx/generic/accel.h +include/wx/generic/calctrl.h +include/wx/generic/caret.h +include/wx/generic/choicdgg.h +include/wx/generic/colrdlgg.h +include/wx/generic/dcpsg.h +include/wx/generic/dirctrlg.h +include/wx/generic/dirdlgg.h +include/wx/generic/dragimgg.h +include/wx/generic/fdrepdlg.h +include/wx/generic/filedlgg.h +include/wx/generic/fontdlgg.h +include/wx/generic/grid.h +include/wx/generic/gridctrl.h +include/wx/generic/gridg.h +include/wx/generic/helpext.h +include/wx/generic/helphtml.h +include/wx/generic/imaglist.h +include/wx/generic/laywin.h +include/wx/generic/listctrl.h +include/wx/generic/msgdlgg.h +include/wx/generic/notebook.h +include/wx/generic/paletteg.h +include/wx/generic/panelg.h +include/wx/generic/printps.h +include/wx/generic/prntdlgg.h +include/wx/generic/progdlgg.h +include/wx/generic/sashwin.h +include/wx/generic/scrolwin.h +include/wx/generic/spinctlg.h +include/wx/generic/splash.h +include/wx/generic/splitter.h +include/wx/generic/statusbr.h +include/wx/generic/tabg.h +include/wx/generic/textdlgg.h +include/wx/generic/timer.h +include/wx/generic/treectlg.h +include/wx/generic/wizard.h +include/wx/geometry.h +include/wx/gifdecod.h +include/wx/glcanvas.h +include/wx/grid.h +include/wx/gsocket.h +include/wx/gtk/accel.h +include/wx/gtk/app.h +include/wx/gtk/bitmap.h +include/wx/gtk/bmpbuttn.h +include/wx/gtk/brush.h +include/wx/gtk/button.h +include/wx/gtk/checkbox.h +include/wx/gtk/checklst.h +include/wx/gtk/choice.h +include/wx/gtk/clipbrd.h +include/wx/gtk/colour.h +include/wx/gtk/combobox.h +include/wx/gtk/control.h +include/wx/gtk/cursor.h +include/wx/gtk/dataform.h +include/wx/gtk/dataobj.h +include/wx/gtk/dataobj2.h +include/wx/gtk/dc.h +include/wx/gtk/dcclient.h +include/wx/gtk/dcmemory.h +include/wx/gtk/dcscreen.h +include/wx/gtk/dialog.h +include/wx/gtk/dnd.h +include/wx/gtk/filedlg.h +include/wx/gtk/font.h +include/wx/gtk/fontdlg.h +include/wx/gtk/frame.h +include/wx/gtk/gauge.h +include/wx/gtk/gdiobj.h +include/wx/gtk/glcanvas.h +include/wx/gtk/icon.h +include/wx/gtk/joystick.h +include/wx/gtk/listbox.h +include/wx/gtk/mdi.h +include/wx/gtk/menu.h +include/wx/gtk/menuitem.h +include/wx/gtk/minifram.h +include/wx/gtk/notebook.h +include/wx/gtk/pen.h +include/wx/gtk/popupwin.h +include/wx/gtk/radiobox.h +include/wx/gtk/radiobut.h +include/wx/gtk/region.h +include/wx/gtk/scrolbar.h +include/wx/gtk/scrolwin.h +include/wx/gtk/slider.h +include/wx/gtk/spinbutt.h +include/wx/gtk/spinctrl.h +include/wx/gtk/statbmp.h +include/wx/gtk/statbox.h +include/wx/gtk/statline.h +include/wx/gtk/stattext.h +include/wx/gtk/tbargtk.h +include/wx/gtk/textctrl.h +include/wx/gtk/tglbtn.h +include/wx/gtk/timer.h +include/wx/gtk/tooltip.h +include/wx/gtk/toplevel.h +include/wx/gtk/treectrl.h +include/wx/gtk/wave.h +include/wx/gtk/win_gtk.h +include/wx/gtk/window.h +include/wx/hash.h +include/wx/hashmap.h +include/wx/help.h +include/wx/helpbase.h +include/wx/helphtml.h +include/wx/helpwin.h +include/wx/html/forcelnk.h +include/wx/html/helpctrl.h +include/wx/html/helpdata.h +include/wx/html/helpfrm.h +include/wx/html/htmlcell.h +include/wx/html/htmldefs.h +include/wx/html/htmlfilt.h +include/wx/html/htmlpars.h +include/wx/html/htmltag.h +include/wx/html/htmlwin.h +include/wx/html/htmprint.h +include/wx/html/m_templ.h +include/wx/html/winpars.h +include/wx/icon.h +include/wx/iconbndl.h +include/wx/imagbmp.h +include/wx/image.h +include/wx/imaggif.h +include/wx/imagiff.h +include/wx/imagjpeg.h +include/wx/imaglist.h +include/wx/imagpcx.h +include/wx/imagpng.h +include/wx/imagpnm.h +include/wx/imagtiff.h +include/wx/imagxpm.h +include/wx/intl.h +include/wx/ioswrap.h +include/wx/ipc.h +include/wx/ipcbase.h +include/wx/isql.h +include/wx/isqlext.h +include/wx/joystick.h +include/wx/layout.h +include/wx/laywin.h +include/wx/list.h +include/wx/listbase.h +include/wx/listbox.h +include/wx/listctrl.h +include/wx/listimpl.cpp +include/wx/log.h +include/wx/longlong.h +include/wx/matrix.h +include/wx/mdi.h +include/wx/memconf.h +include/wx/memory.h +include/wx/memtext.h +include/wx/menu.h +include/wx/menuitem.h +include/wx/metafile.h +include/wx/mimetype.h +include/wx/minifram.h +include/wx/module.h +include/wx/msgdlg.h +include/wx/msgout.h +include/wx/mstream.h +include/wx/notebook.h +include/wx/object.h +include/wx/odbc.h +include/wx/ownerdrw.h +include/wx/palette.h +include/wx/panel.h +include/wx/paper.h +include/wx/pen.h +include/wx/platform.h +include/wx/popupwin.h +include/wx/print.h +include/wx/printdlg.h +include/wx/prntbase.h +include/wx/process.h +include/wx/progdlg.h +include/wx/prop.h +include/wx/propform.h +include/wx/proplist.h +include/wx/protocol/file.h +include/wx/protocol/ftp.h +include/wx/protocol/http.h +include/wx/protocol/protocol.h +include/wx/quantize.h +include/wx/radiobox.h +include/wx/radiobut.h +include/wx/regex.h +include/wx/region.h +include/wx/resource.h +include/wx/sashwin.h +include/wx/sckaddr.h +include/wx/sckipc.h +include/wx/sckstrm.h +include/wx/scrolbar.h +include/wx/scrolwin.h +include/wx/settings.h +include/wx/sizer.h +include/wx/slider.h +include/wx/snglinst.h +include/wx/socket.h +include/wx/spinbutt.h +include/wx/spinctrl.h +include/wx/splash.h +include/wx/splitter.h +include/wx/stack.h +include/wx/statbmp.h +include/wx/statbox.h +include/wx/statline.h +include/wx/stattext.h +include/wx/statusbr.h +include/wx/strconv.h +include/wx/stream.h +include/wx/string.h +include/wx/sysopt.h +include/wx/tab.h +include/wx/tabctrl.h +include/wx/taskbar.h +include/wx/tbarbase.h +include/wx/tbarsmpl.h +include/wx/textbuf.h +include/wx/textctrl.h +include/wx/textdlg.h +include/wx/textfile.h +include/wx/tglbtn.h +include/wx/thread.h +include/wx/thrimpl.cpp +include/wx/time.h +include/wx/timer.h +include/wx/tipdlg.h +include/wx/tipwin.h +include/wx/tokenzr.h +include/wx/toolbar.h +include/wx/tooltip.h +include/wx/toplevel.h +include/wx/treebase.h +include/wx/treectrl.h +include/wx/txtstrm.h +include/wx/types.h +include/wx/unix/execute.h +include/wx/unix/fontutil.h +include/wx/unix/gsockunx.h +include/wx/unix/mimetype.h +include/wx/unix/utilsx11.h +include/wx/url.h +include/wx/utils.h +include/wx/valgen.h +include/wx/validate.h +include/wx/valtext.h +include/wx/variant.h +include/wx/vector.h +include/wx/version.h +include/wx/volume.h +include/wx/wave.h +include/wx/wfstream.h +include/wx/window.h +include/wx/wizard.h +include/wx/wx.h +include/wx/wx_cw.h +include/wx/wx_cw_cm.h +include/wx/wx_cw_d.h +include/wx/wxchar.h +include/wx/wxexpr.h +include/wx/wxhtml.h +include/wx/wxprec.h +include/wx/xpmdecod.h +include/wx/zipstrm.h +include/wx/zstream.h +share/aclocal/wxwin.m4 +share/locale/cs/LC_MESSAGES/wxstd.mo +share/locale/da/LC_MESSAGES/wxstd.mo +share/locale/de/LC_MESSAGES/wxstd.mo +share/locale/es/LC_MESSAGES/wxstd.mo +share/locale/fi/LC_MESSAGES/wxstd.mo +share/locale/fr/LC_MESSAGES/wxstd.mo +share/locale/hu/LC_MESSAGES/wxstd.mo +share/locale/id/LC_MESSAGES/wxstd.mo +share/locale/it/LC_MESSAGES/wxstd.mo +share/locale/nl/LC_MESSAGES/wxstd.mo +share/locale/pl/LC_MESSAGES/wxstd.mo +share/locale/ru/LC_MESSAGES/wxstd.mo +share/locale/sl/LC_MESSAGES/wxstd.mo +share/locale/sv/LC_MESSAGES/wxstd.mo +share/locale/tr/LC_MESSAGES/wxstd.mo +share/locale/zh/LC_MESSAGES/wxstd.mo +share/wx/afm/Cour.afm +share/wx/afm/CourBo.afm +share/wx/afm/CourBoO.afm +share/wx/afm/CourO.afm +share/wx/afm/Helv.afm +share/wx/afm/HelvBo.afm +share/wx/afm/HelvBoO.afm +share/wx/afm/HelvO.afm +share/wx/afm/TimesBo.afm +share/wx/afm/TimesBoO.afm +share/wx/afm/TimesO.afm +share/wx/afm/TimesRo.afm +share/wx/afm/Zapf.afm +share/wx/gs_afm/Cour.afm +share/wx/gs_afm/CourBo.afm +share/wx/gs_afm/CourBoO.afm +share/wx/gs_afm/CourO.afm +share/wx/gs_afm/Helv.afm +share/wx/gs_afm/HelvBo.afm +share/wx/gs_afm/HelvBoO.afm +share/wx/gs_afm/HelvO.afm +share/wx/gs_afm/TimesBo.afm +share/wx/gs_afm/TimesBoO.afm +share/wx/gs_afm/TimesO.afm +share/wx/gs_afm/TimesRo.afm +share/wx/gs_afm/Zapf.afm +@dirrm share/wx/gs_afm +@dirrm share/wx/afm +@dirrm share/wx +@dirrm include/wx/unix +@dirrm include/wx/protocol +@dirrm include/wx/html +@dirrm include/wx/gtk +@dirrm include/wx/generic +@dirrm include/wx diff --git a/x11-toolkits/wxgtk-contrib-common/Makefile b/x11-toolkits/wxgtk-contrib-common/Makefile new file mode 100644 index 000000000000..bdedb77fdd37 --- /dev/null +++ b/x11-toolkits/wxgtk-contrib-common/Makefile @@ -0,0 +1,16 @@ +# New ports collection makefile for: wxgtk-contrib-common +# Date created: November 4, 2003 +# Whom: fjoe@FreeBSD.ORG +# +# $FreeBSD$ +# + +PORTREVISION= 0 + +MAINTAINER= fjoe@FreeBSD.org +COMMENT= The wxWindows GUI toolkit contributed libraries (common files) + +WXGTK_FLAVOR= gtk-contrib-common +MASTERDIR= ${.CURDIR}/../wxgtk-devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk-devel/pkg-plist.contrib b/x11-toolkits/wxgtk-contrib-common/pkg-plist index e7fcd208d6bd..1c12eecee8e3 100644 --- a/x11-toolkits/wxgtk-devel/pkg-plist.contrib +++ b/x11-toolkits/wxgtk-contrib-common/pkg-plist @@ -85,24 +85,6 @@ include/wx/xrc/xh_unkwn.h include/wx/xrc/xh_wizrd.h include/wx/xrc/xml.h include/wx/xrc/xmlres.h -lib/libwx_gtk_canvas.so -lib/libwx_gtk_canvas.so.0 -lib/libwx_gtk_dcsvg.so -lib/libwx_gtk_dcsvg.so.0 -lib/libwx_gtk_fl.so -lib/libwx_gtk_fl.so.0 -lib/libwx_gtk_gizmos.so -lib/libwx_gtk_gizmos.so.0 -lib/libwx_gtk_net.so -lib/libwx_gtk_net.so.0 -lib/libwx_gtk_ogl.so -lib/libwx_gtk_ogl.so.0 -lib/libwx_gtk_plot.so -lib/libwx_gtk_plot.so.0 -lib/libwx_gtk_stc.so -lib/libwx_gtk_stc.so.0 -lib/libwx_gtk_xrc.so -lib/libwx_gtk_xrc.so.0 @dirrm include/wx/xrc @dirrm include/wx/svg @dirrm include/wx/stc @@ -112,4 +94,3 @@ lib/libwx_gtk_xrc.so.0 @dirrm include/wx/gizmos @dirrm include/wx/fl @dirrm include/wx/canvas -@unexec rmdir %D/include/wx 2>/dev/null || true diff --git a/x11-toolkits/wxgtk-contrib/Makefile b/x11-toolkits/wxgtk-contrib/Makefile index c226b5624e2f..ddcc98a41bf0 100644 --- a/x11-toolkits/wxgtk-contrib/Makefile +++ b/x11-toolkits/wxgtk-contrib/Makefile @@ -5,16 +5,12 @@ # $FreeBSD$ # -PORTREVISION= 0 -PKGNAMESUFFIX= -contrib +PORTREVISION= 1 MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWindows GUI toolkit contributed libraries -BUILD_WRKSRC= ${WRKSRC}/contrib/src -INSTALL_WRKSRC= ${BUILD_WRKSRC} - +WXGTK_FLAVOR= gtk-contrib MASTERDIR= ${.CURDIR}/../wxgtk-devel -PLIST= ${PKGDIR}/pkg-plist.contrib .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk-contrib/pkg-plist b/x11-toolkits/wxgtk-contrib/pkg-plist new file mode 100644 index 000000000000..e2b142c75bf6 --- /dev/null +++ b/x11-toolkits/wxgtk-contrib/pkg-plist @@ -0,0 +1,18 @@ +lib/libwx_gtk_canvas-2.4.so +lib/libwx_gtk_canvas-2.4.so.0 +lib/libwx_gtk_dcsvg-2.4.so +lib/libwx_gtk_dcsvg-2.4.so.0 +lib/libwx_gtk_fl-2.4.so +lib/libwx_gtk_fl-2.4.so.0 +lib/libwx_gtk_gizmos-2.4.so +lib/libwx_gtk_gizmos-2.4.so.0 +lib/libwx_gtk_net-2.4.so +lib/libwx_gtk_net-2.4.so.0 +lib/libwx_gtk_ogl-2.4.so +lib/libwx_gtk_ogl-2.4.so.0 +lib/libwx_gtk_plot-2.4.so +lib/libwx_gtk_plot-2.4.so.0 +lib/libwx_gtk_stc-2.4.so +lib/libwx_gtk_stc-2.4.so.0 +lib/libwx_gtk_xrc-2.4.so +lib/libwx_gtk_xrc-2.4.so.0 diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile index 390fb030780c..622b4551c04e 100644 --- a/x11-toolkits/wxgtk-devel/Makefile +++ b/x11-toolkits/wxgtk-devel/Makefile @@ -5,17 +5,18 @@ # $FreeBSD$ # -PORTNAME= wxgtk +PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 3 +PORTREVISION?= 4 +PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ MASTER_SITE_SUBDIR= wxwindows DISTNAME= wxGTK-${PORTVERSION} -MAINTAINER?= ports@FreeBSD.org -COMMENT?= The wxWindows GUI toolkit with GTK+ bindings (unstable version) +MAINTAINER?= fjoe@FreeBSD.org +COMMENT?= The wxWindows GUI toolkit with GTK+ bindings LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -28,7 +29,7 @@ USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-libpng=sys \ +CONFIGURE_ARGS=--with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys \ @@ -40,43 +41,56 @@ CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib \ ${PTHREAD_LIBS}" +MAKE_ENV= WXGTK_FLAVOR="${WXGTK_FLAVOR}" +PLIST= ${.CURDIR}/pkg-plist -.if defined(WITH_GTK2) -USE_GNOME= gtk20 -.else -USE_GNOME= gtk12 +WXGTK_FLAVOR?= gtk + +.if ${WXGTK_FLAVOR} != "gtk-common" +RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common .endif -.include <bsd.port.pre.mk> +.if ${WXGTK_FLAVOR:M*-common} != "" +NO_BUILD= yes +INSTALL_TARGET= install-common +.endif # *-common + +.if ${WXGTK_FLAVOR:M*-contrib*} != "" +BUILD_WRKSRC= ${WRKSRC}/contrib/src +INSTALL_WRKSRC= ${BUILD_WRKSRC} -.if defined(WITH_UNICODE) -WITH_GTK2= yes +.if ${WXGTK_FLAVOR} != "gtk-contrib-common" +RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk-contrib-common +.if ${WXGTK_FLAVOR} == "gtk-contrib" +LIB_DEPENDS+= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk-devel +.elif ${WXGTK_FLAVOR} == "gtk2-contrib" +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +.elif ${WXGTK_FLAVOR} == "gtk2-unicode-contrib" +LIB_DEPENDS+= wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode +.endif +.endif # !gtk-contrib-common +.endif # *-contrib* +.include <bsd.port.pre.mk> + +.if ${WXGTK_FLAVOR:M*-unicode*} != "" .if ${OSVERSION} < 500000 -BROKEN= Unicode mode is not supported on your system +BROKEN= Systems prior to FreeBSD 5.0 currently out of support .else CONFIGURE_ARGS+=--enable-unicode .endif -.endif # WITH_UNICODE +.endif # *-unicode* -.if defined(WITH_GTK2) +.if ${WXGTK_FLAVOR:Mgtk2*} != "" +USE_GNOME= gtk20 CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} .else +USE_GNOME= gtk12 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET} .endif -pre-everything:: -.if !defined(WITH_GTK2) - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "You can define WITH_GTK2=yes if you want to use Gtk20 toolkit." - @${ECHO_MSG} "This is marked as experimental by wxGTK authors." - @${ECHO_MSG} "Note: applications already linked to Gtk12 wxGTK will no longer work." - @${ECHO_MSG} " You have to rebuild them by hand." - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" -.endif - pre-patch: -.if defined(WITH_GTK2) +.if ${WXGTK_FLAVOR:Mgtk2*} != "" @${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure .else @${REINPLACE_CMD} -e 's|lgdk|lgdk12|g' ${WRKSRC}/configure diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa deleted file mode 100644 index bd4ac2acf254..000000000000 --- a/x11-toolkits/wxgtk-devel/files/patch-aa +++ /dev/null @@ -1,108 +0,0 @@ - -$FreeBSD$ - ---- configure.in.orig Sun Sep 21 20:31:30 2003 -+++ configure.in Sun Nov 2 16:18:58 2003 -@@ -1751,7 +1751,7 @@ - dnl Apple did fix the security problem in it and not using the system - dnl library results in a whole bunch of warnings when linking with - dnl Carbon framework -- if test "$USE_DARWIN" = 1; then -+ if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then - system_zlib_h_ok="yes" - else - dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is -@@ -2785,8 +2785,8 @@ - - WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` - --TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" --TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" -+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" -+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl" - - if test "$cross_compiling" = "yes"; then - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" -@@ -2799,14 +2799,12 @@ - WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" - - dnl the name of the shared library --WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" --WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2" -+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2" - - dnl the name of the links to the shared library --WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" --WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" - - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) -@@ -3607,7 +3605,7 @@ - dnl simply linking with libpthread should make the test below work but - dnl it's far from certain that the threaded programs compiled without - dnl any special switches actually work, so try it after all the others -- THREAD_OPTS="$THREAD_OPTS pthread none" -+ THREAD_OPTS= - - dnl now test for all possibilities - THREADS_OK=no -@@ -3649,6 +3647,8 @@ - THREADS_CFLAGS="" - done - -+ THREADS_OK=yes -+ - if test "x$THREADS_OK" != "xyes"; then - wxUSE_THREADS=no - AC_MSG_WARN([No thread support on this system... disabled]) -@@ -3672,7 +3672,6 @@ - flag="-D_THREAD_SAFE" - ;; - *-freebsd*) -- flag="-D_THREAD_SAFE" - ;; - *-hp-hpux* ) - flag="-D_REENTRANT" -@@ -3954,21 +3953,6 @@ - esac - fi - --if test "$wxUSE_OPTIMISE" = "no" ; then -- OPTIMISE= --else -- if test "$GCC" = yes ; then -- OPTIMISE="-O2" -- case "${host}" in -- i586-*-*|i686-*-* ) -- OPTIMISE="${OPTIMISE} " -- ;; -- esac -- else -- OPTIMISE="-O" -- fi --fi -- - if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - AC_DEFINE(WXWIN_COMPATIBILITY_2) - -@@ -5439,7 +5423,6 @@ - AC_SUBST(WX_LIBRARY_IMPORTLIB) - AC_SUBST(WX_TARGET_LIBRARY) - AC_SUBST(WX_LIBRARY_LINK1) --AC_SUBST(WX_LIBRARY_LINK2) - AC_SUBST(PROGRAM_EXT) - - dnl global gl options -@@ -5447,7 +5430,6 @@ - AC_SUBST(WX_LIBRARY_NAME_SHARED_GL) - AC_SUBST(WX_TARGET_LIBRARY_GL) - AC_SUBST(WX_LIBRARY_LINK1_GL) --AC_SUBST(WX_LIBRARY_LINK2_GL) - - dnl are we supposed to create the links? - AC_SUBST(WX_ALL) diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac index f4522eaf15bd..9513e8f0e204 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-ac +++ b/x11-toolkits/wxgtk-devel/files/patch-ac @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.in.orig Sun Jan 5 13:54:59 2003 -+++ Makefile.in Tue Jan 14 18:29:58 2003 +--- Makefile.in.orig Sun Sep 21 18:31:27 2003 ++++ Makefile.in Tue Nov 4 22:33:54 2003 @@ -332,17 +332,13 @@ $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ @@ -23,7 +20,7 @@ $FreeBSD$ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -@@ -371,26 +367,21 @@ +@@ -371,28 +367,23 @@ CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ @@ -41,7 +38,8 @@ $FreeBSD$ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ - afminstall: preinstall +-afminstall: preinstall ++afminstall: @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi $(INSTALL) -d $(datadir)/wx - $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) @@ -50,27 +48,42 @@ $FreeBSD$ - $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm - $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm + $(INSTALL) -d $(datadir)/wx/afm -+ $(INSTALL) -d $(datadir)/wx//gs_afm ++ $(INSTALL) -d $(datadir)/wx/gs_afm + $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm + $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - m4datainstall: preinstall +-m4datainstall: preinstall ++m4datainstall: $(INSTALL) -d $(datadir)/aclocal -@@ -425,20 +416,16 @@ - @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi + $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal +@@ -410,7 +401,7 @@ + + # this is the real install target: copies the library, wx-config and the + # headers to the installation directory +-preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config ++install-common: @AFMINSTALL@ m4datainstall @WIN32INSTALL@ + @echo " " + @echo " Installing wxWindows..." + @echo " " +@@ -419,26 +410,11 @@ + @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + +- $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config +- cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config +- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ +- @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ +- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi +- - $(INSTALL) -d $(libdir)/wx - $(INSTALL) -d $(libdir)/wx/include - $(INSTALL) -d $(libdir)/wx/include/univ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx -+ $(INSTALL) -d $(prefix)/include/wx -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ - $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ +- $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ - $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -+ $(prefix)/include/wx/setup.h - +- $(INSTALL) -d $(includedir)/wx @# FIXME: This will erroneously install a wx/base dir for wxBase.. @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @@ -80,18 +93,32 @@ $FreeBSD$ @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi @# always install msw headers for wxBase, it's much simpler -@@ -494,13 +481,11 @@ - @echo " Removing library..." - @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ - @echo " Removing GL library..." - @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - @echo " Removing helper files..." -- @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -+ @$(RM) $(prefix)/include/wx/@TOOLCHAIN_NAME@/setup.h - @$(RM) $(bindir)/wx-config - @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config - @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/* +@@ -459,6 +435,19 @@ + echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ + done + ++preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config ++ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config ++ @if test "$(WXGTK_FLAVOR)" = "gtk"; then \ ++ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \ ++ fi ++ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ ++ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ ++ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi ++ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ ++ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx ++ $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ ++ $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h ++ + preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ + @echo " " + @echo " Installing wxWindows Mac resource ..." +@@ -474,7 +463,7 @@ + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ + +-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ ++install: @WX_ALL_INSTALLED@ + @echo " " + @echo " The installation of wxWindows is finished. On certain" + @echo " platforms (e.g. Linux) you'll now have to run ldconfig" diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure index 97ca751922d6..2236f9edacee 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-configure +++ b/x11-toolkits/wxgtk-devel/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Sun Nov 2 16:08:40 2003 -+++ configure Sun Nov 2 16:17:32 2003 +--- configure.orig Tue Nov 4 19:54:04 2003 ++++ configure Tue Nov 4 20:12:59 2003 @@ -11731,7 +11731,7 @@ @@ -9,36 +9,21 @@ system_zlib_h_ok="yes" else echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 -@@ -16048,8 +16048,8 @@ - - WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"` - --TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" --TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" -+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" -+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl" - - if test "$cross_compiling" = "yes"; then - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" -@@ -16060,13 +16060,11 @@ - WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" - WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" - --WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" --WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2" -+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2" - --WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" --WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" +@@ -16099,6 +16099,13 @@ + WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc" + fi + ;; ++ ++ *-*-freebsd* ) ++ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" ++ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" ++ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" ++ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" ++ ;; + esac - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) -@@ -18679,7 +18677,7 @@ + WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +@@ -18679,7 +18686,7 @@ ;; esac @@ -47,7 +32,7 @@ THREADS_OK=no for flag in $THREAD_OPTS; do -@@ -18736,6 +18734,8 @@ +@@ -18736,6 +18743,8 @@ THREADS_CFLAGS="" done @@ -56,7 +41,7 @@ if test "x$THREADS_OK" != "xyes"; then wxUSE_THREADS=no echo "configure: warning: No thread support on this system... disabled" 1>&2 -@@ -18752,7 +18752,6 @@ +@@ -18752,7 +18761,6 @@ flag="-D_THREAD_SAFE" ;; *-freebsd*) @@ -64,10 +49,12 @@ ;; *-hp-hpux* ) flag="-D_REENTRANT" -@@ -19531,21 +19530,6 @@ +@@ -19529,21 +19537,6 @@ + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections" + ;; esac - fi - +-fi +- -if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= -else @@ -81,22 +68,6 @@ - else - OPTIMISE="-O" - fi --fi -- + fi + if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - cat >> confdefs.h <<\EOF - #define WXWIN_COMPATIBILITY_2 1 -@@ -22780,13 +22764,11 @@ - s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g - s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g - s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g --s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g - s%@PROGRAM_EXT@%$PROGRAM_EXT%g - s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g - s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g - s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g - s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g --s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g - s%@WX_ALL@%$WX_ALL%g - s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g - s%@SHARED_LD@%$SHARED_LD%g diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-include-wx-fl-frmview.h b/x11-toolkits/wxgtk-devel/files/patch-contrib-include-wx-fl-frmview.h new file mode 100644 index 000000000000..57217e446561 --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-include-wx-fl-frmview.h @@ -0,0 +1,11 @@ +--- contrib/include/wx/fl/frmview.h.orig Wed Nov 5 00:02:21 2003 ++++ contrib/include/wx/fl/frmview.h Wed Nov 5 00:03:08 2003 +@@ -114,7 +114,7 @@ + + // if file name is empty, views are are not saved/loaded + +- virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" ); ++ virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = wxEmptyString ); + + // synonyms + wxFrame* GetParentFrame(); diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in index e7f9083031fb..5d9fe0443f8e 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in @@ -1,5 +1,5 @@ ---- contrib/src/Makefile.in.orig Tue Nov 4 04:29:40 2003 -+++ contrib/src/Makefile.in Tue Nov 4 04:29:51 2003 +--- contrib/src/Makefile.in.orig Sun Sep 21 18:32:39 2003 ++++ contrib/src/Makefile.in Tue Nov 4 22:30:37 2003 @@ -1,6 +1,6 @@ # $Id: Makefile.in,v 1.13.2.1 2003/07/28 08:23:09 VS Exp $ @@ -8,3 +8,13 @@ all: @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done +@@ -10,6 +10,9 @@ + + install: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done ++ ++install-common: ++ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done + + uninstall: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp new file mode 100644 index 000000000000..88d6778914ba --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp @@ -0,0 +1,33 @@ +--- contrib/src/gizmos/multicell.cpp.orig Wed Nov 5 00:04:44 2003 ++++ contrib/src/gizmos/multicell.cpp Wed Nov 5 00:06:11 2003 +@@ -633,17 +633,12 @@ + m_minCellSize = wxSize(5, 5); + } + //--------------------------------------------------------------------------- +-wxString itoa(int x) +-{ +- char bfr[255]; +- sprintf(bfr, "%d", x); +- return bfr; +-} +-//--------------------------------------------------------------------------- + void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col) + { +- wxASSERT_MSG(row >= 0 && row < m_maxRows, wxString("Row ") + itoa(row) + " out of bounds (" + itoa(m_maxRows) + ")"); +- wxASSERT_MSG(col >= 0 && col < m_maxCols, wxString("Column ") + itoa(col) + " out of bounds (" + itoa(m_maxCols) + ")"); ++ wxASSERT_MSG(row >= 0 && row < m_maxRows, ++ wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) ); ++ wxASSERT_MSG(col >= 0 && col < m_maxCols, ++ wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) ); + wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied")); + + wxCell *newCell = new wxCell(win); +@@ -660,7 +655,7 @@ + if (!m_cells[CELL_LOC(row, col)]) + { + // Create an empty static text field as a placeholder +- m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, "")); ++ m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, wxT(""))); + } + wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window); + } diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-plot-plot.cpp b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-plot-plot.cpp new file mode 100644 index 000000000000..ff6fc281b199 --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-plot-plot.cpp @@ -0,0 +1,38 @@ +--- contrib/src/plot/plot.cpp.orig Wed Nov 5 00:03:37 2003 ++++ contrib/src/plot/plot.cpp Wed Nov 5 00:04:27 2003 +@@ -204,7 +204,7 @@ + END_EVENT_TABLE() + + wxPlotArea::wxPlotArea( wxPlotWindow *parent ) +- : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, "plotarea" ) ++ : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") ) + { + m_owner = parent; + +@@ -462,7 +462,7 @@ + END_EVENT_TABLE() + + wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent ) +- : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, "plotxaxisarea" ) ++ : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, _T("plotxaxisarea") ) + { + m_owner = parent; + +@@ -589,7 +589,7 @@ + END_EVENT_TABLE() + + wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent ) +- : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, "plotyaxisarea" ) ++ : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, _T("plotyaxisarea") ) + { + m_owner = parent; + +@@ -713,7 +713,7 @@ + END_EVENT_TABLE() + + wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag ) +- : wxScrolledWindow( parent, id, pos, size, flag, "plotcanvas" ) ++ : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") ) + { + m_xUnitsPerValue = 1.0; + m_xZoom = 1.0; diff --git a/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in index 0322453d05de..17ce4b33fced 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in +++ b/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in @@ -1,20 +1,17 @@ ---- src/makelib.env.in.orig Tue Nov 4 05:00:26 2003 -+++ src/makelib.env.in Tue Nov 4 05:01:53 2003 -@@ -34,9 +34,10 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ +--- src/makelib.env.in.orig Sun Sep 21 18:31:38 2003 ++++ src/makelib.env.in Tue Nov 4 22:33:31 2003 +@@ -35,8 +35,8 @@ INSTALL_DATA = @INSTALL_DATA@ --TARGETLIB_STATIC = $(TARGET_LIBNAME).a + TARGETLIB_STATIC = $(TARGET_LIBNAME).a -TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) -TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -+target_libname = $(TARGET_LIBNAME:-@WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@=) -+TARGETLIB_STATIC = $(target_libname).a -+TARGETLIB_SHARED = $(target_libname).so.$(LIBVERSION_CURRENT) -+TARGETLIB_LINK1 = $(target_libname).so ++TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) ++TARGETLIB_LINK1 = $(TARGET_LIBNAME).so TARGETLIB_LINK2 = $(TARGET_LIBNAME).so TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ -@@ -72,9 +73,8 @@ +@@ -72,9 +72,8 @@ @$(INSTALL) -d $(top_builddir)/lib $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) cd $(top_builddir)/lib \ @@ -26,7 +23,14 @@ $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) @$(INSTALL) -d $(top_builddir)/lib -@@ -86,10 +86,9 @@ +@@ -82,14 +81,15 @@ + $(AR) $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +-install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers ++install: install_@WX_TARGET_LIBRARY_TYPE@ ++ ++install-common: install_headers install_so: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) @@ -39,7 +43,7 @@ install_a: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -@@ -105,7 +104,6 @@ +@@ -105,7 +105,6 @@ $(RM) $(libdir)/$(TARGETLIB_STATIC) $(RM) $(libdir)/$(TARGETLIB_SHARED) $(RM) $(libdir)/$(TARGETLIB_LINK1) @@ -47,7 +51,7 @@ @echo "removing headers" @for h in $(HEADERS); do \ $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ -@@ -118,7 +116,6 @@ +@@ -118,7 +117,6 @@ clean: $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ $(top_builddir)/lib/$(TARGETLIB_LINK1) \ diff --git a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in index ff8564822f23..a7ed9b6792da 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in +++ b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- wx-config.in.orig Sun Jan 5 13:54:59 2003 -+++ wx-config.in Tue Jan 14 18:36:21 2003 +--- wx-config.in.orig Wed Nov 5 00:19:46 2003 ++++ wx-config.in Wed Nov 5 00:20:14 2003 @@ -66,7 +66,7 @@ if test $inplace_flag = yes ; then includes="-I$inplace_builddir/lib/wx/include/@TOOLCHAIN_NAME@ -I$inplace_include" else - includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@$includes" -+ includes="-I@prefix@/include $includes" ++ includes="-I@prefix@/include/wx/@TOOLCHAIN_NAME@$includes" fi if test $static_flag = yes ; then diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist index 2e76e193cd9c..1db0937a8ce8 100644 --- a/x11-toolkits/wxgtk-devel/pkg-plist +++ b/x11-toolkits/wxgtk-devel/pkg-plist @@ -1,422 +1,9 @@ bin/wx-config -bin/wxgtk-config -include/wx/accel.h -include/wx/app.h -include/wx/arrimpl.cpp -include/wx/artprov.h -include/wx/bitmap.h -include/wx/bmpbuttn.h -include/wx/brush.h -include/wx/buffer.h -include/wx/build.h -include/wx/busyinfo.h -include/wx/button.h -include/wx/calctrl.h -include/wx/caret.h -include/wx/checkbox.h -include/wx/checklst.h -include/wx/chkconf.h -include/wx/choicdlg.h -include/wx/choice.h -include/wx/clipbrd.h -include/wx/clntdata.h -include/wx/cmdline.h -include/wx/cmdproc.h -include/wx/cmndata.h -include/wx/colordlg.h -include/wx/colour.h -include/wx/combobox.h -include/wx/confbase.h -include/wx/config.h -include/wx/containr.h -include/wx/control.h -include/wx/cshelp.h -include/wx/ctrlsub.h -include/wx/cursor.h -include/wx/dataobj.h -include/wx/date.h -include/wx/datetime.h -include/wx/datetime.inl -include/wx/datstrm.h -include/wx/db.h -include/wx/dbgrid.h -include/wx/dbkeyg.h -include/wx/dbtable.h -include/wx/dc.h -include/wx/dcbuffer.h -include/wx/dcclient.h -include/wx/dcmemory.h -include/wx/dcprint.h -include/wx/dcps.h -include/wx/dcscreen.h -include/wx/dde.h -include/wx/debug.h -include/wx/defs.h -include/wx/dialog.h -include/wx/dialup.h -include/wx/dir.h -include/wx/dirctrl.h -include/wx/dirdlg.h -include/wx/dnd.h -include/wx/docmdi.h -include/wx/docview.h -include/wx/dragimag.h -include/wx/dynarray.h -include/wx/dynlib.h -include/wx/dynload.h -include/wx/effects.h -include/wx/encconv.h -include/wx/event.h -include/wx/expr.h -include/wx/fdrepdlg.h -include/wx/features.h -include/wx/ffile.h -include/wx/file.h -include/wx/fileconf.h -include/wx/filedlg.h -include/wx/filefn.h -include/wx/filename.h -include/wx/filesys.h -include/wx/font.h -include/wx/fontdlg.h -include/wx/fontenc.h -include/wx/fontenum.h -include/wx/fontmap.h -include/wx/fontutil.h -include/wx/frame.h -include/wx/fs_inet.h -include/wx/fs_mem.h -include/wx/fs_zip.h -include/wx/gauge.h -include/wx/gdicmn.h -include/wx/gdiobj.h -include/wx/generic/accel.h -include/wx/generic/calctrl.h -include/wx/generic/caret.h -include/wx/generic/choicdgg.h -include/wx/generic/colrdlgg.h -include/wx/generic/dcpsg.h -include/wx/generic/dirctrlg.h -include/wx/generic/dirdlgg.h -include/wx/generic/dragimgg.h -include/wx/generic/fdrepdlg.h -include/wx/generic/filedlgg.h -include/wx/generic/fontdlgg.h -include/wx/generic/grid.h -include/wx/generic/gridctrl.h -include/wx/generic/gridg.h -include/wx/generic/helpext.h -include/wx/generic/helphtml.h -include/wx/generic/imaglist.h -include/wx/generic/laywin.h -include/wx/generic/listctrl.h -include/wx/generic/msgdlgg.h -include/wx/generic/notebook.h -include/wx/generic/paletteg.h -include/wx/generic/panelg.h -include/wx/generic/printps.h -include/wx/generic/prntdlgg.h -include/wx/generic/progdlgg.h -include/wx/generic/sashwin.h -include/wx/generic/scrolwin.h -include/wx/generic/spinctlg.h -include/wx/generic/splash.h -include/wx/generic/splitter.h -include/wx/generic/statusbr.h -include/wx/generic/tabg.h -include/wx/generic/textdlgg.h -include/wx/generic/timer.h -include/wx/generic/treectlg.h -include/wx/generic/wizard.h -include/wx/geometry.h -include/wx/gifdecod.h -include/wx/glcanvas.h -include/wx/grid.h -include/wx/gsocket.h -include/wx/gtk/accel.h -include/wx/gtk/app.h -include/wx/gtk/bitmap.h -include/wx/gtk/bmpbuttn.h -include/wx/gtk/brush.h -include/wx/gtk/button.h -include/wx/gtk/checkbox.h -include/wx/gtk/checklst.h -include/wx/gtk/choice.h -include/wx/gtk/clipbrd.h -include/wx/gtk/colour.h -include/wx/gtk/combobox.h -include/wx/gtk/control.h -include/wx/gtk/cursor.h -include/wx/gtk/dataform.h -include/wx/gtk/dataobj.h -include/wx/gtk/dataobj2.h -include/wx/gtk/dc.h -include/wx/gtk/dcclient.h -include/wx/gtk/dcmemory.h -include/wx/gtk/dcscreen.h -include/wx/gtk/dialog.h -include/wx/gtk/dnd.h -include/wx/gtk/filedlg.h -include/wx/gtk/font.h -include/wx/gtk/fontdlg.h -include/wx/gtk/frame.h -include/wx/gtk/gauge.h -include/wx/gtk/gdiobj.h -include/wx/gtk/glcanvas.h -include/wx/gtk/icon.h -include/wx/gtk/joystick.h -include/wx/gtk/listbox.h -include/wx/gtk/mdi.h -include/wx/gtk/menu.h -include/wx/gtk/menuitem.h -include/wx/gtk/minifram.h -include/wx/gtk/notebook.h -include/wx/gtk/pen.h -include/wx/gtk/popupwin.h -include/wx/gtk/radiobox.h -include/wx/gtk/radiobut.h -include/wx/gtk/region.h -include/wx/gtk/scrolbar.h -include/wx/gtk/scrolwin.h -include/wx/gtk/slider.h -include/wx/gtk/spinbutt.h -include/wx/gtk/spinctrl.h -include/wx/gtk/statbmp.h -include/wx/gtk/statbox.h -include/wx/gtk/statline.h -include/wx/gtk/stattext.h -include/wx/gtk/tbargtk.h -include/wx/gtk/textctrl.h -include/wx/gtk/tglbtn.h -include/wx/gtk/timer.h -include/wx/gtk/tooltip.h -include/wx/gtk/toplevel.h -include/wx/gtk/treectrl.h -include/wx/gtk/wave.h -include/wx/gtk/win_gtk.h -include/wx/gtk/window.h -include/wx/hash.h -include/wx/hashmap.h -include/wx/help.h -include/wx/helpbase.h -include/wx/helphtml.h -include/wx/helpwin.h -include/wx/html/forcelnk.h -include/wx/html/helpctrl.h -include/wx/html/helpdata.h -include/wx/html/helpfrm.h -include/wx/html/htmlcell.h -include/wx/html/htmldefs.h -include/wx/html/htmlfilt.h -include/wx/html/htmlpars.h -include/wx/html/htmltag.h -include/wx/html/htmlwin.h -include/wx/html/htmprint.h -include/wx/html/m_templ.h -include/wx/html/winpars.h -include/wx/icon.h -include/wx/iconbndl.h -include/wx/imagbmp.h -include/wx/image.h -include/wx/imaggif.h -include/wx/imagiff.h -include/wx/imagjpeg.h -include/wx/imaglist.h -include/wx/imagpcx.h -include/wx/imagpng.h -include/wx/imagpnm.h -include/wx/imagtiff.h -include/wx/imagxpm.h -include/wx/intl.h -include/wx/ioswrap.h -include/wx/ipc.h -include/wx/ipcbase.h -include/wx/isql.h -include/wx/isqlext.h -include/wx/joystick.h -include/wx/layout.h -include/wx/laywin.h -include/wx/list.h -include/wx/listbase.h -include/wx/listbox.h -include/wx/listctrl.h -include/wx/listimpl.cpp -include/wx/log.h -include/wx/longlong.h -include/wx/matrix.h -include/wx/mdi.h -include/wx/memconf.h -include/wx/memory.h -include/wx/memtext.h -include/wx/menu.h -include/wx/menuitem.h -include/wx/metafile.h -include/wx/mimetype.h -include/wx/minifram.h -include/wx/module.h -include/wx/msgdlg.h -include/wx/msgout.h -include/wx/mstream.h -include/wx/notebook.h -include/wx/object.h -include/wx/odbc.h -include/wx/ownerdrw.h -include/wx/palette.h -include/wx/panel.h -include/wx/paper.h -include/wx/pen.h -include/wx/platform.h -include/wx/popupwin.h -include/wx/print.h -include/wx/printdlg.h -include/wx/prntbase.h -include/wx/process.h -include/wx/progdlg.h -include/wx/prop.h -include/wx/propform.h -include/wx/proplist.h -include/wx/protocol/file.h -include/wx/protocol/ftp.h -include/wx/protocol/http.h -include/wx/protocol/protocol.h -include/wx/quantize.h -include/wx/radiobox.h -include/wx/radiobut.h -include/wx/regex.h -include/wx/region.h -include/wx/resource.h -include/wx/sashwin.h -include/wx/sckaddr.h -include/wx/sckipc.h -include/wx/sckstrm.h -include/wx/scrolbar.h -include/wx/scrolwin.h -include/wx/settings.h -include/wx/setup.h -include/wx/sizer.h -include/wx/slider.h -include/wx/snglinst.h -include/wx/socket.h -include/wx/spinbutt.h -include/wx/spinctrl.h -include/wx/splash.h -include/wx/splitter.h -include/wx/stack.h -include/wx/statbmp.h -include/wx/statbox.h -include/wx/statline.h -include/wx/stattext.h -include/wx/statusbr.h -include/wx/strconv.h -include/wx/stream.h -include/wx/string.h -include/wx/sysopt.h -include/wx/tab.h -include/wx/tabctrl.h -include/wx/taskbar.h -include/wx/tbarbase.h -include/wx/tbarsmpl.h -include/wx/textbuf.h -include/wx/textctrl.h -include/wx/textdlg.h -include/wx/textfile.h -include/wx/tglbtn.h -include/wx/thread.h -include/wx/thrimpl.cpp -include/wx/time.h -include/wx/timer.h -include/wx/tipdlg.h -include/wx/tipwin.h -include/wx/tokenzr.h -include/wx/toolbar.h -include/wx/tooltip.h -include/wx/toplevel.h -include/wx/treebase.h -include/wx/treectrl.h -include/wx/txtstrm.h -include/wx/types.h -include/wx/unix/execute.h -include/wx/unix/fontutil.h -include/wx/unix/gsockunx.h -include/wx/unix/mimetype.h -include/wx/unix/utilsx11.h -include/wx/url.h -include/wx/utils.h -include/wx/valgen.h -include/wx/validate.h -include/wx/valtext.h -include/wx/variant.h -include/wx/vector.h -include/wx/version.h -include/wx/volume.h -include/wx/wave.h -include/wx/wfstream.h -include/wx/window.h -include/wx/wizard.h -include/wx/wx.h -include/wx/wx_cw.h -include/wx/wx_cw_cm.h -include/wx/wx_cw_d.h -include/wx/wxchar.h -include/wx/wxexpr.h -include/wx/wxhtml.h -include/wx/wxprec.h -include/wx/xpmdecod.h -include/wx/zipstrm.h -include/wx/zstream.h -lib/libwx_gtk.so -lib/libwx_gtk.so.2 -lib/libwx_gtk_gl.so -lib/libwx_gtk_gl.so.2 -share/aclocal/wxwin.m4 -share/locale/cs/LC_MESSAGES/wxstd.mo -share/locale/da/LC_MESSAGES/wxstd.mo -share/locale/de/LC_MESSAGES/wxstd.mo -share/locale/es/LC_MESSAGES/wxstd.mo -share/locale/fi/LC_MESSAGES/wxstd.mo -share/locale/fr/LC_MESSAGES/wxstd.mo -share/locale/hu/LC_MESSAGES/wxstd.mo -share/locale/id/LC_MESSAGES/wxstd.mo -share/locale/it/LC_MESSAGES/wxstd.mo -share/locale/nl/LC_MESSAGES/wxstd.mo -share/locale/pl/LC_MESSAGES/wxstd.mo -share/locale/ru/LC_MESSAGES/wxstd.mo -share/locale/sl/LC_MESSAGES/wxstd.mo -share/locale/sv/LC_MESSAGES/wxstd.mo -share/locale/tr/LC_MESSAGES/wxstd.mo -share/locale/zh/LC_MESSAGES/wxstd.mo -share/wx/afm/Cour.afm -share/wx/afm/CourBo.afm -share/wx/afm/CourBoO.afm -share/wx/afm/CourO.afm -share/wx/afm/Helv.afm -share/wx/afm/HelvBo.afm -share/wx/afm/HelvBoO.afm -share/wx/afm/HelvO.afm -share/wx/afm/TimesBo.afm -share/wx/afm/TimesBoO.afm -share/wx/afm/TimesO.afm -share/wx/afm/TimesRo.afm -share/wx/afm/Zapf.afm -share/wx/gs_afm/Cour.afm -share/wx/gs_afm/CourBo.afm -share/wx/gs_afm/CourBoO.afm -share/wx/gs_afm/CourO.afm -share/wx/gs_afm/Helv.afm -share/wx/gs_afm/HelvBo.afm -share/wx/gs_afm/HelvBoO.afm -share/wx/gs_afm/HelvO.afm -share/wx/gs_afm/TimesBo.afm -share/wx/gs_afm/TimesBoO.afm -share/wx/gs_afm/TimesO.afm -share/wx/gs_afm/TimesRo.afm -share/wx/gs_afm/Zapf.afm -@dirrm share/wx/gs_afm -@dirrm share/wx/afm -@dirrm share/wx -@dirrm include/wx/unix -@dirrm include/wx/protocol -@dirrm include/wx/html -@dirrm include/wx/gtk -@dirrm include/wx/generic -@dirrm include/wx +bin/wxgtk-2.4-config +include/wx/gtk-2.4/wx/setup.h +lib/libwx_gtk-2.4.so +lib/libwx_gtk-2.4.so.0 +lib/libwx_gtk_gl-2.4.so +lib/libwx_gtk_gl-2.4.so.0 +@dirrm include/wx/gtk-2.4/wx +@dirrm include/wx/gtk-2.4 diff --git a/x11-toolkits/wxgtk2-contrib/Makefile b/x11-toolkits/wxgtk2-contrib/Makefile new file mode 100644 index 000000000000..d497bf7ba1e7 --- /dev/null +++ b/x11-toolkits/wxgtk2-contrib/Makefile @@ -0,0 +1,16 @@ +# New ports collection makefile for: wxgtk2-contrib +# Date created: November 5, 2003 +# Whom: fjoe@FreeBSD.ORG +# +# $FreeBSD$ +# + +PORTREVISION= 0 + +MAINTAINER= fjoe@FreeBSD.org +COMMENT= The wxWindows GUI toolkit contributed libraries (GTK2 version) + +WXGTK_FLAVOR= gtk2-contrib +MASTERDIR= ${.CURDIR}/../wxgtk-devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2-contrib/pkg-plist b/x11-toolkits/wxgtk2-contrib/pkg-plist new file mode 100644 index 000000000000..622362868a35 --- /dev/null +++ b/x11-toolkits/wxgtk2-contrib/pkg-plist @@ -0,0 +1,18 @@ +lib/libwx_gtk2_canvas-2.4.so +lib/libwx_gtk2_canvas-2.4.so.0 +lib/libwx_gtk2_dcsvg-2.4.so +lib/libwx_gtk2_dcsvg-2.4.so.0 +lib/libwx_gtk2_fl-2.4.so +lib/libwx_gtk2_fl-2.4.so.0 +lib/libwx_gtk2_gizmos-2.4.so +lib/libwx_gtk2_gizmos-2.4.so.0 +lib/libwx_gtk2_net-2.4.so +lib/libwx_gtk2_net-2.4.so.0 +lib/libwx_gtk2_ogl-2.4.so +lib/libwx_gtk2_ogl-2.4.so.0 +lib/libwx_gtk2_plot-2.4.so +lib/libwx_gtk2_plot-2.4.so.0 +lib/libwx_gtk2_stc-2.4.so +lib/libwx_gtk2_stc-2.4.so.0 +lib/libwx_gtk2_xrc-2.4.so +lib/libwx_gtk2_xrc-2.4.so.0 diff --git a/x11-toolkits/wxgtk2-unicode-contrib/Makefile b/x11-toolkits/wxgtk2-unicode-contrib/Makefile new file mode 100644 index 000000000000..5a4086207524 --- /dev/null +++ b/x11-toolkits/wxgtk2-unicode-contrib/Makefile @@ -0,0 +1,16 @@ +# New ports collection makefile for: wxgtk2-unicode-contrib +# Date created: November 5, 2003 +# Whom: fjoe@FreeBSD.ORG +# +# $FreeBSD$ +# + +PORTREVISION= 0 + +MAINTAINER= fjoe@FreeBSD.org +COMMENT= The wxWindows GUI toolkit contributed libraries (Unicode version) + +WXGTK_FLAVOR= gtk2-unicode-contrib +MASTERDIR= ${.CURDIR}/../wxgtk-devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk2-unicode-contrib/pkg-plist new file mode 100644 index 000000000000..2ad88887dbff --- /dev/null +++ b/x11-toolkits/wxgtk2-unicode-contrib/pkg-plist @@ -0,0 +1,18 @@ +lib/libwx_gtk2u_canvas-2.4.so +lib/libwx_gtk2u_canvas-2.4.so.0 +lib/libwx_gtk2u_dcsvg-2.4.so +lib/libwx_gtk2u_dcsvg-2.4.so.0 +lib/libwx_gtk2u_fl-2.4.so +lib/libwx_gtk2u_fl-2.4.so.0 +lib/libwx_gtk2u_gizmos-2.4.so +lib/libwx_gtk2u_gizmos-2.4.so.0 +lib/libwx_gtk2u_net-2.4.so +lib/libwx_gtk2u_net-2.4.so.0 +lib/libwx_gtk2u_ogl-2.4.so +lib/libwx_gtk2u_ogl-2.4.so.0 +lib/libwx_gtk2u_plot-2.4.so +lib/libwx_gtk2u_plot-2.4.so.0 +lib/libwx_gtk2u_stc-2.4.so +lib/libwx_gtk2u_stc-2.4.so.0 +lib/libwx_gtk2u_xrc-2.4.so +lib/libwx_gtk2u_xrc-2.4.so.0 diff --git a/x11-toolkits/wxgtk2-unicode/Makefile b/x11-toolkits/wxgtk2-unicode/Makefile new file mode 100644 index 000000000000..0a6a34fd11e4 --- /dev/null +++ b/x11-toolkits/wxgtk2-unicode/Makefile @@ -0,0 +1,16 @@ +# New ports collection makefile for: wxgtk2-unicode +# Date created: November 4, 2003 +# Whom: fjoe@FreeBSD.ORG +# +# $FreeBSD$ +# + +PORTREVISION= 0 + +MAINTAINER= fjoe@FreeBSD.org +COMMENT= The wxWindows GUI toolkit (Unicode version) + +WXGTK_FLAVOR= gtk2-unicode +MASTERDIR= ${.CURDIR}/../wxgtk-devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2-unicode/pkg-plist b/x11-toolkits/wxgtk2-unicode/pkg-plist new file mode 100644 index 000000000000..6dac093e324a --- /dev/null +++ b/x11-toolkits/wxgtk2-unicode/pkg-plist @@ -0,0 +1,8 @@ +bin/wxgtk2u-2.4-config +include/wx/gtk2u-2.4/wx/setup.h +lib/libwx_gtk2u-2.4.so +lib/libwx_gtk2u-2.4.so.0 +lib/libwx_gtk2u_gl-2.4.so +lib/libwx_gtk2u_gl-2.4.so.0 +@dirrm include/wx/gtk2u-2.4/wx +@dirrm include/wx/gtk2u-2.4 diff --git a/x11-toolkits/wxgtk2/Makefile b/x11-toolkits/wxgtk2/Makefile new file mode 100644 index 000000000000..eac80283e899 --- /dev/null +++ b/x11-toolkits/wxgtk2/Makefile @@ -0,0 +1,16 @@ +# New ports collection makefile for: wxgtk2 +# Date created: November 4, 2003 +# Whom: fjoe@FreeBSD.ORG +# +# $FreeBSD$ +# + +PORTREVISION= 0 + +MAINTAINER= fjoe@FreeBSD.org +COMMENT= The wxWindows GUI toolkit (GTK2 version) + +WXGTK_FLAVOR= gtk2 +MASTERDIR= ${.CURDIR}/../wxgtk-devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2/pkg-plist b/x11-toolkits/wxgtk2/pkg-plist new file mode 100644 index 000000000000..7d5a7f1a22b6 --- /dev/null +++ b/x11-toolkits/wxgtk2/pkg-plist @@ -0,0 +1,8 @@ +bin/wxgtk2-2.4-config +include/wx/gtk2-2.4/wx/setup.h +lib/libwx_gtk2-2.4.so +lib/libwx_gtk2-2.4.so.0 +lib/libwx_gtk2_gl-2.4.so +lib/libwx_gtk2_gl-2.4.so.0 +@dirrm include/wx/gtk2-2.4/wx +@dirrm include/wx/gtk2-2.4 diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile index c226b5624e2f..ddcc98a41bf0 100644 --- a/x11-toolkits/wxgtk24-contrib/Makefile +++ b/x11-toolkits/wxgtk24-contrib/Makefile @@ -5,16 +5,12 @@ # $FreeBSD$ # -PORTREVISION= 0 -PKGNAMESUFFIX= -contrib +PORTREVISION= 1 MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWindows GUI toolkit contributed libraries -BUILD_WRKSRC= ${WRKSRC}/contrib/src -INSTALL_WRKSRC= ${BUILD_WRKSRC} - +WXGTK_FLAVOR= gtk-contrib MASTERDIR= ${.CURDIR}/../wxgtk-devel -PLIST= ${PKGDIR}/pkg-plist.contrib .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk24-contrib/pkg-plist b/x11-toolkits/wxgtk24-contrib/pkg-plist new file mode 100644 index 000000000000..e2b142c75bf6 --- /dev/null +++ b/x11-toolkits/wxgtk24-contrib/pkg-plist @@ -0,0 +1,18 @@ +lib/libwx_gtk_canvas-2.4.so +lib/libwx_gtk_canvas-2.4.so.0 +lib/libwx_gtk_dcsvg-2.4.so +lib/libwx_gtk_dcsvg-2.4.so.0 +lib/libwx_gtk_fl-2.4.so +lib/libwx_gtk_fl-2.4.so.0 +lib/libwx_gtk_gizmos-2.4.so +lib/libwx_gtk_gizmos-2.4.so.0 +lib/libwx_gtk_net-2.4.so +lib/libwx_gtk_net-2.4.so.0 +lib/libwx_gtk_ogl-2.4.so +lib/libwx_gtk_ogl-2.4.so.0 +lib/libwx_gtk_plot-2.4.so +lib/libwx_gtk_plot-2.4.so.0 +lib/libwx_gtk_stc-2.4.so +lib/libwx_gtk_stc-2.4.so.0 +lib/libwx_gtk_xrc-2.4.so +lib/libwx_gtk_xrc-2.4.so.0 |