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

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/net/ucspi-ssl/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/net/ucspi-ssl/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.17
retrieving revision 1.28
diff -u -p -r1.17 -r1.28
--- pkgsrc/net/ucspi-ssl/Makefile	2017/06/17 03:49:04	1.17
+++ pkgsrc/net/ucspi-ssl/Makefile	2019/01/18 18:18:38	1.28
@@ -1,44 +1,69 @@
-# $NetBSD: Makefile,v 1.17 2017/06/17 03:49:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2019/01/18 18:18:38 schmonz Exp $
 #
 
-DISTNAME=		ucspi-ssl-0.99
-PKGREVISION=		1
+DISTNAME=		ucspi-ssl-0.10.7
+PKGNAME=		${DISTNAME:S/-0./-0.999./}
+PKGREVISION=		2
 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
-
-WRKSRC=			${WRKDIR}/host/superscript.com/net/${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/host/superscript.com/net/${DISTNAME}
 DJB_SLASHPACKAGE=	YES
 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.
-
-PLIST_SRC=		${PKGDIR}/PLIST
+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.
+
+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;		\
+	${ECHO} ${DEFAULT_MEDIUM_CIPHERS} > conf-ciphers;
+
+# from `postconf -d | grep tls_medium_cipherlist`
+DEFAULT_MEDIUM_CIPHERS=	aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS=	bin share/doc/ucspi-ssl
+CFLAGS+=		-I${PREFIX}/include/qlibs
+LDFLAGS+=		-L${PREFIX}/lib/qlibs
 
-do-install:
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
+
+do-install: do-install-sslperl
 .	for i in ${SSL_SCRIPTS}
 	  ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
 .	endfor
@@ -47,11 +72,24 @@ 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 TLSVERSION_CIPHERSUITES TLS_1_3 TODO UCSPI-SSL
 	  ${INSTALL_DATA} ${WRKSRC}/doc/${i} \
-	    ${DESTDIR}${PREFIX}/share/doc/ucspi-ssl
+	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .	endfor
 
+.include "../../net/fehqlibs/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/djbware.mk"