diff options
| author | schmonz <schmonz@pkgsrc.org> | 2019-01-05 06:18:11 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2019-01-05 06:18:11 +0000 |
| commit | 108967d9cfbad651c41e4cc58e98caab25afc75e (patch) | |
| tree | adbbb8c21a9075525f94a4b0e875abb69cf0235c | |
| parent | 2be5a51faff50c7e78dda30557a07ee12b896029 (diff) | |
| download | pkgsrc-108967d9cfbad651c41e4cc58e98caab25afc75e.tar.gz | |
Remove commented-out 'inet6' option. Add CONFLICTS with djbdnscurve6.
| -rw-r--r-- | net/djbdns/Makefile | 4 | ||||
| -rw-r--r-- | net/djbdns/options.mk | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index dea1cb04d67..82a73691f01 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2018/09/28 20:36:24 schmonz Exp $ +# $NetBSD: Makefile,v 1.68 2019/01/05 06:18:11 schmonz Exp $ DISTNAME= djbdns-1.05 PKGREVISION= 14 @@ -14,6 +14,8 @@ LICENSE= public-domain MANPAGES= ${DISTNAME}-man-20031023.tar.gz SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/ +CONFLICTS+= djbdnscurve6-[0-9]* + DJB_RESTRICTED= no SUBST_CLASSES+= etc diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk index c610ed2c508..7146427f43b 100644 --- a/net/djbdns/options.mk +++ b/net/djbdns/options.mk @@ -1,25 +1,12 @@ -# $NetBSD: options.mk,v 1.21 2018/09/30 22:10:51 schmonz Exp $ +# $NetBSD: options.mk,v 1.22 2019/01/05 06:18:11 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns -PKG_SUPPORTED_OPTIONS+= # inet6 PKG_SUPPORTED_OPTIONS+= djbdns-cachestats djbdns-ignoreip2 PKG_SUPPORTED_OPTIONS+= djbdns-mergequeries djbdns-tinydns64 PKG_SUGGESTED_OPTIONS+= djbdns-mergequeries djbdns-tinydns64 .include "../../mk/bsd.options.mk" -PLIST_VARS+= inet6 -#.if !empty(PKG_OPTIONS:Minet6) -#IPV6_PATCH= djbdns-1.05-test28.diff.xz -#PATCHFILES+= ${IPV6_PATCH} -#SITES.${IPV6_PATCH}= http://www.fefe.de/dns/ -#USE_TOOLS+= xzcat -#PATCH_DIST_CAT.${IPV6_PATCH}= xzcat < ${IPV6_PATCH} -#PATCH_DIST_STRIP.${IPV6_PATCH}= -p1 -#MAKE_JOBS_SAFE= no -#PLIST.inet6= yes -#.endif - .if !empty(PKG_OPTIONS:Mdjbdns-cachestats) CACHESTATS_PATCH= djbdns-cachestats.patch PATCHFILES+= ${CACHESTATS_PATCH} |