Update to 2.6.3; now there is only one version -- gtk2

This commit is contained in:
alek 2006-10-12 14:09:32 +00:00
parent e14d2f6044
commit 4eef3f67b2
105 changed files with 2040 additions and 5081 deletions

View File

@ -1,13 +1,83 @@
# $OpenBSD: Makefile,v 1.2 2005/11/10 12:18:25 espie Exp $
# $OpenBSD: Makefile,v 1.3 2006/10/12 14:09:32 alek Exp $
SUBDIR += headers
SUBDIR += base
SUBDIR += gtkheaders
SUBDIR += gtk
SUBDIR += gtk2
SUBDIR += motif
# We can't install motif & lesstif together until the lesstif port is updated
# SUBDIR += lesstif
SUBDIR += x11univ
SHARED_ONLY= Yes
.include <bsd.port.subdir.mk>
COMMENT= "c++ cross-platform GUI toolkit"
DISTNAME= wxWidgets-2.6.3
PKGNAME= wxWidgets-gtk2-2.6.3
SHARED_LIBS= wx_base 0.0 \
wx_base_net 0.0 \
wx_base_odbc 0.0 \
wx_base_xml 0.0 \
wx_gtk2_adv 0.0 \
wx_gtk2_core 0.0 \
wx_gtk2_dbgrid 0.0 \
wx_gtk2_gl 0.0 \
wx_gtk2_html 0.0 \
wx_gtk2_media 0.0 \
wx_gtk2_qa 0.0 \
wx_gtk2_xrc 0.0 \
wx_gtk2_fl 0.0 \
wx_gtk2_gizmos 0.0 \
wx_gtk2_gizmos_xrc 0.0 \
wx_gtk2_mmedia 0.0 \
wx_gtk2_ogl 0.0 \
wx_gtk2_plot 0.0 \
wx_gtk2_stc 0.0 \
wx_gtk2_svg 0.0 \
wx_gtk2_deprecated 0.0 \
wx_gtk2_animate 0.0
CATEGORIES= x11
HOMEPAGE= http://www.wxwidgets.org/
# modified LGPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
MODULES= gettext
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
VMEM_WARNING= Yes
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
::devel/cppunit
LIB_DEPENDS= mspack::archivers/libmspack \
SDL::devel/sdl \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
iodbc::databases/iodbc \
esd::audio/esound
WANTLIB= X11 Xext Xinerama Xxf86vm c fontconfig freetype m pthread \
stdc++ usbhid z expat ossaudio jpeg png tiff \
glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pango-1.0 pangoft2-1.0 \
atk-1.0 GL GLU
AUTOCONF_VERSION=2.59
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include"
CONFIGURE_STYLE=autoconf no-autoheader
CONFIGURE_ARGS= --disable-stl \
--with-odbc \
--with-libjpeg \
--with-libtiff \
--with-expat \
--with-sdl \
--with-gtk \
--without-gnomeprint \
--without-hildon \
--with-opengl \
--enable-unicode
MAKE_FLAGS= WXUNICODEFLAG=""
FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST}
FAKE_FLAGS+= WXUNICODEFLAG=""
.include <bsd.port.mk>

View File

@ -1,102 +0,0 @@
# $OpenBSD: Makefile.inc,v 1.3 2006/09/18 10:21:48 espie Exp $
#
# This library can be built for several GUI toolkits.
# Most can be installed side-by-side.
##############################
CATEGORIES= x11
VERSION= 2.4.2
DISTNAME= wxAll-${VERSION}
HOMEPAGE= http://www.wxwidgets.org/
# See also http://wesley.informatik.uni-freiburg.de/~wxxt/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
MAINTAINER= Andrew Dalgleish <openbsd@ajd.net.au>
# Modified LGPL
# See ${WRKDIST}/docs/license.txt
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
##############################
# Allow for building debug libs.
# OpenBSD does not use the 'd' suffix on the library name
# Uncomment this line, or add it to the env.
#CONFIGURE_ARGS+= --enable-debug
##############################
# Depend on various system libraries
MODULES+= converters/libiconv
LIB_DEPENDS+= jpeg.>=62::graphics/jpeg
MY_INC+= -I${LOCALBASE}/include/libpng
LIB_DEPENDS+= png.>=4.0::graphics/png
LIB_DEPENDS+= tiff.>=36.1::graphics/tiff
##############################
WRKDIST= ${WRKDIR}/wxWindows-${VERSION}
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
SEPARATE_BUILD= yes
CONFIGURE_STYLE=gnu dest
USE_GMAKE= Yes
USE_X11= Yes
PATCHDIR= ${.CURDIR}/../patches
CHECKSUM_FILE= ${.CURDIR}/../distinfo
##############################
# Remove some unused source dirs to make sure that:
# We do not accidentally use the wrong header.
# Greping for bugs ignores the unused source.
post-extract:
rm -fr ${WRKDIST}/include/wx/mac
rm -fr ${WRKDIST}/include/wx/msw
rm -fr ${WRKDIST}/include/wx/os2
rm -fr ${WRKDIST}/src/jpeg
rm -fr ${WRKDIST}/src/mac
rm -fr ${WRKDIST}/src/msw
rm -fr ${WRKDIST}/src/os2
rm -fr ${WRKDIST}/src/png
rm -fr ${WRKDIST}/src/regex
rm -fr ${WRKDIST}/src/tiff
rm -fr ${WRKDIST}/src/zlib
##############################
.if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
CFLAGS+= -fPIC
CXXFLAGS+= -fPIC
LDFLAGS+= -fPIC
.endif
MY_INC+= -I${LOCALBASE}/include -I${X11BASE}/include
MY_LIB+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} ${MY_INC}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${MY_INC}"
CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} ${MY_INC}"
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${MY_LIB}"
##############################
# For a regression test, build & run the demos
# (for all except headers & base)
REGRESS_IS_INTERACTIVE= Yes
REGRESS_TARGET=
do-regress:
cd ${WRKBUILD}/demos && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${REGRESS_FLAGS} -f ${MAKE_FILE} ${REGRESS_TARGET}
.for PROG in bombs forty fractal life
cd ${WRKBUILD}/demos/${PROG} && ./${PROG}
.endfor
.for PROG in poem
cd ${WRKBUILD}/demos/${PROG} && ./wx${PROG}
.endfor
##############################

View File

@ -1,16 +0,0 @@
# $OpenBSD: Makefile,v 1.4 2006/01/14 11:46:16 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - base (no GUI) version"
PKGNAME= wxWidgets-base-${VERSION}p1
SHARED_LIBS= wx_base 3.0
NO_REGRESS= Yes
CONFIGURE_ARGS+= --disable-gui
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_base_VERSION:R} \
WX_REVISION=${LIBwx_base_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers
WANTLIB= m z
.include <bsd.port.mk>

View File

@ -1,12 +0,0 @@
wxWidgets gives you a single, easy-to-use API for writing GUI
applications on multiple platforms. Link with the appropriate library
for your platform (Windows/Unix/Mac, others coming shortly) and compiler
(almost any popular C++ compiler), and your application will adopt the
look and feel appropriate to that platform. On top of great GUI
functionality, wxWidgets gives you: online help, network programming,
streams, clipboard and drag and drop, multithreading, image loading and
saving in a variety of popular formats, database support, HTML viewing
and printing, and much much more.
This package contains the 'base' version of the library.
This includes only the utility classes, without any GUI classes.

View File

@ -1,6 +0,0 @@
wxWidgets normally installs a symlink from wx-config to the config
script which is specific to the GUI library.
OpenBSD supports installing multiple GUI libraries side-by-side, so you
must either call the script directly (eg wxgtk-2.4-config), or set an
environment variable WXCONFIG before calling wx-config.

View File

@ -1 +0,0 @@
lib/libwx_base-2.4.a

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/31 15:18:44 naddy Exp $
@lib lib/libwx_base.so.${LIBwx_base_VERSION}

View File

@ -1,5 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/19 08:54:44 pvalchev Exp $
%%SHARED%%
!%%SHARED%%
bin/wxbase-2.4-config
lib/wx/include/base-2.4/wx/setup.h

View File

@ -1,4 +1,4 @@
MD5 (wxAll-2.4.2.tar.gz) = 05c2ac572ec07492b3121e3769c2d258
RMD160 (wxAll-2.4.2.tar.gz) = 31ad6bee22df0e5064b82deb593e885e1d480bc9
SHA1 (wxAll-2.4.2.tar.gz) = eb8f0755a19ddbf64b8bd7de26cb5fab48005249
SIZE (wxAll-2.4.2.tar.gz) = 12679307
MD5 (wxWidgets-2.6.3.tar.gz) = 7af577ac8a6d78d6a0fef1b09cf1093e
RMD160 (wxWidgets-2.6.3.tar.gz) = 06a6732b7505f96511165631938d9815a9f587b4
SHA1 (wxWidgets-2.6.3.tar.gz) = a3bb5e9686a615bd55317efc9b21b65e7aeeec22
SIZE (wxWidgets-2.6.3.tar.gz) = 19006369

View File

@ -1,16 +0,0 @@
# $OpenBSD: Makefile,v 1.8 2006/09/18 10:21:49 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - GTK version"
PKGNAME= wxWidgets-gtk-${VERSION}p4
SHARED_LIBS= wx_gtk 3.0
CONFIGURE_ARGS+= --with-gtk
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_gtk_VERSION:R} \
WX_REVISION=${LIBwx_gtk_VERSION:E}
LIB_DEPENDS+= gtk.>=1.2::x11/gtk+
RUN_DEPENDS+= ::x11/wxWidgets/headers
RUN_DEPENDS+= ::x11/wxWidgets/gtkheaders
WANTLIB= X11 Xext Xi gdk glib gmodule gthread intl m pthread z
.include <bsd.port.mk>

View File

@ -1,11 +0,0 @@
wxWidgets gives you a single, easy-to-use API for writing GUI
applications on multiple platforms. Link with the appropriate library
for your platform (Windows/Unix/Mac, others coming shortly) and compiler
(almost any popular C++ compiler), and your application will adopt the
look and feel appropriate to that platform. On top of great GUI
functionality, wxWidgets gives you: online help, network programming,
streams, clipboard and drag and drop, multithreading, image loading and
saving in a variety of popular formats, database support, HTML viewing
and printing, and much much more.
This package contains the GTK version of the library.

View File

@ -1,6 +0,0 @@
wxWidgets normally installs a symlink from wx-config to the config
script which is specific to the GUI library.
OpenBSD supports installing multiple GUI libraries side-by-side, so you
must either call the script directly (eg wxgtk-2.4-config), or set an
environment variable WXCONFIG before calling wx-config.

View File

@ -1 +0,0 @@
lib/libwx_gtk-2.4.a

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
@lib lib/libwx_gtk.so.${LIBwx_gtk_VERSION}

View File

@ -1,401 +0,0 @@
@comment $OpenBSD: PLIST,v 1.5 2005/12/31 15:18:44 naddy Exp $
%%SHARED%%
!%%SHARED%%
@comment bin/wx-config
bin/wxgtk-2.4-config
@comment include/wx/accel.h
@comment include/wx/app.h
@comment include/wx/arrimpl.cpp
@comment include/wx/artprov.h
@comment include/wx/bitmap.h
@comment include/wx/bmpbuttn.h
@comment include/wx/brush.h
@comment include/wx/buffer.h
@comment include/wx/build.h
@comment include/wx/busyinfo.h
@comment include/wx/button.h
@comment include/wx/calctrl.h
@comment include/wx/caret.h
@comment include/wx/checkbox.h
@comment include/wx/checklst.h
@comment include/wx/chkconf.h
@comment include/wx/choicdlg.h
@comment include/wx/choice.h
@comment include/wx/clipbrd.h
@comment include/wx/clntdata.h
@comment include/wx/cmdline.h
@comment include/wx/cmdproc.h
@comment include/wx/cmndata.h
@comment include/wx/colordlg.h
@comment include/wx/colour.h
@comment include/wx/combobox.h
@comment include/wx/confbase.h
@comment include/wx/config.h
@comment include/wx/containr.h
@comment include/wx/control.h
@comment include/wx/cshelp.h
@comment include/wx/ctrlsub.h
@comment include/wx/cursor.h
@comment include/wx/dataobj.h
@comment include/wx/date.h
@comment include/wx/datetime.h
@comment include/wx/datetime.inl
@comment include/wx/datstrm.h
@comment include/wx/db.h
@comment include/wx/dbgrid.h
@comment include/wx/dbkeyg.h
@comment include/wx/dbtable.h
@comment include/wx/dc.h
@comment include/wx/dcbuffer.h
@comment include/wx/dcclient.h
@comment include/wx/dcmemory.h
@comment include/wx/dcprint.h
@comment include/wx/dcps.h
@comment include/wx/dcscreen.h
@comment include/wx/dde.h
@comment include/wx/debug.h
@comment include/wx/defs.h
@comment include/wx/dialog.h
@comment include/wx/dialup.h
@comment include/wx/dir.h
@comment include/wx/dirctrl.h
@comment include/wx/dirdlg.h
@comment include/wx/dnd.h
@comment include/wx/docmdi.h
@comment include/wx/docview.h
@comment include/wx/dragimag.h
@comment include/wx/dynarray.h
@comment include/wx/dynlib.h
@comment include/wx/dynload.h
@comment include/wx/effects.h
@comment include/wx/encconv.h
@comment include/wx/event.h
@comment include/wx/expr.h
@comment include/wx/fdrepdlg.h
@comment include/wx/features.h
@comment include/wx/ffile.h
@comment include/wx/file.h
@comment include/wx/fileconf.h
@comment include/wx/filedlg.h
@comment include/wx/filefn.h
@comment include/wx/filename.h
@comment include/wx/filesys.h
@comment include/wx/font.h
@comment include/wx/fontdlg.h
@comment include/wx/fontenc.h
@comment include/wx/fontenum.h
@comment include/wx/fontmap.h
@comment include/wx/fontutil.h
@comment include/wx/frame.h
@comment include/wx/fs_inet.h
@comment include/wx/fs_mem.h
@comment include/wx/fs_zip.h
@comment include/wx/gauge.h
@comment include/wx/gdicmn.h
@comment include/wx/gdiobj.h
@comment include/wx/generic/accel.h
@comment include/wx/generic/calctrl.h
@comment include/wx/generic/caret.h
@comment include/wx/generic/choicdgg.h
@comment include/wx/generic/colrdlgg.h
@comment include/wx/generic/dcpsg.h
@comment include/wx/generic/dirctrlg.h
@comment include/wx/generic/dirdlgg.h
@comment include/wx/generic/dragimgg.h
@comment include/wx/generic/fdrepdlg.h
@comment include/wx/generic/filedlgg.h
@comment include/wx/generic/fontdlgg.h
@comment include/wx/generic/grid.h
@comment include/wx/generic/gridctrl.h
@comment include/wx/generic/gridg.h
@comment include/wx/generic/helpext.h
@comment include/wx/generic/helphtml.h
@comment include/wx/generic/imaglist.h
@comment include/wx/generic/laywin.h
@comment include/wx/generic/listctrl.h
@comment include/wx/generic/msgdlgg.h
@comment include/wx/generic/notebook.h
@comment include/wx/generic/paletteg.h
@comment include/wx/generic/panelg.h
@comment include/wx/generic/printps.h
@comment include/wx/generic/prntdlgg.h
@comment include/wx/generic/progdlgg.h
@comment include/wx/generic/sashwin.h
@comment include/wx/generic/scrolwin.h
@comment include/wx/generic/spinctlg.h
@comment include/wx/generic/splash.h
@comment include/wx/generic/splitter.h
@comment include/wx/generic/statusbr.h
@comment include/wx/generic/tabg.h
@comment include/wx/generic/textdlgg.h
@comment include/wx/generic/timer.h
@comment include/wx/generic/treectlg.h
@comment include/wx/generic/wizard.h
@comment include/wx/geometry.h
@comment include/wx/gifdecod.h
@comment include/wx/glcanvas.h
@comment include/wx/grid.h
@comment include/wx/gsocket.h
@comment include/wx/gtk/accel.h
@comment include/wx/gtk/app.h
@comment include/wx/gtk/bitmap.h
@comment include/wx/gtk/bmpbuttn.h
@comment include/wx/gtk/brush.h
@comment include/wx/gtk/button.h
@comment include/wx/gtk/checkbox.h
@comment include/wx/gtk/checklst.h
@comment include/wx/gtk/choice.h
@comment include/wx/gtk/clipbrd.h
@comment include/wx/gtk/colour.h
@comment include/wx/gtk/combobox.h
@comment include/wx/gtk/control.h
@comment include/wx/gtk/cursor.h
@comment include/wx/gtk/dataform.h
@comment include/wx/gtk/dataobj.h
@comment include/wx/gtk/dataobj2.h
@comment include/wx/gtk/dc.h
@comment include/wx/gtk/dcclient.h
@comment include/wx/gtk/dcmemory.h
@comment include/wx/gtk/dcscreen.h
@comment include/wx/gtk/dialog.h
@comment include/wx/gtk/dnd.h
@comment include/wx/gtk/filedlg.h
@comment include/wx/gtk/font.h
@comment include/wx/gtk/fontdlg.h
@comment include/wx/gtk/frame.h
@comment include/wx/gtk/gauge.h
@comment include/wx/gtk/gdiobj.h
@comment include/wx/gtk/glcanvas.h
@comment include/wx/gtk/icon.h
@comment include/wx/gtk/joystick.h
@comment include/wx/gtk/listbox.h
@comment include/wx/gtk/mdi.h
@comment include/wx/gtk/menu.h
@comment include/wx/gtk/menuitem.h
@comment include/wx/gtk/minifram.h
@comment include/wx/gtk/notebook.h
@comment include/wx/gtk/pen.h
@comment include/wx/gtk/popupwin.h
@comment include/wx/gtk/radiobox.h
@comment include/wx/gtk/radiobut.h
@comment include/wx/gtk/region.h
@comment include/wx/gtk/scrolbar.h
@comment include/wx/gtk/scrolwin.h
@comment include/wx/gtk/slider.h
@comment include/wx/gtk/spinbutt.h
@comment include/wx/gtk/spinctrl.h
@comment include/wx/gtk/statbmp.h
@comment include/wx/gtk/statbox.h
@comment include/wx/gtk/statline.h
@comment include/wx/gtk/stattext.h
@comment include/wx/gtk/tbargtk.h
@comment include/wx/gtk/textctrl.h
@comment include/wx/gtk/tglbtn.h
@comment include/wx/gtk/timer.h
@comment include/wx/gtk/tooltip.h
@comment include/wx/gtk/toplevel.h
@comment include/wx/gtk/treectrl.h
@comment include/wx/gtk/wave.h
@comment include/wx/gtk/win_gtk.h
@comment include/wx/gtk/window.h
@comment include/wx/hash.h
@comment include/wx/hashmap.h
@comment include/wx/help.h
@comment include/wx/helpbase.h
@comment include/wx/helphtml.h
@comment include/wx/helpwin.h
@comment include/wx/html/forcelnk.h
@comment include/wx/html/helpctrl.h
@comment include/wx/html/helpdata.h
@comment include/wx/html/helpfrm.h
@comment include/wx/html/htmlcell.h
@comment include/wx/html/htmldefs.h
@comment include/wx/html/htmlfilt.h
@comment include/wx/html/htmlpars.h
@comment include/wx/html/htmltag.h
@comment include/wx/html/htmlwin.h
@comment include/wx/html/htmprint.h
@comment include/wx/html/m_templ.h
@comment include/wx/html/winpars.h
@comment include/wx/icon.h
@comment include/wx/iconbndl.h
@comment include/wx/imagbmp.h
@comment include/wx/image.h
@comment include/wx/imaggif.h
@comment include/wx/imagiff.h
@comment include/wx/imagjpeg.h
@comment include/wx/imaglist.h
@comment include/wx/imagpcx.h
@comment include/wx/imagpng.h
@comment include/wx/imagpnm.h
@comment include/wx/imagtiff.h
@comment include/wx/imagxpm.h
@comment include/wx/intl.h
@comment include/wx/ioswrap.h
@comment include/wx/ipc.h
@comment include/wx/ipcbase.h
@comment include/wx/isql.h
@comment include/wx/isqlext.h
@comment include/wx/joystick.h
@comment include/wx/layout.h
@comment include/wx/laywin.h
@comment include/wx/list.h
@comment include/wx/listbase.h
@comment include/wx/listbox.h
@comment include/wx/listctrl.h
@comment include/wx/listimpl.cpp
@comment include/wx/log.h
@comment include/wx/longlong.h
@comment include/wx/matrix.h
@comment include/wx/mdi.h
@comment include/wx/memconf.h
@comment include/wx/memory.h
@comment include/wx/memtext.h
@comment include/wx/menu.h
@comment include/wx/menuitem.h
@comment include/wx/metafile.h
@comment include/wx/mimetype.h
@comment include/wx/minifram.h
@comment include/wx/module.h
@comment include/wx/msgdlg.h
@comment include/wx/msgout.h
@comment include/wx/mstream.h
@comment include/wx/notebook.h
@comment include/wx/object.h
@comment include/wx/odbc.h
@comment include/wx/ownerdrw.h
@comment include/wx/palette.h
@comment include/wx/panel.h
@comment include/wx/paper.h
@comment include/wx/pen.h
@comment include/wx/platform.h
@comment include/wx/popupwin.h
@comment include/wx/print.h
@comment include/wx/printdlg.h
@comment include/wx/prntbase.h
@comment include/wx/process.h
@comment include/wx/progdlg.h
@comment include/wx/prop.h
@comment include/wx/propform.h
@comment include/wx/proplist.h
@comment include/wx/protocol/file.h
@comment include/wx/protocol/ftp.h
@comment include/wx/protocol/http.h
@comment include/wx/protocol/protocol.h
@comment include/wx/quantize.h
@comment include/wx/radiobox.h
@comment include/wx/radiobut.h
@comment include/wx/regex.h
@comment include/wx/region.h
@comment include/wx/resource.h
@comment include/wx/sashwin.h
@comment include/wx/sckaddr.h
@comment include/wx/sckipc.h
@comment include/wx/sckstrm.h
@comment include/wx/scrolbar.h
@comment include/wx/scrolwin.h
@comment include/wx/settings.h
@comment include/wx/sizer.h
@comment include/wx/slider.h
@comment include/wx/snglinst.h
@comment include/wx/socket.h
@comment include/wx/spinbutt.h
@comment include/wx/spinctrl.h
@comment include/wx/splash.h
@comment include/wx/splitter.h
@comment include/wx/stack.h
@comment include/wx/statbmp.h
@comment include/wx/statbox.h
@comment include/wx/statline.h
@comment include/wx/stattext.h
@comment include/wx/statusbr.h
@comment include/wx/strconv.h
@comment include/wx/stream.h
@comment include/wx/string.h
@comment include/wx/sysopt.h
@comment include/wx/tab.h
@comment include/wx/tabctrl.h
@comment include/wx/taskbar.h
@comment include/wx/tbarbase.h
@comment include/wx/tbarsmpl.h
@comment include/wx/textbuf.h
@comment include/wx/textctrl.h
@comment include/wx/textdlg.h
@comment include/wx/textfile.h
@comment include/wx/tglbtn.h
@comment include/wx/thread.h
@comment include/wx/thrimpl.cpp
@comment include/wx/time.h
@comment include/wx/timer.h
@comment include/wx/tipdlg.h
@comment include/wx/tipwin.h
@comment include/wx/tokenzr.h
@comment include/wx/toolbar.h
@comment include/wx/tooltip.h
@comment include/wx/toplevel.h
@comment include/wx/treebase.h
@comment include/wx/treectrl.h
@comment include/wx/txtstrm.h
@comment include/wx/types.h
@comment include/wx/unix/execute.h
@comment include/wx/unix/fontutil.h
@comment include/wx/unix/gsockunx.h
@comment include/wx/unix/mimetype.h
@comment include/wx/unix/utilsx11.h
@comment include/wx/url.h
@comment include/wx/utils.h
@comment include/wx/valgen.h
@comment include/wx/validate.h
@comment include/wx/valtext.h
@comment include/wx/variant.h
@comment include/wx/vector.h
@comment include/wx/version.h
@comment include/wx/volume.h
@comment include/wx/wave.h
@comment include/wx/wfstream.h
@comment include/wx/window.h
@comment include/wx/wizard.h
@comment include/wx/wx.h
@comment include/wx/wx_cw.h
@comment include/wx/wx_cw_cm.h
@comment include/wx/wx_cw_d.h
@comment include/wx/wxchar.h
@comment include/wx/wxexpr.h
@comment include/wx/wxhtml.h
@comment include/wx/wxprec.h
@comment include/wx/xpmdecod.h
@comment include/wx/zipstrm.h
@comment include/wx/zstream.h
lib/wx/
lib/wx/include/
lib/wx/include/gtk-2.4/
lib/wx/include/gtk-2.4/wx/
lib/wx/include/gtk-2.4/wx/setup.h
lib/wx/include/univ/
@comment share/aclocal/wxwin.m4
@comment share/wx/2.4/afm/Cour.afm
@comment share/wx/2.4/afm/CourBo.afm
@comment share/wx/2.4/afm/CourBoO.afm
@comment share/wx/2.4/afm/CourO.afm
@comment share/wx/2.4/afm/Helv.afm
@comment share/wx/2.4/afm/HelvBo.afm
@comment share/wx/2.4/afm/HelvBoO.afm
@comment share/wx/2.4/afm/HelvO.afm
@comment share/wx/2.4/afm/TimesBo.afm
@comment share/wx/2.4/afm/TimesBoO.afm
@comment share/wx/2.4/afm/TimesO.afm
@comment share/wx/2.4/afm/TimesRo.afm
@comment share/wx/2.4/afm/Zapf.afm
@comment share/wx/2.4/gs_afm/Cour.afm
@comment share/wx/2.4/gs_afm/CourBo.afm
@comment share/wx/2.4/gs_afm/CourBoO.afm
@comment share/wx/2.4/gs_afm/CourO.afm
@comment share/wx/2.4/gs_afm/Helv.afm
@comment share/wx/2.4/gs_afm/HelvBo.afm
@comment share/wx/2.4/gs_afm/HelvBoO.afm
@comment share/wx/2.4/gs_afm/HelvO.afm
@comment share/wx/2.4/gs_afm/TimesBo.afm
@comment share/wx/2.4/gs_afm/TimesBoO.afm
@comment share/wx/2.4/gs_afm/TimesO.afm
@comment share/wx/2.4/gs_afm/TimesRo.afm
@comment share/wx/2.4/gs_afm/Zapf.afm

