CVS commit: pkgsrc/net/ucspi-tcp6

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jul 28 07:48:02 UTC 2018

Modified Files:
        pkgsrc/net/ucspi-tcp6: distinfo
        pkgsrc/net/ucspi-tcp6/patches: patch-package_man

Log Message:
Don't try to auto-detect mandir. Might fix SmartOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ucspi-tcp6/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ucspi-tcp6/patches/patch-package_man

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

Modified files:

Index: pkgsrc/net/ucspi-tcp6/distinfo
diff -u pkgsrc/net/ucspi-tcp6/distinfo:1.1 pkgsrc/net/ucspi-tcp6/distinfo:1.2
--- pkgsrc/net/ucspi-tcp6/distinfo:1.1  Wed Jul 25 16:22:55 2018
+++ pkgsrc/net/ucspi-tcp6/distinfo      Sat Jul 28 07:48:02 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/07/25 16:22:55 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2018/07/28 07:48:02 schmonz Exp $
 
 SHA1 (ucspi-tcp6-1.06.tgz) = bc304397b213e4bf793c28b1a79f5d14c61ca833
 RMD160 (ucspi-tcp6-1.06.tgz) = a954234a9ff35c98d6895da09bcfb1d7bb03477b
 SHA512 (ucspi-tcp6-1.06.tgz) = f27c363cce93e9e0ddc06cb84330e7535d883366e211375ba945f870599833d60cefc979f862b594626cb0a3e34ff5c256e26e337588506df599b795dc924e44
 Size (ucspi-tcp6-1.06.tgz) = 81920 bytes
-SHA1 (patch-package_man) = dabd75991f1369e14b4220e00069c9b28a82d74e
+SHA1 (patch-package_man) = 3fe66e854b7d469aa04cf0ed48625be03eb56647

Index: pkgsrc/net/ucspi-tcp6/patches/patch-package_man
diff -u pkgsrc/net/ucspi-tcp6/patches/patch-package_man:1.1 pkgsrc/net/ucspi-tcp6/patches/patch-package_man:1.2
--- pkgsrc/net/ucspi-tcp6/patches/patch-package_man:1.1 Wed Jul 25 16:22:55 2018
+++ pkgsrc/net/ucspi-tcp6/patches/patch-package_man     Sat Jul 28 07:48:02 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-package_man,v 1.1 2018/07/25 16:22:55 schmonz Exp $
+$NetBSD: patch-package_man,v 1.2 2018/07/28 07:48:02 schmonz Exp $
 
 Support DESTDIR.
 
 --- package/man.orig   2016-08-02 15:14:30.000000000 +0000
 +++ package/man
-@@ -6,6 +6,8 @@ safe() { "$@" || barf "cannot $@"; }
+@@ -6,33 +6,35 @@ safe() { "$@" || barf "cannot $@"; }
  safe umask 022
  [ -d man ] || barf "no man directory"
  
@@ -13,7 +13,22 @@ Support DESTDIR.
  mandir=""
  if [ -f conf-man ]
  then
-@@ -23,16 +25,16 @@ do
+   mandir=`head -1 conf-man`
+ fi
+ 
+-if [ ! -d "$mandir" ]
+-then
+-  mandir=`manpath | awk -F: '{print $1}'`
+-fi
+-shout "Setting man-dir: $mandir."
++#if [ ! -d "$mandir" ]
++#then
++#  mandir=`manpath | awk -F: '{print $1}'`
++#fi
++#shout "Setting man-dir: $mandir."
+ 
+ for i in `find man -name "*[1-8]"`
+ do
    all="$all $i"
  done