Page MenuHomeFreeBSD
Files F141925796

D12509.id33456.diff
No OneTemporary
Actions

D12509.id33456.diff
View Options

Index: dns/bind9-devel/Makefile
===================================================================
--- dns/bind9-devel/Makefile
+++ dns/bind9-devel/Makefile
@@ -3,25 +3,25 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-.if defined(BIND_TOOLS_SLAVE)
-# dns/bind-tools here
+.if ${FLAVOR:U} == tools
+# -tools here
PORTREVISION= 0
.else
-# dns/bind9xx here
+# BIND9 itself here
PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= LOCAL/mat/bind
#MASTER_SITES= https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=snapshot;h=${HASH};sf=tgz;/
-.if defined(BIND_TOOLS_SLAVE)
-PKGNAMESUFFIX= -tools
+.if ${FLAVOR:U} == tools
+PKGNAMESUFFIX= 9-devel-tools
.else
PKGNAMESUFFIX= 9-devel
.endif
DISTNAME= ${PORTNAME}9-${HASH}
MAINTAINER= mat@FreeBSD.org
-.if defined(BIND_TOOLS_SLAVE)
+.if ${FLAVOR:U} == tools
COMMENT= Command line tools from BIND: delv, dig, host, nslookup...
.else
COMMENT= BIND DNS suite with updated DNSSEC and DNS64
@@ -34,6 +34,8 @@
ISCVERSION= 9.12.0a.2017.09.23
HASH= 2919a6d
+FLAVORS= default tools
+
USES= cpe libedit
CPE_VENDOR= isc
@@ -56,14 +58,18 @@
CONFLICTS= bind99 bind910 bind9-devel
-.if defined(BIND_TOOLS_SLAVE)
+tools_PLIST= ${.CURDIR}/pkg-plist-tools
+tools_DESCR= ${.CURDIR}/pkg-descr-tools
+tools_CONFLICTS= bind9-devel
+default_CONFLICTS= bind9-devel-tools
+
+.if ${FLAVOR:U} == tools
CONFIGURE_ARGS+= --disable-shared
-CONFLICTS+= bind911
+INSTALL_WRKSRC= ${WRKSRC}/bin
.else
USE_RC_SUBR= named
SUB_FILES= pkg-message named.conf
-CONFLICTS+= bind-tools
-.endif # BIND_TOOLS_SLAVE
+.endif # FLAVOR=tools
MAKE_JOBS_UNSAFE= yes
@@ -77,7 +83,7 @@
OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11
OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1
-.if !defined(BIND_TOOLS_SLAVE)
+.if ${FLAVOR:U} != tools
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP
OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
@@ -85,7 +91,7 @@
OPTIONS_GROUP= DLZ
OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
-.endif # BIND_TOOLS_SLAVE
+.endif # FLAVOR!=tools
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
@@ -232,7 +238,7 @@
post-patch:
@${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${HASH}#' \
${WRKSRC}/version
-.if defined(BIND_TOOLS_SLAVE)
+.if ${FLAVOR} == tools
@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-e 's#isc-config.sh installdirs#installdirs#' \
-e 's#.*INSTALL.*isc-config.*##' \
@@ -251,7 +257,7 @@
. endfor
.endif
-.if !defined(BIND_TOOLS_SLAVE)
+.if ${FLAVOR} != tools
. if ${PORTREVISION:N0}
post-patch-PORTREVISION-on:
@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
Index: editors/vim/Makefile
===================================================================
--- editors/vim/Makefile
+++ editors/vim/Makefile
@@ -21,6 +21,17 @@
OPTIONS_GROUP_LANGBIND= LUA PERL PYTHON RUBY TCL
OPTIONS_SUB= yes
+FLAVORS:= gtk2 lite ${OPTIONS_SINGLE_UI:NGTK2:tl}
+.if ${FLAVOR:U} == lite
+LITE= yes
+.endif
+
+.for o in ${OPTIONS_SINGLE_UI:NGTK2}
+${o:tl}_OPTIONS_ON= ${o}
+${o:tl}_OPTIONS_OFF= ${OPTIONS_SINGLE_UI:N${o}}
+${o:tl}_PKGNAMESUFFIX= -${o:tl}
+.endfor
+
# BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute
OPTIONS_EXCLUDE_powerpc64= RUBY

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 13, 4:52 PM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27629877
Default Alt Text
D12509.id33456.diff (3 KB)

Event Timeline