View File

@ -1,22 +0,0 @@
# $OpenBSD: Makefile,v 1.11 2006/09/18 12:19:41 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - GTK2 version"
PKGNAME= wxWidgets-gtk2-${VERSION}p5
SHARED_LIBS= wx_gtk2 3.0
CONFIGURE_ARGS= --enable-gtk2
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_gtk2_VERSION:R} \
WX_REVISION=${LIBwx_gtk2_VERSION:E}
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= ::x11/gtk+2 \
::devel/libglade2 \
glib-2.0::devel/glib2
RUN_DEPENDS= ::x11/wxWidgets/gtkheaders
WANTLIB= X11 atk-1.0 fontconfig m z \
freetype gdk-x11-2.0 gdk_pixbuf-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 gtk-x11-2.0 intl \
pango-1.0 pangocairo-1.0 pangoft2-1.0 cairo
.include <bsd.port.mk>

View File

@ -1,6 +0,0 @@
wxWidgets normally installs a symlink from wx-config to the config
script which is specific to the GUI library.
OpenBSD supports installing multiple GUI libraries side-by-side, so you
must either call the script directly (eg wxgtk-2.4-config), or set an
environment variable WXCONFIG before calling wx-config.

View File

@ -1 +0,0 @@
lib/libwx_gtk2-2.4.a

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/31 15:18:44 naddy Exp $
@lib lib/libwx_gtk2.so.${LIBwx_gtk2_VERSION}

View File

@ -1,402 +0,0 @@
@comment $OpenBSD: PLIST,v 1.5 2005/12/31 15:18:44 naddy Exp $
@conflict wxWidgets-gtk-<=2.4.2p0
%%SHARED%%
!%%SHARED%%
@comment bin/wx-config
bin/wxgtk2-2.4-config
@comment include/wx/accel.h
@comment include/wx/app.h
@comment include/wx/arrimpl.cpp
@comment include/wx/artprov.h
@comment include/wx/bitmap.h
@comment include/wx/bmpbuttn.h
@comment include/wx/brush.h
@comment include/wx/buffer.h
@comment include/wx/build.h
@comment include/wx/busyinfo.h
@comment include/wx/button.h
@comment include/wx/calctrl.h
@comment include/wx/caret.h
@comment include/wx/checkbox.h
@comment include/wx/checklst.h
@comment include/wx/chkconf.h
@comment include/wx/choicdlg.h
@comment include/wx/choice.h
@comment include/wx/clipbrd.h
@comment include/wx/clntdata.h
@comment include/wx/cmdline.h
@comment include/wx/cmdproc.h
@comment include/wx/cmndata.h
@comment include/wx/colordlg.h
@comment include/wx/colour.h
@comment include/wx/combobox.h
@comment include/wx/confbase.h
@comment include/wx/config.h
@comment include/wx/containr.h
@comment include/wx/control.h
@comment include/wx/cshelp.h
@comment include/wx/ctrlsub.h
@comment include/wx/cursor.h
@comment include/wx/dataobj.h
@comment include/wx/date.h
@comment include/wx/datetime.h
@comment include/wx/datetime.inl
@comment include/wx/datstrm.h
@comment include/wx/db.h
@comment include/wx/dbgrid.h
@comment include/wx/dbkeyg.h
@comment include/wx/dbtable.h
@comment include/wx/dc.h
@comment include/wx/dcbuffer.h
@comment include/wx/dcclient.h
@comment include/wx/dcmemory.h
@comment include/wx/dcprint.h
@comment include/wx/dcps.h
@comment include/wx/dcscreen.h
@comment include/wx/dde.h
@comment include/wx/debug.h
@comment include/wx/defs.h
@comment include/wx/dialog.h
@comment include/wx/dialup.h
@comment include/wx/dir.h
@comment include/wx/dirctrl.h
@comment include/wx/dirdlg.h
@comment include/wx/dnd.h
@comment include/wx/docmdi.h
@comment include/wx/docview.h
@comment include/wx/dragimag.h
@comment include/wx/dynarray.h
@comment include/wx/dynlib.h
@comment include/wx/dynload.h
@comment include/wx/effects.h
@comment include/wx/encconv.h
@comment include/wx/event.h
@comment include/wx/expr.h
@comment include/wx/fdrepdlg.h
@comment include/wx/features.h
@comment include/wx/ffile.h
@comment include/wx/file.h
@comment include/wx/fileconf.h
@comment include/wx/filedlg.h
@comment include/wx/filefn.h
@comment include/wx/filename.h
@comment include/wx/filesys.h
@comment include/wx/font.h
@comment include/wx/fontdlg.h
@comment include/wx/fontenc.h
@comment include/wx/fontenum.h
@comment include/wx/fontmap.h
@comment include/wx/fontutil.h
@comment include/wx/frame.h
@comment include/wx/fs_inet.h
@comment include/wx/fs_mem.h
@comment include/wx/fs_zip.h
@comment include/wx/gauge.h
@comment include/wx/gdicmn.h
@comment include/wx/gdiobj.h
@comment include/wx/generic/accel.h
@comment include/wx/generic/calctrl.h
@comment include/wx/generic/caret.h
@comment include/wx/generic/choicdgg.h
@comment include/wx/generic/colrdlgg.h
@comment include/wx/generic/dcpsg.h
@comment include/wx/generic/dirctrlg.h
@comment include/wx/generic/dirdlgg.h
@comment include/wx/generic/dragimgg.h
@comment include/wx/generic/fdrepdlg.h
@comment include/wx/generic/filedlgg.h
@comment include/wx/generic/fontdlgg.h
@comment include/wx/generic/grid.h
@comment include/wx/generic/gridctrl.h
@comment include/wx/generic/gridg.h
@comment include/wx/generic/helpext.h
@comment include/wx/generic/helphtml.h
@comment include/wx/generic/imaglist.h
@comment include/wx/generic/laywin.h
@comment include/wx/generic/listctrl.h
@comment include/wx/generic/msgdlgg.h
@comment include/wx/generic/notebook.h
@comment include/wx/generic/paletteg.h
@comment include/wx/generic/panelg.h
@comment include/wx/generic/printps.h
@comment include/wx/generic/prntdlgg.h
@comment include/wx/generic/progdlgg.h
@comment include/wx/generic/sashwin.h
@comment include/wx/generic/scrolwin.h
@comment include/wx/generic/spinctlg.h
@comment include/wx/generic/splash.h
@comment include/wx/generic/splitter.h
@comment include/wx/generic/statusbr.h
@comment include/wx/generic/tabg.h
@comment include/wx/generic/textdlgg.h
@comment include/wx/generic/timer.h
@comment include/wx/generic/treectlg.h
@comment include/wx/generic/wizard.h
@comment include/wx/geometry.h
@comment include/wx/gifdecod.h
@comment include/wx/glcanvas.h
@comment include/wx/grid.h
@comment include/wx/gsocket.h
@comment include/wx/gtk/accel.h
@comment include/wx/gtk/app.h
@comment include/wx/gtk/bitmap.h
@comment include/wx/gtk/bmpbuttn.h
@comment include/wx/gtk/brush.h
@comment include/wx/gtk/button.h
@comment include/wx/gtk/checkbox.h
@comment include/wx/gtk/checklst.h
@comment include/wx/gtk/choice.h
@comment include/wx/gtk/clipbrd.h
@comment include/wx/gtk/colour.h
@comment include/wx/gtk/combobox.h
@comment include/wx/gtk/control.h
@comment include/wx/gtk/cursor.h
@comment include/wx/gtk/dataform.h
@comment include/wx/gtk/dataobj.h
@comment include/wx/gtk/dataobj2.h
@comment include/wx/gtk/dc.h
@comment include/wx/gtk/dcclient.h
@comment include/wx/gtk/dcmemory.h
@comment include/wx/gtk/dcscreen.h
@comment include/wx/gtk/dialog.h
@comment include/wx/gtk/dnd.h
@comment include/wx/gtk/filedlg.h
@comment include/wx/gtk/font.h
@comment include/wx/gtk/fontdlg.h
@comment include/wx/gtk/frame.h
@comment include/wx/gtk/gauge.h
@comment include/wx/gtk/gdiobj.h
@comment include/wx/gtk/glcanvas.h
@comment include/wx/gtk/icon.h
@comment include/wx/gtk/joystick.h
@comment include/wx/gtk/listbox.h
@comment include/wx/gtk/mdi.h
@comment include/wx/gtk/menu.h
@comment include/wx/gtk/menuitem.h
@comment include/wx/gtk/minifram.h
@comment include/wx/gtk/notebook.h
@comment include/wx/gtk/pen.h
@comment include/wx/gtk/popupwin.h
@comment include/wx/gtk/radiobox.h
@comment include/wx/gtk/radiobut.h
@comment include/wx/gtk/region.h
@comment include/wx/gtk/scrolbar.h
@comment include/wx/gtk/scrolwin.h
@comment include/wx/gtk/slider.h
@comment include/wx/gtk/spinbutt.h
@comment include/wx/gtk/spinctrl.h
@comment include/wx/gtk/statbmp.h
@comment include/wx/gtk/statbox.h
@comment include/wx/gtk/statline.h
@comment include/wx/gtk/stattext.h
@comment include/wx/gtk/tbargtk.h
@comment include/wx/gtk/textctrl.h
@comment include/wx/gtk/tglbtn.h
@comment include/wx/gtk/timer.h
@comment include/wx/gtk/tooltip.h
@comment include/wx/gtk/toplevel.h
@comment include/wx/gtk/treectrl.h
@comment include/wx/gtk/wave.h
@comment include/wx/gtk/win_gtk.h
@comment include/wx/gtk/window.h
@comment include/wx/hash.h
@comment include/wx/hashmap.h
@comment include/wx/help.h
@comment include/wx/helpbase.h
@comment include/wx/helphtml.h
@comment include/wx/helpwin.h
@comment include/wx/html/forcelnk.h
@comment include/wx/html/helpctrl.h
@comment include/wx/html/helpdata.h
@comment include/wx/html/helpfrm.h
@comment include/wx/html/htmlcell.h
@comment include/wx/html/htmldefs.h
@comment include/wx/html/htmlfilt.h
@comment include/wx/html/htmlpars.h
@comment include/wx/html/htmltag.h
@comment include/wx/html/htmlwin.h
@comment include/wx/html/htmprint.h
@comment include/wx/html/m_templ.h
@comment include/wx/html/winpars.h
@comment include/wx/icon.h
@comment include/wx/iconbndl.h
@comment include/wx/imagbmp.h
@comment include/wx/image.h
@comment include/wx/imaggif.h
@comment include/wx/imagiff.h
@comment include/wx/imagjpeg.h
@comment include/wx/imaglist.h
@comment include/wx/imagpcx.h
@comment include/wx/imagpng.h
@comment include/wx/imagpnm.h
@comment include/wx/imagtiff.h
@comment include/wx/imagxpm.h
@comment include/wx/intl.h
@comment include/wx/ioswrap.h
@comment include/wx/ipc.h
@comment include/wx/ipcbase.h
@comment include/wx/isql.h
@comment include/wx/isqlext.h
@comment include/wx/joystick.h
@comment include/wx/layout.h
@comment include/wx/laywin.h
@comment include/wx/list.h
@comment include/wx/listbase.h
@comment include/wx/listbox.h
@comment include/wx/listctrl.h
@comment include/wx/listimpl.cpp
@comment include/wx/log.h
@comment include/wx/longlong.h
@comment include/wx/matrix.h
@comment include/wx/mdi.h
@comment include/wx/memconf.h
@comment include/wx/memory.h
@comment include/wx/memtext.h
@comment include/wx/menu.h
@comment include/wx/menuitem.h
@comment include/wx/metafile.h
@comment include/wx/mimetype.h
@comment include/wx/minifram.h
@comment include/wx/module.h
@comment include/wx/msgdlg.h
@comment include/wx/msgout.h
@comment include/wx/mstream.h
@comment include/wx/notebook.h
@comment include/wx/object.h
@comment include/wx/odbc.h
@comment include/wx/ownerdrw.h
@comment include/wx/palette.h
@comment include/wx/panel.h
@comment include/wx/paper.h
@comment include/wx/pen.h
@comment include/wx/platform.h
@comment include/wx/popupwin.h
@comment include/wx/print.h
@comment include/wx/printdlg.h
@comment include/wx/prntbase.h
@comment include/wx/process.h
@comment include/wx/progdlg.h
@comment include/wx/prop.h
@comment include/wx/propform.h
@comment include/wx/proplist.h
@comment include/wx/protocol/file.h
@comment include/wx/protocol/ftp.h
@comment include/wx/protocol/http.h
@comment include/wx/protocol/protocol.h
@comment include/wx/quantize.h
@comment include/wx/radiobox.h
@comment include/wx/radiobut.h
@comment include/wx/regex.h
@comment include/wx/region.h
@comment include/wx/resource.h
@comment include/wx/sashwin.h
@comment include/wx/sckaddr.h
@comment include/wx/sckipc.h
@comment include/wx/sckstrm.h
@comment include/wx/scrolbar.h
@comment include/wx/scrolwin.h
@comment include/wx/settings.h
@comment include/wx/sizer.h
@comment include/wx/slider.h
@comment include/wx/snglinst.h
@comment include/wx/socket.h
@comment include/wx/spinbutt.h
@comment include/wx/spinctrl.h
@comment include/wx/splash.h
@comment include/wx/splitter.h
@comment include/wx/stack.h
@comment include/wx/statbmp.h
@comment include/wx/statbox.h
@comment include/wx/statline.h
@comment include/wx/stattext.h
@comment include/wx/statusbr.h
@comment include/wx/strconv.h
@comment include/wx/stream.h
@comment include/wx/string.h
@comment include/wx/sysopt.h
@comment include/wx/tab.h
@comment include/wx/tabctrl.h
@comment include/wx/taskbar.h
@comment include/wx/tbarbase.h
@comment include/wx/tbarsmpl.h
@comment include/wx/textbuf.h
@comment include/wx/textctrl.h
@comment include/wx/textdlg.h
@comment include/wx/textfile.h
@comment include/wx/tglbtn.h
@comment include/wx/thread.h
@comment include/wx/thrimpl.cpp
@comment include/wx/time.h
@comment include/wx/timer.h
@comment include/wx/tipdlg.h
@comment include/wx/tipwin.h
@comment include/wx/tokenzr.h
@comment include/wx/toolbar.h
@comment include/wx/tooltip.h
@comment include/wx/toplevel.h
@comment include/wx/treebase.h
@comment include/wx/treectrl.h
@comment include/wx/txtstrm.h
@comment include/wx/types.h
@comment include/wx/unix/execute.h
@comment include/wx/unix/fontutil.h
@comment include/wx/unix/gsockunx.h
@comment include/wx/unix/mimetype.h
@comment include/wx/unix/utilsx11.h
@comment include/wx/url.h
@comment include/wx/utils.h
@comment include/wx/valgen.h
@comment include/wx/validate.h
@comment include/wx/valtext.h
@comment include/wx/variant.h
@comment include/wx/vector.h
@comment include/wx/version.h
@comment include/wx/volume.h
@comment include/wx/wave.h
@comment include/wx/wfstream.h
@comment include/wx/window.h
@comment include/wx/wizard.h
@comment include/wx/wx.h
@comment include/wx/wx_cw.h
@comment include/wx/wx_cw_cm.h
@comment include/wx/wx_cw_d.h
@comment include/wx/wxchar.h
@comment include/wx/wxexpr.h
@comment include/wx/wxhtml.h
@comment include/wx/wxprec.h
@comment include/wx/xpmdecod.h
@comment include/wx/zipstrm.h
@comment include/wx/zstream.h
lib/wx/
lib/wx/include/
lib/wx/include/gtk2-2.4/
lib/wx/include/gtk2-2.4/wx/
lib/wx/include/gtk2-2.4/wx/setup.h
lib/wx/include/univ/
@comment share/aclocal/wxwin.m4
@comment share/wx/2.4/afm/Cour.afm
@comment share/wx/2.4/afm/CourBo.afm
@comment share/wx/2.4/afm/CourBoO.afm
@comment share/wx/2.4/afm/CourO.afm
@comment share/wx/2.4/afm/Helv.afm
@comment share/wx/2.4/afm/HelvBo.afm
@comment share/wx/2.4/afm/HelvBoO.afm
@comment share/wx/2.4/afm/HelvO.afm
@comment share/wx/2.4/afm/TimesBo.afm
@comment share/wx/2.4/afm/TimesBoO.afm
@comment share/wx/2.4/afm/TimesO.afm
@comment share/wx/2.4/afm/TimesRo.afm
@comment share/wx/2.4/afm/Zapf.afm
@comment share/wx/2.4/gs_afm/Cour.afm
@comment share/wx/2.4/gs_afm/CourBo.afm
@comment share/wx/2.4/gs_afm/CourBoO.afm
@comment share/wx/2.4/gs_afm/CourO.afm
@comment share/wx/2.4/gs_afm/Helv.afm
@comment share/wx/2.4/gs_afm/HelvBo.afm
@comment share/wx/2.4/gs_afm/HelvBoO.afm
@comment share/wx/2.4/gs_afm/HelvO.afm
@comment share/wx/2.4/gs_afm/TimesBo.afm
@comment share/wx/2.4/gs_afm/TimesBoO.afm
@comment share/wx/2.4/gs_afm/TimesO.afm
@comment share/wx/2.4/gs_afm/TimesRo.afm
@comment share/wx/2.4/gs_afm/Zapf.afm

View File

@ -1,18 +0,0 @@
# $OpenBSD: Makefile,v 1.2 2006/09/18 10:21:49 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - GTK headers"
PKGNAME= wxWidgets-gtkheaders-${VERSION}
CONFIGURE_ARGS+= --with-gtk
.if !defined(PACKAGING)
LIB_DEPENDS+= gtk.>=1.2::x11/gtk+
.endif
RUN_DEPENDS+= ::x11/wxWidgets/headers
NO_BUILD=Yes
INSTALL_TARGET=install_headers
.include <bsd.port.mk>

View File

@ -1,11 +0,0 @@
wxWidgets gives you a single, easy-to-use API for writing GUI
applications on multiple platforms. Link with the appropriate library
for your platform (Windows/Unix/Mac, others coming shortly) and compiler
(almost any popular C++ compiler), and your application will adopt the
look and feel appropriate to that platform. On top of great GUI
functionality, wxWidgets gives you: online help, network programming,
streams, clipboard and drag and drop, multithreading, image loading and
saving in a variety of popular formats, database support, HTML viewing
and printing, and much much more.
This package contains the GTK headers for the library.

View File

@ -1,366 +0,0 @@
@comment $OpenBSD: PLIST,v 1.1 2005/11/10 12:18:25 espie Exp $
@conflict wxWidgets-gtk-<=2.4.2p0
@comment include/wx/accel.h
@comment include/wx/app.h
@comment include/wx/arrimpl.cpp
@comment include/wx/artprov.h
@comment include/wx/bitmap.h
@comment include/wx/bmpbuttn.h
@comment include/wx/brush.h
@comment include/wx/buffer.h
@comment include/wx/build.h
@comment include/wx/busyinfo.h
@comment include/wx/button.h
@comment include/wx/calctrl.h
@comment include/wx/caret.h
@comment include/wx/checkbox.h
@comment include/wx/checklst.h
@comment include/wx/chkconf.h
@comment include/wx/choicdlg.h
@comment include/wx/choice.h
@comment include/wx/clipbrd.h
@comment include/wx/clntdata.h
@comment include/wx/cmdline.h
@comment include/wx/cmdproc.h
@comment include/wx/cmndata.h
@comment include/wx/colordlg.h
@comment include/wx/colour.h
@comment include/wx/combobox.h
@comment include/wx/confbase.h
@comment include/wx/config.h
@comment include/wx/containr.h
@comment include/wx/control.h
@comment include/wx/cshelp.h
@comment include/wx/ctrlsub.h
@comment include/wx/cursor.h
@comment include/wx/dataobj.h
@comment include/wx/date.h
@comment include/wx/datetime.h
@comment include/wx/datetime.inl
@comment include/wx/datstrm.h
@comment include/wx/db.h
@comment include/wx/dbgrid.h
@comment include/wx/dbkeyg.h
@comment include/wx/dbtable.h
@comment include/wx/dc.h
@comment include/wx/dcbuffer.h
@comment include/wx/dcclient.h
@comment include/wx/dcmemory.h
@comment include/wx/dcprint.h
@comment include/wx/dcps.h
@comment include/wx/dcscreen.h
@comment include/wx/dde.h
@comment include/wx/debug.h
@comment include/wx/defs.h
@comment include/wx/dialog.h
@comment include/wx/dialup.h
@comment include/wx/dir.h
@comment include/wx/dirctrl.h
@comment include/wx/dirdlg.h
@comment include/wx/dnd.h
@comment include/wx/docmdi.h
@comment include/wx/docview.h
@comment include/wx/dragimag.h
@comment include/wx/dynarray.h
@comment include/wx/dynlib.h
@comment include/wx/dynload.h
@comment include/wx/effects.h
@comment include/wx/encconv.h
@comment include/wx/event.h
@comment include/wx/expr.h
@comment include/wx/fdrepdlg.h
@comment include/wx/features.h
@comment include/wx/ffile.h
@comment include/wx/file.h
@comment include/wx/fileconf.h
@comment include/wx/filedlg.h
@comment include/wx/filefn.h
@comment include/wx/filename.h
@comment include/wx/filesys.h
@comment include/wx/font.h
@comment include/wx/fontdlg.h
@comment include/wx/fontenc.h
@comment include/wx/fontenum.h
@comment include/wx/fontmap.h
@comment include/wx/fontutil.h
@comment include/wx/frame.h
@comment include/wx/fs_inet.h
@comment include/wx/fs_mem.h
@comment include/wx/fs_zip.h
@comment include/wx/gauge.h
@comment include/wx/gdicmn.h
@comment include/wx/gdiobj.h
@comment include/wx/generic/accel.h
@comment include/wx/generic/calctrl.h
@comment include/wx/generic/caret.h
@comment include/wx/generic/choicdgg.h
@comment include/wx/generic/colrdlgg.h
@comment include/wx/generic/dcpsg.h
@comment include/wx/generic/dirctrlg.h
@comment include/wx/generic/dirdlgg.h
@comment include/wx/generic/dragimgg.h
@comment include/wx/generic/fdrepdlg.h
@comment include/wx/generic/filedlgg.h
@comment include/wx/generic/fontdlgg.h
@comment include/wx/generic/grid.h
@comment include/wx/generic/gridctrl.h
@comment include/wx/generic/gridg.h
@comment include/wx/generic/helpext.h
@comment include/wx/generic/helphtml.h
@comment include/wx/generic/imaglist.h
@comment include/wx/generic/laywin.h
@comment include/wx/generic/listctrl.h
@comment include/wx/generic/msgdlgg.h
@comment include/wx/generic/notebook.h
@comment include/wx/generic/paletteg.h
@comment include/wx/generic/panelg.h
@comment include/wx/generic/printps.h
@comment include/wx/generic/prntdlgg.h
@comment include/wx/generic/progdlgg.h
@comment include/wx/generic/sashwin.h
@comment include/wx/generic/scrolwin.h
@comment include/wx/generic/spinctlg.h
@comment include/wx/generic/splash.h
@comment include/wx/generic/splitter.h
@comment include/wx/generic/statusbr.h
@comment include/wx/generic/tabg.h
@comment include/wx/generic/textdlgg.h
@comment include/wx/generic/timer.h
@comment include/wx/generic/treectlg.h
@comment include/wx/generic/wizard.h
@comment include/wx/geometry.h
@comment include/wx/gifdecod.h
@comment include/wx/glcanvas.h
@comment include/wx/grid.h
@comment include/wx/gsocket.h
include/wx/gtk/
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
@comment include/wx/hash.h
@comment include/wx/hashmap.h
@comment include/wx/help.h
@comment include/wx/helpbase.h
@comment include/wx/helphtml.h
@comment include/wx/helpwin.h
@comment include/wx/html/forcelnk.h
@comment include/wx/html/helpctrl.h
@comment include/wx/html/helpdata.h
@comment include/wx/html/helpfrm.h
@comment include/wx/html/htmlcell.h
@comment include/wx/html/htmldefs.h
@comment include/wx/html/htmlfilt.h
@comment include/wx/html/htmlpars.h
@comment include/wx/html/htmltag.h
@comment include/wx/html/htmlwin.h
@comment include/wx/html/htmprint.h
@comment include/wx/html/m_templ.h
@comment include/wx/html/winpars.h
@comment include/wx/icon.h
@comment include/wx/iconbndl.h
@comment include/wx/imagbmp.h
@comment include/wx/image.h
@comment include/wx/imaggif.h
@comment include/wx/imagiff.h
@comment include/wx/imagjpeg.h
@comment include/wx/imaglist.h
@comment include/wx/imagpcx.h
@comment include/wx/imagpng.h
@comment include/wx/imagpnm.h
@comment include/wx/imagtiff.h
@comment include/wx/imagxpm.h
@comment include/wx/intl.h
@comment include/wx/ioswrap.h
@comment include/wx/ipc.h
@comment include/wx/ipcbase.h
@comment include/wx/isql.h
@comment include/wx/isqlext.h
@comment include/wx/joystick.h
@comment include/wx/layout.h
@comment include/wx/laywin.h
@comment include/wx/list.h
@comment include/wx/listbase.h
@comment include/wx/listbox.h
@comment include/wx/listctrl.h
@comment include/wx/listimpl.cpp
@comment include/wx/log.h
@comment include/wx/longlong.h
@comment include/wx/matrix.h
@comment include/wx/mdi.h
@comment include/wx/memconf.h
@comment include/wx/memory.h
@comment include/wx/memtext.h
@comment include/wx/menu.h
@comment include/wx/menuitem.h
@comment include/wx/metafile.h
@comment include/wx/mimetype.h
@comment include/wx/minifram.h
@comment include/wx/module.h
@comment include/wx/msgdlg.h
@comment include/wx/msgout.h
@comment include/wx/mstream.h
@comment include/wx/notebook.h
@comment include/wx/object.h
@comment include/wx/odbc.h
@comment include/wx/ownerdrw.h
@comment include/wx/palette.h
@comment include/wx/panel.h
@comment include/wx/paper.h
@comment include/wx/pen.h
@comment include/wx/platform.h
@comment include/wx/popupwin.h
@comment include/wx/print.h
@comment include/wx/printdlg.h
@comment include/wx/prntbase.h
@comment include/wx/process.h
@comment include/wx/progdlg.h
@comment include/wx/prop.h
@comment include/wx/propform.h
@comment include/wx/proplist.h
@comment include/wx/protocol/file.h
@comment include/wx/protocol/ftp.h
@comment include/wx/protocol/http.h
@comment include/wx/protocol/protocol.h
@comment include/wx/quantize.h
@comment include/wx/radiobox.h
@comment include/wx/radiobut.h
@comment include/wx/regex.h
@comment include/wx/region.h
@comment include/wx/resource.h
@comment include/wx/sashwin.h
@comment include/wx/sckaddr.h
@comment include/wx/sckipc.h
@comment include/wx/sckstrm.h
@comment include/wx/scrolbar.h
@comment include/wx/scrolwin.h
@comment include/wx/settings.h
@comment include/wx/sizer.h
@comment include/wx/slider.h
@comment include/wx/snglinst.h
@comment include/wx/socket.h
@comment include/wx/spinbutt.h
@comment include/wx/spinctrl.h
@comment include/wx/splash.h
@comment include/wx/splitter.h
@comment include/wx/stack.h
@comment include/wx/statbmp.h
@comment include/wx/statbox.h
@comment include/wx/statline.h
@comment include/wx/stattext.h
@comment include/wx/statusbr.h
@comment include/wx/strconv.h
@comment include/wx/stream.h
@comment include/wx/string.h
@comment include/wx/sysopt.h
@comment include/wx/tab.h
@comment include/wx/tabctrl.h
@comment include/wx/taskbar.h
@comment include/wx/tbarbase.h
@comment include/wx/tbarsmpl.h
@comment include/wx/textbuf.h
@comment include/wx/textctrl.h
@comment include/wx/textdlg.h
@comment include/wx/textfile.h
@comment include/wx/tglbtn.h
@comment include/wx/thread.h
@comment include/wx/thrimpl.cpp
@comment include/wx/time.h
@comment include/wx/timer.h
@comment include/wx/tipdlg.h
@comment include/wx/tipwin.h
@comment include/wx/tokenzr.h
@comment include/wx/toolbar.h
@comment include/wx/tooltip.h
@comment include/wx/toplevel.h
@comment include/wx/treebase.h
@comment include/wx/treectrl.h
@comment include/wx/txtstrm.h
@comment include/wx/types.h
@comment include/wx/unix/execute.h
@comment include/wx/unix/fontutil.h
@comment include/wx/unix/gsockunx.h
@comment include/wx/unix/mimetype.h
@comment include/wx/unix/utilsx11.h
@comment include/wx/url.h
@comment include/wx/utils.h
@comment include/wx/valgen.h
@comment include/wx/validate.h
@comment include/wx/valtext.h
@comment include/wx/variant.h
@comment include/wx/vector.h
@comment include/wx/version.h
@comment include/wx/volume.h
@comment include/wx/wave.h
@comment include/wx/wfstream.h
@comment include/wx/window.h
@comment include/wx/wizard.h
@comment include/wx/wx.h
@comment include/wx/wx_cw.h
@comment include/wx/wx_cw_cm.h
@comment include/wx/wx_cw_d.h
@comment include/wx/wxchar.h
@comment include/wx/wxexpr.h
@comment include/wx/wxhtml.h
@comment include/wx/wxprec.h
@comment include/wx/xpmdecod.h
@comment include/wx/zipstrm.h
@comment include/wx/zstream.h

