[pkgsrc/trunk]: pkgsrc/net/vsftpd Fix tcpwrappers option. Since it is on by d...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b320e033d26
branches:  trunk
changeset: 507311:0b320e033d26
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 30 18:07:06 2006 +0000

description:
Fix tcpwrappers option. Since it is on by default, bump PKGREVISION.
>From Hironaga KOJIMA in private mail.

diffstat:

 net/vsftpd/Makefile   |   3 ++-
 net/vsftpd/options.mk |  12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r 4e71eecee369 -r 0b320e033d26 net/vsftpd/Makefile
--- a/net/vsftpd/Makefile       Mon Jan 30 17:24:49 2006 +0000
+++ b/net/vsftpd/Makefile       Mon Jan 30 18:07:06 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2006/01/13 18:12:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/30 18:07:06 wiz Exp $
 #
 
 DISTNAME=      vsftpd-2.0.4
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://vsftpd.beasts.org/users/cevans/
 
diff -r 4e71eecee369 -r 0b320e033d26 net/vsftpd/options.mk
--- a/net/vsftpd/options.mk     Mon Jan 30 17:24:49 2006 +0000
+++ b/net/vsftpd/options.mk     Mon Jan 30 18:07:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/01/13 18:12:46 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/01/30 18:07:06 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.vsftpd
 PKG_SUPPORTED_OPTIONS= inet6 ssl tcpwrappers
@@ -15,7 +15,7 @@
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 SUBST_CLASSES+=                ssl
-SUBST_FILES.ssl=       builddefs.h tunables.c vsftpd.conf.5
+SUBST_FILES.ssl=       builddefs.h
 SUBST_SED.ssl+=                -e 's,undef VSF_BUILD_SSL,define VSF_BUILD_SSL,g'
 SUBST_SED.ssl+=                -e 's,/usr/share/ssl/certs/vsftpd.pem,${SSLCERTS}/vsftpd.pem,g'
 SUBST_STAGE.ssl=       pre-configure
@@ -23,8 +23,8 @@
 
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
 .include "../../security/tcp_wrappers/buildlink3.mk"
-SUBST_CLASSES+=                tcpwrappers
-SUBST_FILES.ssl=       builddefs.h
-SUBST_SED.ssl+=                -e 's,undef VSF_BUILD_TCPWRAPPERS,define VSF_BUILD_TCPWRAPPERS,g'
-SUBST_STAGE.ssl=       pre-configure
+SUBST_CLASSES+=                        tcpwrappers
+SUBST_FILES.tcpwrappers=       builddefs.h
+SUBST_SED.tcpwrappers+=                -e 's,undef VSF_BUILD_TCPWRAPPERS,define VSF_BUILD_TCPWRAPPERS,g'
+SUBST_STAGE.tcpwrappers=       pre-configure
 .endif