CVS commit: pkgsrc/net/tcl-scotty

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Aug 19 00:26:26 UTC 2017

Modified Files:
        pkgsrc/net/tcl-scotty: distinfo
        pkgsrc/net/tcl-scotty/patches: patch-unix-Makefile.in

Log Message:
net/tcl-scotty: Install manpages into ${PKGMANDIR}.

Modify unix/Makefile.in so that the GNU configure script can
replace @mandir@ with the correct location for the installed
manpages under ${PKGMANDIR}.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/tcl-scotty/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/tcl-scotty/patches/patch-unix-Makefile.in

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

Modified files:

Index: pkgsrc/net/tcl-scotty/distinfo
diff -u pkgsrc/net/tcl-scotty/distinfo:1.20 pkgsrc/net/tcl-scotty/distinfo:1.21
--- pkgsrc/net/tcl-scotty/distinfo:1.20 Wed Feb  1 09:35:05 2017
+++ pkgsrc/net/tcl-scotty/distinfo      Sat Aug 19 00:26:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/02/01 09:35:05 he Exp $
+$NetBSD: distinfo,v 1.21 2017/08/19 00:26:26 jlam Exp $
 
 SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13
 RMD160 (scotty-2.1.11.tar.gz) = 3b4d45f3db73f05b49a46017bf2ffed6d6464b00
@@ -41,7 +41,7 @@ SHA1 (patch-tnm_snmp_tnmSnmpRecv.c) = f5
 SHA1 (patch-tnm_snmp_tnmSnmpSend.c) = 46c2b0f7c3d5f6392df96cba55b831ef763deeb7
 SHA1 (patch-tnm_snmp_tnmSnmpTcl.c) = 565d982a4e24e8033c4a16895ff503a3159a1a33
 SHA1 (patch-tnm_snmp_tnmSnmpUtil.c) = 9441f16f0be0f15689e9e628c3e96fc0c10bc942
-SHA1 (patch-unix-Makefile.in) = f5aad7fb5537855e36fe2ea444e410a7f04334d8
+SHA1 (patch-unix-Makefile.in) = 9a00bc8affad69035d7bc78955d30e4f2f8fc991
 SHA1 (patch-unix_configure) = 6d2b4b522ba802d07c0bc8346330070ae7e0edea
 SHA1 (patch-unix_scotty.c) = fdb6a9bb414566ddb5317a3ebc60d2c305f611a7
 SHA1 (patch-unix_tnmUnixIcmp.c) = 86be48d8da9d77098662e7d2515193515a028e96

Index: pkgsrc/net/tcl-scotty/patches/patch-unix-Makefile.in
diff -u pkgsrc/net/tcl-scotty/patches/patch-unix-Makefile.in:1.3 pkgsrc/net/tcl-scotty/patches/patch-unix-Makefile.in:1.4
--- pkgsrc/net/tcl-scotty/patches/patch-unix-Makefile.in:1.3    Sun Jul 12 04:59:55 2015
+++ pkgsrc/net/tcl-scotty/patches/patch-unix-Makefile.in        Sat Aug 19 00:26:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix-Makefile.in,v 1.3 2015/07/12 04:59:55 dholland Exp $
+$NetBSD: patch-unix-Makefile.in,v 1.4 2017/08/19 00:26:26 jlam Exp $
 
 Put installed files under lib/tcl, so that tcl more easily picks it
 up using e.g. "package require Tnm".
@@ -8,11 +8,14 @@ Don't initialize $(LD_SEARCH_FLAGS), fix
 Support DESTDIR installs, but not yet for the "uninstall" target,
 since that's not used in pkgsrc.
 
+Allow configure script to substitute for @mandir@ to set the
+location of the installed manpages.
+
 Use SPECIAL_PERMS instead of installing setuid directly.
 
 --- unix/Makefile.in.orig      2001-06-15 10:06:35.000000000 +0000
 +++ unix/Makefile.in
-@@ -35,13 +35,13 @@ LIB_INSTALL_DIR =       $(exec_prefix)/l
+@@ -35,16 +35,16 @@ LIB_INSTALL_DIR =       $(exec_prefix)/l
  LIB_RUNTIME_DIR =       $(exec_prefix)/lib
  
  # Directory in which to install library files belonging to the extension.
@@ -27,7 +30,11 @@ Use SPECIAL_PERMS instead of installing 
 +TKI_INSTALL_DIR =     $(prefix)/lib/tcl/tkined$(TKI_VERSION)
  
  # Top-level directory for manual entries:
- MAN_INSTALL_DIR =     $(prefix)/man
+-MAN_INSTALL_DIR =     $(prefix)/man
++MAN_INSTALL_DIR =     @mandir@
+ 
+ # Directory in which to install the manual entries:
+ MAN1_INSTALL_DIR =    $(MAN_INSTALL_DIR)/man1
 @@ -57,7 +57,7 @@ MANN_INSTALL_DIR =   $(MAN_INSTALL_DIR)/ma
  
  # To change the compiler switches, for example to change from -O