View File

@ -1,17 +0,0 @@
# $OpenBSD: Makefile,v 1.2 2005/02/13 10:56:23 sturm Exp $
COMMENT= "C++ cross-platform GUI toolkit - header files"
PKGNAME= wxWidgets-headers-${VERSION}p0
NO_REGRESS= Yes
# Configuring for X11 seems to be the most common subset
CONFIGURE_ARGS+= --with-x11
NO_BUILD= Yes
INSTALL_TARGET= install_common
post-install:
rm -fr ${PREFIX}/include/wx/x11/
${INSTALL_SCRIPT} ${FILESDIR}/wx-config ${PREFIX}/bin
.include <bsd.port.mk>

View File

@ -1,38 +0,0 @@
# $OpenBSD: wx-config,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
# Copyright (c) 2003 Andrew Dalgleish.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBSD
# PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
case x$WXCONFIG in
x) # figure out manually what to do
echo "Provide a WXCONFIG environment variable, please"
exit 1
;;
x*)
if ! test -x $WXCONFIG; then
echo "WXCONFIG ($WXCONFIG) not found"
else
exec $WXCONFIG "$@"
fi
;;
esac

View File

@ -1,11 +0,0 @@
wxWidgets gives you a single, easy-to-use API for writing GUI
applications on multiple platforms. Link with the appropriate library
for your platform (Windows/Unix/Mac, others coming shortly) and compiler
(almost any popular C++ compiler), and your application will adopt the
look and feel appropriate to that platform. On top of great GUI
functionality, wxWidgets gives you: online help, network programming,
streams, clipboard and drag and drop, multithreading, image loading and
saving in a variety of popular formats, database support, HTML viewing
and printing, and much much more.
This package contains the common include files.

View File

@ -1,6 +0,0 @@
wxWidgets normally installs a symlink from wx-config to the config
script which is specific to the GUI library.
OpenBSD supports installing multiple GUI libraries side-by-side, so you
must either call the script directly (eg wxgtk-2.4-config), or set an
environment variable WXCONFIG before calling wx-config.

View File

@ -1,382 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2005/02/13 10:56:23 sturm Exp $
bin/wx-config
include/wx/
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/
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/mdig.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/statline.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/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/
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/
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/univ/
include/wx/univ/app.h
include/wx/univ/bmpbuttn.h
include/wx/univ/button.h
include/wx/univ/checkbox.h
include/wx/univ/checklst.h
include/wx/univ/choice.h
include/wx/univ/colschem.h
include/wx/univ/combobox.h
include/wx/univ/control.h
include/wx/univ/dialog.h
include/wx/univ/frame.h
include/wx/univ/gauge.h
include/wx/univ/inpcons.h
include/wx/univ/inphand.h
include/wx/univ/listbox.h
include/wx/univ/menu.h
include/wx/univ/menuitem.h
include/wx/univ/notebook.h
include/wx/univ/radiobox.h
include/wx/univ/radiobut.h
include/wx/univ/renderer.h
include/wx/univ/scrarrow.h
include/wx/univ/scrolbar.h
include/wx/univ/scrthumb.h
include/wx/univ/scrtimer.h
include/wx/univ/setup.h
include/wx/univ/slider.h
include/wx/univ/spinbutt.h
include/wx/univ/statbmp.h
include/wx/univ/statbox.h
include/wx/univ/statline.h
include/wx/univ/stattext.h
include/wx/univ/statusbr.h
include/wx/univ/textctrl.h
include/wx/univ/theme.h
include/wx/univ/toolbar.h
include/wx/univ/toplevel.h
include/wx/univ/window.h
include/wx/unix/
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/
share/aclocal/wxwin.m4
share/locale/
share/wx/
share/wx/2.4/
share/wx/2.4/afm/
share/wx/2.4/afm/Cour.afm
share/wx/2.4/afm/CourBo.afm
share/wx/2.4/afm/CourBoO.afm
share/wx/2.4/afm/CourO.afm
share/wx/2.4/afm/Helv.afm
share/wx/2.4/afm/HelvBo.afm
share/wx/2.4/afm/HelvBoO.afm
share/wx/2.4/afm/HelvO.afm
share/wx/2.4/afm/TimesBo.afm
share/wx/2.4/afm/TimesBoO.afm
share/wx/2.4/afm/TimesO.afm
share/wx/2.4/afm/TimesRo.afm
share/wx/2.4/afm/Zapf.afm
share/wx/2.4/gs_afm/
share/wx/2.4/gs_afm/Cour.afm
share/wx/2.4/gs_afm/CourBo.afm
share/wx/2.4/gs_afm/CourBoO.afm
share/wx/2.4/gs_afm/CourO.afm
share/wx/2.4/gs_afm/Helv.afm
share/wx/2.4/gs_afm/HelvBo.afm
share/wx/2.4/gs_afm/HelvBoO.afm
share/wx/2.4/gs_afm/HelvO.afm
share/wx/2.4/gs_afm/TimesBo.afm
share/wx/2.4/gs_afm/TimesBoO.afm
share/wx/2.4/gs_afm/TimesO.afm
share/wx/2.4/gs_afm/TimesRo.afm
share/wx/2.4/gs_afm/Zapf.afm

View File

