CVS commit: pkgsrc/net/nicotine

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Mon Jul  3 11:54:52 UTC 2017

Modified Files:
        pkgsrc/net/nicotine: Makefile distinfo
Added Files:
        pkgsrc/net/nicotine/patches: patch-setup.py

Log Message:
support PKGLOCALEDIR


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/nicotine/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/nicotine/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/nicotine/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/net/nicotine/Makefile
diff -u pkgsrc/net/nicotine/Makefile:1.46 pkgsrc/net/nicotine/Makefile:1.47
--- pkgsrc/net/nicotine/Makefile:1.46   Sun Jan  1 14:43:50 2017
+++ pkgsrc/net/nicotine/Makefile        Mon Jul  3 11:54:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2017/01/01 14:43:50 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2017/07/03 11:54:52 wiedi Exp $
 
 DISTNAME=      nicotine-1.0.8
 PKGREVISION=   16
@@ -17,5 +17,7 @@ USE_PKGLOCALEDIR=     yes
 USE_LANGUAGES=         # empty
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-gtk2
 
+MAKE_ENV+=     PKGLOCALEDIR=$(PKGLOCALEDIR:Q)
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/nicotine/distinfo
diff -u pkgsrc/net/nicotine/distinfo:1.6 pkgsrc/net/nicotine/distinfo:1.7
--- pkgsrc/net/nicotine/distinfo:1.6    Wed Nov  4 00:35:16 2015
+++ pkgsrc/net/nicotine/distinfo        Mon Jul  3 11:54:52 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:35:16 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/07/03 11:54:52 wiedi Exp $
 
 SHA1 (nicotine-1.0.8.tar.bz2) = 8549172106c8f59da5a244382cbc5951dfbbc3fa
 RMD160 (nicotine-1.0.8.tar.bz2) = eaf4b0496f563ebf4521954b8d309ad3fcf5376d
 SHA512 (nicotine-1.0.8.tar.bz2) = fe623ec3602ca1f0c581f8857c0356c6692cd0386e9cded446438704a0a22307676e47dbbc1902c7c15e967ae0247f33db2cd8743d8a791cce6879edd124cef4
 Size (nicotine-1.0.8.tar.bz2) = 305645 bytes
+SHA1 (patch-setup.py) = d6028d23c499c3aacf6c24238c18404675b203df

Added files:

Index: pkgsrc/net/nicotine/patches/patch-setup.py
diff -u /dev/null pkgsrc/net/nicotine/patches/patch-setup.py:1.1
--- /dev/null   Mon Jul  3 11:54:52 2017
+++ pkgsrc/net/nicotine/patches/patch-setup.py  Mon Jul  3 11:54:52 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2017/07/03 11:54:52 wiedi Exp $
+
+support PKGLOCALEDIR
+--- setup.py.orig      2003-11-02 03:41:32.000000000 +0000
++++ setup.py
+@@ -19,7 +19,7 @@ for mo in mo_dirs:
+       p, lang = os.path.split(mo)
+       if lang == "nicotine.pot":
+               continue
+-      translations.append((os.path.join(sys.prefix, "share", "locale", lang, "LC_MESSAGES"), [os.path.join(mo, "nicotine.mo")]))
++      translations.append((os.path.join(sys.prefix, os.environ.get("PKGLOCALEDIR", "share"), "locale", lang, "LC_MESSAGES"), [os.path.join(mo, "nicotine.mo")]))
+       
+ if sys.platform.startswith("win"):
+   try: