From d2971959106ff626016db8b8f4409e5201d9484c Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 23 Mar 2009 00:38:55 +0000 Subject: Update to wxGTK-2.8.10: - bugfixes For pkgsrc: - fix installation of wxrc - build both Unicode and non-Unicode version, they are not API and ABI compatible and different programs either --- x11/wxGTK28-contrib/Makefile | 5 +++-- x11/wxGTK28-contrib/PLIST | 27 +++++++++++++++------------ x11/wxGTK28-contrib/buildlink3.mk | 4 ++-- 3 files changed, 20 insertions(+), 16 deletions(-) (limited to 'x11/wxGTK28-contrib') diff --git a/x11/wxGTK28-contrib/Makefile b/x11/wxGTK28-contrib/Makefile index 618d35c3f38..f4299b26bac 100644 --- a/x11/wxGTK28-contrib/Makefile +++ b/x11/wxGTK28-contrib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/23 00:38:56 joerg Exp $ # .include "../../x11/wxGTK28/Makefile.common" @@ -9,7 +9,8 @@ COMMENT= GTK-based implementation of the wxWidgets GUI library (contrib librari USE_TOOLS+= gmake -BUILD_DIRS= contrib/src +BUILD_DIRS= ${WRKSRC}/build-non-unicode/contrib/src \ + ${WRKSRC}/build-unicode/contrib/src INSTALL_TARGET= install diff --git a/x11/wxGTK28-contrib/PLIST b/x11/wxGTK28-contrib/PLIST index c5062e698f6..c5fde4a5bda 100644 --- a/x11/wxGTK28-contrib/PLIST +++ b/x11/wxGTK28-contrib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/03/23 00:38:56 joerg Exp $ include/wx-2.8/wx/fl/antiflickpl.h include/wx-2.8/wx/fl/bardragpl.h include/wx-2.8/wx/fl/barhintspl.h @@ -51,20 +51,23 @@ include/wx-2.8/wx/plot/plot_zot.bmp include/wx-2.8/wx/plot/wxplot.rc include/wx-2.8/wx/stc/stc.h include/wx-2.8/wx/svg/dcsvg.h -lib/libwx_gtk2_fl-2.8.la -lib/libwx_gtk2_gizmos-2.8.la -lib/libwx_gtk2_gizmos_xrc-2.8.la -lib/libwx_gtk2_ogl-2.8.la -lib/libwx_gtk2_plot-2.8.la -lib/libwx_gtk2_stc-2.8.la -lib/libwx_gtk2_svg-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_fl-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_gizmos-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_gizmos_xrc-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_ogl-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_plot-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_stc-2.8.la +lib/libwx_gtk2${DEBUG_LIB}_svg-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_fl-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_gizmos-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_gizmos_xrc-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_ogl-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_plot-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_stc-2.8.la +lib/libwx_gtk2u${DEBUG_LIB}_svg-2.8.la @dirrm include/wx-2.8/wx/svg @dirrm include/wx-2.8/wx/stc @dirrm include/wx-2.8/wx/plot @dirrm include/wx-2.8/wx/ogl -@exec ${MKDIR} %D/include/wx-2.8/wx/mmedia -@dirrm include/wx-2.8/wx/mmedia @dirrm include/wx-2.8/wx/gizmos @dirrm include/wx-2.8/wx/fl -@dirrm include/wx-2.8/wx -@dirrm include/wx-2.8 diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk index eb1f3cc4b28..ce71ea9a3c9 100644 --- a/x11/wxGTK28-contrib/buildlink3.mk +++ b/x11/wxGTK28-contrib/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/23 00:38:56 joerg Exp $ BUILDLINK_TREE+= wxGTK28-contrib .if !defined(WXGTK28_CONTRIB_BUILDLINK3_MK) WXGTK28_CONTRIB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.wxGTK28-contrib+= wxGTK28-contrib>=2.8.8 +BUILDLINK_API_DEPENDS.wxGTK28-contrib+= wxGTK28-contrib>=2.8.10 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib .include "../../x11/wxGTK28/buildlink3.mk" -- cgit v1.2.3