From 32a4d0994415f255b685a6206478b8f2f3dbb91d Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Sat, 27 Sep 2014 10:35:48 +0000
Subject: Really fix pkglocaledir.

---
 multimedia/dvdstyler/distinfo                      |  4 ++--
 .../dvdstyler/patches/patch-locale_Makefile.in     | 27 ++++++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'multimedia/dvdstyler')

diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index 0993ddd38bb..6859eee28c7 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2014/09/25 15:06:23 jperkin Exp $
+$NetBSD: distinfo,v 1.16 2014/09/27 10:35:48 jperkin Exp $
 
 SHA1 (DVDStyler-2.7.1.tar.bz2) = e8bd2510dd7cee09a48ecfac19842a20a1232f61
 RMD160 (DVDStyler-2.7.1.tar.bz2) = 38eaa277818b67b3c79ec7e379c6b1284a73b9bb
 Size (DVDStyler-2.7.1.tar.bz2) = 5816255 bytes
 SHA1 (patch-aa) = 2629351931c11d2a3bf910fc7a3eed34486528a4
-SHA1 (patch-locale_Makefile.in) = 2b17db6e3057a974456cc220681e4d30a613bee2
+SHA1 (patch-locale_Makefile.in) = 5d5a4c6cd0baa197cabf3c630497fc8396a009ef
diff --git a/multimedia/dvdstyler/patches/patch-locale_Makefile.in b/multimedia/dvdstyler/patches/patch-locale_Makefile.in
index 9d94cc49b40..a81b53ea9d1 100644
--- a/multimedia/dvdstyler/patches/patch-locale_Makefile.in
+++ b/multimedia/dvdstyler/patches/patch-locale_Makefile.in
@@ -1,15 +1,32 @@
-$NetBSD: patch-locale_Makefile.in,v 1.1 2014/09/25 15:06:23 jperkin Exp $
+$NetBSD: patch-locale_Makefile.in,v 1.2 2014/09/27 10:35:49 jperkin Exp $
 
 Fix pkglocaledir.
 
 --- locale/Makefile.in.orig	2013-10-27 19:24:57.000000000 +0000
 +++ locale/Makefile.in
-@@ -8,7 +8,7 @@ LINGUAS=ar ca cs da de el es es_ar eu fi
+@@ -8,6 +8,7 @@ LINGUAS=ar ca cs da de el es es_ar eu fi
  
  prefix=@prefix@
  datarootdir=@datarootdir@
--DATADIR=@datadir@
-+DATADIR=@localedir@
++localedir= @localedir@
+ DATADIR=@datadir@
  INSTALL=@INSTALL@
  
- # the programs we use (TODO: use configure to detect them)
+@@ -44,14 +45,14 @@ pot:
+ 
+ install: allmo
+ 	linguas='$(LINGUAS)'; for lang in $$linguas ; do \
+-	   $(INSTALL) -d $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
++	   $(INSTALL) -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ; \
+ 	   $(INSTALL) -m 644 $$lang/$(PROGNAME).mo \
+-		$(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
++		$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
+ 	done
+ 
+ uninstall:
+ 	linguas='$(LINGUAS)'; for lang in $$linguas ; do \
+-	   rm -f $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
++	   rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
+ 	done
+ 
+ clean:
-- 
cgit v1.2.3