--- /dev/null
+--- wxBase-2.8.7/Makefile.in.old 2008-03-30 01:04:57.000000000 -0500
++++ wxBase-2.8.7/Makefile.in 2008-03-30 01:05:58.000000000 -0500
+@@ -11331,13 +11331,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
+
+ ### Targets: ###
+
+-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) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
++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) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+-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_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___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: 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_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___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)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
--- /dev/null
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxBase-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+ oe_runconf
+}
+++ /dev/null
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
-
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxBase-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.6.so*"
-
-do_configure() {
- oe_runconf
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/wx-2.6/wx
- cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
- cp -pR lib/libwx* ${STAGING_LIBDIR}
- cp -pR lib/wx ${STAGING_LIBDIR}
- cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
- cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
- ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
- sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
- -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
- -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
- -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
- -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
-}
-
-FILES_${PN} += " \
- ${libdir}/wx/config"
-
-FILES_${PN}-dev += " \
- ${libdir}/wx/include \
- ${datadir}/bakefile"
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
- ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
- install -d ${D}${docdir}/${PN}-${PV}
- install -m 644 -p CHANGES.txt ${D}${docdir}/${PN}-${PV}
- install -m 644 -p COPYING.LIB ${D}${docdir}/${PN}-${PV}
- install -m 644 -p LICENCE.txt ${D}${docdir}/${PN}-${PV}
- install -m 644 -p README.txt ${D}${docdir}/${PN}-${PV}
-}
--- /dev/null
+require wxbase.inc
+
+PR = "r0"
+
+EXTRA_OECONF = "--enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.6.so"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/wx-2.6/wx
+ cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
+ cp -pR lib/libwx* ${STAGING_LIBDIR}
+ cp -pR lib/wx ${STAGING_LIBDIR}
+ cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
+ cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
+ ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
+ sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+ -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+ -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+ -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
+}
+
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile"
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+ ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
+ install -d ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p CHANGES.txt ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p COPYING.LIB ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p LICENCE.txt ${D}${docdir}/${PN}-${PV}
+ install -m 644 -p README.txt ${D}${docdir}/${PN}-${PV}
+}
+++ /dev/null
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
-
-
-SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2"
-#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxGTK"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gui --enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.7*"
-
-do_configure() {
- oe_runconf
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/wx-2.7/wx
- cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
- cp -pR lib/libwx* ${STAGING_LIBDIR}
- cp -pR lib/wx ${STAGING_LIBDIR}
- cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
- cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
- ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
- sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
- -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
- -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
- -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
- -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
-}
-
-FILES_${PN} += " \
- ${libdir}/wx/config"
-
-FILES_${PN}-dev += " \
- ${libdir}/wx/include \
- ${datadir}/bakefile"
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
- ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
- install -d ${D}${docdir}/${PN}-${PV}
- install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV}
- install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV}
-}
--- /dev/null
+require wxbase.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+
+SRC_URI += "file://Makefile.in.patch;patch=1"
+
+EXTRA_OECONF = " --disable-gui --enable-largefile --without-subdirs "
+
+LEAD_SONAME = "libwx_base-2.8.so"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/wx-2.8/wx
+ cp -pR include/wx ${STAGING_INCDIR}/wx-2.8
+ cp -pR lib/libwx* ${STAGING_LIBDIR}
+ cp -pR lib/wx ${STAGING_LIBDIR}
+ cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal
+ ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config
+ sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+ -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+ -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+ -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+ -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8
+}
+
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include"
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+ ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${D}${bindir}/wx-config
+}