[pkgsrc/trunk]: pkgsrc/net/ucspi-ssl Only build sslperl if option "ucspi-ssl-...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7f62aad3a4f
branches:  trunk
changeset: 510702:c7f62aad3a4f
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Apr 02 17:44:16 2006 +0000

description:
Only build sslperl if option "ucspi-ssl-perl" is enabled. Bump PKGREVISION.

diffstat:

 net/ucspi-ssl/Makefile   |  16 ++++++++--------
 net/ucspi-ssl/PLIST      |   3 +--
 net/ucspi-ssl/PLIST.perl |   2 ++
 net/ucspi-ssl/options.mk |  18 ++++++++++++++----
 4 files changed, 25 insertions(+), 14 deletions(-)

diffs (108 lines):

diff -r 49ecfd94fcbe -r c7f62aad3a4f net/ucspi-ssl/Makefile
--- a/net/ucspi-ssl/Makefile    Sun Apr 02 17:40:19 2006 +0000
+++ b/net/ucspi-ssl/Makefile    Sun Apr 02 17:44:16 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/11 20:17:58 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/02 17:44:16 schmonz Exp $
 #
 
 DISTNAME=              ucspi-ssl-0.70
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          http://www.superscript.com/ucspi-ssl/
 
@@ -14,21 +15,21 @@
 WRKSRC=                        ${WRKDIR}/host/superscript.com/net/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=      YES
 
-USE_TOOLS+=            perl:run
-
 SSL_SCRIPTS=           https@ sslcat sslconnect
+SSL_PROGRAMS=          sslclient sslserver
 
 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_MESSAGE.paths=   Fixing paths.
+
+PLIST_SRC=             ${PKGDIR}/PLIST
 
 DJB_CONFIG_CMDS=                                                       \
        ${ECHO} ${LOCALBASE}/bin > conf-tcpbin;                         \
        ${ECHO} > conf-ssl;                                             \
-       ${ECHO} ${PERL5} > conf-perl;                                   \
-       ${ECHO} ${PKG_SYSCONFDIR} > conf-cadir
+       ${ECHO} ${PKG_SYSCONFDIR} > conf-cadir;
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,7 +46,7 @@
          ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${PREFIX}/bin
 .      endfor
 
-.      for i in sslclient sslserver sslperl
+.      for i in ${SSL_PROGRAMS}
          ${INSTALL_PROGRAM} ${WRKSRC}/command/${i} ${PREFIX}/bin
 .      endfor
 
@@ -53,7 +54,6 @@
          ${INSTALL_DATA} ${WRKSRC}/src/${i} ${PREFIX}/share/doc/ucspi-ssl
 .      endfor
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 49ecfd94fcbe -r c7f62aad3a4f net/ucspi-ssl/PLIST
--- a/net/ucspi-ssl/PLIST       Sun Apr 02 17:40:19 2006 +0000
+++ b/net/ucspi-ssl/PLIST       Sun Apr 02 17:44:16 2006 +0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/11 20:17:58 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/02 17:44:16 schmonz Exp $
 bin/https@
 bin/sslcat
 bin/sslclient
 bin/sslconnect
-bin/sslperl
 bin/sslserver
 share/doc/ucspi-ssl/CHANGES
 share/doc/ucspi-ssl/TODO
diff -r 49ecfd94fcbe -r c7f62aad3a4f net/ucspi-ssl/PLIST.perl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ucspi-ssl/PLIST.perl  Sun Apr 02 17:44:16 2006 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.perl,v 1.1 2006/04/02 17:44:16 schmonz Exp $
+bin/sslperl
diff -r 49ecfd94fcbe -r c7f62aad3a4f net/ucspi-ssl/options.mk
--- a/net/ucspi-ssl/options.mk  Sun Apr 02 17:40:19 2006 +0000
+++ b/net/ucspi-ssl/options.mk  Sun Apr 02 17:44:16 2006 +0000
@@ -1,13 +1,23 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/01/11 20:17:58 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2006/04/02 17:44:16 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucspi-ssl
-PKG_SUPPORTED_OPTIONS+=        tls
+PKG_SUPPORTED_OPTIONS+=        ucspi-ssl-perl tls
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mucspi-ssl-perl)
+.include "../../lang/perl5/buildlink3.mk"
+USE_TOOLS+=            perl:run
+SSL_PROGRAMS+=         sslperl
+PLIST_SRC+=            ${PKGDIR}/PLIST.perl
+DJB_CONFIG_CMDS+=      ${ECHO} ${PERL5} > conf-perl;
+.else
+DJB_BUILD_ARGS+=       - sslperl
+.endif
+
 .if !empty(PKG_OPTIONS:Mtls)
 TLS_PATCH=             ucspi-ssl-0.70-ucspitls-0.1.patch
-PATCHFILES+=            ${TLS_PATCH}
-SITES_${TLS_PATCH}=    http://www.suspectclass.com/~sgifford/ucspi-tls/files/
+PATCHFILES+=           ${TLS_PATCH}
+SITES.${TLS_PATCH}=    http://www.suspectclass.com/~sgifford/ucspi-tls/files/
 PATCH_DIST_STRIP.${TLS_PATCH}= -p1
 .endif