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

4 files changed, 25 insertions, 14 deletions

diff --git a/net/ucspi-ssl/Makefile b/net/ucspi-ssl/Makefile
index e0dc5403025..f69df23fa44 100644
--- a/net/ucspi-ssl/Makefile
+++ b/net/ucspi-ssl/Makefile
@@ -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 @@ DEPENDS+=		ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 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 @@ do-install:
 	  ${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 @@ do-install:
 	  ${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 --git a/net/ucspi-ssl/PLIST b/net/ucspi-ssl/PLIST
index 73d8d363af8..d469f76c775 100644
--- a/net/ucspi-ssl/PLIST
+++ b/net/ucspi-ssl/PLIST
@@ -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 --git a/net/ucspi-ssl/PLIST.perl b/net/ucspi-ssl/PLIST.perl
new file mode 100644
index 00000000000..82166a40251
--- /dev/null
+++ b/net/ucspi-ssl/PLIST.perl
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.perl,v 1.1 2006/04/02 17:44:16 schmonz Exp $
+bin/sslperl
diff --git a/net/ucspi-ssl/options.mk b/net/ucspi-ssl/options.mk
index 8bfa7c78033..f81fcd939b0 100644
--- a/net/ucspi-ssl/options.mk
+++ b/net/ucspi-ssl/options.mk
@@ -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