On Tue, Aug 11, 2009 at 03:39:13PM +0200, Stefan Rinkes wrote:
> 2009/6/26 Stefan Rinkes <[email protected]>:
> > Hello,
> >
> > I worked on a diff for x11/wxWidgets.
> > The reason was, that the i18n-catalog files were not created and packaged.
> >
> > With this diff the catalogs are created and packaged in the
> > wxWidget-package.
> >
> > So please test and comment this diff, so it will be commited soon.
Here's a (slightly) cleaner diff. calling ${MAKE} allmo there makes more
sense, at least to me. no idea why $upstream doesn't do this though..
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 11 Jun 2009 08:32:42 -0000 1.17
+++ Makefile 11 Aug 2009 14:48:49 -0000
@@ -5,7 +5,7 @@
COMMENT= c++ cross-platform GUI toolkit
DISTNAME= wxWidgets-2.8.7
-PKGNAME= wxWidgets-gtk2-2.8.7p4
+PKGNAME= wxWidgets-gtk2-2.8.7p5
SHARED_LIBS= wx_base 1.0 \
wx_base_net 1.0 \
wx_base_odbc 1.0 \
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 23 Oct 2007 11:28:10 -0000 1.4
+++ patches/patch-Makefile_in 11 Aug 2009 14:48:49 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.4 2007/10/23 11:28:10 steven Exp $
---- Makefile.in.orig Tue Sep 25 10:51:52 2007
-+++ Makefile.in Tue Oct 2 14:08:29 2007
+--- Makefile.in.orig Wed Nov 21 13:42:32 2007
++++ Makefile.in Tue Aug 11 16:27:54 2009
@@ -1530,7 +1530,7 @@ LOCALE_MSW_LINGUAS = it
@cond_platform_win3...@wxdllnameprefixgui = wx_$(PORTNAME)$(WXUNIVNAME)
@cond_platform_win3...@wxdllnameprefixgui = \
@@ -158,11 +158,12 @@
@cond_monolithi...@__wxlibgldep_base_p =
$(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@@ -11332,7 +11332,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@@ -11332,7 +11332,12 @@ 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)
+ cd contrib && ${MAKE}
++ cd locale && ${MAKE} allmo
+check:
+ cd tests && ${MAKE}
@@ -170,7 +171,7 @@
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_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-@@ -11345,13 +11349,14 @@ install: all $(__install_wxregex___depname)
$(__instal
+@@ -11345,13 +11350,14 @@ install: all $(__install_wxregex___depname)
$(__instal
fi; \
$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f
$(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
done
@@ -189,7 +190,7 @@
@echo " "
@echo " ------------------------------------------------------"
@echo " "
-@@ -11592,15 +11597,14 @@ distclean: clean
+@@ -11592,15 +11598,14 @@ distclean: clean
@[email protected]/wxprec_monolib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_monolib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
@@ -207,7 +208,7 @@
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ;
$(__basedll___so_symlinks_inst_cmd))
@cond_monolithic_0_share...@uninstall_basedll:
-@@ -11626,15 +11630,14 @@ distclean: clean
+@@ -11626,15 +11631,14 @@ distclean: clean
@[email protected]/wxprec_baselib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_baselib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
@@ -226,7 +227,7 @@
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ;
$(__netdll___so_symlinks_inst_cmd))
@cond_monolithic_0_share...@uninstall_netdll:
-@@ -11660,15 +11663,14 @@ distclean: clean
+@@ -11660,15 +11664,14 @@ distclean: clean
@[email protected]/wxprec_netlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_netlib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
@@ -245,7 +246,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ;
$(__coredll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_gu...@uninstall_coredll:
-@@ -11694,15 +11696,14 @@ distclean: clean
+@@ -11694,15 +11697,14 @@ distclean: clean
@[email protected]/wxprec_corelib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_corelib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
@@ -264,7 +265,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ;
$(__advdll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_gu...@uninstall_advdll:
-@@ -11728,15 +11729,14 @@ distclean: clean
+@@ -11728,15 +11730,14 @@ distclean: clean
@[email protected]/wxprec_advlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_advlib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
@@ -283,7 +284,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir)
; $(__mediadll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_gui_1_use_medi...@uninstall_mediadll:
-@@ -11762,15 +11762,14 @@ distclean: clean
+@@ -11762,15 +11763,14 @@ distclean: clean
@[email protected]/wxprec_medialib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_medialib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
@@ -302,7 +303,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ;
$(__odbcdll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_odb...@uninstall_odbcdll:
-@@ -11796,15 +11795,14 @@ distclean: clean
+@@ -11796,15 +11796,14 @@ distclean: clean
@[email protected]/wxprec_odbclib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_odbclib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
@@ -321,7 +322,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir)
; $(__dbgriddll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_gui_1_use_odb...@uninstall_dbgriddll:
-@@ -11830,15 +11828,14 @@ distclean: clean
+@@ -11830,15 +11829,14 @@ distclean: clean
@[email protected]/wxprec_dbgridlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_dbgridlib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
@@ -340,7 +341,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir)
; $(__htmldll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_gui_1_use_htm...@uninstall_htmldll:
-@@ -11864,15 +11861,14 @@ distclean: clean
+@@ -11864,15 +11862,14 @@ distclean: clean
@[email protected]/wxprec_htmllib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_htmllib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
@@ -359,7 +360,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir)
; $(__qadll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_gui_1_use_q...@uninstall_qadll:
-@@ -11898,15 +11894,14 @@ distclean: clean
+@@ -11898,15 +11895,14 @@ distclean: clean
@[email protected]/wxprec_qalib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_qalib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
@@ -378,7 +379,7 @@
@COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ;
$(__xmldll___so_symlinks_inst_cmd))
@cond_monolithic_0_share...@uninstall_xmldll:
-@@ -11932,15 +11927,14 @@ distclean: clean
+@@ -11932,15 +11928,14 @@ distclean: clean
@[email protected]/wxprec_xmllib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_xmllib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
@@ -397,7 +398,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ;
$(__xrcdll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_xr...@uninstall_xrcdll:
-@@ -11966,15 +11960,14 @@ distclean: clean
+@@ -11966,15 +11961,14 @@ distclean: clean
@[email protected]/wxprec_xrclib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_xrclib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
@@ -416,7 +417,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ;
$(__auidll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_au...@uninstall_auidll:
-@@ -12000,15 +11993,14 @@ distclean: clean
+@@ -12000,15 +11994,14 @@ distclean: clean
@[email protected]/wxprec_auilib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_auilib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
@@ -435,7 +436,7 @@
@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ;
$(__richtextdll___so_symlinks_inst_cmd))
@cond_monolithic_0_shared_1_use_richtex...@uninstall_richtextdll:
-@@ -12034,15 +12026,14 @@ distclean: clean
+@@ -12034,15 +12027,14 @@ distclean: clean
@[email protected]/wxprec_richtextlib/wx/wxprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_richtextlib/wx/wxprec.h.gch
wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 28 Oct 2008 01:22:46 -0000 1.3
+++ pkg/PLIST 11 Aug 2009 14:48:49 -0000
@@ -674,5 +674,27 @@
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/
share/locale/zh/LC_MESSAGES/
+share/locale/zh_CN/LC_MESSAGES/wxstd.mo
+share/locale/zh_TW/LC_MESSAGES/wxstd.mo
