pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Update to wxGTK-2.8.10:
details: https://anonhg.NetBSD.org/pkgsrc/rev/38bb0fbdf25b
branches: trunk
changeset: 556605:38bb0fbdf25b
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Mar 23 00:38:55 2009 +0000
description:
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
diffstat:
x11/wxGTK28-contrib/Makefile | 5 +-
x11/wxGTK28-contrib/PLIST | 27 +++++----
x11/wxGTK28-contrib/buildlink3.mk | 4 +-
x11/wxGTK28/Makefile | 3 +-
x11/wxGTK28/Makefile.common | 21 +++++++-
x11/wxGTK28/PLIST | 51 ++++++++++++------
x11/wxGTK28/buildlink3.mk | 4 +-
x11/wxGTK28/distinfo | 16 ++--
x11/wxGTK28/patches/manual-bakefile.diff | 86 +++++++++++++++++--------------
x11/wxGTK28/patches/manual-regen.diff | 22 ++++++-
x11/wxGTK28/patches/patch-ab | 23 +++-----
11 files changed, 159 insertions(+), 103 deletions(-)
diffs (truncated from 500 to 300 lines):
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28-contrib/Makefile
--- a/x11/wxGTK28-contrib/Makefile Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28-contrib/Makefile Mon Mar 23 00:38:55 2009 +0000
@@ -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 @@
USE_TOOLS+= gmake
-BUILD_DIRS= contrib/src
+BUILD_DIRS= ${WRKSRC}/build-non-unicode/contrib/src \
+ ${WRKSRC}/build-unicode/contrib/src
INSTALL_TARGET= install
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28-contrib/PLIST
--- a/x11/wxGTK28-contrib/PLIST Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28-contrib/PLIST Mon Mar 23 00:38:55 2009 +0000
@@ -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/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 -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28-contrib/buildlink3.mk
--- a/x11/wxGTK28-contrib/buildlink3.mk Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28-contrib/buildlink3.mk Mon Mar 23 00:38:55 2009 +0000
@@ -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"
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28/Makefile
--- a/x11/wxGTK28/Makefile Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28/Makefile Mon Mar 23 00:38:55 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/01/08 21:58:17 shattered Exp $
+# $NetBSD: Makefile,v 1.3 2009/03/23 00:38:55 joerg Exp $
#
.include "../../x11/wxGTK28/Makefile.common"
-PKGREVISION= 1
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/}
COMMENT= GTK-based implementation of the wxWidgets GUI library
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28/Makefile.common
--- a/x11/wxGTK28/Makefile.common Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28/Makefile.common Mon Mar 23 00:38:55 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/03/23 00:38:55 joerg Exp $
#
-DISTNAME= wxGTK-2.8.8
+DISTNAME= wxGTK-2.8.10
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
EXTRACT_SUFX= .tar.bz2
@@ -14,6 +14,7 @@
PATCHFILES= ${DISTNAME}-libtool.diff.bz2
PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_DIST_STRIP.${DISTNAME}-libtool.diff.bz2= -p1
PKG_DESTDIR_SUPPORT= user-destdir
@@ -33,6 +34,22 @@
DOCDIR= ${PREFIX}/share/doc/wxGTK
+CONFIGURE_DIRS= ${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode
+
+INSTALL_MAKE_FLAGS+= LN_S="ln -fs"
+
+#CONFIGURE_ARGS+= --enable-debug
+#PLIST_SUBST+= DEBUG_LIB=d DEBUG_CONFIG=-config
+
+PLIST_SUBST+= DEBUG_LIB= DEBUG_CONFIG=-release
+
+pre-configure:
+ mkdir ${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode
+ printf '#!%s\n../configure --enable-unicode "$$@"' ${SH:Q} \
+ > ${WRKSRC}/build-unicode/configure
+ printf '#!%s\n../configure --disable-unicode "$$@"' ${SH:Q} \
+ > ${WRKSRC}/build-non-unicode/configure
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28/PLIST
--- a/x11/wxGTK28/PLIST Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28/PLIST Mon Mar 23 00:38:55 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/03/23 00:38:55 joerg Exp $
bin/wx-config
bin/wxrc
bin/wxrc-2.8
@@ -16,6 +16,7 @@
include/wx-2.8/wx/arrstr.h
include/wx-2.8/wx/artprov.h
include/wx-2.8/wx/aui/aui.h
+include/wx-2.8/wx/aui/auibar.h
include/wx-2.8/wx/aui/auibook.h
include/wx-2.8/wx/aui/dockart.h
include/wx-2.8/wx/aui/floatpane.h
@@ -540,20 +541,34 @@
include/wx-2.8/wx/xtixml.h
include/wx-2.8/wx/zipstrm.h
include/wx-2.8/wx/zstream.h
-lib/libwx_base-2.8.la
-lib/libwx_base_net-2.8.la
-lib/libwx_base_xml-2.8.la
-lib/libwx_gtk2_adv-2.8.la
-lib/libwx_gtk2_aui-2.8.la
-lib/libwx_gtk2_core-2.8.la
-lib/libwx_gtk2_gl-2.8.la
-lib/libwx_gtk2_html-2.8.la
-lib/libwx_gtk2_qa-2.8.la
-lib/libwx_gtk2_richtext-2.8.la
-lib/libwx_gtk2_xrc-2.8.la
-lib/libwxregex-2.8.la
-lib/wx/config/gtk2-ansi-release-2.8
-lib/wx/include/gtk2-ansi-release-2.8/wx/setup.h
+lib/libwx_base${DEBUG_LIB}-2.8.la
+lib/libwx_base${DEBUG_LIB}_net-2.8.la
+lib/libwx_base${DEBUG_LIB}_xml-2.8.la
+lib/libwx_baseu${DEBUG_LIB}-2.8.la
+lib/libwx_baseu${DEBUG_LIB}_net-2.8.la
+lib/libwx_baseu${DEBUG_LIB}_xml-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_adv-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_aui-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_core-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_gl-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_html-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_qa-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_richtext-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_xrc-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_adv-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_aui-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_core-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_gl-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_html-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_qa-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_richtext-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_xrc-2.8.la
+lib/libwxregex${DEBUG_LIB}-2.8.la
+lib/libwxregexu${DEBUG_LIB}-2.8.la
+lib/wx/config/gtk2-ansi${DEBUG_CONFIG}-2.8
+lib/wx/config/gtk2-unicode${DEBUG_CONFIG}-2.8
+lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8/wx/setup.h
+lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8/wx/setup.h
share/aclocal/wxwin.m4
share/bakefile/presets/wx.bkl
share/bakefile/presets/wx_unix.bkl
@@ -584,8 +599,10 @@
@dirrm share/doc/wxGTK
@dirrm share/bakefile/presets
@dirrm share/bakefile
-@dirrm lib/wx/include/gtk2-ansi-release-2.8/wx
-@dirrm lib/wx/include/gtk2-ansi-release-2.8
+@dirrm lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8/wx
+@dirrm lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8
+@dirrm lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8/wx
+@dirrm lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8
@dirrm lib/wx/include
@dirrm lib/wx/config
@dirrm lib/wx
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28/buildlink3.mk
--- a/x11/wxGTK28/buildlink3.mk Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28/buildlink3.mk Mon Mar 23 00:38:55 2009 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/23 00:38:55 joerg Exp $
BUILDLINK_TREE+= wxGTK28
.if !defined(WXGTK28_BUILDLINK3_MK)
WXGTK28_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.8
+BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10
BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28
.include "../../devel/gettext-lib/buildlink3.mk"
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28/distinfo
--- a/x11/wxGTK28/distinfo Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28/distinfo Mon Mar 23 00:38:55 2009 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2009/01/08 21:58:17 shattered Exp $
+$NetBSD: distinfo,v 1.3 2009/03/23 00:38:55 joerg Exp $
-SHA1 (wxGTK-2.8.8-libtool.diff.bz2) = f09ae6cefe70dab7383e11b4ca0abd10b44baeac
-RMD160 (wxGTK-2.8.8-libtool.diff.bz2) = 34b3c3949adc47f2ce9293f91e0cb72543c7d7bb
-Size (wxGTK-2.8.8-libtool.diff.bz2) = 154447 bytes
-SHA1 (wxGTK-2.8.8.tar.bz2) = ba33ca7efad2847c538d3df524d31b8b4011ad8a
-RMD160 (wxGTK-2.8.8.tar.bz2) = 1dc3fab9e6f4d446bbc1c104aa69cf395c56b577
-Size (wxGTK-2.8.8.tar.bz2) = 9482521 bytes
+SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
+RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
+Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
+SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
+RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
+Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
SHA1 (patch-aa) = 9cf0af5d5d9f6eaee43ed74c45e45c0a88907ad1
-SHA1 (patch-ab) = d071e5e9f8dfd9c61a527464c55bfc671a27bbd0
+SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
diff -r 555593618fa0 -r 38bb0fbdf25b x11/wxGTK28/patches/manual-bakefile.diff
--- a/x11/wxGTK28/patches/manual-bakefile.diff Mon Mar 23 00:37:41 2009 +0000
+++ b/x11/wxGTK28/patches/manual-bakefile.diff Mon Mar 23 00:38:55 2009 +0000
@@ -1,7 +1,8 @@
-diff -ur ../bakefile-0.2.3.orig/rules/autoconf.bkl ./rules/autoconf.bkl
---- ../bakefile-0.2.3.orig/rules/autoconf.bkl 2008-01-06 15:43:17.000000000 +0100
-+++ ./rules/autoconf.bkl 2008-09-08 19:43:18.000000000 +0200
-@@ -195,67 +195,19 @@
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
+
+--- rules/autoconf.bkl.orig 2008-09-20 19:58:53.000000000 +0000
++++ rules/autoconf.bkl
+@@ -199,67 +199,19 @@
<set var="__linkname1">$(__linkname)</set>
@@ -72,7 +73,7 @@
<set var="__mac_instname">$(__linkname2)</set>
<clean-files>
-@@ -278,12 +230,6 @@
+@@ -282,12 +234,6 @@
<set var="__macinstname" eval="0">
$(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
</set>
@@ -85,10 +86,11 @@
<modify-target target="install_$(id)">
<command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
-diff -ur ../bakefile-0.2.3.orig/rules/makefile.bkl ./rules/makefile.bkl
---- ../bakefile-0.2.3.orig/rules/makefile.bkl 2008-01-06 15:43:17.000000000 +0100
-+++ ./rules/makefile.bkl 2008-09-08 19:46:12.000000000 +0200
-@@ -663,7 +663,7 @@
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
+
+--- rules/makefile.bkl.orig 2008-09-20 19:58:53.000000000 +0000
++++ rules/makefile.bkl
+@@ -749,7 +749,7 @@
<define-tag name="install-to" rules="exe">
<modify-target target="install_$(id)">
<command>
@@ -97,7 +99,7 @@
</command>
Home |
Main Index |
Thread Index |
Old Index