summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-01-30 18:07:06 +0000
committerwiz <wiz@pkgsrc.org>2006-01-30 18:07:06 +0000
commit6b956f7411d9b622a40081d71dfbf01afffd1612 (patch)
tree3fa0b4345b092f8d285d072a1514ad4452c9f310 /net
parentadf8da23f989c7a95b758dd9d596f42b696cf060 (diff)
downloadpkgsrc-6b956f7411d9b622a40081d71dfbf01afffd1612.tar.gz
Fix tcpwrappers option. Since it is on by default, bump PKGREVISION.
From Hironaga KOJIMA in private mail.
Diffstat (limited to 'net')
-rw-r--r--net/vsftpd/Makefile3
-rw-r--r--net/vsftpd/options.mk12
2 files changed, 8 insertions, 7 deletions
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 366e88c10f0..679e47078d1 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -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 --git a/net/vsftpd/options.mk b/net/vsftpd/options.mk
index 8ccddc62e0f..79cae71adb4 100644
--- a/net/vsftpd/options.mk
+++ b/net/vsftpd/options.mk
@@ -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 @@ BROKEN= Needs ipv6 option enabled.
.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 @@ SUBST_STAGE.ssl= pre-configure
.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