head 1.6; access; symbols pkgsrc-2018Q3:1.2.0.2 pkgsrc-2018Q3-base:1.2; locks; strict; comment @# @; 1.6 date 2018.12.16.06.40.29; author schmonz; state dead; branches; next 1.5; commitid jtA2fkHanhmhsZ3B; 1.5 date 2018.12.16.06.09.20; author schmonz; state Exp; branches; next 1.4; commitid jKUfVOZeczhAhZ3B; 1.4 date 2018.12.14.22.52.15; author schmonz; state Exp; branches; next 1.3; commitid y1d2yGChzaNHTO3B; 1.3 date 2018.10.07.12.55.16; author schmonz; state Exp; branches; next 1.2; commitid HvrqSa5gwmHqM1VA; 1.2 date 2018.07.28.07.48.02; author schmonz; state Exp; branches; next 1.1; commitid jAlXanqm7nunmSLA; 1.1 date 2018.07.25.16.22.55; author schmonz; state Exp; branches; next ; commitid iKcwxmGIRAg7jxLA; desc @@ 1.6 log @Better yet, just install manpages ourselves. Probably fixes SmartOS. @ text @$NetBSD: patch-package_man,v 1.5 2018/12/16 06:09:20 schmonz Exp $ Support DESTDIR. Avoid nroff. --- package/man.orig 2018-11-10 19:42:10.000000000 +0000 +++ package/man @@@@ -10,20 +10,11 @@@@ mandir="" usemanpath=0 usemandoc=0 -if [ `which manpath` 2>/dev/null ] -then - usemanpath=1 -fi - -if [ `which mandoc` 2>/dev/null ] -then - usemandoc=1 - shout "Using mandoc facility for man files." -fi - safe umask 022 [ -d man ] || barf "no man directory" +destdir=`head -1 conf-destdir` + if [ -f conf-man ] then mandir=`head -1 conf-man` @@@@ -49,16 +40,18 @@@@ else fi cd man +if false; then if [ $usemandoc -eq 1 ] then safe make -f Makefile.mandoc else safe make fi +fi if [ $usemandoc -eq 0 ] then - shout "Installing ${me} compressed man-files in ${mandir}." + shout "Installing ${me} man-files in ${mandir}." else shout "Installing ${me} un-compressed man-files in ${mandir}." fi @@@@ -71,11 +64,11 @@@@ done for manfile in $all do dir="man`echo $manfile | awk -F. '{print $NF}'`" - [ -d $mandir/$dir ] || safe mkdir $mandir/$dir + [ -d $destdir/$mandir/$dir ] || safe mkdir $destdir/$mandir/$dir if [ $usemandoc -eq 0 ] then safe gzip $manfile && \ - cp "$manfile.gz" "$mandir/$dir/$manfile.gz" + cp "$manfile.gz" "$destdir/$mandir/$dir/$manfile.gz" else safe cp "$manfile" "$mandir/$dir/$manfile" fi @@@@ -83,6 +76,7 @@@@ done ## nroff: Required for old catman systems only +if false; then if [ $usemandoc -eq 0 ] then shout "Installing ${me} nroff'ed man-files in ${mandir}/catX." @@@@ -119,6 +113,7 @@@@ else shout "Installing ${me} mandoc files in db (man -w)." fi fi +fi cd .. @ 1.5 log @Avoid nroff. Fixes FreeBSD build. @ text @d1 1 a1 1 $NetBSD: patch-package_man,v 1.4 2018/12/14 22:52:15 schmonz Exp $ @ 1.4 log @Update to 1.10.1. From the changelog: - Added socket_dualstack option for OS using IPv6_V6ONLY as default. - fehQlibs-10 required. @ text @d1 1 a1 1 $NetBSD: patch-package_man,v 1.3 2018/10/07 12:55:16 schmonz Exp $ d3 1 a3 1 Support DESTDIR. d30 12 a41 1 @@@@ -58,7 +49,7 @@@@ fi d50 1 a50 1 @@@@ -71,11 +62,11 @@@@ done d64 16 @ 1.3 log @Update to 1.10. From the changelog: - complete new build upon fehQlibs. - tcprules delimiter can be customized via #define DELIMITER in tcprules.c. - Removed options '-4' and '-6' for shell scripts and fixed bugs. - Native handling of IPv4 and IPv6 addresses for tcpclient. @ text @d1 1 a1 1 $NetBSD: patch-package_man,v 1.2 2018/07/28 07:48:02 schmonz Exp $ d5 1 a5 1 --- package/man.orig 2018-08-27 21:16:33.000000000 +0000 d7 1 a7 1 @@@@ -9,20 +9,11 @@@@ mandir="" d30 1 a30 1 @@@@ -57,7 +48,7 @@@@ fi d39 1 a39 1 @@@@ -70,11 +61,11 @@@@ done d48 2 a49 2 - install -m 644 "$manfile.gz" $mandir/$dir/"${manfile#*/}.gz" + install -m 644 "$manfile.gz" $destdir/$mandir/$dir/"${manfile#*/}.gz" d51 1 a51 1 safe install -m 644 $manfile $mandir/$dir/${manfile#*./} @ 1.2 log @Don't try to auto-detect mandir. Might fix SmartOS build. @ text @d1 1 a1 1 $NetBSD: patch-package_man,v 1.1 2018/07/25 16:22:55 schmonz Exp $ d5 1 a5 1 --- package/man.orig 2016-08-02 15:14:30.000000000 +0000 d7 15 a21 1 @@@@ -6,33 +6,35 @@@@ safe() { "$@@" || barf "cannot $@@"; } a26 1 mandir="" d29 9 a37 1 mandir=`head -1 conf-man` d39 2 a40 13 -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]"` d42 5 a46 13 all="$all $i" done -shout "Installing ucspi-tcp6 compressed man-files in ${mandir}." +shout "Installing ucspi-tcp6 man-files in ${destdir}/${mandir}." if [ $# -eq 0 ] then for manfile in $all do dir="man`echo $manfile | awk -F. '{print $NF}'`" - safe mkdir -p $mandir/$dir + safe mkdir -p $destdir/$mandir/$dir d50 3 a52 3 done fi @ 1.1 log @Add ucspi-tcp6, a fork of ucspi-tcp with more features, including: - rblsmtpd Greetdelay add-on and removal of the compiled-in default-RBL - Felix von Leitner's's IPv6 patch ucspi-tcp-0.88-ipv6.diff19.bz2 - Jens Wehrenbrecht's IPv4 CIDR extension - Li Minh Bui's IPv6 support for compactified IPv6 addresses and CIDR notation support @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -6,6 +6,8 @@@@ safe() { "$@@" || barf "cannot $@@"; } d16 16 a31 1 @@@@ -23,16 +25,16 @@@@ do @