@ -1,18 +0,0 @@
# $OpenBSD: Makefile,v 1.4 2006/01/14 11:46:16 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - lesstif version"
# Note the package name must conflict with motif until these can be installed side-by-side
PKGNAME= wxWidgets-motif-${VERSION}p2-lesstif
SHARED_LIBS= wx_motif 3.0
CONFIGURE_ARGS+= --with-motif
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_motif_VERSION:R} \
WX_REVISION=${LIBwx_motif_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers
# 'USE_MOTIF=any' breaks package names if lesstif is already in FLAVORS or PSEUDO_FLAVORS
# 'USE_MOTIF=lesstif' has a broken LIB_DEPENDS
# (You can build with openmotif installed, but you get a broken package)
LIB_DEPENDS+= Xm.=1::x11/lesstif
.include <bsd.port.mk>

View File

@ -1,11 +0,0 @@
wxWidgets gives you a single, easy-to-use API for writing GUI
applications on multiple platforms. Link with the appropriate library
for your platform (Windows/Unix/Mac, others coming shortly) and compiler
(almost any popular C++ compiler), and your application will adopt the
look and feel appropriate to that platform. On top of great GUI
functionality, wxWidgets gives you: online help, network programming,
streams, clipboard and drag and drop, multithreading, image loading and
saving in a variety of popular formats, database support, HTML viewing
and printing, and much much more.
This package contains the Lesstif version of the library.

View File

@ -1,6 +0,0 @@
wxWidgets normally installs a symlink from wx-config to the config
script which is specific to the GUI library.
OpenBSD supports installing multiple GUI libraries side-by-side, so you
must either call the script directly (eg wxgtk-2.4-config), or set an
environment variable WXCONFIG before calling wx-config.

View File

@ -1 +0,0 @@
lib/libwx_motif-2.4.a

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
@lib lib/libwx_motif.so.${LIBwx_motif_VERSION}

View File

@ -1,400 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2005/02/13 10:56:24 sturm Exp $
%%SHARED%%
!%%SHARED%%
@comment bin/wx-config
bin/wxmotif-2.4-config
@comment include/wx/accel.h
@comment include/wx/app.h
@comment include/wx/arrimpl.cpp
@comment include/wx/artprov.h
@comment include/wx/bitmap.h
@comment include/wx/bmpbuttn.h
@comment include/wx/brush.h
@comment include/wx/buffer.h
@comment include/wx/build.h
@comment include/wx/busyinfo.h
@comment include/wx/button.h
@comment include/wx/calctrl.h
@comment include/wx/caret.h
@comment include/wx/checkbox.h
@comment include/wx/checklst.h
@comment include/wx/chkconf.h
@comment include/wx/choicdlg.h
@comment include/wx/choice.h
@comment include/wx/clipbrd.h
@comment include/wx/clntdata.h
@comment include/wx/cmdline.h
@comment include/wx/cmdproc.h
@comment include/wx/cmndata.h
@comment include/wx/colordlg.h
@comment include/wx/colour.h
@comment include/wx/combobox.h
@comment include/wx/confbase.h
@comment include/wx/config.h
@comment include/wx/containr.h
@comment include/wx/control.h
@comment include/wx/cshelp.h
@comment include/wx/ctrlsub.h
@comment include/wx/cursor.h
@comment include/wx/dataobj.h
@comment include/wx/date.h
@comment include/wx/datetime.h
@comment include/wx/datetime.inl
@comment include/wx/datstrm.h
@comment include/wx/db.h
@comment include/wx/dbgrid.h
@comment include/wx/dbkeyg.h
@comment include/wx/dbtable.h
@comment include/wx/dc.h
@comment include/wx/dcbuffer.h
@comment include/wx/dcclient.h
@comment include/wx/dcmemory.h
@comment include/wx/dcprint.h
@comment include/wx/dcps.h
@comment include/wx/dcscreen.h
@comment include/wx/dde.h
@comment include/wx/debug.h
@comment include/wx/defs.h
@comment include/wx/dialog.h
@comment include/wx/dialup.h
@comment include/wx/dir.h
@comment include/wx/dirctrl.h
@comment include/wx/dirdlg.h
@comment include/wx/dnd.h
@comment include/wx/docmdi.h
@comment include/wx/docview.h
@comment include/wx/dragimag.h
@comment include/wx/dynarray.h
@comment include/wx/dynlib.h
@comment include/wx/dynload.h
@comment include/wx/effects.h
@comment include/wx/encconv.h
@comment include/wx/event.h
@comment include/wx/expr.h
@comment include/wx/fdrepdlg.h
@comment include/wx/features.h
@comment include/wx/ffile.h
@comment include/wx/file.h
@comment include/wx/fileconf.h
@comment include/wx/filedlg.h
@comment include/wx/filefn.h
@comment include/wx/filename.h
@comment include/wx/filesys.h
@comment include/wx/font.h
@comment include/wx/fontdlg.h
@comment include/wx/fontenc.h
@comment include/wx/fontenum.h
@comment include/wx/fontmap.h
@comment include/wx/fontutil.h
@comment include/wx/frame.h
@comment include/wx/fs_inet.h
@comment include/wx/fs_mem.h
@comment include/wx/fs_zip.h
@comment include/wx/gauge.h
@comment include/wx/gdicmn.h
@comment include/wx/gdiobj.h
@comment include/wx/generic/accel.h
@comment include/wx/generic/calctrl.h
@comment include/wx/generic/caret.h
@comment include/wx/generic/choicdgg.h
@comment include/wx/generic/colrdlgg.h
@comment include/wx/generic/dcpsg.h
@comment include/wx/generic/dirctrlg.h
@comment include/wx/generic/dirdlgg.h
@comment include/wx/generic/dragimgg.h
@comment include/wx/generic/fdrepdlg.h
@comment include/wx/generic/filedlgg.h
@comment include/wx/generic/fontdlgg.h
@comment include/wx/generic/grid.h
@comment include/wx/generic/gridctrl.h
@comment include/wx/generic/gridg.h
@comment include/wx/generic/helpext.h
@comment include/wx/generic/helphtml.h
@comment include/wx/generic/imaglist.h
@comment include/wx/generic/laywin.h
@comment include/wx/generic/listctrl.h
@comment include/wx/generic/mdig.h
@comment include/wx/generic/msgdlgg.h
@comment include/wx/generic/notebook.h
@comment include/wx/generic/paletteg.h
@comment include/wx/generic/panelg.h
@comment include/wx/generic/printps.h
@comment include/wx/generic/prntdlgg.h
@comment include/wx/generic/progdlgg.h
@comment include/wx/generic/sashwin.h
@comment include/wx/generic/scrolwin.h
@comment include/wx/generic/spinctlg.h
@comment include/wx/generic/splash.h
@comment include/wx/generic/splitter.h
@comment include/wx/generic/statline.h
@comment include/wx/generic/statusbr.h
@comment include/wx/generic/tabg.h
@comment include/wx/generic/textdlgg.h
@comment include/wx/generic/timer.h
@comment include/wx/generic/treectlg.h
@comment include/wx/generic/wizard.h
@comment include/wx/geometry.h
@comment include/wx/gifdecod.h
@comment include/wx/glcanvas.h
@comment include/wx/grid.h
@comment include/wx/gsocket.h
@comment include/wx/hash.h
@comment include/wx/hashmap.h
@comment include/wx/help.h
@comment include/wx/helpbase.h
@comment include/wx/helphtml.h
@comment include/wx/helpwin.h
@comment include/wx/html/forcelnk.h
@comment include/wx/html/helpctrl.h
@comment include/wx/html/helpdata.h
@comment include/wx/html/helpfrm.h
@comment include/wx/html/htmlcell.h
@comment include/wx/html/htmldefs.h
@comment include/wx/html/htmlfilt.h
@comment include/wx/html/htmlpars.h
@comment include/wx/html/htmltag.h
@comment include/wx/html/htmlwin.h
@comment include/wx/html/htmprint.h
@comment include/wx/html/m_templ.h
@comment include/wx/html/winpars.h
@comment include/wx/icon.h
@comment include/wx/iconbndl.h
@comment include/wx/imagbmp.h
@comment include/wx/image.h
@comment include/wx/imaggif.h
@comment include/wx/imagiff.h
@comment include/wx/imagjpeg.h
@comment include/wx/imaglist.h
@comment include/wx/imagpcx.h
@comment include/wx/imagpng.h
@comment include/wx/imagpnm.h
@comment include/wx/imagtiff.h
@comment include/wx/imagxpm.h
@comment include/wx/intl.h
@comment include/wx/ioswrap.h
@comment include/wx/ipc.h
@comment include/wx/ipcbase.h
@comment include/wx/isql.h
@comment include/wx/isqlext.h
@comment include/wx/joystick.h
@comment include/wx/layout.h
@comment include/wx/laywin.h
@comment include/wx/list.h
@comment include/wx/listbase.h
@comment include/wx/listbox.h
@comment include/wx/listctrl.h
@comment include/wx/listimpl.cpp
@comment include/wx/log.h
@comment include/wx/longlong.h
@comment include/wx/matrix.h
@comment include/wx/mdi.h
@comment include/wx/memconf.h
@comment include/wx/memory.h
@comment include/wx/memtext.h
@comment include/wx/menu.h
@comment include/wx/menuitem.h
@comment include/wx/metafile.h
@comment include/wx/mimetype.h
@comment include/wx/minifram.h
@comment include/wx/module.h
include/wx/motif/
include/wx/motif/accel.h
include/wx/motif/app.h
include/wx/motif/bitmap.h
include/wx/motif/bmpbuttn.h
include/wx/motif/brush.h
include/wx/motif/button.h
include/wx/motif/checkbox.h
include/wx/motif/checklst.h
include/wx/motif/choice.h
include/wx/motif/clipbrd.h
include/wx/motif/colordlg.h
include/wx/motif/colour.h
include/wx/motif/combobox.h
include/wx/motif/control.h
include/wx/motif/cursor.h
include/wx/motif/dataform.h
include/wx/motif/dataobj.h
include/wx/motif/dc.h
include/wx/motif/dcclient.h
include/wx/motif/dcmemory.h
include/wx/motif/dcprint.h
include/wx/motif/dcscreen.h
include/wx/motif/dialog.h
include/wx/motif/dnd.h
include/wx/motif/filedlg.h
include/wx/motif/font.h
include/wx/motif/fontdlg.h
include/wx/motif/frame.h
include/wx/motif/gauge.h
include/wx/motif/gdiobj.h
include/wx/motif/glcanvas.h
include/wx/motif/icon.h
include/wx/motif/joystick.h
include/wx/motif/listbox.h
include/wx/motif/mdi.h
include/wx/motif/menu.h
include/wx/motif/menuitem.h
include/wx/motif/metafile.h
include/wx/motif/minifram.h
include/wx/motif/msgdlg.h
include/wx/motif/palette.h
include/wx/motif/pen.h
include/wx/motif/print.h
include/wx/motif/printdlg.h
include/wx/motif/private.h
include/wx/motif/radiobox.h
include/wx/motif/radiobut.h
include/wx/motif/region.h
include/wx/motif/scrolbar.h
include/wx/motif/slider.h
include/wx/motif/spinbutt.h
include/wx/motif/statbmp.h
include/wx/motif/statbox.h
include/wx/motif/stattext.h
include/wx/motif/textctrl.h
include/wx/motif/timer.h
include/wx/motif/toolbar.h
include/wx/motif/window.h
@comment include/wx/msgdlg.h
@comment include/wx/msgout.h
@comment include/wx/mstream.h
@comment include/wx/notebook.h
@comment include/wx/object.h
@comment include/wx/odbc.h
@comment include/wx/ownerdrw.h
@comment include/wx/palette.h
@comment include/wx/panel.h
@comment include/wx/paper.h
@comment include/wx/pen.h
@comment include/wx/platform.h
@comment include/wx/popupwin.h
@comment include/wx/print.h
@comment include/wx/printdlg.h
@comment include/wx/prntbase.h
@comment include/wx/process.h
@comment include/wx/progdlg.h
@comment include/wx/prop.h
@comment include/wx/propform.h
@comment include/wx/proplist.h
@comment include/wx/protocol/file.h
@comment include/wx/protocol/ftp.h
@comment include/wx/protocol/http.h
@comment include/wx/protocol/protocol.h
@comment include/wx/quantize.h
@comment include/wx/radiobox.h
@comment include/wx/radiobut.h
@comment include/wx/regex.h
@comment include/wx/region.h
@comment include/wx/resource.h
@comment include/wx/sashwin.h
@comment include/wx/sckaddr.h
@comment include/wx/sckipc.h
@comment include/wx/sckstrm.h
@comment include/wx/scrolbar.h
@comment include/wx/scrolwin.h
@comment include/wx/settings.h
@comment include/wx/sizer.h
@comment include/wx/slider.h
@comment include/wx/snglinst.h
@comment include/wx/socket.h
@comment include/wx/spinbutt.h
@comment include/wx/spinctrl.h
@comment include/wx/splash.h
@comment include/wx/splitter.h
@comment include/wx/stack.h
@comment include/wx/statbmp.h
@comment include/wx/statbox.h
@comment include/wx/statline.h
@comment include/wx/stattext.h
@comment include/wx/statusbr.h
@comment include/wx/strconv.h
@comment include/wx/stream.h
@comment include/wx/string.h
@comment include/wx/sysopt.h
@comment include/wx/tab.h
@comment include/wx/tabctrl.h
@comment include/wx/taskbar.h
@comment include/wx/tbarbase.h
@comment include/wx/tbarsmpl.h
@comment include/wx/textbuf.h
@comment include/wx/textctrl.h
@comment include/wx/textdlg.h
@comment include/wx/textfile.h
@comment include/wx/tglbtn.h
@comment include/wx/thread.h
@comment include/wx/thrimpl.cpp
@comment include/wx/time.h
@comment include/wx/timer.h
@comment include/wx/tipdlg.h
@comment include/wx/tipwin.h
@comment include/wx/tokenzr.h
@comment include/wx/toolbar.h
@comment include/wx/tooltip.h
@comment include/wx/toplevel.h
@comment include/wx/treebase.h
@comment include/wx/treectrl.h
@comment include/wx/txtstrm.h
@comment include/wx/types.h
@comment include/wx/unix/execute.h
@comment include/wx/unix/fontutil.h
@comment include/wx/unix/gsockunx.h
@comment include/wx/unix/mimetype.h
@comment include/wx/unix/utilsx11.h
@comment include/wx/url.h
@comment include/wx/utils.h
@comment include/wx/valgen.h
@comment include/wx/validate.h
@comment include/wx/valtext.h
@comment include/wx/variant.h
@comment include/wx/vector.h
@comment include/wx/version.h
@comment include/wx/volume.h
@comment include/wx/wave.h
@comment include/wx/wfstream.h
@comment include/wx/window.h
@comment include/wx/wizard.h
@comment include/wx/wx.h
@comment include/wx/wx_cw.h
@comment include/wx/wx_cw_cm.h
@comment include/wx/wx_cw_d.h
@comment include/wx/wxchar.h
@comment include/wx/wxexpr.h
@comment include/wx/wxhtml.h
@comment include/wx/wxprec.h
@comment include/wx/xpmdecod.h
@comment include/wx/zipstrm.h
@comment include/wx/zstream.h
lib/wx/
lib/wx/include/
lib/wx/include/motif-2.4/
lib/wx/include/motif-2.4/wx/
lib/wx/include/motif-2.4/wx/setup.h
lib/wx/include/univ/
@comment share/aclocal/wxwin.m4
@comment share/wx/2.4/afm/Cour.afm
@comment share/wx/2.4/afm/CourBo.afm
@comment share/wx/2.4/afm/CourBoO.afm
@comment share/wx/2.4/afm/CourO.afm
@comment share/wx/2.4/afm/Helv.afm
@comment share/wx/2.4/afm/HelvBo.afm
@comment share/wx/2.4/afm/HelvBoO.afm
@comment share/wx/2.4/afm/HelvO.afm
@comment share/wx/2.4/afm/TimesBo.afm
@comment share/wx/2.4/afm/TimesBoO.afm
@comment share/wx/2.4/afm/TimesO.afm
@comment share/wx/2.4/afm/TimesRo.afm
@comment share/wx/2.4/afm/Zapf.afm
@comment share/wx/2.4/gs_afm/Cour.afm
@comment share/wx/2.4/gs_afm/CourBo.afm
@comment share/wx/2.4/gs_afm/CourBoO.afm
@comment share/wx/2.4/gs_afm/CourO.afm
@comment share/wx/2.4/gs_afm/Helv.afm
@comment share/wx/2.4/gs_afm/HelvBo.afm
@comment share/wx/2.4/gs_afm/HelvBoO.afm
@comment share/wx/2.4/gs_afm/HelvO.afm
@comment share/wx/2.4/gs_afm/TimesBo.afm
@comment share/wx/2.4/gs_afm/TimesBoO.afm
@comment share/wx/2.4/gs_afm/TimesO.afm
@comment share/wx/2.4/gs_afm/TimesRo.afm
@comment share/wx/2.4/gs_afm/Zapf.afm

View File

@ -1,15 +0,0 @@
# $OpenBSD: Makefile,v 1.6 2006/01/14 11:46:16 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - motif version"
PKGNAME= wxWidgets-motif-${VERSION}p3
SHARED_LIBS= wx_motif 3.0
USE_MOTIF= openmotif
CONFIGURE_ARGS+= --with-motif
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_motif_VERSION:R} \
WX_REVISION=${LIBwx_motif_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers
WANTLIB= ICE SM X11 Xext Xmu Xpm Xt m z
.include <bsd.port.mk>

View File

@ -1,11 +0,0 @@
wxWidgets gives you a single, easy-to-use API for writing GUI
applications on multiple platforms. Link with the appropriate library
for your platform (Windows/Unix/Mac, others coming shortly) and compiler
(almost any popular C++ compiler), and your application will adopt the
look and feel appropriate to that platform. On top of great GUI
functionality, wxWidgets gives you: online help, network programming,
streams, clipboard and drag and drop, multithreading, image loading and
saving in a variety of popular formats, database support, HTML viewing
and printing, and much much more.
This package contains the motif version of the library.

View File

@ -1,6 +0,0 @@
wxWidgets normally installs a symlink from wx-config to the config
script which is specific to the GUI library.
OpenBSD supports installing multiple GUI libraries side-by-side, so you
must either call the script directly (eg wxgtk-2.4-config), or set an
environment variable WXCONFIG before calling wx-config.

View File

@ -1 +0,0 @@
lib/libwx_motif-2.4.a

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/31 15:18:44 naddy Exp $
@lib lib/libwx_motif.so.${LIBwx_motif_VERSION}

View File

@ -1,400 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2005/02/13 10:56:24 sturm Exp $
%%SHARED%%
!%%SHARED%%
@comment bin/wx-config
bin/wxmotif-2.4-config
@comment include/wx/accel.h
@comment include/wx/app.h
@comment include/wx/arrimpl.cpp
@comment include/wx/artprov.h
@comment include/wx/bitmap.h
@comment include/wx/bmpbuttn.h
@comment include/wx/brush.h
@comment include/wx/buffer.h
@comment include/wx/build.h
@comment include/wx/busyinfo.h
@comment include/wx/button.h
@comment include/wx/calctrl.h
@comment include/wx/caret.h
@comment include/wx/checkbox.h
@comment include/wx/checklst.h
@comment include/wx/chkconf.h
@comment include/wx/choicdlg.h
@comment include/wx/choice.h
@comment include/wx/clipbrd.h
@comment include/wx/clntdata.h
@comment include/wx/cmdline.h
@comment include/wx/cmdproc.h
@comment include/wx/cmndata.h
@comment include/wx/colordlg.h
@comment include/wx/colour.h
@comment include/wx/combobox.h
@comment include/wx/confbase.h
@comment include/wx/config.h
@comment include/wx/containr.h
@comment include/wx/control.h
@comment include/wx/cshelp.h
@comment include/wx/ctrlsub.h
@comment include/wx/cursor.h
@comment include/wx/dataobj.h
@comment include/wx/date.h
@comment include/wx/datetime.h
@comment include/wx/datetime.inl
@comment include/wx/datstrm.h
@comment include/wx/db.h
@comment include/wx/dbgrid.h
@comment include/wx/dbkeyg.h
@comment include/wx/dbtable.h
@comment include/wx/dc.h
@comment include/wx/dcbuffer.h
@comment include/wx/dcclient.h
@comment include/wx/dcmemory.h
@comment include/wx/dcprint.h
@comment include/wx/dcps.h
@comment include/wx/dcscreen.h
@comment include/wx/dde.h
@comment include/wx/debug.h
@comment include/wx/defs.h
@comment include/wx/dialog.h
@comment include/wx/dialup.h
@comment include/wx/dir.h
@comment include/wx/dirctrl.h
@comment include/wx/dirdlg.h
@comment include/wx/dnd.h
@comment include/wx/docmdi.h
@comment include/wx/docview.h
@comment include/wx/dragimag.h
@comment include/wx/dynarray.h
@comment include/wx/dynlib.h
@comment include/wx/dynload.h
@comment include/wx/effects.h
@comment include/wx/encconv.h
@comment include/wx/event.h
@comment include/wx/expr.h
@comment include/wx/fdrepdlg.h
@comment include/wx/features.h
@comment include/wx/ffile.h
@comment include/wx/file.h
@comment include/wx/fileconf.h
@comment include/wx/filedlg.h
@comment include/wx/filefn.h
@comment include/wx/filename.h
@comment include/wx/filesys.h
@comment include/wx/font.h
@comment include/wx/fontdlg.h
@comment include/wx/fontenc.h
@comment include/wx/fontenum.h
@comment include/wx/fontmap.h
@comment include/wx/fontutil.h
@comment include/wx/frame.h
@comment include/wx/fs_inet.h
@comment include/wx/fs_mem.h
@comment include/wx/fs_zip.h
@comment include/wx/gauge.h
@comment include/wx/gdicmn.h
@comment include/wx/gdiobj.h
@comment include/wx/generic/accel.h
@comment include/wx/generic/calctrl.h
@comment include/wx/generic/caret.h
@comment include/wx/generic/choicdgg.h
@comment include/wx/generic/colrdlgg.h
@comment include/wx/generic/dcpsg.h
@comment include/wx/generic/dirctrlg.h
@comment include/wx/generic/dirdlgg.h
@comment include/wx/generic/dragimgg.h
@comment include/wx/generic/fdrepdlg.h
@comment include/wx/generic/filedlgg.h
@comment include/wx/generic/fontdlgg.h
@comment include/wx/generic/grid.h
@comment include/wx/generic/gridctrl.h
@comment include/wx/generic/gridg.h
@comment include/wx/generic/helpext.h
@comment include/wx/generic/helphtml.h
@comment include/wx/generic/imaglist.h
@comment include/wx/generic/laywin.h
@comment include/wx/generic/listctrl.h
@comment include/wx/generic/mdig.h
@comment include/wx/generic/msgdlgg.h
@comment include/wx/generic/notebook.h
@comment include/wx/generic/paletteg.h
@comment include/wx/generic/panelg.h
@comment include/wx/generic/printps.h
@comment include/wx/generic/prntdlgg.h
@comment include/wx/generic/progdlgg.h
@comment include/wx/generic/sashwin.h
@comment include/wx/generic/scrolwin.h
@comment include/wx/generic/spinctlg.h
@comment include/wx/generic/splash.h
@comment include/wx/generic/splitter.h
@comment include/wx/generic/statline.h
@comment include/wx/generic/statusbr.h
@comment include/wx/generic/tabg.h
@comment include/wx/generic/textdlgg.h
@comment include/wx/generic/timer.h
@comment include/wx/generic/treectlg.h
@comment include/wx/generic/wizard.h
@comment include/wx/geometry.h
@comment include/wx/gifdecod.h
@comment include/wx/glcanvas.h
@comment include/wx/grid.h
@comment include/wx/gsocket.h
@comment include/wx/hash.h
@comment include/wx/hashmap.h
@comment include/wx/help.h
@comment include/wx/helpbase.h
@comment include/wx/helphtml.h
@comment include/wx/helpwin.h
@comment include/wx/html/forcelnk.h
@comment include/wx/html/helpctrl.h
@comment include/wx/html/helpdata.h
@comment include/wx/html/helpfrm.h
@comment include/wx/html/htmlcell.h
@comment include/wx/html/htmldefs.h
@comment include/wx/html/htmlfilt.h
@comment include/wx/html/htmlpars.h
@comment include/wx/html/htmltag.h
@comment include/wx/html/htmlwin.h
@comment include/wx/html/htmprint.h
@comment include/wx/html/m_templ.h
@comment include/wx/html/winpars.h
@comment include/wx/icon.h
@comment include/wx/iconbndl.h
@comment include/wx/imagbmp.h
@comment include/wx/image.h
@comment include/wx/imaggif.h
@comment include/wx/imagiff.h
@comment include/wx/imagjpeg.h
@comment include/wx/imaglist.h
@comment include/wx/imagpcx.h
@comment include/wx/imagpng.h
@comment include/wx/imagpnm.h
@comment include/wx/imagtiff.h
@comment include/wx/imagxpm.h
@comment include/wx/intl.h
@comment include/wx/ioswrap.h
@comment include/wx/ipc.h
@comment include/wx/ipcbase.h
@comment include/wx/isql.h
@comment include/wx/isqlext.h
@comment include/wx/joystick.h
@comment include/wx/layout.h
@comment include/wx/laywin.h
@comment include/wx/list.h
@comment include/wx/listbase.h
@comment include/wx/listbox.h
@comment include/wx/listctrl.h
@comment include/wx/listimpl.cpp
@comment include/wx/log.h
@comment include/wx/longlong.h
@comment include/wx/matrix.h
@comment include/wx/mdi.h
@comment include/wx/memconf.h
@comment include/wx/memory.h
@comment include/wx/memtext.h
@comment include/wx/menu.h
@comment include/wx/menuitem.h
@comment include/wx/metafile.h
@comment include/wx/mimetype.h
@comment include/wx/minifram.h
@comment include/wx/module.h
include/wx/motif/
include/wx/motif/accel.h
include/wx/motif/app.h
include/wx/motif/bitmap.h
include/wx/motif/bmpbuttn.h
include/wx/motif/brush.h
include/wx/motif/button.h
include/wx/motif/checkbox.h
include/wx/motif/checklst.h
include/wx/motif/choice.h
include/wx/motif/clipbrd.h
include/wx/motif/colordlg.h
include/wx/motif/colour.h
include/wx/motif/combobox.h
include/wx/motif/control.h
include/wx/motif/cursor.h
include/wx/motif/dataform.h
include/wx/motif/dataobj.h
include/wx/motif/dc.h
include/wx/motif/dcclient.h
include/wx/motif/dcmemory.h
include/wx/motif/dcprint.h
include/wx/motif/dcscreen.h
include/wx/motif/dialog.h
include/wx/motif/dnd.h
include/wx/motif/filedlg.h
include/wx/motif/font.h
include/wx/motif/fontdlg.h
include/wx/motif/frame.h
include/wx/motif/gauge.h
include/wx/motif/gdiobj.h
include/wx/motif/glcanvas.h
include/wx/motif/icon.h
include/wx/motif/joystick.h
include/wx/motif/listbox.h
include/wx/motif/mdi.h
include/wx/motif/menu.h
include/wx/motif/menuitem.h
include/wx/motif/metafile.h
include/wx/motif/minifram.h
include/wx/motif/msgdlg.h
include/wx/motif/palette.h
include/wx/motif/pen.h
include/wx/motif/print.h
include/wx/motif/printdlg.h
include/wx/motif/private.h
include/wx/motif/radiobox.h
include/wx/motif/radiobut.h
include/wx/motif/region.h
include/wx/motif/scrolbar.h
include/wx/motif/slider.h
include/wx/motif/spinbutt.h
include/wx/motif/statbmp.h
include/wx/motif/statbox.h
include/wx/motif/stattext.h
include/wx/motif/textctrl.h
include/wx/motif/timer.h
include/wx/motif/toolbar.h
include/wx/motif/window.h
@comment include/wx/msgdlg.h
@comment include/wx/msgout.h
@comment include/wx/mstream.h
@comment include/wx/notebook.h
@comment include/wx/object.h
@comment include/wx/odbc.h
@comment include/wx/ownerdrw.h
@comment include/wx/palette.h
@comment include/wx/panel.h
@comment include/wx/paper.h
@comment include/wx/pen.h
@comment include/wx/platform.h
@comment include/wx/popupwin.h
@comment include/wx/print.h
@comment include/wx/printdlg.h
@comment include/wx/prntbase.h
@comment include/wx/process.h
@comment include/wx/progdlg.h
@comment include/wx/prop.h
@comment include/wx/propform.h
@comment include/wx/proplist.h
@comment include/wx/protocol/file.h
@comment include/wx/protocol/ftp.h
@comment include/wx/protocol/http.h
@comment include/wx/protocol/protocol.h
@comment include/wx/quantize.h
@comment include/wx/radiobox.h
@comment include/wx/radiobut.h
@comment include/wx/regex.h
@comment include/wx/region.h
@comment include/wx/resource.h
@comment include/wx/sashwin.h
@comment include/wx/sckaddr.h
@comment include/wx/sckipc.h
@comment include/wx/sckstrm.h
@comment include/wx/scrolbar.h
@comment include/wx/scrolwin.h
@comment include/wx/settings.h
@comment include/wx/sizer.h
@comment include/wx/slider.h
@comment include/wx/snglinst.h
@comment include/wx/socket.h
@comment include/wx/spinbutt.h
@comment include/wx/spinctrl.h
@comment include/wx/splash.h
@comment include/wx/splitter.h
@comment include/wx/stack.h
@comment include/wx/statbmp.h
@comment include/wx/statbox.h
@comment include/wx/statline.h
@comment include/wx/stattext.h
@comment include/wx/statusbr.h
@comment include/wx/strconv.h
@comment include/wx/stream.h
@comment include/wx/string.h
@comment include/wx/sysopt.h
@comment include/wx/tab.h
@comment include/wx/tabctrl.h
@comment include/wx/taskbar.h
@comment include/wx/tbarbase.h
@comment include/wx/tbarsmpl.h
@comment include/wx/textbuf.h
@comment include/wx/textctrl.h
@comment include/wx/textdlg.h
@comment include/wx/textfile.h
@comment include/wx/tglbtn.h
@comment include/wx/thread.h
@comment include/wx/thrimpl.cpp
@comment include/wx/time.h
@comment include/wx/timer.h
@comment include/wx/tipdlg.h
@comment include/wx/tipwin.h
@comment include/wx/tokenzr.h
@comment include/wx/toolbar.h
@comment include/wx/tooltip.h
@comment include/wx/toplevel.h
@comment include/wx/treebase.h
@comment include/wx/treectrl.h
@comment include/wx/txtstrm.h
@comment include/wx/types.h
@comment include/wx/unix/execute.h
@comment include/wx/unix/fontutil.h
@comment include/wx/unix/gsockunx.h
@comment include/wx/unix/mimetype.h
@comment include/wx/unix/utilsx11.h
@comment include/wx/url.h
@comment include/wx/utils.h
@comment include/wx/valgen.h
@comment include/wx/validate.h
@comment include/wx/valtext.h
@comment include/wx/variant.h
@comment include/wx/vector.h
@comment include/wx/version.h
@comment include/wx/volume.h
@comment include/wx/wave.h
@comment include/wx/wfstream.h
@comment include/wx/window.h
@comment include/wx/wizard.h
@comment include/wx/wx.h
@comment include/wx/wx_cw.h
@comment include/wx/wx_cw_cm.h
@comment include/wx/wx_cw_d.h
@comment include/wx/wxchar.h
@comment include/wx/wxexpr.h
@comment include/wx/wxhtml.h
@comment include/wx/wxprec.h
@comment include/wx/xpmdecod.h
@comment include/wx/zipstrm.h
@comment include/wx/zstream.h
lib/wx/
lib/wx/include/
lib/wx/include/motif-2.4/
lib/wx/include/motif-2.4/wx/
lib/wx/include/motif-2.4/wx/setup.h
lib/wx/include/univ/
@comment share/aclocal/wxwin.m4
@comment share/wx/2.4/afm/Cour.afm
@comment share/wx/2.4/afm/CourBo.afm
@comment share/wx/2.4/afm/CourBoO.afm
@comment share/wx/2.4/afm/CourO.afm
@comment share/wx/2.4/afm/Helv.afm
@comment share/wx/2.4/afm/HelvBo.afm
@comment share/wx/2.4/afm/HelvBoO.afm
@comment share/wx/2.4/afm/HelvO.afm
@comment share/wx/2.4/afm/TimesBo.afm
@comment share/wx/2.4/afm/TimesBoO.afm
@comment share/wx/2.4/afm/TimesO.afm
@comment share/wx/2.4/afm/TimesRo.afm
@comment share/wx/2.4/afm/Zapf.afm
@comment share/wx/2.4/gs_afm/Cour.afm
@comment share/wx/2.4/gs_afm/CourBo.afm
@comment share/wx/2.4/gs_afm/CourBoO.afm
@comment share/wx/2.4/gs_afm/CourO.afm
@comment share/wx/2.4/gs_afm/Helv.afm
@comment share/wx/2.4/gs_afm/HelvBo.afm
@comment share/wx/2.4/gs_afm/HelvBoO.afm
@comment share/wx/2.4/gs_afm/HelvO.afm
@comment share/wx/2.4/gs_afm/TimesBo.afm
@comment share/wx/2.4/gs_afm/TimesBoO.afm
@comment share/wx/2.4/gs_afm/TimesO.afm
@comment share/wx/2.4/gs_afm/TimesRo.afm
@comment share/wx/2.4/gs_afm/Zapf.afm

View File

@ -1,63 +1,399 @@
$OpenBSD: patch-Makefile_in,v 1.2 2005/12/31 15:18:44 naddy Exp $
--- Makefile.in.orig Sat Sep 20 12:23:04 2003
+++ Makefile.in Sat Dec 31 00:06:57 2005
@@ -383,7 +383,7 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
$OpenBSD: patch-Makefile_in,v 1.3 2006/10/12 14:09:33 alek Exp $
--- Makefile.in.orig Thu Mar 16 14:00:30 2006
+++ Makefile.in Wed Aug 2 18:05:30 2006
@@ -1358,7 +1358,7 @@ LOCALE_MSW_LINGUAS = it
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
COND_WXUSE_REGEX_BUILTIN___wxregex___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -5695,7 +5695,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_ltversion)
@COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
@COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll
COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd = -install_name \
@@ -6049,7 +6049,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJEC
@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
@COND_TOOLKIT_MAC@ baselib_utils.o baselib_uma.o
COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_net_ltversion)
@COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
@COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll
COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd = -install_name \
@@ -6119,7 +6119,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___de
@COND_PLATFORM_WIN32_1@ $(__NET_WINCE_SRC_OBJECTS_3)
@COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_3 = netlib_net.o
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_core_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_coredll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll
@@ -8551,7 +8551,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_
corelib_window.o
@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_adv_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
@@ -8681,7 +8681,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_media_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_mediadll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_mediadll
@@ -8757,7 +8757,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___m
@COND_TOOLKIT_WINCE@ medialib_mediactrl.o medialib_activex.o
@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_odbc_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ = install_odbcdll
@@ -8813,7 +8813,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___
@COND_USE_PCH_1@___pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/wxprec_odbclib/wx/wxprec.h.gch
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_dbgrid_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_dbgriddll
@@ -8869,7 +8869,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE
@COND_USE_PCH_1@___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_html_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = install_htmldll
@@ -8931,7 +8931,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_qa_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__install_qadll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ = install_qadll
@@ -8987,7 +8987,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE
@COND_USE_PCH_1@___pch_wxprec_qalib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/wxprec_qalib/wx/wxprec.h.gch
COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_xml_ltversion)
@COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
@COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd = -install_name \
@@ -9041,7 +9041,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___de
@COND_USE_PCH_1@___pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/wxprec_xmllib/wx/wxprec.h.gch
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_xrc_ltversion)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
@@ -9097,7 +9097,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___x
@COND_USE_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/wxprec_xrclib/wx/wxprec.h.gch
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_gl_ltversion)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
@@ -9151,10 +9151,10 @@ COND_USE_SOSYMLINKS_1___gldll___so_symli
@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -9386,7 +9386,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
### Targets: ###
-afminstall: preinstall
+afminstall:
@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
$(INSTALL) -d $(datadir)/wx
$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
@@ -392,11 +392,11 @@ afminstall: preinstall
$(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
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ cd contrib && ${MAKE}
-m4datainstall: preinstall
+m4datainstall:
$(INSTALL) -d $(datadir)/aclocal
$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
-win32install: preinstall
+win32install:
$(INSTALL) -d $(includedir)/wx/msw
$(INSTALL) -d $(includedir)/wx/msw/gnuwin32
$(INSTALL) -d $(includedir)/wx/msw/gnuwin32/gl
@@ -408,8 +408,7 @@ win32install: preinstall
$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/*.h $(includedir)/wx/msw/gnuwin32
$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/gnuwin32/gl/*.h $(includedir)/wx/msw/gnuwin32/gl
-# this is the real install target: copies the library, wx-config and the
-# headers to the installation directory
+# this is the real install target: copies the library, wx-config to the installation directory
preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
@echo " "
@echo " Installing wxWindows..."
@@ -433,6 +432,7 @@ preinstall: $(build_libdir)/@WX_TARGET_L
$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
$(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+install_headers:
$(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
@@ -451,6 +451,7 @@ preinstall: $(build_libdir)/@WX_TARGET_L
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done
+install_locale:
@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
@for p in $(WX_LINGUAS); do \
if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
@@ -474,7 +475,9 @@ preinstall_gl: $(build_libdir)/@WX_TARGE
@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_common: install_headers install_locale @AFMINSTALL@ m4datainstall
+check:
+ cd tests && ${MAKE}
+
+install: preinstall install_headers install_locale @AFMINSTALL@ m4datainstall @WIN32INSTALL@
install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___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)
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
@@ -9399,13 +9403,14 @@ install: all $(__install_wxregex___depna
fi; \
$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
done
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/
for f in $(ALL_HEADERS); do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \
done
+ cd contrib && ${MAKE} install
@echo " "
@echo " The installation of wxWindows is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@echo " ------------------------------------------------------"
@echo " "
@@ -9598,15 +9603,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_monolib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__basedll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
+@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_ltversion): $(BASEDLL_OBJECTS) $(__basedll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@COND_MONOLITHIC_0_SHARED_1@
@COND_MONOLITHIC_0_SHARED_1@ $(__basedll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1@install_basedll:
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_basedll/wx/wxprec.h.gch:
@@ -9624,15 +9628,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_baselib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__netdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_net_ltversion): $(NETDLL_OBJECTS) $(__netdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0_SHARED_1@
@COND_MONOLITHIC_0_SHARED_1@ $(__netdll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1@install_netdll:
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_net_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_netdll/wx/wxprec.h.gch:
@@ -9650,15 +9653,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_netlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__coredll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_core_ltversion): $(COREDLL_OBJECTS) $(__coredll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_core_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_coredll/wx/wxprec.h.gch:
@@ -9676,15 +9678,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_corelib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__advdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_adv_ltversion): $(ADVDLL_OBJECTS) $(__advdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $(PLUGIN_ADV_EXTRALIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_adv_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_advdll/wx/wxprec.h.gch:
@@ -9702,15 +9703,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__mediadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_media_ltversion): $(MEDIADLL_OBJECTS) $(__mediadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__mediadll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_mediadll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_media_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_mediadll/wx/wxprec.h.gch:
@@ -9728,15 +9728,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_medialib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__odbcdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_ODBC)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_odbc_ltversion): $(ODBCDLL_OBJECTS) $(__odbcdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $(EXTRALIBS_ODBC)
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(__odbcdll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@install_odbcdll:
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_odbc_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_odbcdll/wx/wxprec.h.gch:
@@ -9754,15 +9753,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_odbclib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__dbgriddll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_dbgrid_ltversion): $(DBGRIDDLL_OBJECTS) $(__dbgriddll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__dbgriddll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_dbgriddll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_dbgrid_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_dbgriddll/wx/wxprec.h.gch:
@@ -9780,15 +9778,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__htmldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_html_ltversion): $(HTMLDLL_OBJECTS) $(__htmldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $(EXTRALIBS_HTML)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(__htmldll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_html_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_htmldll/wx/wxprec.h.gch:
@@ -9806,15 +9803,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_htmllib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__qadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_qa_ltversion): $(QADLL_OBJECTS) $(__qadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(__qadll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll:
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_qa_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_qadll/wx/wxprec.h.gch:
@@ -9832,15 +9828,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_qalib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__xmldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_xml_ltversion): $(XMLDLL_OBJECTS) $(__xmldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $(EXTRALIBS_XML)
@COND_MONOLITHIC_0_SHARED_1@
@COND_MONOLITHIC_0_SHARED_1@ $(__xmldll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1@install_xmldll:
@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_base_xml_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_xmldll/wx/wxprec.h.gch:
@@ -9858,15 +9853,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_xmllib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__xrcdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_xrc_ltversion): $(XRCDLL_OBJECTS) $(__xrcdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll:
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_xrc_ltversion) $(DESTDIR)$(libdir)
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_xrcdll/wx/wxprec.h.gch:
@@ -9884,15 +9878,14 @@ distclean: clean
@COND_USE_PCH_1@.pch/wxprec_xrclib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__gldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_gl_ltversion): $(GLDLL_OBJECTS) $(__gldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll:
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(libwx_gtk2_gl_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_gldll/wx/wxprec.h.gch:
@@ -9933,7 +9926,7 @@ install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2005/12/31 15:18:44 naddy Exp $
--- configure.orig Sun Sep 21 13:10:06 2003
+++ configure Fri Dec 30 23:43:16 2005
@@ -1093,8 +1093,8 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
-WX_CURRENT=0
-WX_REVISION=1
+#WX_CURRENT=0
+#WX_REVISION=1
WX_AGE=1
@@ -16042,9 +16042,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
fi
lib_debug_suffix=
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
- lib_debug_suffix=d
-fi
WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
@@ -16060,13 +16057,13 @@ WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
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%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}"
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}"
-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%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}"
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
@@ -16104,11 +16101,11 @@ esac
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
-WXCONFIG_LIBS="-l${WX_LIBRARY}"
+WXCONFIG_LIBS="-l${WX_LIBRARY%-${WX_RELEASE}}"
WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
if test "$wxUSE_OPENGL" = "yes"; then
- WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
+ WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL%-${WX_RELEASE}} ${OPENGL_LIBS}"
WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
fi

View File

@ -0,0 +1,103 @@
$OpenBSD: patch-configure_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- configure.in.orig Tue Mar 21 21:34:49 2006
+++ configure.in Thu Oct 5 03:49:41 2006
@@ -3475,7 +3475,7 @@ if test "$TOOLKIT" != "MSW" ; then
AC_CHECK_HEADER([sql.h], [found_sql_h=1])
if test "x$found_sql_h" = "x1" ; then
- AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
+ AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK="-pthread -liodbc",
[
AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
[
@@ -3768,7 +3768,7 @@ UNICODE=0
lib_unicode_suffix=
WX_CHARTYPE="ansi"
if test "$wxUSE_UNICODE" = "yes"; then
- lib_unicode_suffix=u
+ lib_unicode_suffix=
WX_CHARTYPE="unicode"
UNICODE=1
fi
@@ -3777,8 +3777,8 @@ lib_debug_suffix=
WX_DEBUGTYPE="release"
DEBUG_FLAG=0
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
- lib_debug_suffix=d
- WX_DEBUGTYPE="debug"
+ lib_debug_suffix=
+ WX_DEBUGTYPE="release"
DEBUG_FLAG=1
fi
@@ -3792,7 +3792,7 @@ fi
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
@@ -4016,14 +4016,6 @@ if test "$wxUSE_WCHAR_T" = "yes"; then
if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
fi
-
- dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU
- dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the
- dnl library, not the header, so do a header check for mbstate_t first.
- AC_CHECK_TYPES([mbstate_t],
- [AC_CHECK_FUNCS(wcsrtombs)],
- [],
- [#include <wchar.h>])
else
AC_MSG_WARN([Wide character support is unavailable])
fi
@@ -5252,8 +5244,37 @@ if test "$USE_UNIX" = "1" ; then
)
])
+ AC_CACHE_CHECK([for ioctl() in soundcard.h], ac_cv_header_soundcard, [
+ AC_TRY_LINK([
+ #include <soundcard.h>
+ ],
+ [
+ ioctl(0, SNDCTL_DSP_SYNC, 0);
+ ],
+ ac_cv_header_soundcard=yes,
+ [
+ saveLibs="$LIBS"
+ LIBS="$saveLibs -lossaudio"
+ AC_TRY_LINK([
+ #include <soundcard.h>
+ ],
+ [
+ ioctl(0, SNDCTL_DSP_SYNC, 0);
+ ],
+ ac_cv_header_soundcard=yes,
+ [
+ LIBS="$saveLibs"
+ ac_cv_header_soundcard=no
+ ]
+ )
+ ]
+ )
+ ])
+
if test "$ac_cv_header_sys_soundcard" = "yes"; then
AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
+ elif test "$ac_cv_header_soundcard" = "yes"; then
+ AC_DEFINE(HAVE_SOUNDCARD_H)
else
DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
fi
@@ -6852,7 +6873,7 @@ if test "$wxUSE_GUI" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
dynamic erase event exec font image minimal mobile \
mobile/wxedit mobile/styles propsize render \
- richedit rotate shaped vscroll widgets"
+ rotate shaped vscroll widgets"
if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-contrib_include_wx_stc_stc_h,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/include/wx/stc/stc.h.orig 2003-10-06 16:09:39.000000000 +1000
+++ contrib/include/wx/stc/stc.h 2003-10-06 16:09:58.000000000 +1000
@@ -1346,7 +1346,7 @@ public:
int GetMarginWidth(int margin);
// Set a mask that determines which markers are displayed in a margin.
- void SetMarginMask(int margin, int mask);
+ void SetMarginMask(int margin, unsigned int mask);
// Retrieve the marker mask of a margin.
int GetMarginMask(int margin);

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-contrib_src_animate_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/animate/Makefile.in.orig Thu Mar 16 14:01:12 2006
+++ contrib/src/animate/Makefile.in Mon Oct 2 23:18:18 2006
@@ -86,14 +86,14 @@ ANIMATELIB_ODEP = $(___pch_wxprec_anima
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___animatedll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3).$(libwx_gtk2_animate_ltversion)
@COND_SHARED_1@__animatedll___depname = $(COND_SHARED_1___animatedll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -179,10 +179,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___animatelib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -203,12 +203,11 @@ COND_SHARED_0___animatelib___depname = \
all: $(__animatedll___depname) $(__animatelib___depname)
install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/animate/animate.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -227,15 +226,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS) $(__animatedll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3).$(libwx_gtk2_animate_ltversion): $(ANIMATEDLL_OBJECTS) $(__animatedll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__animatedll___so_symlinks_cmd)
@COND_SHARED_1@install_animatedll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_animate_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__animatedll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch:

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-contrib_src_deprecated_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/deprecated/Makefile.in.orig Thu Mar 16 14:01:12 2006
+++ contrib/src/deprecated/Makefile.in Mon Oct 2 23:18:18 2006
@@ -115,14 +115,14 @@ DEPRECATEDLIB_ODEP = \
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___deprecateddll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(libwx_gtk2_deprecated_ltversion)
@COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -209,10 +209,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___deprecatedlib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -233,12 +233,11 @@ COND_SHARED_0___deprecatedlib___depname
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -257,15 +256,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(libwx_gtk2_deprecated_ltversion): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd)
@COND_SHARED_1@install_deprecateddll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_deprecated_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_deprecateddll/wx/wxprec.h.gch:

View File

@ -0,0 +1,59 @@
$OpenBSD: patch-contrib_src_fl_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/fl/Makefile.in.orig Thu Mar 16 14:01:12 2006
+++ contrib/src/fl/Makefile.in Wed Aug 2 18:19:26 2006
@@ -125,7 +125,7 @@ FLLIB_ODEP = $(___pch_wxprec_fllib_wx_w
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___fldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(__fldll___targetsuf3).$(libwx_gtk2_fl_ltversion)
@COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -210,10 +210,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___fllib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -234,12 +234,11 @@ COND_SHARED_0___fllib___depname = \
all: $(__fldll___depname) $(__fllib___depname)
install: all $(__install_fldll___depname) $(__install_fllib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -258,15 +257,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(__fldll___targetsuf3).$(libwx_gtk2_fl_ltversion): $(FLDLL_OBJECTS) $(__fldll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__fldll___so_symlinks_cmd)
@COND_SHARED_1@install_fldll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_fl_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch:

View File

@ -0,0 +1,106 @@
$OpenBSD: patch-contrib_src_gizmos_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/gizmos/Makefile.in.orig Thu Mar 16 14:01:13 2006
+++ contrib/src/gizmos/Makefile.in Mon Oct 2 23:18:18 2006
@@ -113,14 +113,14 @@ GIZMOS_XRCLIB_ODEP = \
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___gizmosdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0).$(libwx_gtk2_gizmos_ltversion)
@COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
@COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd = -install_name \
@@ -165,7 +165,7 @@ COND_USE_SOSYMLINKS_1___gizmosdll___so_s
@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd)
@COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0).$(libwx_gtk2_gizmos_xrc_ltversion)
@COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
@COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
@COND_SHARED_1_USE_XRC_1@ = install_gizmos_xrcdll
@@ -213,10 +213,10 @@ COND_USE_SOSYMLINKS_1___gizmos_xrcdll___
@COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
@COND_PLATFORM_WIN32_1@ gizmos_xrcdll_version_rc.o
COND_MONOLITHIC_0___WXLIB_XRC_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc
@COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
COND_MONOLITHIC_0___WXLIB_XML_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
COND_SHARED_0___gizmoslib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -274,10 +274,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@@ -289,12 +289,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -318,29 +317,27 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOSDLL_OBJECTS) $(__gizmosdll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0).$(libwx_gtk2_gizmos_ltversion): $(GIZMOSDLL_OBJECTS) $(__gizmosdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd)
@COND_SHARED_1@install_gizmosdll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_gizmos_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
-@COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
-@COND_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0).$(libwx_gtk2_gizmos_xrc_ltversion): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
+@COND_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1_USE_XRC_1@
@COND_SHARED_1_USE_XRC_1@ $(__gizmos_xrcdll___so_symlinks_cmd)
@COND_SHARED_1_USE_XRC_1@install_gizmos_xrcdll:
@COND_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_gizmos_xrc_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch:

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-contrib_src_mmedia_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/mmedia/Makefile.in.orig Thu Mar 16 14:01:14 2006
+++ contrib/src/mmedia/Makefile.in Mon Oct 2 23:18:18 2006
@@ -121,14 +121,14 @@ MMEDIALIB_ODEP = $(___pch_wxprec_mmedia
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___mmediadll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(libwx_gtk2_mmedia_ltversion)
@COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -222,10 +222,10 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_S
@COND_PLATFORM_WIN32_1@ = mmediadll_cdwin.o mmediadll_sndwin.o \
@COND_PLATFORM_WIN32_1@ mmediadll_vidwin.o
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___mmedialib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -255,12 +255,11 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_S
all: $(__mmediadll___depname) $(__mmedialib___depname)
install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -279,15 +278,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(__mmediadll___targetsuf3).$(libwx_gtk2_mmedia_ltversion): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd)
@COND_SHARED_1@install_mmediadll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_mmedia_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch:

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-contrib_src_mmedia_sndoss_cpp,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/mmedia/sndoss.cpp.orig Tue Aug 1 21:50:05 2006
+++ contrib/src/mmedia/sndoss.cpp Tue Aug 1 21:50:27 2006
@@ -14,7 +14,7 @@
// System dependent headers
// --------------------------------------------------------------------------
-#include <sys/soundcard.h>
+#include <soundcard.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>

View File

@ -0,0 +1,59 @@
$OpenBSD: patch-contrib_src_ogl_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/ogl/Makefile.in.orig Thu Mar 16 14:01:15 2006
+++ contrib/src/ogl/Makefile.in Wed Aug 2 18:19:41 2006
@@ -115,7 +115,7 @@ OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___ogldll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(__ogldll___targetsuf3).$(libwx_gtk2_ogl_ltversion)
@COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -200,10 +200,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___ogllib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -224,12 +224,11 @@ COND_SHARED_0___ogllib___depname = \
all: $(__ogldll___depname) $(__ogllib___depname)
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -248,15 +247,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(__ogldll___targetsuf3).$(libwx_gtk2_ogl_ltversion): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)
@COND_SHARED_1@install_ogldll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_ogl_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch:

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-contrib_src_ogl_drawn_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/src/ogl/drawn.cpp.orig Thu Dec 19 05:14:05 2002
+++ contrib/src/ogl/drawn.cpp Wed Apr 30 12:08:03 2003
@@ -40,6 +40,7 @@
static void IntToHex(unsigned int dec, char *buf);
static unsigned long HexToInt(char *buf);
extern char *oglBuffer;
+extern size_t oglBufferLength;
#define gyTYPE_PEN 40
#define gyTYPE_BRUSH 41
@@ -1146,8 +1147,8 @@ wxExpr *wxOpPolyDraw::WriteExpr(wxPseudo
// Don't overrun the buffer
if ((i*8) < 3000)
{
- strcat(oglBuffer, buf2);
- strcat(oglBuffer, buf3);
+ strlcat(oglBuffer, buf2, oglBufferLength);
+ strlcat(oglBuffer, buf3, oglBufferLength);
}
}
expr->Append(new wxExpr(wxExprString, oglBuffer));

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-contrib_src_ogl_oglmisc_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/src/ogl/oglmisc.cpp.orig Sat Sep 20 20:23:20 2003
+++ contrib/src/ogl/oglmisc.cpp Mon Jun 28 19:15:54 2004
@@ -50,7 +50,9 @@ wxPen* g_oglBlackForegroundPen;
wxCursor* g_oglBullseyeCursor = NULL;
char* oglBuffer = NULL;
+size_t oglBufferLength = 0;
+
wxList oglObjectCopyMapping(wxKEY_INTEGER);
@@ -72,6 +74,7 @@ void wxOGLInitialize()
// Initialize big buffer used when writing images
oglBuffer = new char[3000];
+ oglBufferLength = 3000;
}
@@ -81,8 +84,11 @@ void wxOGLCleanUp()
{
delete[] oglBuffer;
oglBuffer = NULL;
+ oglBufferLength = 0;
}
oglBuffer = NULL;
+ oglBufferLength = 0;
+
if (g_oglBullseyeCursor)
{
delete g_oglBullseyeCursor;

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-contrib_src_plot_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/plot/Makefile.in.orig Thu Mar 16 14:01:15 2006
+++ contrib/src/plot/Makefile.in Mon Oct 2 23:18:18 2006
@@ -86,14 +86,14 @@ PLOTLIB_ODEP = $(___pch_wxprec_plotlib_
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___plotdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3).$(libwx_gtk2_plot_ltversion)
@COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -178,10 +178,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___plotlib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -202,12 +202,11 @@ COND_SHARED_0___plotlib___depname = \
all: $(__plotdll___depname) $(__plotlib___depname)
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -226,15 +225,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3).$(libwx_gtk2_plot_ltversion): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__plotdll___so_symlinks_cmd)
@COND_SHARED_1@install_plotdll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_plot_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch:

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-contrib_src_stc_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/stc/Makefile.in.orig Thu Mar 16 14:01:15 2006
+++ contrib/src/stc/Makefile.in Mon Oct 2 23:18:18 2006
@@ -243,14 +243,14 @@ STCLIB_OBJECTS = \
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___stcdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3).$(libwx_gtk2_stc_ltversion)
@COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -330,10 +330,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___stclib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -349,12 +349,11 @@ COND_SHARED_0___stclib___depname = \
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/stc/stc.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -373,15 +372,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3).$(libwx_gtk2_stc_ltversion): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__stcdll___so_symlinks_cmd)
@COND_SHARED_1@install_stcdll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_stc_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS)

View File

@ -1,40 +0,0 @@
$OpenBSD: patch-contrib_src_stc_PlatWX_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/src/stc/PlatWX.cpp.orig 2003-09-20 20:23:20.000000000 +1000
+++ contrib/src/stc/PlatWX.cpp 2003-10-04 13:24:11.000000000 +1000
@@ -982,8 +982,7 @@ void ListBoxImpl::GetValue(int n, char *
item.SetColumn(1);
item.SetMask(wxLIST_MASK_TEXT);
GETLB(id)->GetItem(item);
- strncpy(value, wx2stc(item.GetText()), len);
- value[len-1] = '\0';
+ strlcpy(value, wx2stc(item.GetText()), len);
}
void ListBoxImpl::Sort() {
@@ -1085,7 +1084,7 @@ ColourDesired Platform::ChromeHighlight(
const char *Platform::DefaultFont() {
static char buf[128];
- strcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str());
+ strlcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str(), sizeof(buf));
return buf;
}
@@ -1167,7 +1166,7 @@ bool Platform::ShowAssertionPopUps(bool
void Platform::Assert(const char *c, const char *file, int line) {
char buffer[2000];
- sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
+ snprintf(buffer, sizeof(buffer), "Assertion [%s] failed at %s %d", c, file, line);
if (assertionPopUps) {
/*int idButton = */
wxMessageBox(stc2wx(buffer),
@@ -1181,7 +1180,7 @@ void Platform::Assert(const char *c, con
// abort();
// }
} else {
- strcat(buffer, "\r\n");
+ strlcat(buffer, "\r\n", sizeof(buffer));
Platform::DebugDisplay(buffer);
abort();
}

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-contrib_src_stc_scintilla_src_AutoComplete_cxx,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/src/stc/scintilla/src/AutoComplete.cxx.orig Sat May 10 07:36:08 2003
+++ contrib/src/stc/scintilla/src/AutoComplete.cxx Thu Jun 26 11:05:09 2003
@@ -56,8 +56,7 @@ void AutoComplete::Start(Window &parent,
}
void AutoComplete::SetStopChars(const char *stopChars_) {
- strncpy(stopChars, stopChars_, sizeof(stopChars));
- stopChars[sizeof(stopChars) - 1] = '\0';
+ strlcpy(stopChars, stopChars_, sizeof(stopChars));
}
bool AutoComplete::IsStopChar(char ch) {
@@ -65,8 +64,7 @@ bool AutoComplete::IsStopChar(char ch) {
}
void AutoComplete::SetFillUpChars(const char *fillUpChars_) {
- strncpy(fillUpChars, fillUpChars_, sizeof(fillUpChars));
- fillUpChars[sizeof(fillUpChars) - 1] = '\0';
+ strlcpy(fillUpChars, fillUpChars_, sizeof(fillUpChars));
}
bool AutoComplete::IsFillUpChar(char ch) {

View File

@ -1,43 +0,0 @@
$OpenBSD: patch-contrib_src_stc_scintilla_src_PropSet_cxx,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/src/stc/scintilla/src/PropSet.cxx.orig 2003-09-20 20:23:23.000000000 +1000
+++ contrib/src/stc/scintilla/src/PropSet.cxx 2003-10-04 13:30:58.000000000 +1000
@@ -15,6 +15,8 @@
#include "PropSet.h"
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+
// The comparison and case changing functions here assume ASCII
// or extended ASCII such as the normal Windows code page.
@@ -185,9 +187,9 @@ SString PropSet::Expand(const char *with
break;
size_t newlenbase = strlen(base) + val.length() - lenvar;
char *newbase = new char[newlenbase];
- strncpy(newbase, base, cpvar - base);
- strcpy(newbase + (cpvar - base), val.c_str());
- strcpy(newbase + (cpvar - base) + val.length(), cpendvar + 1);
+ strlcpy(newbase, base, min(cpvar - base +1, newlenbase));
+ strlcat(newbase, val.c_str(), newlenbase);
+ strlcat(newbase, cpendvar + 1, newlenbase);
delete []var;
delete []base;
base = newbase;
@@ -305,9 +307,9 @@ SString PropSet::GetNewExpand(const char
SString val = GetWild(var, filename);
size_t newlenbase = strlen(base) + val.length() - lenvar;
char *newbase = new char[newlenbase];
- strncpy(newbase, base, cpvar - base);
- strcpy(newbase + (cpvar - base), val.c_str());
- strcpy(newbase + (cpvar - base) + val.length(), cpendvar + 1);
+ strlcpy(newbase, base, min(cpvar - base +1, newlenbase));
+ strlcat(newbase, val.c_str(), newlenbase);
+ strlcat(newbase, cpendvar + 1, newlenbase);
delete []var;
delete []base;
base = newbase;
@@ -715,3 +717,4 @@ char *WordList::GetNearestWords(
}
return NULL;
}
+

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-contrib_src_stc_stc_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- contrib/src/stc/stc.cpp.orig 2003-10-06 16:10:25.000000000 +1000
+++ contrib/src/stc/stc.cpp 2003-10-06 16:10:41.000000000 +1000
@@ -499,7 +499,7 @@ int wxStyledTextCtrl::GetMarginWidth(int
}
// Set a mask that determines which markers are displayed in a margin.
-void wxStyledTextCtrl::SetMarginMask(int margin, int mask) {
+void wxStyledTextCtrl::SetMarginMask(int margin, unsigned int mask) {
SendMsg(2244, margin, mask);
}

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-contrib_src_svg_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- contrib/src/svg/Makefile.in.orig Thu Mar 16 14:01:17 2006
+++ contrib/src/svg/Makefile.in Mon Oct 2 23:18:18 2006
@@ -86,14 +86,14 @@ SVGLIB_ODEP = $(___pch_wxprec_svglib_wx
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
COND_SHARED_1___svgdll___depname = \
- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3)
+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3).$(libwx_gtk2_svg_ltversion)
@COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@@ -178,10 +178,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_SHARED_0___svglib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -202,12 +202,11 @@ COND_SHARED_0___svglib___depname = \
all: $(__svgdll___depname) $(__svglib___depname)
install: all $(__install_svgdll___depname) $(__install_svglib___depname)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/svg/dcsvg.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
fi; \
- $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
done
uninstall:
@@ -226,15 +225,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS) $(__svgdll___win32rc)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3).$(libwx_gtk2_svg_ltversion): $(SVGDLL_OBJECTS) $(__svgdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__svgdll___so_symlinks_cmd)
@COND_SHARED_1@install_svgdll:
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(HOST_SUFFIX).$(DLLIMP_SUFFIX).$(libwx_gtk2_svg_ltversion) $(DESTDIR)$(libdir)
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__svgdll___so_symlinks_inst_cmd))
@COND_USE_PCH_1@.pch/wxprec_svgdll/wx/wxprec.h.gch:

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-demos_configure,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
--- demos/configure.orig Fri Jan 25 22:59:25 2002
+++ demos/configure Mon Jun 28 20:15:05 2004
@@ -641,7 +641,6 @@ ac_given_srcdir=$srcdir
trap 'rm -fr `echo "
Makefile
bombs/Makefile
- dbbrowse/Makefile
forty/Makefile
fractal/Makefile
life/Makefile
@@ -722,7 +721,6 @@ cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile
bombs/Makefile
- dbbrowse/Makefile
forty/Makefile
fractal/Makefile
life/Makefile

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-demos_poem_wxpoem_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- demos/poem/wxpoem.cpp.orig Tue May 14 23:53:48 2002
+++ demos/poem/wxpoem.cpp Wed Apr 30 12:12:42 2003
@@ -284,8 +284,8 @@ void MainWindow::ScanBuffer(wxDC *dc, bo
dc->SetFont(* BoldFont);
line_ptr = line+3;
- strcpy(title, line_ptr);
- strcat(title, " (cont'd)");
+ strlcpy(title, line_ptr, sizeof(title));
+ strlcat(title, " (cont'd)", sizeof(title));
dc->GetTextExtent(line_ptr, &xx, &yy);
FindMax(&curr_width, (int)xx);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-include_wx_time_h,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- include/wx/time.h.orig Sat Aug 31 21:29:11 2002
+++ include/wx/time.h Wed Apr 30 00:06:40 2003
@@ -123,7 +123,7 @@ public:
{ _T("%H:%M:%S"), _T("%H:%M") } // wx24h
};
- wxStrncpy(ms_bufTime, m_time.Format(formats[ms_Format][ms_Precision]),
+ strlcpy(ms_bufTime, m_time.Format(formats[ms_Format][ms_Precision]),
WXSIZEOF(ms_bufTime));
return ms_bufTime;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-include_wx_wxchar_h,v 1.1 2006/10/12 14:09:33 alek Exp $
--- include/wx/wxchar.h.orig Sat Oct 7 13:10:36 2006
+++ include/wx/wxchar.h Sat Oct 7 13:10:56 2006
@@ -426,6 +426,8 @@
#endif
#endif
+ #define wxNEED_WX_MBSTOWCS
+
#ifdef wxNEED_WX_MBSTOWCS
/* even though they are defined and "implemented", they are bad and just
stubs so we need our own - we need these even in ANSI builds!! */

View File

@ -1,53 +0,0 @@
$OpenBSD: patch-samples_configure,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
--- samples/configure.orig Sun Sep 21 18:13:35 2003
+++ samples/configure Mon Jun 28 19:22:58 2004
@@ -694,16 +694,12 @@ trap 'rm -fr `echo "
mobile/wxedit/Makefile
mobile/styles/Makefile
multimon/Makefile
- nativdlg/Makefile
newgrid/Makefile
notebook/Makefile
- oleauto/Makefile
- ownerdrw/Makefile
png/Makefile
printing/Makefile
proplist/Makefile
propsize/Makefile
- regtest/Makefile
resource/Makefile
rotate/Makefile
sashtest/Makefile
@@ -713,7 +709,6 @@ trap 'rm -fr `echo "
sockets/Makefile
splitter/Makefile
statbar/Makefile
- taskbar/Makefile
text/Makefile
thread/Makefile
toolbar/Makefile
@@ -854,16 +849,12 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
mobile/wxedit/Makefile
mobile/styles/Makefile
multimon/Makefile
- nativdlg/Makefile
newgrid/Makefile
notebook/Makefile
- oleauto/Makefile
- ownerdrw/Makefile
png/Makefile
printing/Makefile
proplist/Makefile
propsize/Makefile
- regtest/Makefile
resource/Makefile
rotate/Makefile
sashtest/Makefile
@@ -873,7 +864,6 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
sockets/Makefile
splitter/Makefile
statbar/Makefile
- taskbar/Makefile
text/Makefile
thread/Makefile
toolbar/Makefile

View File

@ -1,87 +0,0 @@
$OpenBSD: patch-samples_console_console_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- samples/console/console.cpp.orig Tue Jun 3 23:57:50 2003
+++ samples/console/console.cpp Thu Jun 26 11:05:09 2003
@@ -2560,38 +2560,43 @@ static void
fp_test (void)
{
int i, j, k, l;
- wxChar buf[7];
- wxChar *prefix = buf;
+ wxChar prefix[7];
wxChar tp[20];
wxPuts(_T("\nFormatted output test"));
wxPrintf(_T("prefix 6d 6o 6x 6X 6u\n"));
- wxStrcpy(prefix, _T("%"));
+
for (i = 0; i < 2; i++) {
for (j = 0; j < 2; j++) {
for (k = 0; k < 2; k++) {
for (l = 0; l < 2; l++) {
- wxStrcpy(prefix, _T("%"));
- if (i == 0) wxStrcat(prefix, _T("-"));
- if (j == 0) wxStrcat(prefix, _T("+"));
- if (k == 0) wxStrcat(prefix, _T("#"));
- if (l == 0) wxStrcat(prefix, _T("0"));
+ strlcpy(prefix, _T("%"), sizeof(prefix));
+ if (i == 0) strlcat(prefix, _T("-"), sizeof(prefix));
+ if (j == 0) strlcat(prefix, _T("+"), sizeof(prefix));
+ if (k == 0) strlcat(prefix, _T("#"), sizeof(prefix));
+ if (l == 0) strlcat(prefix, _T("0"), sizeof(prefix));
wxPrintf(_T("%5s |"), prefix);
- wxStrcpy(tp, prefix);
- wxStrcat(tp, _T("6d |"));
+
+ strlcpy(tp, prefix, sizeof(tp));
+ strlcat(tp, _T("6d |"), sizeof(tp));
wxPrintf(tp, DEC);
- wxStrcpy(tp, prefix);
- wxStrcat(tp, _T("6o |"));
+
+ strlcpy(tp, prefix, sizeof(tp));
+ strlcat(tp, _T("6o |"), sizeof(tp));
wxPrintf(tp, INT);
- wxStrcpy(tp, prefix);
- wxStrcat(tp, _T("6x |"));
+
+ strlcpy(tp, prefix, sizeof(tp));
+ strlcat(tp, _T("6x |"), sizeof(tp));
wxPrintf(tp, INT);
- wxStrcpy(tp, prefix);
- wxStrcat(tp, _T("6X |"));
+
+ strlcpy(tp, prefix, sizeof(tp));
+ strlcat(tp, _T("6X |"), sizeof(tp));
wxPrintf(tp, INT);
- wxStrcpy(tp, prefix);
- wxStrcat(tp, _T("6u |"));
+
+ strlcpy(tp, prefix, sizeof(tp));
+ strlcat(tp, _T("6u |"), sizeof(tp));
wxPrintf(tp, UNS);
+
wxPrintf(_T("\n"));
}
}
@@ -5804,14 +5809,14 @@ static void TestPChar()
for (int i = 0; i < 1000000; ++i)
{
- wxStrcpy (a, _T("Hello"));
- wxStrcpy (b, _T(" world"));
- wxStrcpy (c, _T("! How'ya doin'?"));
- wxStrcat (a, b);
- wxStrcat (a, c);
- wxStrcpy (c, _T("Hello world! What's up?"));
+ strlcpy (a, _T("Hello"), sizeof(a));
+ strlcpy (b, _T(" world"), sizeof(b));
+ strlcpy (c, _T("! How'ya doin'?"), sizeof(c));
+ strlcat (a, b, sizeof(a));
+ strlcat (a, c, sizeof(a));
+ strlcpy (c, _T("Hello world! What's up?"), sizeof(c));
if (wxStrcmp (c, a) == 0)
- wxStrcpy (c, _T("Doh!"));
+ strlcpy (c, _T("Doh!"), sizeof(c));
}
wxPrintf(_T("TestPChar elapsed time: %ld\n"), sw.Time());

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-samples_newgrid_griddemo_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- samples/newgrid/griddemo.cpp.orig Mon Dec 16 23:56:06 2002
+++ samples/newgrid/griddemo.cpp Tue Apr 29 22:00:59 2003
@@ -1221,11 +1221,11 @@ void BugsGridTable::SetValue( int row, i
break;
case Col_Summary:
- wxStrncpy(gd.summary, value, WXSIZEOF(gd.summary));
+ strlcpy(gd.summary, value, WXSIZEOF(gd.summary));
break;
case Col_Platform:
- wxStrncpy(gd.platform, value, WXSIZEOF(gd.platform));
+ strlcpy(gd.platform, value, WXSIZEOF(gd.platform));
break;
}
}

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_common_appcmn_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/appcmn.cpp.orig Sat May 10 07:36:53 2003
+++ src/common/appcmn.cpp Thu Jun 26 11:05:09 2003
@@ -541,12 +541,12 @@ void ShowAssertDialog(const wxChar *szFi
if ( szMsg != NULL )
{
- wxStrcat(szBuf, wxT(": "));
- wxStrcat(szBuf, szMsg);
+ strlcat(szBuf, wxT(": "), sizeof(szBuf));
+ strlcat(szBuf, szMsg, sizeof(szBuf));
}
else // no message given
{
- wxStrcat(szBuf, wxT("."));
+ strlcat(szBuf, wxT("."), sizeof(szBuf));
}
#if wxUSE_THREADS
@@ -575,7 +575,7 @@ void ShowAssertDialog(const wxChar *szFi
#if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__)
// this message is intentionally not translated - it is for
// developpers only
- wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
+ strlcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."), sizeof(szBuf));
// use the native message box if available: this is more robust than
// using our own

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_common_cmndata_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/cmndata.cpp.orig Tue Jun 3 23:58:10 2003
+++ src/common/cmndata.cpp Thu Jun 26 11:05:09 2003
@@ -476,8 +476,7 @@ void wxPrintData::ConvertToNative()
if (m_printerName != wxT(""))
{
//int len = wxMin(31, m_printerName.Len());
- wxStrncpy((wxChar*)devMode->dmDeviceName,m_printerName.c_str(),31);
- devMode->dmDeviceName[31] = wxT('\0');
+ strlcpy((wxChar*)devMode->dmDeviceName,m_printerName.c_str(), 32);
}
//// Colour

View File

@ -1,14 +1,18 @@
$OpenBSD: patch-src_common_db_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/db.cpp.orig Mon Dec 16 23:56:26 2002
+++ src/common/db.cpp Sat May 3 10:59:20 2003
@@ -81,6 +81,15 @@ wxChar const *SQL_CATALOG_FILENAME =
$OpenBSD: patch-src_common_db_cpp,v 1.2 2006/10/12 14:09:33 alek Exp $
--- src/common/db.cpp.orig Tue Jan 17 12:14:16 2006
+++ src/common/db.cpp Thu Jun 1 02:33:00 2006
@@ -72,6 +72,19 @@ wxChar const *SQL_CATALOG_FILENAME =
extern wxList TablesInUse;
#endif
+#ifndef ___SQLTCHAR
+#define ___SQLTCHAR SQLCHAR
+#endif
+
+FILE* fopen_create(char *path, char *mode)
+{
+ // Only open the file if it does not already exist
+ int fd = open(path, O_WRONLY | O_CREAT | O_EXCL, 0600)
+ int fd = open(path, O_WRONLY | O_CREAT | O_EXCL, 0600);
+ if (fd < 0)
+ return NULL;
+ return fdopen(fd, mode);
@ -17,34 +21,3 @@ $OpenBSD: patch-src_common_db_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
// SQL Log defaults to be used by GetDbConnection
wxDbSqlLogState SQLLOGstate = sqlLogOFF;
@@ -2994,7 +3003,7 @@ bool wxDb::Catalog(const wxChar *userID,
wxChar typeName[30+1];
SDWORD precision, length;
- FILE *fp = fopen(fileName.c_str(),wxT("wt"));
+ FILE *fp = fopen_create(fileName.c_str(),wxT("wt"));
if (fp == NULL)
return(FALSE);
@@ -3331,7 +3340,10 @@ bool wxDb::SetSqlLogging(wxDbSqlLogState
{
if (fpSqlLog == 0)
{
- fpSqlLog = fopen(filename, (append ? wxT("at") : wxT("wt")));
+ if (append)
+ fpSqlLog = fopen(filename, wxT("at"));
+ else
+ fpSqlLog = fopen_create(filename, wxT("wt"));
if (fpSqlLog == NULL)
return(FALSE);
}
@@ -3442,8 +3454,7 @@ wxDBMS wxDb::Dbms(void)
return(dbmsType);
wxChar baseName[25+1];
- wxStrncpy(baseName,dbInf.dbmsName,25);
- baseName[25] = 0;
+ strlcpy(baseName,dbInf.dbmsName,sizeof(baseName));
// RGG 20001025 : add support for Interbase
// GT : Integrated to base classes on 20001121

View File

@ -1,52 +1,14 @@
$OpenBSD: patch-src_common_dbtable_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/dbtable.cpp.orig Mon Dec 16 23:56:26 2002
+++ src/common/dbtable.cpp Tue Apr 29 22:22:20 2003
@@ -2148,11 +2148,8 @@ void wxDbTable::SetColDefs(UWORD index,
if (!colDefs) // May happen if the database connection fails
return;
$OpenBSD: patch-src_common_dbtable_cpp,v 1.2 2006/10/12 14:09:33 alek Exp $
--- src/common/dbtable.cpp.orig Fri Sep 16 06:03:53 2005
+++ src/common/dbtable.cpp Thu Jun 1 02:33:07 2006
@@ -63,6 +63,10 @@
# endif
#endif
- if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
+ if (strlcpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN) >= DB_MAX_COLUMN_NAME_LEN)
{
- wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
- colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;
-
#ifdef __WXDEBUG__
wxString tmpMsg;
tmpMsg.Printf(_T("Column name '%s' is too long. Truncated to '%s'."),
@@ -2160,8 +2157,6 @@ void wxDbTable::SetColDefs(UWORD index,
wxFAIL_MSG(tmpMsg);
#endif // __WXDEBUG__
}
- else
- wxStrcpy(colDefs[index].ColName, fieldName);
colDefs[index].DbDataType = dataType;
colDefs[index].PtrDataObj = pData;
@@ -2604,14 +2599,6 @@ wxVariant wxDbTable::GetCol(const int co
} // wxDbTable::GetCol()
+#ifndef __SQLTCHAR
+#define __SQLTCHAR SQLCHAR
+#endif
+
ULONG lastTableID = 0;
-void csstrncpyt(char *s, const char *t, int n)
-{
- while ( (*s++ = *t++) != '\0' && --n )
- ;
-
- *s = '\0';
-}
-
void wxDbTable::SetCol(const int colNo, const wxVariant val)
{
//FIXME: Add proper wxDateTime support to wxVariant..
@@ -2634,9 +2621,9 @@ void wxDbTable::SetCol(const int colNo,
{
case SQL_CHAR:
case SQL_VARCHAR:
- csstrncpyt((char *)(colDefs[colNo].PtrDataObj),
+ strlcpy((char *)(colDefs[colNo].PtrDataObj),
val.GetString().c_str(),
- colDefs[colNo].SzDataObj-1);
+ colDefs[colNo].SzDataObj);
break;
case SQL_C_LONG:
case SQL_C_SLONG:

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_common_dynlib_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/dynlib.cpp.orig Sun Dec 22 21:59:26 2002
+++ src/common/dynlib.cpp Thu Mar 27 23:05:52 2003
@@ -60,7 +60,7 @@
// second argument on dlopen is ignored.
#ifdef __VMS
# define wxDllOpen(lib) dlopen(lib.fn_str(), 0 )
-#elif defined( __osf__ )
+#elif defined( __osf__ ) || defined(__OpenBSD__)
# define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_LAZY )
#else
# define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_LAZY | RTLD_GLOBAL)
@@ -220,6 +220,9 @@ wxDllType wxDllLoader::GetProgramHandle(
{
#if defined( HAVE_DLOPEN ) && !defined(__EMX__)
// optain handle for main program
+#ifndef RTLD_NOW
+#define RTLD_NOW RTLD_LAZY
+#endif
return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
#elif defined (HAVE_SHL_LOAD)
// shl_findsymbol with NULL handle looks up in main program

View File

@ -1,95 +0,0 @@
$OpenBSD: patch-src_common_filefn_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/filefn.cpp.orig Sun Jun 8 17:58:14 2003
+++ src/common/filefn.cpp Thu Jun 26 11:05:10 2003
@@ -169,6 +169,8 @@ const off_t wxInvalidOffset = (off_t)-1;
// macros
// ----------------------------------------------------------------------------
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+
// we need to translate Mac filenames before passing them to OS functions
#define OS_FILENAME(s) (s.fn_str())
@@ -299,8 +301,8 @@ wxString wxPathList::FindValidPath (cons
wxStrcpy (wxFileFunctionsBuffer, path);
wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
if (ch != wxT('\\') && ch != wxT('/'))
- wxStrcat (wxFileFunctionsBuffer, wxT("/"));
- wxStrcat (wxFileFunctionsBuffer, filename);
+ strlcat (wxFileFunctionsBuffer, wxT("/"), sizeof(wxFileFunctionsBuffer));
+ strlcat (wxFileFunctionsBuffer, filename, sizeof(wxFileFunctionsBuffer));
#ifdef __WINDOWS__
wxUnix2DosFilename (wxFileFunctionsBuffer);
#endif
@@ -479,12 +481,12 @@ wxChar *wxCopyAbsolutePath(const wxStrin
wxChar ch = buf[wxStrlen(buf) - 1];
#ifdef __WXMSW__
if (ch != wxT('\\') && ch != wxT('/'))
- wxStrcat(buf, wxT("\\"));
+ strlcat(buf, wxT("\\"), sizeof(buf));
#else
if (ch != wxT('/'))
- wxStrcat(buf, wxT("/"));
+ strlcat(buf, wxT("/"), sizeof(buf));
#endif
- wxStrcat(buf, wxFileFunctionsBuffer);
+ strlcat(buf, wxFileFunctionsBuffer, sizeof(buf));
return copystring( wxRealPath(buf) );
}
return copystring( wxFileFunctionsBuffer );
@@ -684,12 +686,12 @@ wxContractPath (const wxString& filename
if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
(tcp = wxStrstr (dest, val)) != NULL)
{
- wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
- *tcp++ = wxT('$');
- *tcp++ = wxT('{');
- wxStrcpy (tcp, WXSTRINGCAST envname);
- wxStrcat (tcp, wxT("}"));
- wxStrcat (tcp, wxFileFunctionsBuffer);
+ strlcpy(wxFileFunctionsBuffer, dest, min(tcp-dest+1, sizeof(wxFileFunctionsBuffer)));
+ strlcat(wxFileFunctionsBuffer, wxT("${"), sizeof(wxFileFunctionsBuffer));
+ strlcat(wxFileFunctionsBuffer, WXSTRINGCAST envname, sizeof(wxFileFunctionsBuffer));
+ strlcat(wxFileFunctionsBuffer, wxT("}"), sizeof(wxFileFunctionsBuffer));
+ strlcat(wxFileFunctionsBuffer, tcp + strlen(val), sizeof(wxFileFunctionsBuffer));
+ strlcpy(dest, wxFileFunctionsBuffer, sizeof(dest));
}
// Handle User's home (ignore root homes!)
@@ -698,11 +700,11 @@ wxContractPath (const wxString& filename
(len = wxStrlen(val)) > 2 &&
wxStrncmp(dest, val, len) == 0)
{
- wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+ strlcpy(wxFileFunctionsBuffer, wxT("~"), sizeof(wxFileFunctionsBuffer));
if (user != wxT(""))
- wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
- wxStrcat(wxFileFunctionsBuffer, dest + len);
- wxStrcpy (dest, wxFileFunctionsBuffer);
+ strlcat(wxFileFunctionsBuffer, (const wxChar*) user, sizeof(wxFileFunctionsBuffer));
+ strlcat(wxFileFunctionsBuffer, dest + len, sizeof(wxFileFunctionsBuffer));
+ strlcpy(dest, wxFileFunctionsBuffer, sizeof(dest));
}
return dest;
@@ -899,7 +901,7 @@ wxString wxMacFSSpec2MacFilename( const
if (theStatus == noErr) {
// append file name to path
// includes previously prepended path separator
- strcat(thePath, theFileName);
+ strlcat(thePath, theFileName, sizeof(thePath));
}
// create path string for return value
@@ -947,9 +949,8 @@ void wxMacFilename2FSSpec( const char *p
if ( strchr( path , ':' ) == NULL )
{
// try whether it is a volume / or a mounted volume
- strncpy( sMacFileNameConversion , path , 1000 ) ;
- sMacFileNameConversion[998] = 0 ;
- strcat( sMacFileNameConversion , ":" ) ;
+ strlcpy( sMacFileNameConversion , path , sizeof(sMacFileNameConversion)) ;
+ strlcat( sMacFileNameConversion , ":" , sizeof(sMacFileNameConversion)) ;
err = FSpLocationFromFullPath( strlen(sMacFileNameConversion) , sMacFileNameConversion , spec ) ;
}
else

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_common_filename_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/filename.cpp.orig 2003-09-20 20:24:24.000000000 +1000
+++ src/common/filename.cpp 2003-10-04 13:24:11.000000000 +1000
@@ -1787,8 +1787,7 @@ public :
}
MacDefaultExtensionRecord( const char * extension , OSType type , OSType creator )
{
- strncpy( m_ext , extension , kMacExtensionMaxLength ) ;
- m_ext[kMacExtensionMaxLength] = 0 ;
+ strlcpy( m_ext , extension , sizeof(m_ext)) ;
m_type = type ;
m_creator = creator ;
}
@@ -1888,7 +1887,7 @@ void wxFileName::MacRegisterDefaultTypeA
MacDefaultExtensionRecord rec ;
rec.m_type = type ;
rec.m_creator = creator ;
- strncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ;
+ strlcpy( rec.m_ext , ext.Lower().c_str() , sizeof(rec.m_ext)) ;
gMacDefaultExtensions.Add( rec ) ;
}
#endif

View File

@ -1,63 +0,0 @@
$OpenBSD: patch-src_common_log_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/log.cpp.orig 2003-09-20 20:24:25.000000000 +1000
+++ src/common/log.cpp 2003-10-04 13:24:11.000000000 +1000
@@ -248,22 +248,13 @@ void wxLogVerbose(const wxChar *szFormat
if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
- wxChar *p = s_szBuf;
- size_t len = s_szBufSize;
- wxStrncpy(s_szBuf, _T("("), len);
- len -= 1; // strlen("(")
- p += 1;
- wxStrncat(p, mask, len);
- size_t lenMask = wxStrlen(mask);
- len -= lenMask;
- p += lenMask;
-
- wxStrncat(p, _T(") "), len);
- len -= 2;
- p += 2;
-
- wxVsnprintf(p, len, szFormat, argptr);
-
+ strlcpy(s_szBuf, _T("("), s_szBufSize);
+ strlcat(s_szBuf, mask, s_szBufSize);
+ strlcat(s_szBuf, _T(") "), s_szBufSize);
+
+ size_t len = strlen(s_szBuf);
+ wxVsnprintf(s_szBuf + len, s_szBufSize - len, szFormat, argptr);
+
wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
}
}
@@ -314,7 +305,7 @@ void wxLogSysErrorHelper(long lErrCode)
wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
_(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
- wxStrncat(s_szBuf, szErrMsg, s_szBufSize - wxStrlen(s_szBuf));
+ strlcat(s_szBuf, szErrMsg, s_szBufSize);
wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
}
@@ -725,8 +716,8 @@ void wxLogStderr::DoLogString(const wxCh
#endif // MSW
#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
Str255 pstr ;
- strcpy( (char*) pstr , str.c_str() ) ;
- strcat( (char*) pstr , ";g" ) ;
+ strlcpy( (char*) pstr , str.c_str(), sizeof(pstr)) ;
+ strlcat( (char*) pstr , ";g", sizeof(pstr)) ;
c2pstr( (char*) pstr ) ;
Boolean running = false ;
@@ -946,8 +937,7 @@ const wxChar *wxSysErrorMsg(unsigned lon
// copy it to our buffer and free memory
if( lpMsgBuf != 0 ) {
- wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
- s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
+ strlcpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf));
LocalFree(lpMsgBuf);

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_common_odbc_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/odbc.cpp.orig Wed Dec 15 10:42:40 1999
+++ src/common/odbc.cpp Tue Apr 29 22:32:38 2003
@@ -1697,8 +1697,7 @@ bool wxQueryField::SetData(void* d, long
for (i = 0; i < size; i++)
str[i] = 0;
- strncpy(str, (char *)d, (int)size);
- str[size] = 0;
+ strlcpy(str, (char *)d, (int)size);
break;
}
case SQL_INTEGER:

View File

@ -1,65 +0,0 @@
$OpenBSD: patch-src_common_resourc2_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/resourc2.cpp.orig Wed Jan 9 10:52:53 2002
+++ src/common/resourc2.cpp Wed Apr 30 14:31:53 2003
@@ -76,6 +76,8 @@
#include "wx/settings.h"
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+
#if ((defined(__BORLANDC__) || defined(__SC__)) && defined(__WIN16__))
// Forward (private) declarations
@@ -116,7 +118,7 @@ bool wxReallocateResourceBuffer()
{
long newSize = wxResourceBufferSize + 1000;
char *tmp = new char[(int)newSize];
- strncpy(tmp, wxResourceBuffer, (int)wxResourceBufferCount);
+ strlcpy(tmp, wxResourceBuffer, newSize);
delete[] wxResourceBuffer;
wxResourceBuffer = tmp;
wxResourceBufferSize = newSize;
@@ -292,9 +294,9 @@ bool wxResourceReadOneResource(FILE *fd,
else if (strcmp(wxResourceBuffer, "static") != 0)
{
char buf[300];
- strcpy(buf, _("Found "));
- strncat(buf, wxResourceBuffer, 30);
- strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ strlcpy(buf, _("Found "), sizeof(buf));
+ strlcat(buf, wxResourceBuffer, min(30+1, sizeof(buf)));
+ strlcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."), sizeof(buf));
wxLogWarning(buf);
return FALSE;
}
@@ -327,7 +329,7 @@ bool wxResourceReadOneResource(FILE *fd,
return FALSE;
}
char nameBuf[100];
- strncpy(nameBuf, wxResourceBuffer+1, 99);
+ strlcpy(nameBuf, wxResourceBuffer+1, sizeof(nameBuf));
// =
if (!wxGetResourceToken(fd))
@@ -1357,9 +1359,9 @@ bool wxResourceReadOneResourceString(cha
else if (strcmp(wxResourceBuffer, "static") != 0)
{
char buf[300];
- strcpy(buf, _("Found "));
- strncat(buf, wxResourceBuffer, 30);
- strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ strlcpy(buf, _("Found "), sizeof(buf));
+ strlcat(buf, wxResourceBuffer, min(30+1, sizeof(buf)));
+ strlcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."), sizeof(buf));
wxLogWarning(buf);
return FALSE;
}
@@ -1392,7 +1394,7 @@ bool wxResourceReadOneResourceString(cha
return FALSE;
}
char nameBuf[100];
- strncpy(nameBuf, wxResourceBuffer+1, 99);
+ strlcpy(nameBuf, wxResourceBuffer+1, sizeof(nameBuf));
// =
if (!wxGetResourceTokenString(s))

View File

@ -1,69 +0,0 @@
$OpenBSD: patch-src_common_resource_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/resource.cpp.orig Tue Nov 5 06:31:56 2002
+++ src/common/resource.cpp Wed Apr 30 14:32:13 2003
@@ -84,6 +84,8 @@
#include "wx/settings.h"
#include "wx/stream.h"
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+
// Forward (private) declarations
bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);
@@ -1514,7 +1516,7 @@ bool wxReallocateResourceBuffer()
{
long newSize = wxResourceBufferSize + 1000;
char *tmp = new char[(int)newSize];
- strncpy(tmp, wxResourceBuffer, (int)wxResourceBufferCount);
+ strlcpy(tmp, wxResourceBuffer, newSize);
delete[] wxResourceBuffer;
wxResourceBuffer = tmp;
wxResourceBufferSize = newSize;
@@ -1811,9 +1813,9 @@ bool wxResourceReadOneResource(FILE *fd,
else if (strcmp(wxResourceBuffer, "static") != 0)
{
wxChar buf[300];
- wxStrcpy(buf, _("Found "));
- wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
- wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ strlcpy(buf, _("Found "), sizeof(buf));
+ strlcat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), min(30+1, sizeof(buf)));
+ strlcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."), sizeof(buf));
wxLogWarning(buf);
return FALSE;
}
@@ -1941,9 +1943,9 @@ bool wxResourceReadOneResource(wxInputSt
else if (strcmp(wxResourceBuffer, "static") != 0)
{
wxChar buf[300];
- wxStrcpy(buf, _("Found "));
- wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);
- wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ strlcpy(buf, _("Found "), sizeof(buf));
+ strlcat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), min(30+1, sizeof(buf)));
+ strlcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."), sizeof(buf));
wxLogWarning(buf);
return FALSE;
}
@@ -1976,7 +1978,7 @@ bool wxResourceReadOneResource(wxInputSt
return FALSE;
}
char nameBuf[100];
- strncpy(nameBuf, wxResourceBuffer+1, 99);
+ strlcpy(nameBuf, wxResourceBuffer+1, sizeof(nameBuf));
// =
if (!wxGetResourceToken(fd))
@@ -3025,9 +3027,9 @@ bool wxResourceReadOneResourceString(cha
else if (strcmp(wxResourceBuffer, "static") != 0)
{
wxChar buf[300];
- wxStrcpy(buf, _("Found "));
- wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
- wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+ strlcpy(buf, _("Found "), sizeof(buf));
+ strlcat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), min(30+1, sizeof(buf)));
+ strlcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."), sizeof(buf));
wxLogWarning(buf);
return FALSE;
}

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_common_string_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/string.cpp.orig 2003-09-20 20:24:26.000000000 +1000
+++ src/common/string.cpp 2003-10-04 13:24:11.000000000 +1000
@@ -1514,10 +1514,12 @@ wxString& wxString::insert(size_t nPos,
if ( !str.IsEmpty() ) {
wxString strTmp;
- wxChar *pc = strTmp.GetWriteBuf(Len() + str.Len());
- wxStrncpy(pc, c_str(), nPos);
- wxStrcpy(pc + nPos, str);
- wxStrcpy(pc + nPos + str.Len(), c_str() + nPos);
+ size_t newLen = Len() + str.Len() + 1;
+ wxChar *pc = strTmp.GetWriteBuf(newLen);
+ strlcpy(pc, c_str(), newLen);
+ pc[nPos] = 0;
+ strlcat(pc, str, newLen);
+ strlcat(pc, c_str() + nPos, newLen);
strTmp.UngetWriteBuf();
*this = strTmp;
}

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_common_utilscmn_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/utilscmn.cpp.orig Sat May 10 07:36:55 2003
+++ src/common/utilscmn.cpp Thu Jun 26 11:05:10 2003
@@ -948,8 +948,7 @@ bool wxGetEmailAddress(wxChar *address,
if ( !email )
return FALSE;
- wxStrncpy(address, email, maxSize - 1);
- address[maxSize - 1] = wxT('\0');
+ strlcpy(address, email, maxSize);
return TRUE;
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_common_xpmdecod_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/common/xpmdecod.cpp.orig Mon Dec 16 23:56:27 2002
+++ src/common/xpmdecod.cpp Wed Apr 30 11:53:27 2003
@@ -192,7 +192,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputSt
for (q = p + 1; *q != '\0'; q++)
if (*q == '"')
break;
- strncpy(xpm_buffer + i, p + 1, q - p - 1);
+ memmove(xpm_buffer + i, p + 1, q - p - 1);
i += q - p - 1;
xpm_buffer[i++] = '\n';
p = q + 1;

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_generic_gridg_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/generic/gridg.cpp.orig Sat Sep 7 00:42:47 2002
+++ src/generic/gridg.cpp Wed Apr 30 13:00:20 2003
@@ -1585,8 +1585,8 @@ void wxGenericGrid::OnChangeLabels()
for (j = 0; j < noTimes; j++)
{
char buf2[20];
- sprintf(buf2, wxT("%c"), (char)ch);
- strcat(buf, buf2);
+ snprintf(buf2, sizeof(buf2), wxT("%c"), (char)ch);
+ strlcat(buf, buf2, sizeof(buf));
}
SetLabelValue(wxHORIZONTAL, buf, i);
}

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-src_gtk_menu_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/gtk/menu.cpp.orig 2003-09-20 20:24:30.000000000 +1000
+++ src/gtk/menu.cpp 2003-10-04 13:24:11.000000000 +1000
@@ -371,7 +371,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu,
/* local buffer in multibyte form */
char cbuf[400];
- strcpy(cbuf, wxGTK_CONV(buf) );
+ strlcpy(cbuf, wxGTK_CONV(buf), sizeof(cbuf));
GtkItemFactoryEntry entry;
entry.path = (gchar *)cbuf; // const_cast
@@ -1150,8 +1150,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem
/* local buffer in multibyte form */
char buf[200];
- strcpy( buf, "/" );
- strcat( buf, wxGTK_CONV( text ) );
+ strlcpy( buf, "/", sizeof(buf));
+ strlcat( buf, wxGTK_CONV( text ), sizeof(buf));
GtkItemFactoryEntry entry;
entry.path = buf;
@@ -1240,8 +1240,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem
char bufPath[256],
bufType[256];
- strcpy( bufPath, "/" );
- strncat( bufPath, wxGTK_CONV(text), WXSIZEOF(bufPath) - 2 );
+ strlcpy( bufPath, "/", WXSIZEOF(bufPath));
+ strlcat( bufPath, wxGTK_CONV(text), WXSIZEOF(bufPath));
bufPath[WXSIZEOF(bufPath) - 1] = '\0';
GtkItemFactoryEntry entry;
@@ -1272,8 +1272,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem
pathRadio.Replace(wxT("_"), wxT(""));
pathRadio.Prepend(wxT("<main>/"));
- strncpy(bufType, wxGTK_CONV(pathRadio), WXSIZEOF(bufType));
- bufType[WXSIZEOF(bufType) - 1] = '\0';
+ strlcpy(bufType, wxGTK_CONV(pathRadio), WXSIZEOF(bufType));
item_type = bufType;
}
@@ -1357,7 +1356,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem
// somehow! (VZ)
char s_accel[50]; // should be big enough, we check for overruns
wxString tmp( GetHotKey(*mitem) );
- strncpy(s_accel, wxGTK_CONV( tmp ), WXSIZEOF(s_accel));
+ strlcpy(s_accel, wxGTK_CONV( tmp ), WXSIZEOF(s_accel));
s_accel[WXSIZEOF(s_accel) - 1] = '\0';
entry.accelerator = s_accel;
#else // !wxUSE_ACCEL
@@ -1946,4 +1945,3 @@ changed_have_pixmap_status (GtkPixmapMen
}
#endif // __WXGTK20__
-

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_html_helpfrm_cpp,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/html/helpfrm.cpp.orig Mon Dec 16 23:56:32 2002
+++ src/html/helpfrm.cpp Wed Apr 30 09:50:13 2003
@@ -1385,8 +1385,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxComm
int displ = 0;
for (int i = 0; i < cnt; i++)
{
- wxStrncpy(mybuff, index[i].m_Name, 512);
- mybuff[511] = _T('\0');
+ strlcpy(mybuff, index[i].m_Name, sizeof(mybuff));
for (ptr = mybuff; *ptr != 0; ptr++)
if (*ptr >= _T('A') && *ptr <= _T('Z'))
*ptr -= (wxChar)(_T('A') - _T('a'));

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_iodbc_connect_c,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/iodbc/connect.c.orig Fri Jan 21 00:19:20 2000
+++ src/iodbc/connect.c Tue Apr 29 17:56:57 2003
@@ -841,18 +841,15 @@ SQLDriverConnect (
dsn = "default";
}
- if (cbConnStrIn > sizeof (cnstr2drv)
- - STRLEN (dsn) - STRLEN ("DSN=;") - 1)
+ if (snprintf ((char*)cnstr2drv, sizeof(cnstr2drv), "DSN=%s;%s", dsn, szConnStrIn) >= sizeof(cnstr2drv)) {
{
sqlstat = en_S1001; /* a lazy way to avoid
* using heap memory */
break;
}
- sprintf ((char*)cnstr2drv, "DSN=%s;", dsn);
- cbConnStrIn += STRLEN (cnstr2drv);
- STRNCAT (cnstr2drv, szConnStrIn, cbConnStrIn);
szConnStrIn = cnstr2drv;
+ cbConnStrIn = STRLEN (szConnStrIn);
break;
default:

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_iodbc_herr_c,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/iodbc/herr.c.orig Wed Jun 2 01:31:41 1999
+++ src/iodbc/herr.c Wed Apr 30 10:03:24 2003
@@ -291,15 +291,13 @@ SQLError (
if (ststr == NULL)
{
- len = 0;
+ szSqlstate[0] = 0;
}
else
{
- len = (int) STRLEN (ststr);
+ strlcpy (szSqlstate, ststr, 6);
}
- STRNCPY (szSqlstate, ststr, len);
- szSqlstate[len] = 0;
/* buffer size of szSqlstate is not checked. Applications
* suppose provide enough ( not less than 6 bytes ) buffer
* or NULL for it.
@@ -347,8 +345,7 @@ SQLError (
/* and not posts error for itself */
}
- STRNCPY ((char *) szErrorMsg, msgbuf, len);
- szErrorMsg[len] = 0;
+ strlcpy ((char *) szErrorMsg, msgbuf, len);
if (pcbErrorMsg != NULL)
{

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_iodbc_info_c,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/iodbc/info.c.orig Fri Jan 28 09:47:49 2000
+++ src/iodbc/info.c Wed Apr 30 10:04:17 2003
@@ -192,7 +192,7 @@ SQLDataSources (
/*
* Copy DSN information
*/
- STRNCPY (szDSN, sect[cur_entry], cbDSNMax);
+ strlcpy (szDSN, sect[cur_entry], cbDSNMax);
/*
glt??? pcbDSN = strlen(szDSN);
*/
@@ -309,8 +309,7 @@ SQLGetInfo (
retcode = SQL_SUCCESS_WITH_INFO;
}
- STRNCPY (rgbInfoValue, buf, len);
- ((char FAR *) rgbInfoValue)[len] = '\0';
+ strlcpy (rgbInfoValue, buf, len);
}
if (pcbInfoValue != NULL)
@@ -421,8 +420,7 @@ SQLGetInfo (
PUSHSQLERR (pdbc->herr, en_01004);
}
- STRNCPY (rgbInfoValue, buf, len);
- ((char FAR *) rgbInfoValue)[len] = '\0';
+ strlcpy (rgbInfoValue, buf, len);
}
if (pcbInfoValue != NULL)

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_iodbc_misc_c,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
--- src/iodbc/misc.c.orig Wed Jun 2 01:31:41 1999
+++ src/iodbc/misc.c Wed Apr 30 10:04:59 2003
@@ -236,8 +236,8 @@ _iodbcdm_getkeyvalbydsn (
value[0] = '\0';
- STRNCAT (dsntk, dsn, dsnlen);
- STRCAT (dsntk, "]");
+ strlcat (dsntk, dsn, sizeof(dsntk));
+ strlcat (dsntk, "]", sizeof(dsntk));
dsnlen = dsnlen + 2;
@@ -320,7 +320,7 @@ _iodbcdm_getkeyvalbydsn (
break;
}
- STRNCPY (value, token, size);
+ strlcpy (value, token, size);
/* copy the value(i.e. next token) to buf */
if (dsnid != DSN_DEFAULT)
@@ -400,7 +400,7 @@ _iodbcdm_getkeyvalinstr (
return NULL;
}
- STRNCPY (value, token, size);
+ strlcpy (value, token, size);
return value;

View File

@ -1,208 +0,0 @@
$OpenBSD: patch-src_motif_utils_cpp,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
--- src/motif/utils.cpp.orig 2003-09-20 20:24:35.000000000 +1000
+++ src/motif/utils.cpp 2003-10-04 13:24:11.000000000 +1000
@@ -225,26 +225,26 @@ int wxGetOsVersion(int *majorVsn, int *m
// Read $HOME for what it says is home, if not
// read $USER or $LOGNAME for user name else determine
// the Real User, then determine the Real home dir.
-static char * GetIniFile (char *dest, const char *filename)
+static char * GetIniFile (char *dest, size_t size, const char *filename)
{
char *home = NULL;
if (filename && wxIsAbsolutePath(filename))
{
- strcpy(dest, filename);
+ strlcpy(dest, filename, size);
}
else if ((home = wxGetUserHome("")) != NULL)
{
- strcpy(dest, home);
+ strlcpy(dest, home, size);
if (dest[strlen(dest) - 1] != '/')
- strcat (dest, "/");
+ strlcat (dest, "/", size);
if (filename == NULL)
{
if ((filename = getenv ("XENVIRONMENT")) == NULL)
filename = ".Xdefaults";
}
else if (*filename != '.')
- strcat (dest, ".");
- strcat (dest, filename);
+ strlcat (dest, ".", size);
+ strlcat (dest, filename, size);
} else
{
dest[0] = '\0';
@@ -252,20 +252,20 @@ static char * GetIniFile (char *dest, co
return dest;
}
-static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
+static char *GetResourcePath(char *buf, size_t buflen, const char *name, bool create = FALSE)
{
if (create && wxFileExists (name) ) {
- strcpy(buf, name);
+ strlcpy(buf, name, buflen);
return buf; // Exists so ...
}
if (*name == '/')
- strcpy(buf, name);
+ strlcpy(buf, name, buflen);
else {
// Put in standard place for resource files if not absolute
- strcpy (buf, DEFAULT_XRESOURCE_DIR);
- strcat (buf, "/");
- strcat (buf, (const char*) wxFileNameFromPath (name));
+ strlcpy (buf, DEFAULT_XRESOURCE_DIR, buflen);
+ strlcat (buf, "/", buflen);
+ strlcat (buf, (const char*) wxFileNameFromPath (name), buflen);
}
if (create) {
@@ -295,7 +295,7 @@ wxFlushResources (void)
{
const char *file = node->GetKeyString();
// If file doesn't exist, create it first.
- (void)GetResourcePath(nameBuffer, file, TRUE);
+ (void)GetResourcePath(nameBuffer, sizeof(nameBuffer), file, TRUE);
XrmDatabase database = (XrmDatabase) node->Data ();
XrmPutFileDatabase (database, nameBuffer);
@@ -314,7 +314,7 @@ bool wxWriteResource(const wxString& sec
{
char buffer[500];
- (void) GetIniFile (buffer, file);
+ (void) GetIniFile (buffer, sizeof(buffer), file);
XrmDatabase database;
wxNode *node = wxResourceCache.Find (buffer);
@@ -327,9 +327,9 @@ bool wxWriteResource(const wxString& sec
}
char resName[300];
- strcpy (resName, (const char*) section);
- strcat (resName, ".");
- strcat (resName, (const char*) entry);
+ strlcpy (resName, (const char*) section, sizeof(resName));
+ strlcat (resName, ".", sizeof(resName));
+ strlcat (resName, (const char*) entry, sizeof(resName));
XrmPutStringResource (&database, resName, value);
return TRUE;
@@ -338,21 +338,21 @@ bool wxWriteResource(const wxString& sec
bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
{
char buf[50];
- sprintf(buf, "%.4f", value);
+ snprintf(buf, sizeof(buf), "%.4f", value);
return wxWriteResource(section, entry, buf, file);
}
bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
{
char buf[50];
- sprintf(buf, "%ld", value);
+ snprintf(buf, sizeof(buf), "%ld", value);
return wxWriteResource(section, entry, buf, file);
}
bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
{
char buf[50];
- sprintf(buf, "%d", value);
+ snprintf(buf, sizeof(buf), "%d", value);
return wxWriteResource(section, entry, buf, file);
}
@@ -372,7 +372,7 @@ bool wxGetResource(const wxString& secti
// Is this right? Trying to get it to look in the user's
// home directory instead of current directory -- JACS
- (void) GetIniFile (buffer, file);
+ (void) GetIniFile (buffer, sizeof(buffer), file);
wxNode *node = wxResourceCache.Find (buffer);
if (node)
@@ -389,9 +389,9 @@ bool wxGetResource(const wxString& secti
XrmValue xvalue;
char *str_type[20];
char buf[150];
- strcpy (buf, section);
- strcat (buf, ".");
- strcat (buf, entry);
+ strlcpy (buf, section, sizeof(buf));
+ strlcat (buf, ".", sizeof(buf));
+ strlcat (buf, entry, sizeof(buf));
Bool success = XrmGetResource (database, buf, "*", str_type,
&xvalue);
@@ -408,7 +408,7 @@ bool wxGetResource(const wxString& secti
delete[] *value;
*value = new char[xvalue.size + 1];
- strncpy (*value, xvalue.addr, (int) xvalue.size);
+ strlcpy (*value, xvalue.addr, (int) xvalue.size);
return TRUE;
}
return FALSE;
@@ -472,8 +472,8 @@ void wxXMergeDatabases (wxApp * theApp,
char *environment;
wxString classname = theApp->GetClassName();
char name[256];
- (void) strcpy (name, "/usr/lib/X11/app-defaults/");
- (void) strcat (name, (const char*) classname);
+ (void) strlcpy (name, "/usr/lib/X11/app-defaults/", sizeof(name));
+ (void) strlcat (name, (const char*) classname, sizeof(name));
/* Get application defaults file, if any */
applicationDB = XrmGetFileDatabase (name);
@@ -491,7 +491,7 @@ void wxXMergeDatabases (wxApp * theApp,
}
else
{
- (void) GetIniFile (filename, NULL);
+ (void) GetIniFile (filenamebuf, sizeof(filenamebuf), NULL);
serverDB = XrmGetFileDatabase (filename);
}
XrmMergeDatabases (serverDB, &wxResourceDatabase);
@@ -502,12 +502,10 @@ void wxXMergeDatabases (wxApp * theApp,
if ((environment = getenv ("XENVIRONMENT")) == NULL)
{
- size_t len;
- environment = GetIniFile (filename, NULL);
- len = strlen (environment);
+ GetIniFile (filenamebuf, sizeof(filenamebuf), NULL);
wxString hostname = wxGetHostName();
if ( !!hostname )
- strncat(environment, hostname, 1024 - len);
+ strlcat(filenamebuf, hostname, sizeof(filenamebuf));
}
homeDB = XrmGetFileDatabase (environment);
XrmMergeDatabases (homeDB, &wxResourceDatabase);
@@ -1162,17 +1160,17 @@ char * wxFindAccelerator (const char *s)
{
*p = '\0';
if (buf[0])
- strcat (buf, " ");
+ strlcat (buf, " ", sizeof(buf));
if (strcmp (s, "Alt"))
- strcat (buf, s);
+ strlcat (buf, s, sizeof(buf));
else
- strcat (buf, "Meta");
+ strlcat (buf, "Meta", sizeof(buf));
s = p++;
}
else
{
- strcat (buf, "<Key>");
- strcat (buf, s);
+ strlcat (buf, "<Key>", sizeof(buf));
+ strlcat (buf, s, sizeof(buf));
break;
}
}

View File

@ -1,361 +0,0 @@
$OpenBSD: patch-src_motif_xmcombo_xmcombo_c,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
--- src/motif/xmcombo/xmcombo.c.orig Sun Sep 22 06:53:58 2002
+++ src/motif/xmcombo/xmcombo.c Wed Apr 30 15:15:48 2003
@@ -2224,11 +2224,11 @@ static void MotionVerifyCallback(Widget
* Bastele einen vollstaendigen Namens- und Klassenbezeichner anhand
* des angegebenen Widgets zusammen.
*/
-static void MakeNameAndClass(Widget w, char *NameBuff, char *ClassBuff)
+static void MakeNameAndClass(Widget w, char *NameBuff, size_t NameBuffLen, char *ClassBuff, size_t ClassBuffLen)
{
Widget Parent = XtParent(w);
- if ( Parent ) MakeNameAndClass(Parent, NameBuff, ClassBuff);
+ if ( Parent ) MakeNameAndClass(Parent, NameBuff, NameBuffLen, ClassBuff, ClassBuffLen);
if ( XtIsSubclass(w, applicationShellWidgetClass) ) {
/* Wenn wir ganz oben angekommen sind, holen wir uns den
* Namen und die Klasse der Applikation selbst und nicht die
@@ -2237,16 +2237,16 @@ static void MakeNameAndClass(Widget w, c
String AppName, AppClass;
XtGetApplicationNameAndClass(
XtDisplayOfObject(w), &AppName, &AppClass);
- strcpy(NameBuff, AppName);
- strcpy(ClassBuff, AppClass);
+ strlcpy(NameBuff, AppName, NameBuffLen);
+ strlcpy(ClassBuff, AppClass, ClassBuffLen);
} else {
/* Ansonsten sind wir noch mitten irgendwo in der Hierarchie
* und besorgen uns den Namen und die Klasse dieses Widgets
*/
- strcat(NameBuff, ".");
- strcat(NameBuff, XtName(w));
- strcat(ClassBuff, ".");
- strcat(ClassBuff, ((CoreClassRec *) XtClass(w))->core_class.class_name);
+ strlcat(NameBuff, ".", NameBuffLen);
+ strlcat(NameBuff, XtName(w), NameBuffLen);
+ strlcat(ClassBuff, ".", NameBuffLen);
+ strlcat(ClassBuff, ((CoreClassRec *) XtClass(w))->core_class.class_name, NameBuffLen);
}
} /* MakeNameAndClass */
@@ -2256,7 +2256,8 @@ static void MakeNameAndClass(Widget w, c
* noch in das gewuenschte Zielformat konvertiert werden.
*/
static Boolean FetchResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
XrmValue *RscValue,
String *RepresentationType)
@@ -2265,8 +2266,10 @@ static Boolean FetchResource(Widget w,
char *EndOfName = FullName + strlen(FullName);
char *EndOfClass = FullClass + strlen(FullClass);
- strcat(FullName, "."); strcat(FullName, RscName);
- strcat(FullClass, "."); strcat(FullClass, RscClass);
+ strlcat(FullName, ".", FullNameLen);
+ strlcat(FullName, RscName, FullNameLen);
+ strlcat(FullClass, ".", FullClassLen);
+ strlcat(FullClass, RscClass, FullClassLen);
ok = XrmGetResource(
XtDatabase(XtDisplayOfObject(w)),
FullName, FullClass, RepresentationType, RscValue);
@@ -2291,14 +2294,15 @@ static Boolean FetchResource(Widget w,
* String --> KeySym
*/
static Boolean FetchIntResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
int *pInt)
{
XrmValue RscValue, RscDest;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
RscDest.size = sizeof(int);
@@ -2311,14 +2315,15 @@ static Boolean FetchIntResource(Widget w
} /* FetchIntResource */
static Boolean FetchShortResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
short *pShort)
{
XrmValue RscValue, RscDest;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
RscDest.size = sizeof(short);
@@ -2331,14 +2336,15 @@ static Boolean FetchShortResource(Widget
} /* FetchShortResource */
static Boolean FetchLabelTypeResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
unsigned char *pUChar)
{
XrmValue RscValue;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
if ( strcasecmp((char *) RscValue.addr, "XmPIXMAP") == 0 )
@@ -2351,14 +2357,15 @@ static Boolean FetchLabelTypeResource(Wi
} /* FetchLabelTypeResource */
static Boolean FetchDimensionResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
Dimension *pDimension)
{
XrmValue RscValue, RscDest;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
RscDest.size = sizeof(Dimension);
@@ -2371,14 +2378,15 @@ static Boolean FetchDimensionResource(Wi
} /* FetchDimensionResource */
static Boolean FetchStringResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
String *pString)
{
XrmValue RscValue;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
*pString = (char *) RscValue.addr;
@@ -2388,14 +2396,15 @@ static Boolean FetchStringResource(Widge
} /* FetchStringResource */
static Boolean FetchKeySymResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
KeySym *pKeySym)
{
XrmValue RscValue, RscDest;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
RscDest.size = sizeof(KeySym);
@@ -2408,14 +2417,15 @@ static Boolean FetchKeySymResource(Widge
} /* FetchKeySymResource */
static Boolean FetchXmStringResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
XmString *pString)
{
XrmValue RscValue;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
*pString = XmCvtCTToXmString((char *) RscValue.addr);
@@ -2425,7 +2435,8 @@ static Boolean FetchXmStringResource(Wid
} /* FetchXmStringResource */
static Boolean FetchXmStringTableResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
XmStringTable *pStringTable,
int *pTableSize)
@@ -2435,7 +2446,7 @@ static Boolean FetchXmStringTableResourc
String TmpList, p, pStart;
int Entries, Entry;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
/*
@@ -2474,14 +2485,15 @@ static Boolean FetchXmStringTableResourc
} /* FetchXmStringTableResource */
static Boolean FetchXmFontListResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
XmFontList *pFontList)
{
XrmValue RscValue, RscDest;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
RscDest.size = sizeof(XmFontList);
@@ -2494,14 +2506,15 @@ static Boolean FetchXmFontListResource(W
} /* FetchXmFontListResource */
static Boolean FetchPixmapResource(Widget w,
- char *FullName, char *FullClass,
+ char *FullName, size_t FullNameLen,
+ char *FullClass, size_t FullClassLen,
char *RscName, char *RscClass,
Pixmap *pPixmap)
{
XrmValue RscValue, RscDest;
String RepresentationType;
- if ( FetchResource(w, FullName, FullClass,
+ if ( FetchResource(w, FullName, FullNameLen, FullClass, FullClassLen,
RscName, RscClass,
&RscValue, &RepresentationType) ) {
RscDest.size = sizeof(Pixmap);
@@ -2588,13 +2601,14 @@ static void InitMirrorResources(XmComboB
int i, size = XtNumber(ResourceMirror);
FullName[0] = 0; FullClass[0] = 0;
- MakeNameAndClass((Widget) w, FullName, FullClass);
+ MakeNameAndClass((Widget) w, FullName, sizeof(FullName), FullClass, sizeof(FullClass));
for ( i=0; i < size; i++ ) {
switch ( ResourceMirror[i].Converter ) {
case RInt:
if ( FetchIntResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AInt) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2602,7 +2616,8 @@ static void InitMirrorResources(XmComboB
break;
case RXmItemCount:
if ( FetchIntResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AInt) && ( AInt != 0) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2610,7 +2625,8 @@ static void InitMirrorResources(XmComboB
break;
case RShort:
if ( FetchShortResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AShort) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2618,7 +2634,8 @@ static void InitMirrorResources(XmComboB
break;
case RLType:
if ( FetchLabelTypeResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AUChar) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2626,7 +2643,8 @@ static void InitMirrorResources(XmComboB
break;
case RDimension:
if ( FetchDimensionResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&ADimension) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2634,7 +2652,8 @@ static void InitMirrorResources(XmComboB
break;
case RXmString:
if ( FetchXmStringResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AXmString) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2642,7 +2661,8 @@ static void InitMirrorResources(XmComboB
break;
case RXmStringTable:
if ( FetchXmStringTableResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AStringTable, &TableSize) ) {
XtVaSetValues((Widget) w,
@@ -2652,7 +2672,8 @@ static void InitMirrorResources(XmComboB
break;
case RKeySym:
if ( FetchKeySymResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AKeySym) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2660,7 +2681,8 @@ static void InitMirrorResources(XmComboB
break;
case RString:
if ( FetchStringResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AString) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2668,7 +2690,8 @@ static void InitMirrorResources(XmComboB
break;
case RPixmap:
if ( FetchPixmapResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&APixmap) ) {
XtVaSetValues((Widget) w, ResourceMirror[i].Name,
@@ -2681,7 +2704,8 @@ static void InitMirrorResources(XmComboB
break;
case RXmFontList:
if ( FetchXmFontListResource((Widget) w,
- FullName, FullClass,
+ FullName, sizeof(FullName),
+ FullClass, sizeof(FullClass),
ResourceMirror[i].Name, ResourceMirror[i].Class,
&AFontList) )
XtVaSetValues((Widget) w, ResourceMirror[i].Name,

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-src_unix_gsocket_c,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
--- src/unix/gsocket.c.orig Fri Sep 6 06:49:18 2002
+++ src/unix/gsocket.c Wed Apr 30 09:52:24 2003
@@ -1601,7 +1601,7 @@ GSocketError GAddress_INET_GetHostName(G
return GSOCK_NOHOST;
}
- strncpy(hostname, he->h_name, sbuf);
+ strlcpy(hostname, he->h_name, sbuf);
return GSOCK_NOERROR;
}
@@ -1664,8 +1664,7 @@ GSocketError GAddress_UNIX_SetPath(GAddr
CHECK_ADDRESS(address, UNIX);
addr = ((struct sockaddr_un *)address->m_addr);
- strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);
- addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0';
+ strlcpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);
return GSOCK_NOERROR;
}
@@ -1679,7 +1678,7 @@ GSocketError GAddress_UNIX_GetPath(GAddr
addr = (struct sockaddr_un *)address->m_addr;
- strncpy(path, addr->sun_path, sbuf);
+ strlcpy(path, addr->sun_path, sbuf);
return GSOCK_NOERROR;
}

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_unix_sound_cpp,v 1.1 2006/10/12 14:09:33 alek Exp $
--- src/unix/sound.cpp.orig Tue Sep 20 23:35:41 2005
+++ src/unix/sound.cpp Sat Feb 11 22:49:42 2006
@@ -34,6 +34,10 @@
#include <sys/soundcard.h>
#endif
+#ifdef HAVE_SOUNDCARD_H
+#include <soundcard.h>
+#endif
+
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/intl.h"
@@ -102,10 +106,10 @@ public:
// wxSoundBackendOSS, for Linux
// ----------------------------------------------------------------------------
-#ifdef HAVE_SYS_SOUNDCARD_H
+#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_SOUNDCARD_H)
#ifndef AUDIODEV
-#define AUDIODEV "/dev/dsp" // Default path for audio device
+#define AUDIODEV "/dev/audio" // Default path for audio device
#endif
class wxSoundBackendOSS : public wxSoundBackend

View File

@ -1,43 +0,0 @@
$OpenBSD: patch-src_unix_utilsunx_cpp,v 1.1.1.1 2004/07/16 21:01:36 todd Exp $
--- src/unix/utilsunx.cpp.orig Mon Apr 7 04:03:01 2003
+++ src/unix/utilsunx.cpp Thu Jun 26 11:05:10 2003
@@ -864,8 +864,7 @@ static bool wxGetHostNameInternal(wxChar
bool ok = uname(&uts) != -1;
if ( ok )
{
- wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1);
- buf[sz] = wxT('\0');
+ strlcpy(buf, wxConvertMB2WX(uts.nodename), sz);
}
#elif defined(HAVE_GETHOSTNAME)
bool ok = gethostname(buf, sz) != -1;
@@ -920,7 +919,7 @@ bool wxGetFullHostName(wxChar *buf, int
else
{
// the canonical name
- wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz);
+ strlcpy(buf, wxConvertMB2WX(host->h_name), sz);
}
}
//else: it's already a FQDN (BSD behaves this way)
@@ -936,7 +935,7 @@ bool wxGetUserId(wxChar *buf, int sz)
*buf = wxT('\0');
if ((who = getpwuid(getuid ())) != NULL)
{
- wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+ strlcpy (buf, wxConvertMB2WX(who->pw_name), sz);
return TRUE;
}
@@ -955,9 +954,9 @@ bool wxGetUserName(wxChar *buf, int sz)
char *comma = strchr(who->pw_gecos, ',');
if (comma)
*comma = '\0'; // cut off non-name comment fields
- wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
+ strlcpy (buf, wxConvertMB2WX(who->pw_gecos), sz);
#else // !HAVE_PW_GECOS
- wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+ strlcpy (buf, wxConvertMB2WX(who->pw_name), sz);
#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
return TRUE;
}

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_unix_utilsx11_cpp,v 1.1 2005/12/06 19:16:03 alek Exp $
--- src/unix/utilsx11.cpp.orig Sun Dec 4 16:24:05 2005
+++ src/unix/utilsx11.cpp Sun Dec 4 16:24:08 2005
@@ -101,8 +101,8 @@ void wxSetIconsX11( WXDisplay* display,
if( size > 0 )
{
- wxUint32* data = new wxUint32[size];
- wxUint32* ptr = data;
+ long* data = new long[size];
+ long* ptr = data;
for( i = 0; i < max; ++i )
{

View File

@ -0,0 +1,48 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- tests/Makefile.in.orig Sun Feb 5 22:41:01 2006
+++ tests/Makefile.in Sun Jul 30 14:33:16 2006
@@ -81,7 +81,7 @@ TEST_OBJECTS = \
TEST_ODEP = $(___pch_testprec_test_testprec_h_gch___depname)
TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples \
+ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../tests \
$(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
TEST_GUI_OBJECTS = \
$(__test_gui___win32rc) \
@@ -114,7 +114,7 @@ TEST_GUI_ODEP = $(___pch_testprec_test_
@COND_USE_PCH_1@___pch_testprec_test_testprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/testprec_test/testprec.h.gch
COND_MONOLITHIC_0___WXLIB_NET_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
@COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
@COND_PLATFORM_MAC_1@__test_gui___mac_setfilecmd = \
@@ -148,7 +148,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
@COND_USE_PCH_1@___pch_testprec_test_gui_testprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/testprec_test_gui/testprec.h.gch
COND_MONOLITHIC_0___WXLIB_CORE_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \
@@ -162,7 +162,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -189,6 +189,8 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
### Targets: ###
all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data
+ LD_LIBRARY_PATH=../lib/ ./test
+ LD_LIBRARY_PATH=../lib/ ./test_gui
install: all

View File

@ -0,0 +1,32 @@
$OpenBSD: patch-utils_wxrc_Makefile_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- utils/wxrc/Makefile.in.orig Sun Feb 5 22:41:14 2006
+++ utils/wxrc/Makefile.in Fri Aug 4 00:38:52 2006
@@ -66,14 +66,14 @@ WXRC_OBJECTS = \
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
COND_MONOLITHIC_0___WXLIB_XML_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
COND_MONOLITHIC_0___WXLIB_BASE_p = \
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
@COND_USE_XRC_1@__install_wxrc___depname = install_wxrc
COND_MONOLITHIC_1___WXLIB_MONO_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
@@ -120,9 +120,7 @@ distclean: clean
@COND_USE_XRC_1@install_wxrc:
@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc
wxrc_wxrc.o: $(srcdir)/wxrc.cpp
$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp

View File

@ -0,0 +1,72 @@
$OpenBSD: patch-wx-config_in,v 1.1 2006/10/12 14:09:33 alek Exp $
--- wx-config.in.orig Thu Feb 16 10:53:49 2006
+++ wx-config.in Thu Oct 5 03:44:30 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ksh
#
# Name: wx-config{.in,}
# Purpose: wx configuration search and query tool {template,}
@@ -20,24 +20,6 @@
# Extra^2 debug mode, for if things ever get really weird.
[ -z "$WXDEBUG_X" ] || set -x
-# We expect a posix shell, so if this is a Bourne shell,
-# and apparently a few still exist, try for bash or ksh.
-
-if [ ~ = '~' ]
-then
- if (bash -c echo) >/dev/null 2>&1
- then
- exec bash "$0" "$@"
- fi
- if (ksh -c echo) >/dev/null 2>&1
- then
- exec ksh "$0" "$@"
- fi
- echo "$0: this script requires bash or ksh"
- exit 1
-fi
-
-
# On with some basic stuff, like the ability to die gracefully,
# and to tell people what we are about.
# ------------------------------------------------------------------
@@ -579,8 +561,8 @@ find_best_delegate()
get_legacy_mask()
{
[ $# -gt 0 ] || set m
- eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u
- eval [ "x\${$1_debugtype}" != "xdebug" ] || _debug_flag=d
+ eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=
+ eval [ "x\${$1_debugtype}" != "xdebug" ] || _debug_flag=
eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
}
@@ -998,7 +980,7 @@ lib_flags_for()
_libname="@WX_LIBRARY_BASENAME_GUI@"
fi
[ $lib = base ] || _libname="${_libname}_$lib"
- _libname="${_libname}-@WX_RELEASE@$_target"
+ _libname="${_libname}$_target"
if is_static; then
_wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
@@ -1057,7 +1039,7 @@ link_deps_for()
_libname="@WX_LIBRARY_BASENAME_GUI@"
fi
[ $lib = base ] || _libname="${_libname}_$lib"
- _libname="${_libname}-@WX_RELEASE@$_target"
+ _libname="${_libname}$_target"
_wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
done
@@ -1138,7 +1120,7 @@ fi
[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
if is_installed; then
- _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
+ _include_cppflags="-I${includedir}"
else
_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
fi

608
x11/wxWidgets/pkg/PLIST Normal file
View File

@ -0,0 +1,608 @@
@comment $OpenBSD: PLIST,v 1.1 2006/10/12 14:09:33 alek Exp $
@conflict wxWidgets-headers-*
@conflict wxWidgets-gtkheaders-*
@conflict wxWidgets-x11univ-*
@conflict wxWidgets-motif-*
@conflict wxWidgets-lesstif-*
@conflict wxWidgets-gtk-*
@conflict wxWidgets-gtk2-*
@pkgpath x11/wxWidgets/x11univ
@pkgpath x11/wxWidgets/motif
@pkgpath x11/wxWidgets/lesstif
@pkgpath x11/wxWidgets/gtk
@pkgpath x11/wxWidgets/gtk2
bin/wx-config
bin/wxrc
include/wx/
include/wx/accel.h
include/wx/access.h
include/wx/afterstd.h
include/wx/animate/
include/wx/animate/animate.h
include/wx/app.h
include/wx/apptrait.h
include/wx/archive.h
include/wx/arrimpl.cpp
include/wx/arrstr.h
include/wx/artprov.h
include/wx/beforestd.h
include/wx/bitmap.h
include/wx/bmpbuttn.h
include/wx/bookctrl.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/choicebk.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/datectrl.h
include/wx/dateevt.h
include/wx/datetime.h
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/dcmirror.h
include/wx/dcprint.h
include/wx/dcps.h
include/wx/dcscreen.h
include/wx/dde.h
include/wx/debug.h
include/wx/debugrpt.h
include/wx/defs.h
include/wx/deprecated/
include/wx/deprecated/expr.h
include/wx/deprecated/prop.h
include/wx/deprecated/propform.h
include/wx/deprecated/proplist.h
include/wx/deprecated/resource.h
include/wx/deprecated/setup.h
include/wx/deprecated/tbarsmpl.h
include/wx/deprecated/treelay.h
include/wx/deprecated/wxexpr.h
include/wx/dialog.h
include/wx/dialup.h
include/wx/dir.h
include/wx/dirctrl.h
include/wx/dirdlg.h
include/wx/display.h
include/wx/dlimpexp.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/encinfo.h
include/wx/event.h
include/wx/evtloop.h
include/wx/except.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/fl/
include/wx/fl/antiflickpl.h
include/wx/fl/bardragpl.h
include/wx/fl/barhintspl.h
include/wx/fl/cbcustom.h
include/wx/fl/controlbar.h
include/wx/fl/dynbarhnd.h
include/wx/fl/dyntbar.h
include/wx/fl/dyntbarhnd.h
include/wx/fl/fldefs.h
include/wx/fl/frmview.h
include/wx/fl/garbagec.h
include/wx/fl/gcupdatesmgr.h
include/wx/fl/hintanimpl.h
include/wx/fl/newbmpbtn.h
include/wx/fl/panedrawpl.h
include/wx/fl/rowdragpl.h
include/wx/fl/rowlayoutpl.h
include/wx/fl/toolwnd.h
include/wx/fl/updatesmgr.h
include/wx/fmappriv.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/gbsizer.h
include/wx/gdicmn.h
include/wx/gdiobj.h
include/wx/generic/
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/datectrl.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/gridsel.h
include/wx/generic/helpext.h
include/wx/generic/imaglist.h
include/wx/generic/laywin.h
include/wx/generic/listctrl.h
include/wx/generic/logg.h
include/wx/generic/msgdlgg.h
include/wx/generic/notebook.h
include/wx/generic/numdlgg.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/propdlg.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/gizmos/
include/wx/gizmos/dynamicsash.h
include/wx/gizmos/editlbox.h
include/wx/gizmos/gizmos.h
include/wx/gizmos/ledctrl.h
include/wx/gizmos/multicell.h
include/wx/gizmos/splittree.h
include/wx/gizmos/statpict.h
include/wx/gizmos/xh_statpict.h
include/wx/glcanvas.h
include/wx/grid.h
include/wx/gsocket.h
include/wx/gtk/
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/colordlg.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/gnome/
include/wx/gtk/gnome/gprint.h
include/wx/gtk/icon.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/msgdlg.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/win_gtk.h
include/wx/gtk/window.h
include/wx/hash.h
include/wx/hashmap.h
include/wx/hashset.h
include/wx/help.h
include/wx/helpbase.h
include/wx/helphtml.h
include/wx/helpwin.h
include/wx/html/
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/htmlproc.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/htmllbox.h
include/wx/icon.h
include/wx/iconbndl.h
include/wx/iconloc.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/init.h
include/wx/intl.h
include/wx/iosfwrap.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/listbook.h
include/wx/listbox.h
include/wx/listctrl.h
include/wx/listimpl.cpp
include/wx/log.h
include/wx/longlong.h
include/wx/math.h
include/wx/matrix.h
include/wx/mdi.h
include/wx/mediactrl.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/mmedia/
include/wx/mmedia/cdbase.h
include/wx/mmedia/cdunix.h
include/wx/mmedia/cdwin.h
include/wx/mmedia/sndaiff.h
include/wx/mmedia/sndbase.h
include/wx/mmedia/sndcodec.h
include/wx/mmedia/sndcpcm.h
include/wx/mmedia/sndesd.h
include/wx/mmedia/sndfile.h
include/wx/mmedia/sndg72x.h
include/wx/mmedia/sndmsad.h
include/wx/mmedia/sndoss.h
include/wx/mmedia/sndpcm.h
include/wx/mmedia/sndulaw.h
include/wx/mmedia/sndwav.h
include/wx/mmedia/sndwin.h
include/wx/mmedia/vidbase.h
include/wx/mmedia/vidwin.h
include/wx/mmedia/vidxanm.h
include/wx/module.h
include/wx/msgdlg.h
include/wx/msgout.h
include/wx/mstream.h
include/wx/notebook.h
include/wx/numdlg.h
include/wx/object.h
include/wx/ogl/
include/wx/ogl/basic.h
include/wx/ogl/basicp.h
include/wx/ogl/bmpshape.h
include/wx/ogl/canvas.h
include/wx/ogl/composit.h
include/wx/ogl/constrnt.h
include/wx/ogl/divided.h
include/wx/ogl/drawn.h
include/wx/ogl/drawnp.h
include/wx/ogl/lines.h
include/wx/ogl/linesp.h
include/wx/ogl/mfutils.h
include/wx/ogl/misc.h
include/wx/ogl/ogl.h
include/wx/ogl/ogldiag.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/plot/
include/wx/plot/plot.h
include/wx/plot/plot_dwn.bmp
include/wx/plot/plot_enl.bmp
include/wx/plot/plot_shr.bmp
include/wx/plot/plot_up.bmp
include/wx/plot/plot_zin.bmp
include/wx/plot/plot_zot.bmp
include/wx/plot/wxplot.rc
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/propdlg.h
include/wx/protocol/
include/wx/protocol/file.h
include/wx/protocol/ftp.h
include/wx/protocol/http.h
include/wx/protocol/protocol.h
include/wx/ptr_scpd.h
include/wx/quantize.h
include/wx/radiobox.h
include/wx/radiobut.h
include/wx/rawbmp.h
include/wx/recguard.h
include/wx/regex.h
include/wx/region.h
include/wx/renderer.h
include/wx/sashwin.h
include/wx/sckaddr.h
include/wx/sckipc.h
include/wx/sckstrm.h
include/wx/scopeguard.h
include/wx/scrolbar.h
include/wx/scrolwin.h
include/wx/selstore.h
include/wx/settings.h
include/wx/sizer.h
include/wx/slider.h
include/wx/snglinst.h
include/wx/socket.h
include/wx/sound.h
include/wx/spinbutt.h
include/wx/spinctrl.h
include/wx/splash.h
include/wx/splitter.h
include/wx/sstream.h
include/wx/stack.h
include/wx/stackwalk.h
include/wx/statbmp.h
include/wx/statbox.h
include/wx/statline.h
include/wx/stattext.h
include/wx/statusbr.h
include/wx/stc/
include/wx/stc/stc.h
include/wx/stdpaths.h
include/wx/stockitem.h
include/wx/stopwatch.h
include/wx/strconv.h
include/wx/stream.h
include/wx/string.h
include/wx/svg/
include/wx/svg/dcsvg.h
include/wx/sysopt.h
include/wx/tab.h
include/wx/tabctrl.h
include/wx/taskbar.h
include/wx/tbarbase.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/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/
include/wx/unix/apptbase.h
include/wx/unix/apptrait.h
include/wx/unix/displayx11.h
include/wx/unix/execute.h
include/wx/unix/fontutil.h
include/wx/unix/gsockunx.h
include/wx/unix/joystick.h
include/wx/unix/mimetype.h
include/wx/unix/pipe.h
include/wx/unix/sound.h
include/wx/unix/stackwalk.h
include/wx/unix/stdpaths.h
include/wx/unix/taskbarx11.h
include/wx/unix/utilsx11.h
include/wx/uri.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/vidmode.h
include/wx/vlbox.h
include/wx/vms_x_fix.h
include/wx/volume.h
include/wx/vscroll.h
include/wx/wave.h
include/wx/wfstream.h
include/wx/window.h
include/wx/wizard.h
include/wx/wx.h
include/wx/wxchar.h
include/wx/wxhtml.h
include/wx/wxprec.h
include/wx/xml/
include/wx/xml/xml.h
include/wx/xpmdecod.h
include/wx/xpmhand.h
include/wx/xrc/
include/wx/xrc/xh_all.h
include/wx/xrc/xh_bmp.h
include/wx/xrc/xh_bmpbt.h
include/wx/xrc/xh_bttn.h
include/wx/xrc/xh_cald.h
include/wx/xrc/xh_chckb.h
include/wx/xrc/xh_chckl.h
include/wx/xrc/xh_choic.h
include/wx/xrc/xh_choicbk.h
include/wx/xrc/xh_combo.h
include/wx/xrc/xh_datectrl.h
include/wx/xrc/xh_dlg.h
include/wx/xrc/xh_frame.h
include/wx/xrc/xh_gauge.h
include/wx/xrc/xh_gdctl.h
include/wx/xrc/xh_html.h
include/wx/xrc/xh_listb.h
include/wx/xrc/xh_listbk.h
include/wx/xrc/xh_listc.h
include/wx/xrc/xh_mdi.h
include/wx/xrc/xh_menu.h
include/wx/xrc/xh_notbk.h
include/wx/xrc/xh_panel.h
include/wx/xrc/xh_radbt.h
include/wx/xrc/xh_radbx.h
include/wx/xrc/xh_scrol.h
include/wx/xrc/xh_scwin.h
include/wx/xrc/xh_sizer.h
include/wx/xrc/xh_slidr.h
include/wx/xrc/xh_spin.h
include/wx/xrc/xh_split.h
include/wx/xrc/xh_statbar.h
include/wx/xrc/xh_stbmp.h
include/wx/xrc/xh_stbox.h
include/wx/xrc/xh_stlin.h
include/wx/xrc/xh_sttxt.h
include/wx/xrc/xh_text.h
include/wx/xrc/xh_tglbtn.h
include/wx/xrc/xh_toolb.h
include/wx/xrc/xh_tree.h
include/wx/xrc/xh_unkwn.h
include/wx/xrc/xh_wizrd.h
include/wx/xrc/xmlres.h
include/wx/xti.h
include/wx/xtistrm.h
include/wx/xtixml.h
include/wx/zipstrm.h
include/wx/zstream.h
@lib lib/libwx_base.so.${LIBwx_base_VERSION}
@lib lib/libwx_base_net.so.${LIBwx_base_net_VERSION}
@lib lib/libwx_base_odbc.so.${LIBwx_base_odbc_VERSION}
@lib lib/libwx_base_xml.so.${LIBwx_base_xml_VERSION}
@lib lib/libwx_gtk2_adv.so.${LIBwx_gtk2_adv_VERSION}
@lib lib/libwx_gtk2_animate.so.${LIBwx_gtk2_animate_VERSION}
@lib lib/libwx_gtk2_core.so.${LIBwx_gtk2_core_VERSION}
@lib lib/libwx_gtk2_dbgrid.so.${LIBwx_gtk2_dbgrid_VERSION}
@lib lib/libwx_gtk2_deprecated.so.${LIBwx_gtk2_deprecated_VERSION}
@lib lib/libwx_gtk2_fl.so.${LIBwx_gtk2_fl_VERSION}
@lib lib/libwx_gtk2_gizmos.so.${LIBwx_gtk2_gizmos_VERSION}
@lib lib/libwx_gtk2_gizmos_xrc.so.${LIBwx_gtk2_gizmos_xrc_VERSION}
@lib lib/libwx_gtk2_gl.so.${LIBwx_gtk2_gl_VERSION}
@lib lib/libwx_gtk2_html.so.${LIBwx_gtk2_html_VERSION}
@lib lib/libwx_gtk2_media.so.${LIBwx_gtk2_media_VERSION}
@lib lib/libwx_gtk2_mmedia.so.${LIBwx_gtk2_mmedia_VERSION}
@lib lib/libwx_gtk2_ogl.so.${LIBwx_gtk2_ogl_VERSION}
@lib lib/libwx_gtk2_plot.so.${LIBwx_gtk2_plot_VERSION}
@lib lib/libwx_gtk2_qa.so.${LIBwx_gtk2_qa_VERSION}
@lib lib/libwx_gtk2_stc.so.${LIBwx_gtk2_stc_VERSION}
@lib lib/libwx_gtk2_svg.so.${LIBwx_gtk2_svg_VERSION}
@lib lib/libwx_gtk2_xrc.so.${LIBwx_gtk2_xrc_VERSION}
lib/wx/
lib/wx/config/
lib/wx/config/gtk2-unicode-release-2.6
lib/wx/include/
lib/wx/include/gtk2-unicode-release-2.6/
lib/wx/include/gtk2-unicode-release-2.6/wx/
lib/wx/include/gtk2-unicode-release-2.6/wx/setup.h
share/aclocal/wxwin.m4
share/bakefile/
share/bakefile/presets/
share/bakefile/presets/wx.bkl
share/bakefile/presets/wx_unix.bkl
share/bakefile/presets/wx_win32.bkl
share/locale/zh/
share/locale/zh/LC_MESSAGES/

View File

@ -1,14 +0,0 @@
# $OpenBSD: Makefile,v 1.6 2006/01/14 11:46:16 espie Exp $
COMMENT= "C++ cross-platform GUI toolkit - x11univ version"
PKGNAME= wxWidgets-x11univ-${VERSION}p3
SHARED_LIBS= wx_x11univ 3.0
CONFIGURE_ARGS+= --with-x11
CONFIGURE_ENV+= WX_CURRENT=${LIBwx_x11univ_VERSION:R} \
WX_REVISION=${LIBwx_x11univ_VERSION:E}
RUN_DEPENDS+= ::x11/wxWidgets/headers
WANTLIB= X11 Xpm m z
.include <bsd.port.mk>

Some files were not shown because too many files have changed in this diff Show More