Better yet, just install manpages ourselves. Probably fixes SmartOS.

3 files changed, 9 insertions, 95 deletions

diff --git a/net/ucspi-tcp6/Makefile b/net/ucspi-tcp6/Makefile
index 8f8ae5e969e..c3bc2d5d782 100644
--- a/net/ucspi-tcp6/Makefile
+++ b/net/ucspi-tcp6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/12/14 22:52:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2018/12/16 06:40:29 schmonz Exp $
 
 DISTNAME=		ucspi-tcp6-1.10.1
 CATEGORIES=		net
@@ -20,21 +20,10 @@ DJB_CONFIG_DIR=		${WRKSRC}
 CFLAGS+=		-I${PREFIX}/include/qlibs
 LDFLAGS+=		-L${PREFIX}/lib/qlibs
 
-INSTALLATION_DIRS=	bin
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(MANZ)
-SUBST_CLASSES+=		manz
-SUBST_STAGE.manz=	do-configure
-SUBST_FILES.manz=	package/man
-SUBST_SED.manz=		-e 's|safe gzip |safe true |g'
-SUBST_SED.manz+=	-e 's|\.gz||g'
-.endif
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 post-configure:
 	${RUN}cd ${DJB_CONFIG_DIR};		\
-	${ECHO} ${PKGMANDIR} > conf-man;	\
 	${MKDIR} compile;			\
 	${ECHO} ${DJB_CONFIG_PREFIX}/bin > compile/home
 
@@ -47,7 +36,12 @@ do-install:
 	for i in date@ finger@ http@ mconnect tcpcat who@; do		\
 	  ${INSTALL_SCRIPT} command/$${i} ${DESTDIR}${PREFIX}/bin;	\
 	done;								\
-	./package/man
+	for i in *.1; do						\
+	  ${INSTALL_MAN} man/$${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/;\
+	done;								\
+	for i in *.5; do						\
+	  ${INSTALL_MAN} man/$${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/;\
+	done
 
 .include "../../net/fehqlibs/buildlink3.mk"
 .include "../../mk/djbware.mk"
diff --git a/net/ucspi-tcp6/distinfo b/net/ucspi-tcp6/distinfo
index b198ee414da..8b578d4d71c 100644
--- a/net/ucspi-tcp6/distinfo
+++ b/net/ucspi-tcp6/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/12/16 06:09:19 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2018/12/16 06:40:29 schmonz Exp $
 
 SHA1 (ucspi-tcp6-1.10.1.tgz) = effea43aa352d4800d6549723f94d2b4c4e9cd24
 RMD160 (ucspi-tcp6-1.10.1.tgz) = 6114e50579308f719db8de70c5fdcbac0fc151fe
 SHA512 (ucspi-tcp6-1.10.1.tgz) = b8962220e3fc0f4de1987401a0c6de2b6d78522b8efdbca9c53971a6d52bd050c8fd1f31d1add1336d6c23175022ae5a480f168b2ec283d506b9ca608494eb3f
 Size (ucspi-tcp6-1.10.1.tgz) = 51200 bytes
-SHA1 (patch-package_man) = 1a9d609a41aec72e9b42b2b4f6869655d540fad6
 SHA1 (patch-src_rblsmtpd.c) = 05a7e6e0560458f833e4f8cf3201c0ccc1d598b8
diff --git a/net/ucspi-tcp6/patches/patch-package_man b/net/ucspi-tcp6/patches/patch-package_man
deleted file mode 100644
index c4856ab113e..00000000000
--- a/net/ucspi-tcp6/patches/patch-package_man
+++ /dev/null
@@ -1,79 +0,0 @@
-$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 ..
-