Sat Sep 17 11:12:26 2011 UTC ()
PR/39143 -- use generic 'perl' option instead of private one.


(shattered)
diff -r1.1 -r1.2 pkgsrc/net/oinkmaster/options.mk
diff -r1.2 -r1.3 pkgsrc/net/ucspi-ssl/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/net/oinkmaster/options.mk (expand / switch to unified diff)

--- pkgsrc/net/oinkmaster/options.mk 2008/12/08 13:05:22 1.1
+++ pkgsrc/net/oinkmaster/options.mk 2011/09/17 11:12:26 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: options.mk,v 1.1 2008/12/08 13:05:22 adrianp Exp $ 1# $NetBSD: options.mk,v 1.2 2011/09/17 11:12:26 shattered Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.oinkmaster 3PKG_OPTIONS_VAR= PKG_OPTIONS.oinkmaster
4 4
5PKG_SUPPORTED_OPTIONS= oinkmaster-perl-tools 5PKG_SUPPORTED_OPTIONS= perl
 6PKG_OPTIONS_LEGACY_OPTS+= oinkmaster-perl-tools:perl
6 7
7.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
8 9
9### 10###
10### Use perl tools for downloading rule files 11### Use perl tools for downloading rule files
11### 12###
12.if !empty(PKG_OPTIONS:Moinkmaster-perl-tools) 13.if !empty(PKG_OPTIONS:Mperl)
13DEPENDS+= p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar 14DEPENDS+= p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar
14DEPENDS+= p5-IO-Zlib-[0-9]*:../../devel/p5-IO-Zlib 15DEPENDS+= p5-IO-Zlib-[0-9]*:../../devel/p5-IO-Zlib
15DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww 16DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
16.else 17.else
17DEPENDS+= wget>=1.00:../../net/wget 18DEPENDS+= wget>=1.00:../../net/wget
18.endif 19.endif
cvs diff -r1.2 -r1.3 pkgsrc/net/ucspi-ssl/options.mk (expand / switch to unified diff)

--- pkgsrc/net/ucspi-ssl/options.mk 2006/04/02 17:44:16 1.2
+++ pkgsrc/net/ucspi-ssl/options.mk 2011/09/17 11:12:26 1.3
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: options.mk,v 1.2 2006/04/02 17:44:16 schmonz Exp $ 1# $NetBSD: options.mk,v 1.3 2011/09/17 11:12:26 shattered Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ucspi-ssl 3PKG_OPTIONS_VAR= PKG_OPTIONS.ucspi-ssl
4PKG_SUPPORTED_OPTIONS+= ucspi-ssl-perl tls 4PKG_SUPPORTED_OPTIONS+= perl tls
 5PKG_OPTIONS_LEGACY_OPTS+= ucspi-ssl-perl:perl
5 6
6.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
7 8
8.if !empty(PKG_OPTIONS:Mucspi-ssl-perl) 9.if !empty(PKG_OPTIONS:Mperl)
9.include "../../lang/perl5/buildlink3.mk" 10.include "../../lang/perl5/buildlink3.mk"
10USE_TOOLS+= perl:run 11USE_TOOLS+= perl:run
11SSL_PROGRAMS+= sslperl 12SSL_PROGRAMS+= sslperl
12PLIST_SRC+= ${PKGDIR}/PLIST.perl 13PLIST_SRC+= ${PKGDIR}/PLIST.perl
13DJB_CONFIG_CMDS+= ${ECHO} ${PERL5} > conf-perl; 14DJB_CONFIG_CMDS+= ${ECHO} ${PERL5} > conf-perl;
14.else 15.else
15DJB_BUILD_ARGS+= - sslperl 16DJB_BUILD_ARGS+= - sslperl
16.endif 17.endif
17 18
18.if !empty(PKG_OPTIONS:Mtls) 19.if !empty(PKG_OPTIONS:Mtls)
19TLS_PATCH= ucspi-ssl-0.70-ucspitls-0.1.patch 20TLS_PATCH= ucspi-ssl-0.70-ucspitls-0.1.patch
20PATCHFILES+= ${TLS_PATCH} 21PATCHFILES+= ${TLS_PATCH}
21SITES.${TLS_PATCH}= http://www.suspectclass.com/~sgifford/ucspi-tls/files/ 22SITES.${TLS_PATCH}= http://www.suspectclass.com/~sgifford/ucspi-tls/files/