CVS commit: pkgsrc/net/ucspi-tcp6

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Dec 16 06:40:29 UTC 2018

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

Log Message:
Better yet, just install manpages ourselves. Probably fixes SmartOS.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ucspi-tcp6/Makefile \
    pkgsrc/net/ucspi-tcp6/distinfo
cvs rdiff -u -r1.5 -r0 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/Makefile
diff -u pkgsrc/net/ucspi-tcp6/Makefile:1.6 pkgsrc/net/ucspi-tcp6/Makefile:1.7
--- pkgsrc/net/ucspi-tcp6/Makefile:1.6  Fri Dec 14 22:52:15 2018
+++ pkgsrc/net/ucspi-tcp6/Makefile      Sun Dec 16 06:40:29 2018
@@ -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"
Index: pkgsrc/net/ucspi-tcp6/distinfo
diff -u pkgsrc/net/ucspi-tcp6/distinfo:1.6 pkgsrc/net/ucspi-tcp6/distinfo:1.7
--- pkgsrc/net/ucspi-tcp6/distinfo:1.6  Sun Dec 16 06:09:19 2018
+++ pkgsrc/net/ucspi-tcp6/distinfo      Sun Dec 16 06:40:29 2018
@@ -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