5 files changed, 65 insertions, 35 deletions

diff --git a/x11-toolkits/wxgtk26-common/Makefile b/x11-toolkits/wxgtk26-common/Makefile
index 3ad84ec3dd16..7ab1bc1bcae3 100644
--- a/x11-toolkits/wxgtk26-common/Makefile
+++ b/x11-toolkits/wxgtk26-common/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit (common files)
diff --git a/x11-toolkits/wxgtk26-common/pkg-plist b/x11-toolkits/wxgtk26-common/pkg-plist
index 0e470d5a294e..f70473a288aa 100644
--- a/x11-toolkits/wxgtk26-common/pkg-plist
+++ b/x11-toolkits/wxgtk26-common/pkg-plist
@@ -455,34 +455,33 @@ include/wx-2.6/wx/xtistrm.h
 include/wx-2.6/wx/xtixml.h
 include/wx-2.6/wx/zipstrm.h
 include/wx-2.6/wx/zstream.h
-share/aclocal/wxwin.m4
-share/bakefile/presets/wx.bkl
-share/bakefile/presets/wx_unix.bkl
-share/bakefile/presets/wx_win32.bkl
-share/locale/ca/LC_MESSAGES/wxstd.mo
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxmsw.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-@dirrm share/bakefile/presets
-@dirrm share/bakefile
+share/aclocal/wxwin26.m4
+share/bakefile/presets/wx26.bkl
+share/bakefile/presets/wx26_unix.bkl
+share/bakefile/presets/wx26_win32.bkl
+share/locale/ca/LC_MESSAGES/wxstd26.mo
+share/locale/cs/LC_MESSAGES/wxstd26.mo
+share/locale/da/LC_MESSAGES/wxstd26.mo
+share/locale/de/LC_MESSAGES/wxstd26.mo
+share/locale/el/LC_MESSAGES/wxstd26.mo
+share/locale/es/LC_MESSAGES/wxstd26.mo
+share/locale/fi/LC_MESSAGES/wxstd26.mo
+share/locale/fr/LC_MESSAGES/wxstd26.mo
+share/locale/hu/LC_MESSAGES/wxstd26.mo
+share/locale/id/LC_MESSAGES/wxstd26.mo
+share/locale/it/LC_MESSAGES/wxstd26.mo
+share/locale/ja/LC_MESSAGES/wxstd26.mo
+share/locale/nl/LC_MESSAGES/wxstd26.mo
+share/locale/pl/LC_MESSAGES/wxstd26.mo
+share/locale/ru/LC_MESSAGES/wxstd26.mo
+share/locale/sl/LC_MESSAGES/wxstd26.mo
+share/locale/sv/LC_MESSAGES/wxstd26.mo
+share/locale/tr/LC_MESSAGES/wxstd26.mo
+share/locale/uk/LC_MESSAGES/wxstd26.mo
+share/locale/zh_CN/LC_MESSAGES/wxstd26.mo
+share/locale/zh_TW/LC_MESSAGES/wxstd26.mo
+@dirrmtry share/bakefile/presets
+@dirrmtry share/bakefile
 @dirrm include/wx-2.6/wx/xrc
 @dirrm include/wx-2.6/wx/xml
 @dirrm include/wx-2.6/wx/unix
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index ab643d3cc2c1..76c47b24505b 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -52,7 +52,7 @@ PLIST=		${.CURDIR}/pkg-plist
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	1
+PORTREVISION=	2
 CONFLICTS=	wxgtk2-contrib-devel-2.5.2*
 .endif
 
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
index c4a0015bafa5..0ba321f4834c 100644
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Mar 21 11:39:27 2006
-+++ Makefile.in	Tue Mar 21 11:54:48 2006
+--- Makefile.in.orig	Wed Mar 22 05:42:05 2006
++++ Makefile.in	Tue Jan  9 00:08:38 2007
 @@ -24,6 +24,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -17,11 +17,12 @@
 +	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
 +	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
 +
-+install-common: locale_install locale_msw_install
++install-common: locale_install
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- 	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(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 $(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 \
@@ -29,6 +30,7 @@
 -	fi; \
 -	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
 -	done
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in $(ALL_HEADERS); do \
  	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
@@ -43,3 +45,12 @@
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -9941,7 +9937,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
new file mode 100644
index 000000000000..7d964d6826d1
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
@@ -0,0 +1,20 @@
+--- src/common/intl.cpp.orig	Wed Mar 22 05:42:10 2006
++++ src/common/intl.cpp	Tue Jan  9 00:27:17 2007
+@@ -1452,6 +1452,8 @@
+   m_initialized = false;
+ }
+ 
++#define wxSTRINGIZE2(x)	wxSTRINGIZE(x)
++
+ // NB: this function has (desired) side effect of changing current locale
+ bool wxLocale::Init(const wxChar *szName,
+                     const wxChar *szShort,
+@@ -1520,7 +1522,7 @@
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist