CVS commit: pkgsrc/x11/wxGTK32

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/wxGTK32
From: "Darrin B. Jewell" <dbj%netbsd.org@localhost>
Date: Thu, 4 Aug 2022 04:49:40 +0000

Module Name:    pkgsrc
Committed By:   dbj
Date:           Thu Aug  4 04:49:40 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK32: Makefile PLIST PLIST.configure

Log Message:
x11/wxGTK32: install locale files when building with cmake

switch deafult to build with cmake


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/wxGTK32/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/wxGTK32/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/wxGTK32/PLIST.configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/wxGTK32/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.8 pkgsrc/x11/wxGTK32/Makefile:1.9
--- pkgsrc/x11/wxGTK32/Makefile:1.8     Sun Jul 31 16:57:22 2022
+++ pkgsrc/x11/wxGTK32/Makefile Thu Aug  4 04:49:40 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/07/31 16:57:22 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/08/04 04:49:40 dbj Exp $
 
 DISTNAME=      wxWidgets-3.2.0
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wxWidgets/}
 GITHUB_PROJECT=        wxWidgets
@@ -15,7 +15,7 @@ COMMENT=      Cross-platform wxWidgets GUI li
 # LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows
 LICENSE=       gnu-lgpl-v2
 
-USE_TOOLS+=            pkg-config msgfmt
+USE_TOOLS+=            pkg-config
 USE_LANGUAGES=         c c++
 
 PLIST_SRC+=            ${PLIST_SRC_DFLT}
@@ -32,17 +32,14 @@ REPLACE_SH=         wx-config.in wx-config-inpl
 # We build using configure by default
 # The software supports building using cmake but
 # the default cmake configuration is different.
-# In particular, it doesn't install proper locale data
-# and also installs unused headers.
+# In particular it installs unused headers.
 #
 # This option is expected to be a temporary hack.
 # We should fix cmake builds to match configure builds
 # and remove support for building with GNU_CONFIGURE
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wxGTK32
 PKG_SUPPORTED_OPTIONS= cmake
-.if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS= cmake
-.endif
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcmake)
@@ -103,6 +100,13 @@ SUBST_VARS.fix-paths=              PREFIX
 .endif
 
 post-install:
+       for f in ${WRKSRC}/locale/*.mo; do \
+         lang="$$(basename "$${f}" .mo)"; \
+         ${INSTALL_DATA_DIR} "${DESTDIR}/${PREFIX}/share/wx-3.2/locale/$${lang}/LC_MESSAGES"; \
+         ${INSTALL_DATA} "$${f}" "${DESTDIR}/${PREFIX}/share/wx-3.2/locale/$${lang}/LC_MESSAGES/wxstd.mo"; \
+       done
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/wx-3.2/aclocal
+       ${INSTALL_DATA} ${WRKSRC}/wxwin.m4 ${DESTDIR}${PREFIX}/share/wx-3.2/aclocal/wxwin.m4
        ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/docs/lgpl.txt ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR}

Index: pkgsrc/x11/wxGTK32/PLIST
diff -u pkgsrc/x11/wxGTK32/PLIST:1.3 pkgsrc/x11/wxGTK32/PLIST:1.4
--- pkgsrc/x11/wxGTK32/PLIST:1.3        Thu Jul 28 05:25:22 2022
+++ pkgsrc/x11/wxGTK32/PLIST    Thu Aug  4 04:49:40 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/07/28 05:25:22 dbj Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/08/04 04:49:40 dbj Exp $
 bin/wx-config-3.2
 bin/wxrc-3.2
 include/wx-3.2/wx/aboutdlg.h
@@ -802,7 +802,53 @@ lib/libwx_gtk3u_xrc-3.2.so.0.0.0
 libexec/wx-3.2/wx-config
 libexec/wx-3.2/wxrc
 libexec/wx-3.2/wxrc-3.2
+share/wx-3.2/aclocal/wxwin.m4
 share/wx-3.2/doc/wxWidgets/changes.txt
 share/wx-3.2/doc/wxWidgets/lgpl.txt
 share/wx-3.2/doc/wxWidgets/licence.txt
 share/wx-3.2/doc/wxWidgets/readme.txt
+share/wx-3.2/locale/af/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/an/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ar/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ca/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ca@valencia/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/co/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/cs/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/da/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/de/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/el/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/es/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/eu/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/fa_IR/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/fi/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/fr/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/gl_ES/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/hi/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/hr/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/hu/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/id/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/it/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ja/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ka/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ko_KR/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/lt/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/lv/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ms/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/nb/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ne/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/nl/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/pl/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/pt/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/pt_BR/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ro/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ru/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/sk/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/sl/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/sq/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/sv/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/ta/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/tr/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/uk/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/vi/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/zh_CN/LC_MESSAGES/wxstd.mo
+share/wx-3.2/locale/zh_TW/LC_MESSAGES/wxstd.mo

Index: pkgsrc/x11/wxGTK32/PLIST.configure
diff -u pkgsrc/x11/wxGTK32/PLIST.configure:1.2 pkgsrc/x11/wxGTK32/PLIST.configure:1.3
--- pkgsrc/x11/wxGTK32/PLIST.configure:1.2      Thu Jul 28 05:25:22 2022
+++ pkgsrc/x11/wxGTK32/PLIST.configure  Thu Aug  4 04:49:40 2022
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST.configure,v 1.2 2022/07/28 05:25:22 dbj Exp $
-share/wx-3.2/aclocal/wxwin.m4
+@comment $NetBSD: PLIST.configure,v 1.3 2022/08/04 04:49:40 dbj Exp $
 share/wx-3.2/bakefile/presets/wx.bkl
 share/wx-3.2/bakefile/presets/wx_presets.py
 share/wx-3.2/bakefile/presets/wx_unix.bkl

Follow-Ups:
- Re: CVS commit: pkgsrc/x11/wxGTK32
  - From: Joerg Sonnenberger

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/pkgtools/lintpkgsrc/files
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc/x11/wxGTK32
Indexes:

Home | Main Index | Thread Index | Old Index