From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 26 14:10:07 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 953BC106566C for ; Thu, 26 Jul 2012 14:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 677BC8FC0C for ; Thu, 26 Jul 2012 14:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6QEA7Rg045050 for ; Thu, 26 Jul 2012 14:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6QEA7SI045049; Thu, 26 Jul 2012 14:10:07 GMT (envelope-from gnats) Resent-Date: Thu, 26 Jul 2012 14:10:07 GMT Resent-Message-Id: <201207261410.q6QEA7SI045049@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rainer Hurling Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3479E106564A for ; Thu, 26 Jul 2012 14:08:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 1E58F8FC12 for ; Thu, 26 Jul 2012 14:08:42 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QE8f0l093345 for ; Thu, 26 Jul 2012 14:08:41 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q6QE8fN0093344; Thu, 26 Jul 2012 14:08:41 GMT (envelope-from nobody) Message-Id: <201207261408.q6QE8fN0093344@red.freebsd.org> Date: Thu, 26 Jul 2012 14:08:41 GMT From: Rainer Hurling To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/170194: [patch] x11-toolkits/wxgtk29: update to 2.9.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2012 14:10:07 -0000 >Number: 170194 >Category: ports >Synopsis: [patch] x11-toolkits/wxgtk29: update to 2.9.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jul 26 14:10:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Rainer Hurling >Release: 10.0-CURRENT amd64 >Organization: >Environment: FreeBSD xxx.xxx.xxx 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r238740: Tue Jul 24 18:08:13 CEST 2012 xxx@xxx.xxx.:/usr/obj/usr/src/sys/XXX amd64 >Description: Update x11-toolkits/wxgtk29 from version 2.9.3_1 to 2.9.4. There are many changes and some important bugfixes against 2.9.3. This version is needed for example for the upcoming version of math/saga. I am working on an update of the port for SAGA GIS. >How-To-Repeat: >Fix: The attached patch should update the port. Patch attached with submission follows: diff -Naur wxgtk29.orig/Makefile wxgtk29/Makefile --- wxgtk29.orig/Makefile 2012-06-28 17:27:07.000000000 +0200 +++ wxgtk29/Makefile 2012-07-26 16:05:52.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= wx -PORTVERSION= 2.9.3 -PORTREVISION?= 1 +PORTVERSION= 2.9.4 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= gtk2 @@ -23,7 +22,7 @@ inotify.0:${PORTSDIR}/devel/libinotify USE_BZIP2= yes -USE_XORG= x11 sm xxf86vm xinerama +USE_XORG= x11 sm xxf86vm xinerama USE_GL= glu USE_GMAKE= yes MAKE_JOBS_SAFE= yes @@ -57,10 +56,10 @@ CONFIGURE_ARGS+=--enable-mediactrl USE_GNOME+= gconf2 USE_GSTREAMER= yes -PLIST_SUB+= GSTREAMER="" +PLIST_SUB+= GSTREAMER="" .else -CONFIGURE_ARGS+=--disable-mediactrl -PLIST_SUB+= GSTREAMER="@comment " +CONFIGURE_ARGS+= --disable-mediactrl +PLIST_SUB+= GSTREAMER="@comment " .endif .if defined(WITH_MSPACK) diff -Naur wxgtk29.orig/distinfo wxgtk29/distinfo --- wxgtk29.orig/distinfo 2012-05-16 19:16:26.000000000 +0200 +++ wxgtk29/distinfo 2012-07-26 15:04:51.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (wxWidgets-2.9.3.tar.bz2) = 739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2 -SIZE (wxWidgets-2.9.3.tar.bz2) = 17180968 +SHA256 (wxWidgets-2.9.4.tar.bz2) = 6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12 +SIZE (wxWidgets-2.9.4.tar.bz2) = 17045208 diff -Naur wxgtk29.orig/files/patch-Makefile.in wxgtk29/files/patch-Makefile.in --- wxgtk29.orig/files/patch-Makefile.in 2011-02-18 12:06:54.000000000 +0100 +++ wxgtk29/files/patch-Makefile.in 2012-07-26 15:21:41.000000000 +0200 @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2010-07-18 20:39:20.000000000 +0700 -+++ Makefile.in 2011-02-18 15:33:56.000000000 +0600 +--- Makefile.in.orig 2012-07-08 12:28:27.000000000 +0200 ++++ Makefile.in 2012-07-26 15:20:50.000000000 +0200 @@ -25,6 +25,7 @@ SONAME_FLAG = @SONAME_FLAG@ STRIP = @STRIP@ @@ -8,30 +8,30 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ -@@ -13465,9 +13466,9 @@ +@@ -14775,9 +14776,10 @@ - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_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_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___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_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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) + (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) + (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) + (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done) $(DYLIB_RPATH_INSTALL) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx for f in setup.h $(RCDEFS_H); do \ -@@ -14308,9 +14309,7 @@ +@@ -15660,9 +15662,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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -14318,7 +14317,7 @@ +@@ -15670,7 +15670,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/$$l.mo ; then \ diff -Naur wxgtk29.orig/pkg-plist wxgtk29/pkg-plist --- wxgtk29.orig/pkg-plist 2012-06-08 15:07:13.000000000 +0200 +++ wxgtk29/pkg-plist 2012-07-26 15:53:22.000000000 +0200 @@ -25,6 +25,8 @@ include/wx-2.9/wx/aui/dockart.h include/wx-2.9/wx/aui/floatpane.h include/wx-2.9/wx/aui/framemanager.h +include/wx-2.9/wx/aui/tabart.h +include/wx-2.9/wx/aui/tabartgtk.h include/wx-2.9/wx/aui/tabmdi.h include/wx-2.9/wx/bannerwindow.h include/wx-2.9/wx/base64.h @@ -247,10 +249,6 @@ include/wx-2.9/wx/gtk/dataobj.h include/wx-2.9/wx/gtk/dataobj2.h include/wx-2.9/wx/gtk/dataview.h -include/wx-2.9/wx/gtk/dc.h -include/wx-2.9/wx/gtk/dcclient.h -include/wx-2.9/wx/gtk/dcmemory.h -include/wx-2.9/wx/gtk/dcscreen.h include/wx-2.9/wx/gtk/dialog.h include/wx-2.9/wx/gtk/dirdlg.h include/wx-2.9/wx/gtk/dnd.h @@ -284,7 +282,6 @@ include/wx-2.9/wx/gtk/pen.h include/wx-2.9/wx/gtk/popupwin.h include/wx-2.9/wx/gtk/print.h -include/wx-2.9/wx/gtk/private/win_gtk.h include/wx-2.9/wx/gtk/radiobox.h include/wx-2.9/wx/gtk/radiobut.h include/wx-2.9/wx/gtk/region.h @@ -699,57 +696,65 @@ include/wx-2.9/wx/zipstrm.h include/wx-2.9/wx/zstream.h lib/libwx_baseu-2.9.so -lib/libwx_baseu-2.9.so.3 -lib/libwx_baseu-2.9.so.3.0.0 +lib/libwx_baseu-2.9.so.4 +lib/libwx_baseu-2.9.so.4.0.0 lib/libwx_baseu_net-2.9.so -lib/libwx_baseu_net-2.9.so.3 -lib/libwx_baseu_net-2.9.so.3.0.0 +lib/libwx_baseu_net-2.9.so.4 +lib/libwx_baseu_net-2.9.so.4.0.0 lib/libwx_baseu_xml-2.9.so -lib/libwx_baseu_xml-2.9.so.3 -lib/libwx_baseu_xml-2.9.so.3.0.0 +lib/libwx_baseu_xml-2.9.so.4 +lib/libwx_baseu_xml-2.9.so.4.0.0 lib/libwx_gtk2u_adv-2.9.so -lib/libwx_gtk2u_adv-2.9.so.3 -lib/libwx_gtk2u_adv-2.9.so.3.0.0 +lib/libwx_gtk2u_adv-2.9.so.4 +lib/libwx_gtk2u_adv-2.9.so.4.0.0 lib/libwx_gtk2u_aui-2.9.so -lib/libwx_gtk2u_aui-2.9.so.3 -lib/libwx_gtk2u_aui-2.9.so.3.0.0 +lib/libwx_gtk2u_aui-2.9.so.4 +lib/libwx_gtk2u_aui-2.9.so.4.0.0 lib/libwx_gtk2u_core-2.9.so -lib/libwx_gtk2u_core-2.9.so.3 -lib/libwx_gtk2u_core-2.9.so.3.0.0 +lib/libwx_gtk2u_core-2.9.so.4 +lib/libwx_gtk2u_core-2.9.so.4.0.0 lib/libwx_gtk2u_gl-2.9.so -lib/libwx_gtk2u_gl-2.9.so.3 -lib/libwx_gtk2u_gl-2.9.so.3.0.0 +lib/libwx_gtk2u_gl-2.9.so.4 +lib/libwx_gtk2u_gl-2.9.so.4.0.0 lib/libwx_gtk2u_html-2.9.so -lib/libwx_gtk2u_html-2.9.so.3 -lib/libwx_gtk2u_html-2.9.so.3.0.0 -%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so -%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so.3 -%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so.3.0.0 +lib/libwx_gtk2u_html-2.9.so.4 +lib/libwx_gtk2u_html-2.9.so.4.0.0 +lib/libwx_gtk2u_media-2.9.so +lib/libwx_gtk2u_media-2.9.so.4 +lib/libwx_gtk2u_media-2.9.so.4.0.0 lib/libwx_gtk2u_propgrid-2.9.so -lib/libwx_gtk2u_propgrid-2.9.so.3 -lib/libwx_gtk2u_propgrid-2.9.so.3.0.0 +lib/libwx_gtk2u_propgrid-2.9.so.4 +lib/libwx_gtk2u_propgrid-2.9.so.4.0.0 lib/libwx_gtk2u_qa-2.9.so -lib/libwx_gtk2u_qa-2.9.so.3 -lib/libwx_gtk2u_qa-2.9.so.3.0.0 +lib/libwx_gtk2u_qa-2.9.so.4 +lib/libwx_gtk2u_qa-2.9.so.4.0.0 lib/libwx_gtk2u_ribbon-2.9.so -lib/libwx_gtk2u_ribbon-2.9.so.3 -lib/libwx_gtk2u_ribbon-2.9.so.3.0.0 +lib/libwx_gtk2u_ribbon-2.9.so.4 +lib/libwx_gtk2u_ribbon-2.9.so.4.0.0 lib/libwx_gtk2u_richtext-2.9.so -lib/libwx_gtk2u_richtext-2.9.so.3 -lib/libwx_gtk2u_richtext-2.9.so.3.0.0 +lib/libwx_gtk2u_richtext-2.9.so.4 +lib/libwx_gtk2u_richtext-2.9.so.4.0.0 lib/libwx_gtk2u_stc-2.9.so -lib/libwx_gtk2u_stc-2.9.so.3 -lib/libwx_gtk2u_stc-2.9.so.3.0.0 +lib/libwx_gtk2u_stc-2.9.so.4 +lib/libwx_gtk2u_stc-2.9.so.4.0.0 +lib/libwx_gtk2u_webview-2.9.so +lib/libwx_gtk2u_webview-2.9.so.4 +lib/libwx_gtk2u_webview-2.9.so.4.0.0 lib/libwx_gtk2u_xrc-2.9.so -lib/libwx_gtk2u_xrc-2.9.so.3 -lib/libwx_gtk2u_xrc-2.9.so.3.0.0 +lib/libwx_gtk2u_xrc-2.9.so.4 +lib/libwx_gtk2u_xrc-2.9.so.4.0.0 lib/wx/include/gtk2-unicode-2.9/wx/setup.h share/aclocal/wxwin29.m4 +share/bakefile/presets/wx.bkl share/bakefile/presets/wx29.bkl share/bakefile/presets/wx29_presets.py share/bakefile/presets/wx29_unix.bkl share/bakefile/presets/wx29_win32.bkl share/bakefile/presets/wx29_xrc.bkl +share/bakefile/presets/wx_presets.py +share/bakefile/presets/wx_unix.bkl +share/bakefile/presets/wx_win32.bkl +share/bakefile/presets/wx_xrc.bkl @dirrmtry share/bakefile/presets @dirrmtry share/bakefile @dirrm lib/wx/include/gtk2-unicode-2.9/wx @@ -767,7 +772,6 @@ @dirrm include/wx-2.9/wx/persist @dirrm include/wx-2.9/wx/meta @dirrm include/wx-2.9/wx/html -@dirrm include/wx-2.9/wx/gtk/private @dirrm include/wx-2.9/wx/gtk/hildon @dirrm include/wx-2.9/wx/gtk/gnome @dirrm include/wx-2.9/wx/gtk >Release-Note: >Audit-Trail: >Unformatted: