From 70f626b710295ed3e6f90bbbb24acee557d93399 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Fri, 1 May 2020 20:19:23 +0000
Subject: graphics/dia: fix hard-coded /usr/pkg

Detected by both pkglint and SUBST_NOOP_OK=no.
---
 graphics/dia-python/Makefile  | 4 ++--
 graphics/dia/Makefile         | 4 ++--
 graphics/dia/Makefile.common  | 4 ++--
 graphics/dia/distinfo         | 4 ++--
 graphics/dia/patches/patch-be | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'graphics')

diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index b4cf2cf6f03..5ddb8f8c1ab 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2020/03/10 22:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2020/05/01 20:19:23 rillig Exp $
 
 DIA_SUBPKG=		-python
-PKGREVISION= 11
+PKGREVISION=		12
 .include "../../graphics/dia/Makefile.common"
 
 COMMENT+=		(Python plugin)
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index f91dc760aa0..aef7d7ce99b 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.107 2020/04/25 10:51:42 nia Exp $
+# $NetBSD: Makefile,v 1.108 2020/05/01 20:19:23 rillig Exp $
 
-PKGREVISION= 16
+PKGREVISION=	17
 .include "Makefile.common"
 
 .include "options.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index 326b5463bc3..2b7d46594ef 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2019/11/02 22:37:55 rillig Exp $
+# $NetBSD: Makefile.common,v 1.31 2020/05/01 20:19:23 rillig Exp $
 #
 # used by graphics/dia-python/Makefile
 
@@ -31,7 +31,7 @@ SUBST_CLASSES+=		intl
 SUBST_MESSAGE.intl=	Fixing path to installed files.
 SUBST_STAGE.intl=	pre-configure
 SUBST_FILES.intl=	lib/intl.c
-SUBST_SED.intl=		-e 's,%%PREFIX%%,${PREFIX},g'
+SUBST_VARS.intl=	PREFIX
 
 SUBST_CLASSES+=		for
 SUBST_MESSAGE.for=	Fixing empty "for" loops.
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index f8250e716ba..062efa67236 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2019/03/23 18:12:32 gutteridge Exp $
+$NetBSD: distinfo,v 1.35 2020/05/01 20:19:23 rillig Exp $
 
 SHA1 (dia-0.97.3.tar.xz) = 316393951daebd186ba387e1cd6e34160a458c39
 RMD160 (dia-0.97.3.tar.xz) = a984efa1663cc154f4394060af37fab146f99175
@@ -6,7 +6,7 @@ SHA512 (dia-0.97.3.tar.xz) = 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e4
 Size (dia-0.97.3.tar.xz) = 5548500 bytes
 SHA1 (patch-aa) = bad171ff4f379030f05c613b362e669a53d7f6da
 SHA1 (patch-app_load_save.c) = 2956f9ad67b8270cd84a8421abbb676af29338f2
-SHA1 (patch-be) = 08db7c440eea343895cced29522dd487f11d4773
+SHA1 (patch-be) = fc6ba43fabefca18188ab0541f4be7f19d9726d6
 SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
 SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
 SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50
diff --git a/graphics/dia/patches/patch-be b/graphics/dia/patches/patch-be
index 4a0ca1dd9ad..b313f7bb06e 100644
--- a/graphics/dia/patches/patch-be
+++ b/graphics/dia/patches/patch-be
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.2 2015/06/09 08:55:23 wiz Exp $
+$NetBSD: patch-be,v 1.3 2020/05/01 20:19:23 rillig Exp $
 
 --- lib/intl.c.orig	2014-08-24 11:46:01.000000000 -0400
 +++ lib/intl.c
@@ -8,7 +8,7 @@ $NetBSD: patch-be,v 1.2 2015/06/09 08:55:23 wiz Exp $
      read_aliases ("/usr/lib/X11/locale/locale.alias");
 +    read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias");
 +    read_aliases ("/usr/X11R7/lib/X11/locale/locale.alias");
-+    read_aliases ("/usr/pkg/share/locale/locale.alias");
++    read_aliases ("@PREFIX@/share/locale/locale.alias");
      read_aliases ("/usr/openwin/lib/locale/locale.alias");
    }
    while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang))
-- 
cgit v1.2.3