summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2017-09-09 14:40:24 +0000
committerjoerg <joerg@pkgsrc.org>2017-09-09 14:40:24 +0000
commit0a63b312532230ae9bdb513ec25908e23484aadc (patch)
treeb9c9d3e7f0a46be032036b2e3f4bcea971b41d74
parent4160eda1a080bf2a41f93642be4bb8a5855036fe (diff)
downloadpkgsrc-0a63b312532230ae9bdb513ec25908e23484aadc.tar.gz
Explicitly depend on msgfmt. Use += for USE_TOOLS, it's a list. Don't
use msgfmt for desktop and appdata files, not all versions support that and it is pointless for the current version anyway.
-rw-r--r--games/hitori/Makefile4
-rw-r--r--games/hitori/distinfo3
-rw-r--r--games/hitori/patches/patch-Makefile.in26
3 files changed, 30 insertions, 3 deletions
diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index ef22c87e7f1..1709ffb35e8 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/08/29 23:38:01 prlw1 Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/09 14:40:24 joerg Exp $
DISTNAME= hitori-3.22.3
CATEGORIES= games gnome
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3 AND cc-by-sa-v3.0
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS= gmake pkg-config
+USE_TOOLS+= gmake pkg-config msgfmt
USE_PKGLOCALEDIR= yes
BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
diff --git a/games/hitori/distinfo b/games/hitori/distinfo
index 72bf608ab0b..a25bbe8b81c 100644
--- a/games/hitori/distinfo
+++ b/games/hitori/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/08/29 23:38:01 prlw1 Exp $
+$NetBSD: distinfo,v 1.8 2017/09/09 14:40:24 joerg Exp $
SHA1 (hitori-3.22.3.tar.xz) = dfdaff8560e1f2303af229a38f040bbedc0e635e
RMD160 (hitori-3.22.3.tar.xz) = ed082d6a46ce248ed3c12b1c961f3a1eddfab344
SHA512 (hitori-3.22.3.tar.xz) = a79e8f8f5e0ca4d202184fc301ddda44e2606ca911b9b3910e50f8ad218cd5047b8749e9c9798f970a107682c7f4fc49475be126c06cdd4a6914e1fa831ed7d5
Size (hitori-3.22.3.tar.xz) = 462592 bytes
+SHA1 (patch-Makefile.in) = 7e46cbba64b670cd5c105b2d7691091d8bf975c8
diff --git a/games/hitori/patches/patch-Makefile.in b/games/hitori/patches/patch-Makefile.in
new file mode 100644
index 00000000000..89ccf292a24
--- /dev/null
+++ b/games/hitori/patches/patch-Makefile.in
@@ -0,0 +1,26 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/09/09 14:40:24 joerg Exp $
+
+Don't use modern msgfmt features they don't do anything.
+
+--- Makefile.in.orig 2017-04-30 22:19:31.000000000 +0000
++++ Makefile.in
+@@ -1416,8 +1416,7 @@ check-local: check-builder
+ # Desktop file
+ %.desktop: %.desktop.in
+ @$(MKDIR_P) $(dir $@)
+- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+- -d $(top_srcdir)/po && mv $@-t $@
++ cp $< $@
+
+ check-desktop: $(desktop_DATA)
+ [ "$(DESKTOP_FILE_VALIDATE)" = "" ] || \
+@@ -1429,8 +1428,7 @@ check-local: check-desktop
+
+ %.appdata.xml: %.appdata.xml.in
+ @$(MKDIR_P) $(dir $@)
+- $(AM_V_GEN) $(MSGFMT) --xml --template $< -o $@-t \
+- -d $(top_srcdir)/po && mv $@-t $@
++ cp $< $@
+
+ # Copy all the spec files. Of course, only one is actually used.
+ dist-hook: