diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile index 8ff76c67e2d5..c9466a79f7cc 100644 --- a/databases/shared-mime-info/Makefile +++ b/databases/shared-mime-info/Makefile @@ -1,30 +1,28 @@ -# $NetBSD: Makefile,v 1.74 2022/04/18 19:10:45 adam Exp $ +# $NetBSD: Makefile,v 1.75 2022/10/13 11:08:43 wiz Exp $ -DISTNAME= shared-mime-info-1.10 -PKGREVISION= 6 +DISTNAME= shared-mime-info-2.2 CATEGORIES= databases -MASTER_SITES= http://people.freedesktop.org/~hadess/ -EXTRACT_SUFX= .tar.xz +MASTER_SITES= https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PKGVERSION_NOREV}/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.freedesktop.org/wiki/Software/shared-mime-info COMMENT= Core database of common types LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= YES -USE_LANGUAGES+= c99 -USE_LIBTOOL= YES -USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake intltool msgfmt pkg-config xgettext -MAKE_JOBS_SAFE= no - -CONFIGURE_ARGS+= --disable-update-mimedb +TOOL_DEPENDS+= gettext-tools>=0.19.8:../../devel/gettext-tools +TOOL_DEPENDS+= xmlto>=0:../../textproc/xmlto -# patched in Makefile.in -CHECK_PORTABILITY_SKIP+= Makefile.am +USE_LANGUAGES+= c99 +USE_TOOLS+= bash:test intltool msgfmt pkg-config xgettext .include "../../mk/bsd.prefs.mk" +# msgfmt: unknown option --xml +.if ${OPSYS} == "NetBSD" +TOOLS_PLATFORM.msgfmt= +.endif + CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" FILES_SUBST+= MIMEDB_PATH="${PREFIX}/share/mime" @@ -33,7 +31,10 @@ FILES_SUBST+= UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database" PRINT_PLIST_AWK+= /^share\/mime\/packages/ { print; next; } PRINT_PLIST_AWK+= /^share\/mime/ { next; } +# for tests +.include "../../lang/python/tool.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/meson/build.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/shared-mime-info/PLIST b/databases/shared-mime-info/PLIST index 1209b6ad1c41..f058ca9ded7a 100644 --- a/databases/shared-mime-info/PLIST +++ b/databases/shared-mime-info/PLIST @@ -1,6 +1,9 @@ -@comment $NetBSD: PLIST,v 1.24 2018/08/16 12:45:23 wiz Exp $ +@comment $NetBSD: PLIST,v 1.25 2022/10/13 11:08:43 wiz Exp $ bin/update-mime-database man/man1/update-mime-database.1 +share/gettext/its/shared-mime-info.its +share/gettext/its/shared-mime-info.loc +share/locale/af/LC_MESSAGES/shared-mime-info.mo share/locale/ar/LC_MESSAGES/shared-mime-info.mo share/locale/as/LC_MESSAGES/shared-mime-info.mo share/locale/ast/LC_MESSAGES/shared-mime-info.mo @@ -41,6 +44,7 @@ share/locale/ka/LC_MESSAGES/shared-mime-info.mo share/locale/kk/LC_MESSAGES/shared-mime-info.mo share/locale/kn/LC_MESSAGES/shared-mime-info.mo share/locale/ko/LC_MESSAGES/shared-mime-info.mo +share/locale/ky/LC_MESSAGES/shared-mime-info.mo share/locale/lt/LC_MESSAGES/shared-mime-info.mo share/locale/lv/LC_MESSAGES/shared-mime-info.mo share/locale/ml/LC_MESSAGES/shared-mime-info.mo diff --git a/databases/shared-mime-info/distinfo b/databases/shared-mime-info/distinfo index 9bb5a479b983..ff9c7b035b5a 100644 --- a/databases/shared-mime-info/distinfo +++ b/databases/shared-mime-info/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.38 2021/10/26 10:10:04 nia Exp $ +$NetBSD: distinfo,v 1.39 2022/10/13 11:08:43 wiz Exp $ -BLAKE2s (shared-mime-info-1.10.tar.xz) = ef40f02b9fc7705abdc44220b262474e6c1abd97365eb3f329e18ad1c57332e3 -SHA512 (shared-mime-info-1.10.tar.xz) = efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda -Size (shared-mime-info-1.10.tar.xz) = 616800 bytes -SHA1 (patch-Makefile.am) = 73de6b316926b29103dc9152401563d01c152b0a -SHA1 (patch-Makefile.in) = d7237ae74b408332cbf9e3d50a08118bcbf062b7 -SHA1 (patch-aa) = 2e55e6051412b06b2661f88673cb14154eef2c8a +BLAKE2s (shared-mime-info-2.2.tar.bz2) = b9c873ddc28ef0760605e5a2a0e088660ed23841df6fa41e84e3d96c701698d4 +SHA512 (shared-mime-info-2.2.tar.bz2) = e32e78435b6bbcdd5abcd1b7708a715d14310f920742e762ce1d4a4f27c1215dbd6493f816d3bf8cf32cf8635a4cee031cf7ea7bad56c4034302273f25da1065 +Size (shared-mime-info-2.2.tar.bz2) = 6428871 bytes +SHA1 (patch-src_update-mime-database.c) = c4477e3f1e1a71931be67df2556cdcf9357acb95 diff --git a/databases/shared-mime-info/patches/patch-Makefile.am b/databases/shared-mime-info/patches/patch-Makefile.am deleted file mode 100644 index b89043b7abed..000000000000 --- a/databases/shared-mime-info/patches/patch-Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-Makefile.am,v 1.1 2020/03/13 15:12:41 ryoon Exp $ - ---- Makefile.am.orig 2018-04-24 13:09:03.000000000 +0000 -+++ Makefile.am -@@ -147,7 +147,7 @@ check-translations: - RET=1; \ - fi; \ - done; \ -- if [ $$RET == 1 ] ; then exit 1; fi -+ if [ $$RET = 1 ] ; then exit 1; fi - - update-translations: create-pot - @tx pull --all --force --skip diff --git a/databases/shared-mime-info/patches/patch-Makefile.in b/databases/shared-mime-info/patches/patch-Makefile.in deleted file mode 100644 index 72321d775d63..000000000000 --- a/databases/shared-mime-info/patches/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2020/02/05 08:04:17 he Exp $ - -Don't use non-portable test operator ==. - ---- Makefile.in.orig 2018-06-28 10:02:41.000000000 +0000 -+++ Makefile.in -@@ -1238,7 +1238,7 @@ check-translations: - RET=1; \ - fi; \ - done; \ -- if [ $$RET == 1 ] ; then exit 1; fi -+ if [ $$RET = 1 ] ; then exit 1; fi - - update-translations: create-pot - @tx pull --all --force --skip diff --git a/databases/shared-mime-info/patches/patch-aa b/databases/shared-mime-info/patches/patch-src_update-mime-database.c similarity index 57% rename from databases/shared-mime-info/patches/patch-aa rename to databases/shared-mime-info/patches/patch-src_update-mime-database.c index 9f14f5167c91..8b63f305fc39 100644 --- a/databases/shared-mime-info/patches/patch-aa +++ b/databases/shared-mime-info/patches/patch-src_update-mime-database.c @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.8 2014/04/25 08:53:21 wiz Exp $ +$NetBSD: patch-src_update-mime-database.c,v 1.1 2022/10/13 11:08:43 wiz Exp $ Adapt paths for pkgsrc. ---- update-mime-database.c.orig 2013-07-09 22:10:53.000000000 +0000 -+++ update-mime-database.c -@@ -2135,7 +2135,7 @@ static void check_in_path_xdg_data(const +--- src/update-mime-database.c.orig 2022-03-27 10:19:00.000000000 +0000 ++++ src/update-mime-database.c +@@ -2174,7 +2174,7 @@ static void check_in_path_xdg_data(const env = getenv("XDG_DATA_DIRS"); if (!env)