5 files changed, 69 insertions, 26 deletions
diff --git a/net/ucspi-ssl/Makefile b/net/ucspi-ssl/Makefile
index fcfb2bf1537..fe62237a4d9 100644
--- a/net/ucspi-ssl/Makefile
+++ b/net/ucspi-ssl/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2017/07/22 02:58:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2018/06/18 11:00:21 schmonz Exp $
 #
 
-DISTNAME=		ucspi-ssl-0.99b
+DISTNAME=		ucspi-ssl-0.99d
 CATEGORIES=		net
-MASTER_SITES=		http://www.fehcom.de/ipnet/ucspi-ssl/
+MASTER_SITES=		https://www.fehcom.de/ipnet/ucspi-ssl/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		schmonz@NetBSD.org
-HOMEPAGE=		http://www.fehcom.de/ipnet/ucspi-ssl.html
+HOMEPAGE=		https://www.fehcom.de/ipnet/ucspi-ssl.html
 COMMENT=		Command-line tools for SSL client-server applications
 
 DEPENDS+=		ucspi-tcp-[0-9]*:../../net/ucspi-tcp
@@ -18,26 +18,45 @@ DJB_RESTRICTED=		no
 
 SSL_SCRIPTS=		https@ sslcat sslconnect
 SSL_PROGRAMS=		sslclient sslserver
+SSL_MAN1PAGES=		${SSL_SCRIPTS:S/$/.1/g} ${SSL_PROGRAMS:S/$/.1/g}
+SSL_MAN2PAGES=		ucspi-tls.2
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	do-configure
-SUBST_FILES.paths=	${SSL_SCRIPTS:S/^/src\//g:S/$/.sh/g}
-SUBST_SED.paths=	-e 's|HOME/command/|${PREFIX}/bin/|g'
-SUBST_MESSAGE.paths=	Fixing paths.
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	do-configure
+SUBST_FILES.prefix=	${SSL_SCRIPTS:S/^/src\//g:S/$/.sh/g}
+SUBST_SED.prefix=	-e 's|HOME/command/|${PREFIX}/bin/|g'
+SUBST_MESSAGE.prefix=	Fixing prefix.
 
-PLIST_SRC=		${PKGDIR}/PLIST
+SUBST_CLASSES+=		etc
+SUBST_STAGE.etc=	do-configure
+SUBST_FILES.etc=	src/dns_rcrw.c
+SUBST_SED.etc=		-e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
+SUBST_MESSAGE.etc=	Fixing prefix.
+
+PKG_USERS_VARS+=	UCSPI_SSL_USER
+PKG_GROUPS_VARS+=	UCSPI_SSL_GROUP
+PKG_GROUPS+=		${UCSPI_SSL_GROUP}
+PKG_USERS+=		${UCSPI_SSL_USER}:${UCSPI_SSL_GROUP}
+
+BUILD_DEFS+=		PKG_SYSCONFBASE
+PKG_SYSCONFSUBDIR=	${PKGBASE}
+
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+MAKE_DIRS+=		${PKG_SYSCONFDIR}
+CONF_FILES+=		${EGDIR}/dh1024.pem ${PKG_SYSCONFDIR}/dh1024.pem
 
 DJB_CONFIG_DIR=		${WRKSRC}
 DJB_CONFIG_CMDS=							\
 	${ECHO} ${PREFIX}/bin > conf-tcpbin;				\
 	${ECHO} > conf-ssl;						\
-	${ECHO} ${SSLDIR} > conf-cadir;
+	${ECHO} ${SSLDIR}/certs > conf-cadir;				\
+	${ECHO} ${PKG_SYSCONFDIR}/dh1024.pem > conf-dhfile;
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS=	bin share/doc/ucspi-ssl
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
 
-do-install:
+do-install: do-install-sslperl
 .	for i in ${SSL_SCRIPTS}
 	  ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
 .	endfor
@@ -46,9 +65,21 @@ do-install:
 	  ${INSTALL_PROGRAM} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
 .	endfor
 
-.	for i in CHANGES TODO UCSPI-SSL
+.	for i in ${SSL_MAN1PAGES}
+	  ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.	endfor
+
+.	for i in ${SSL_MAN2PAGES}
+	  ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man2
+.	endfor
+
+.	for i in dh1024.pem
+	  ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${DESTDIR}${EGDIR}
+.	endfor
+
+.	for i in CERTS CHAIN-SSL CHANGES TODO UCSPI-SSL
 	  ${INSTALL_DATA} ${WRKSRC}/doc/${i} \
-	    ${DESTDIR}${PREFIX}/share/doc/ucspi-ssl
+	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .	endfor
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/ucspi-ssl/PLIST b/net/ucspi-ssl/PLIST
index bae615bef3c..83b8c67be45 100644
--- a/net/ucspi-ssl/PLIST
+++ b/net/ucspi-ssl/PLIST
@@ -1,9 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/06/18 11:00:21 schmonz Exp $
 bin/https@
 bin/sslcat
 bin/sslclient
 bin/sslconnect
+${PLIST.perl}bin/sslperl
 bin/sslserver
+man/man1/https@.1
+man/man1/sslcat.1
+man/man1/sslclient.1
+man/man1/sslconnect.1
+man/man1/sslserver.1
+man/man2/ucspi-tls.2
+share/doc/ucspi-ssl/CERTS
+share/doc/ucspi-ssl/CHAIN-SSL
 share/doc/ucspi-ssl/CHANGES
 share/doc/ucspi-ssl/TODO
 share/doc/ucspi-ssl/UCSPI-SSL
+share/examples/ucspi-ssl/dh1024.pem
diff --git a/net/ucspi-ssl/PLIST.perl b/net/ucspi-ssl/PLIST.perl
deleted file mode 100644
index 82166a40251..00000000000
--- a/net/ucspi-ssl/PLIST.perl
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.perl,v 1.1 2006/04/02 17:44:16 schmonz Exp $
-bin/sslperl
diff --git a/net/ucspi-ssl/distinfo b/net/ucspi-ssl/distinfo
index 26960ac1a2d..d2580791e57 100644
--- a/net/ucspi-ssl/distinfo
+++ b/net/ucspi-ssl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2017/07/22 02:58:09 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2018/06/18 11:00:21 schmonz Exp $
 
-SHA1 (ucspi-ssl-0.99b.tgz) = a3022e1a3d39165f5388a87be398510228634884
-RMD160 (ucspi-ssl-0.99b.tgz) = 337f968bd66a6340c4ca4f37d302de64d14abac2
-SHA512 (ucspi-ssl-0.99b.tgz) = 02e8c5bed7d2e31ddb8fe7f02eba1ea2b4f211e9df13283690d417e5ffc6245ecaf2842b0b98fb67ff5f6323f6a9e665edee776827522816de5ef8129499ac33
-Size (ucspi-ssl-0.99b.tgz) = 112640 bytes
+SHA1 (ucspi-ssl-0.99d.tgz) = 4becb4dc26ae151b6017ef18d0330974eac40f77
+RMD160 (ucspi-ssl-0.99d.tgz) = 628b9fdb80f390465eec8d97684245c061ceca5a
+SHA512 (ucspi-ssl-0.99d.tgz) = 9e8f057dd0cda00ace623f0109fbf926f766515ec23480850ab74c2519ca1a6cb6fb04eab31a3fdfa861dbb285eaaf2a813e9db30a8fb70002c4e02379d7b5da
+Size (ucspi-ssl-0.99d.tgz) = 112640 bytes
 SHA1 (patch-src_print-dl.sh) = 456ae878c5116bbdfab1e9b4c049f6e4e80bc2b1
diff --git a/net/ucspi-ssl/options.mk b/net/ucspi-ssl/options.mk
index 9f405dc493b..2caadc671f8 100644
--- a/net/ucspi-ssl/options.mk
+++ b/net/ucspi-ssl/options.mk
@@ -1,16 +1,20 @@
-# $NetBSD: options.mk,v 1.4 2017/05/20 01:39:12 schmonz Exp $
+# $NetBSD: options.mk,v 1.5 2018/06/18 11:00:21 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ucspi-ssl
 PKG_SUPPORTED_OPTIONS+=	perl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		perl
 .if !empty(PKG_OPTIONS:Mperl)
 .include "../../lang/perl5/buildlink3.mk"
 USE_TOOLS+=		perl:run
-SSL_PROGRAMS+=		sslperl
-PLIST_SRC+=		${PKGDIR}/PLIST.perl
 DJB_CONFIG_CMDS+=	${ECHO} ${PERL5} > conf-perl;
+PLIST.perl=		yes
+do-install-sslperl:
+	${INSTALL_PROGRAM} ${WRKSRC}/command/sslperl ${DESTDIR}${PREFIX}/bin
 .else
 DJB_BUILD_ARGS+=	- sslperl
+do-install-sslperl:
+	${DO_NADA}
 .endif