diff options
| author | tv <tv> | 2007-01-03 15:54:56 +0000 |
|---|---|---|
| committer | tv <tv> | 2007-01-03 15:54:56 +0000 |
| commit | 59371e109b66719582f55a8d5f0729a7fb62cd19 (patch) | |
| tree | 8f1bdf49aab6e1177a7557327904a3a871217e3f /net/vsftpd | |
| parent | 2cd7496a4c813aa68f6d9ea252697f2b0d083f97 (diff) | |
| download | pkgsrc-59371e109b66719582f55a8d5f0729a7fb62cd19.tar.gz | |
Require "inet6" option instead of using deprecated USE_INET6; also don't
set that in PKG_SUGGESTED_OPTIONS (it's up to bsd.pkg.mk to do that).
Diffstat (limited to 'net/vsftpd')
| -rw-r--r-- | net/vsftpd/Makefile | 6 | ||||
| -rw-r--r-- | net/vsftpd/options.mk | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 950673b6a19..eb208f6369a 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/10/05 15:20:28 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/03 15:54:56 tv Exp $ # DISTNAME= vsftpd-2.0.4 @@ -40,10 +40,6 @@ MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../mk/bsd.prefs.mk" -.if empty(USE_INET6:M[Yy][Ee][Ss]) -PKG_FAIL_REASON+= "${PKGNAME} requires a IPv6-enabled userland to compile." -.endif - LIBS.SunOS= -lsocket -lnsl -lrt -lsendfile .include "options.mk" diff --git a/net/vsftpd/options.mk b/net/vsftpd/options.mk index 455f6d1607c..d1a51b0f971 100644 --- a/net/vsftpd/options.mk +++ b/net/vsftpd/options.mk @@ -1,8 +1,10 @@ -# $NetBSD: options.mk,v 1.3 2006/05/16 21:08:50 joerg Exp $ +# $NetBSD: options.mk,v 1.4 2007/01/03 15:54:56 tv Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vsftpd -PKG_SUPPORTED_OPTIONS= inet6 pam ssl tcpwrappers -PKG_SUGGESTED_OPTIONS= inet6 pam tcpwrappers +PKG_SUPPORTED_OPTIONS= pam ssl tcpwrappers +PKG_SUGGESTED_OPTIONS= pam tcpwrappers +PKG_OPTIONS_REQUIRED_GROUPS= inet6 # require inet6 capability +PKG_OPTIONS_GROUP.inet6= inet6 .include "../../mk/bsd.options.mk" |