CVS commit: pkgsrc/chat/gajim

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Oct  5 12:56:36 UTC 2018

Modified Files:
        pkgsrc/chat/gajim: Makefile distinfo
        pkgsrc/chat/gajim/patches: patch-setup.py

Log Message:
chat/gajim: Fix man page installation.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/chat/gajim/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/gajim/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/gajim/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/chat/gajim/Makefile
diff -u pkgsrc/chat/gajim/Makefile:1.40 pkgsrc/chat/gajim/Makefile:1.41
--- pkgsrc/chat/gajim/Makefile:1.40     Thu Sep 20 10:30:16 2018
+++ pkgsrc/chat/gajim/Makefile  Fri Oct  5 12:56:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/09/20 10:30:16 nia Exp $
+# $NetBSD: Makefile,v 1.41 2018/10/05 12:56:36 nia Exp $
 
 DISTNAME=      gajim-1.0.3
 PKGREVISION=   2
@@ -11,6 +11,10 @@ COMMENT=     XMPP/Jabber chat client written
 LICENSE=       gnu-gpl-v3
 
 USE_TOOLS+=    gettext
+
+MANCOMPRESSED= yes
+MAKE_ENV+=     PKGMANDIR=${PKGMANDIR}
+
 # needs --desktop
 _TOOLS_USE_PKGSRC.msgfmt=      yes
 

Index: pkgsrc/chat/gajim/distinfo
diff -u pkgsrc/chat/gajim/distinfo:1.5 pkgsrc/chat/gajim/distinfo:1.6
--- pkgsrc/chat/gajim/distinfo:1.5      Thu Sep 20 10:30:16 2018
+++ pkgsrc/chat/gajim/distinfo  Fri Oct  5 12:56:36 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/09/20 10:30:16 nia Exp $
+$NetBSD: distinfo,v 1.6 2018/10/05 12:56:36 nia Exp $
 
 SHA1 (gajim-1.0.3.tar.gz) = 2f59e9eb6225144676718215d1f123b54e7b1ebb
 RMD160 (gajim-1.0.3.tar.gz) = 404c7ba2e6c7062762ca301f08aacae6969150aa
 SHA512 (gajim-1.0.3.tar.gz) = eb3ff2e4fe650fd98300d25b6a19eeb8101aaa5e88b6bd9f2fdabc9168d2211b3b69de82674dc861bb19a8e7e74eb6b1e1daa2e3a3ffe9a4099c557568512f4a
 Size (gajim-1.0.3.tar.gz) = 7520798 bytes
-SHA1 (patch-setup.py) = e6c0f220c42b642af28abb4bfa83ffba3ee4d27c
+SHA1 (patch-setup.py) = f8fd2bb45d0ced7c86972218e1a0194ad35127b8

Index: pkgsrc/chat/gajim/patches/patch-setup.py
diff -u pkgsrc/chat/gajim/patches/patch-setup.py:1.2 pkgsrc/chat/gajim/patches/patch-setup.py:1.3
--- pkgsrc/chat/gajim/patches/patch-setup.py:1.2        Thu Sep 20 10:30:16 2018
+++ pkgsrc/chat/gajim/patches/patch-setup.py    Fri Oct  5 12:56:36 2018
@@ -1,31 +1,15 @@
-$NetBSD: patch-setup.py,v 1.2 2018/09/20 10:30:16 nia Exp $
-
-Don't compress man pages.
+$NetBSD: patch-setup.py,v 1.3 2018/10/05 12:56:36 nia Exp $
 
 Fix man page install location.
 
---- setup.py.orig      2018-05-19 09:02:48.000000000 +0000
+--- setup.py.orig      2018-10-05 12:43:13.496034076 +0000
 +++ setup.py
-@@ -112,11 +112,11 @@ def build_man(build_cmd):
- 
+@@ -113,7 +113,7 @@ def build_man(build_cmd):
  def install_man(install_cmd):
      data_files = install_cmd.distribution.data_files
--    man_dir = os.path.join(build_dir, 'man')
+     man_dir = os.path.join(build_dir, 'man')
 -    target = 'share/man/man1'
-+    man_dir = 'data'
-+    target = 'man/man1'
++    target = os.path.join(os.environ['PKGMANDIR'], 'man1')
  
      for man in MAN_FILES:
--        man_file_gz = os.path.join(man_dir, man + '.gz')
-+        man_file_gz = os.path.join(man_dir, man)
-         data_files.append((target, [man_file_gz]))
- 
- 
-@@ -164,7 +164,6 @@ class build(_build):
-     def run(self):
-         build_trans(self)
-         if sys.platform != 'win32':
--            build_man(self)
-             build_intl(self)
-         _build.run(self)
- 
+         man_file_gz = os.path.join(man_dir, man + '.gz')