Attachment #189127 for bug #224613




# INVALID_BDB_VER
#			- This variable can be defined when the port does not
#			  support one or more versions of Berkeley DB.
# WITH_BDB_VER
#			- User defined global variable to set Berkeley DB version.
#			  Deprecated, use DEFAULT_VERSIONS+=bdb=xx
# <BDB_UNIQUENAME>_WITH_BDB_VER
#			- User defined port specific variable to set Berkeley DB
#			  version.


BDB_UNIQUENAME?=	${PKGNAMEPREFIX}${PORTNAME}

.if defined(WITH_BDB_VER)
WARNING+=	"WITH_BDB_VER is deprecated and will be removed on 2016-08-01. Use DEFAULT_VERSIONS+=bdb=${WITH_BDB_VER}"
BDB_DEFAULT:=${WITH_BDB_VER}
.endif

_BDB_DEFAULT_save:=${BDB_DEFAULT}

_DB_PORTS=		48 5 6

Lines 47-53 do-test: Link Here

(-)Mk/Uses/cran.mk (-1 / +1 lines)
47	R_POSTCMD_INSTALL_OPTIONS+= -l ${STAGEDIR}${PREFIX}/${R_LIB_DIR}	47	R_POSTCMD_INSTALL_OPTIONS+= -l ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
48	R_POSTCMD_INSTALL_OPTIONS+= --install-tests	48	R_POSTCMD_INSTALL_OPTIONS+= --install-tests
49		49
50	.if defined(NOPORTDOCS)	50	.if empty(PORT_OPTIONS:MDOCS)
51	R_POSTCMD_INSTALL_OPTIONS+= --no-docs --no-html	51	R_POSTCMD_INSTALL_OPTIONS+= --no-docs --no-html
52	.endif	52	.endif
53		53

Lines 111-117 do-install: Link Here

(-)Mk/Uses/gem.mk (-2 / +2 lines)
111	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \	111	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
112	${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null \|\| ${TRUE}	112	${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null \|\| ${TRUE}
113	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null \|\| ${TRUE}	113	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null \|\| ${TRUE}
114	.if defined(NOPORTDOCS)	114	.if !${PORT_OPTIONS:MDOCS}
115	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}	115	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
116	.endif	116	.endif
117	.endif	117	.endif
Lines 120-126 do-install: Link Here
120	_USES_install+= 820:gem-autoplist	120	_USES_install+= 820:gem-autoplist
121	gem-autoplist:	121	gem-autoplist:
122	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}	122	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
123	.if !defined(NOPORTDOCS)	123	.if ${PORT_OPTIONS:MDOCS}
124	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print \| ${SED} -E -e \	124	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print \| ${SED} -E -e \
125	's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}	125	's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
126	.endif	126	.endif




LINUX_DEFAULT?=		c6
.endif
.if defined(OVERRIDE_LINUX_BASE_PORT)
WARNING+=		"OVERRIDE_LINUX_BASE_PORT is unsupported, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
WARNING+=		"OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
.endif
# Possible values: 5.1, 5.2, 5.3
LUA_DEFAULT?=		5.2

#	but give an installed port preference over it.
.  if defined(WITH_OPENSSL_PORT)
.    if defined(OPENSSL_PORT)
WARNING+=	"Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is unsupported, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf"
WARNING+=	"Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf"
.    else
WARNING+=	"Using WITH_OPENSSL_PORT in make.conf is unsupported, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf"
WARNING+=	"Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf"
.    endif
.  elif defined(WITH_OPENSSL_BASE)
WARNING+=	"Using WITH_OPENSSL_BASE in make.conf is unsupported, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf"
WARNING+=	"Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf"
.  elif	!defined(WITH_OPENSSL_BASE) && \
	!defined(WITH_OPENSSL_PORT) && \
	!defined(SSL_DEFAULT) && \




			package:300:pre package:500:do package:700:post \
			stage:800:post

PORT_OPTIONS+=	DOCS NLS EXAMPLES IPV6
.if !defined(NOPORTDOCS)
PORT_OPTIONS+=	DOCS
.else
OPTIONS_WARNINGS+=		"NOPORTDOCS"
WITHOUT+=			DOCS
OPTIONS_WARNINGS_UNSET+=	DOCS
.endif

.if !defined(WITHOUT_NLS)
PORT_OPTIONS+=	NLS
.else
WITHOUT+=		NLS
.endif

.if !defined(NOPORTEXAMPLES)
PORT_OPTIONS+=	EXAMPLES
.else
OPTIONS_WARNINGS+=		"NOPORTEXAMPLES"
WITHOUT+=			EXAMPLES
OPTIONS_WARNINGS_UNSET+=	EXAMPLES
.endif

PORT_OPTIONS+=	IPV6

# Add per arch options
.for opt in ${OPTIONS_DEFINE_${ARCH}}

.  endif
.  sinclude "${OPTIONS_FILE}.local"

### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
# XXX once WITH_DEBUG is not magic any more, do remove the :NDEBUG from here.
.for opt in ${ALL_OPTIONS:NDEBUG}
.if defined(WITH_${opt})
OPTIONS_WARNINGS+=	"WITH_${opt}"
OPTIONS_WARNINGS_SET+=	${opt}
PORT_OPTIONS+=	${opt}
.endif
.if defined(WITHOUT_${opt})
OPTIONS_WARNINGS+=	"WITHOUT_${opt}"
OPTIONS_WARNINGS_UNSET+=	${opt}
PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
.endif
.endfor

_OPTIONS_UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
.for _k in SET UNSET SET_FORCE UNSET_FORCE
.if defined(${_OPTIONS_UNIQUENAME}_${_k})

.endif
.endfor

.if defined(OPTIONS_WARNINGS)
WARNING+=	"You are using the following deprecated options: ${OPTIONS_WARNINGS}"
WARNING+=	"If you added them on the command line, you should replace them by"
WARNING+=	"WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\""
WARNING+=	""
WARNING+=	"If they are global options set in your make.conf, you should replace them with:"
.if defined(OPTIONS_WARNINGS_SET)
WARNING+=	"OPTIONS_SET=${OPTIONS_WARNINGS_SET}"
.endif
.if defined(OPTIONS_WARNINGS_UNSET)
WARNING+=	"OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}"
.endif
WARNING+=	""
WARNING+=	"If they are local to this port, you should use:"
.if defined(OPTIONS_WARNINGS_SET)
WARNING+=	"${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}"
.endif
.if defined(OPTIONS_WARNINGS_UNSET)
WARNING+=	"${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}"
.endif
.endif

## Finish by using the options set by the port config dialog, if any
.  for opt in ${OPTIONS_FILE_SET}
.    if !empty(COMPLETE_OPTIONS_LIST:M${opt})


## Now some compatibility
.if empty(PORT_OPTIONS:MDOCS)
PLIST_SUB+=		PORTDOCS="@comment "
.else
PLIST_SUB+=		PORTDOCS=""
.endif

.if empty(PORT_OPTIONS:MEXAMPLES)
PLIST_SUB+=	        PORTEXAMPLES="@comment "
.else
PLIST_SUB+=	        PORTEXAMPLES=""
.endif

.if ${PORT_OPTIONS:MDEBUG}




MAKE_ENV+=	WITHOUT_KERNEL_SYMBOLS=yes
.endif

.if defined(NOPORTDOCS)
PLIST_SUB+=		PORTDOCS="@comment "
.else
PLIST_SUB+=		PORTDOCS=""
.endif

.if defined(NOPORTEXAMPLES)
PLIST_SUB+=	        PORTEXAMPLES="@comment "
.else
PLIST_SUB+=	        PORTEXAMPLES=""
.endif

CONFIGURE_SHELL?=	${SH}
MAKE_SHELL?=	${SH}



.for _type in EXAMPLES DOCS
.if !target(add-plist-${_type:tl})
.if defined(PORT${_type}) && !empty(PORT_OPTIONS:M${_type})
add-plist-${_type:tl}:
.for x in ${PORT${_type}}
	@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \




#

.if defined(WITHOUT_NLS)
WARNING+=	"WITHOUT_NLS is unsupported use OPTIONS_UNSET=NLS instead"
.endif

.if defined(NOPORTDOCS)
WARNING+=	"NOPORTDOCS is unsupported use OPTIONS_UNSET=DOCS instead"
.endif

.if defined(NOPORTEXAMPLES)
WARNING+=	"NOPORTEXAMPLES is unsupported use OPTIONS_UNSET=EXAMPLES instead"
.endif

.for opt in ${ALL_OPTIONS:NDEBUG}
.if defined(WITH_${opt})
WARNING+=     "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port."
.endif
.if defined(WITHOUT_${opt})
WARNING+=     "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port."
.endif
.endfor

.if defined(WITH_NEW_XORG) || defined(WITHOUT_NEW_XORG)
WARNING+=	"WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect"
.endif





.include <bsd.port.options.mk>

pre-everything::
.if defined(WITH_BDB_VER)
pre-everything::
	@${ECHO_CMD} ""
	@${ECHO_CMD} "WARNING:"
	@${ECHO_CMD} "	You have defined WITH_BDB_VER. Make sure you use the same"
	@${ECHO_CMD} "	db version for all ports that use libtabe, such as xcin."
	@${ECHO_CMD} "	Otherwise, ports that use libtabe may not work correctly."
	@${ECHO_CMD} ""
.endif

post-patch-X11-off:
	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' \
		${WRKSRC}/src/Makefile.in





CONFIGURE_ARGS=	DB="${BDB_LIB_NAME}"

pre-everything::
	@${ECHO_CMD} ""
	@${ECHO_CMD} "You may specify db version to use:"
	@${ECHO_CMD} ""
	@${ECHO_CMD} "	WITH_BDB_VER=version	(Default 41)"
.if defined(WITH_BDB_VER)
	@${ECHO_CMD} ""
	@${ECHO_CMD} "WARNING:"
	@${ECHO_CMD} "	You have defined WITH_BDB_VER. Make sure you use the same"
	@${ECHO_CMD} "	db version that libtabe uses. Otherwise, this port may"
	@${ECHO_CMD} "	not work correctly."
.endif
	@${ECHO_CMD} ""

.include <bsd.port.mk>

Lines 9-15 MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \ Link Here

(-)databases/ruby-bdb/Makefile (-1 lines)
9	http://idaemons.org/distfiles/ruby/ \	9	http://idaemons.org/distfiles/ruby/ \
10	LOCAL/knu	10	LOCAL/knu
11	PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}	11	PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
12	PKGNAMESUFFIX= ${WITH_BDB_VER}
13	DIST_SUBDIR= ruby	12	DIST_SUBDIR= ruby
14		13
15	MAINTAINER= knu@FreeBSD.org	14	MAINTAINER= knu@FreeBSD.org

Lines 43-50 SHEBANG_FILES= \ Link Here

(-)www/rubygem-passenger/Makefile (-2 lines)
43	dev/ci/run-tests-natively \	43	dev/ci/run-tests-natively \
44	dev/ci/setup-host	44	dev/ci/setup-host
45		45
46	NOPORTDOCS= yes
47
48	APACHE22_USE= APACHE=22+	46	APACHE22_USE= APACHE=22+
49		47
50	LIB_DEPENDS+= libuv.so:devel/libuv \	48	LIB_DEPENDS+= libuv.so:devel/libuv \

Return to bug 224613

Lines 196-225 _OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \ Link Here

(-)Mk/bsd.options.mk (-63 / +7 lines)
196	package:300:pre package:500:do package:700:post \	196	package:300:pre package:500:do package:700:post \
197	stage:800:post	197	stage:800:post
198		198
199	# Set the default values for the global options, as defined by portmgr	199	PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6
200	.if !defined(NOPORTDOCS)
201	PORT_OPTIONS+= DOCS
202	.else
203	OPTIONS_WARNINGS+= "NOPORTDOCS"
204	WITHOUT+= DOCS
205	OPTIONS_WARNINGS_UNSET+= DOCS
206	.endif
207
208	.if !defined(WITHOUT_NLS)
209	PORT_OPTIONS+= NLS
210	.else
211	WITHOUT+= NLS
212	.endif
213
214	.if !defined(NOPORTEXAMPLES)
215	PORT_OPTIONS+= EXAMPLES
216	.else
217	OPTIONS_WARNINGS+= "NOPORTEXAMPLES"
218	WITHOUT+= EXAMPLES
219	OPTIONS_WARNINGS_UNSET+= EXAMPLES
220	.endif
221
222	PORT_OPTIONS+= IPV6
223		200
224	# Add per arch options	201	# Add per arch options
225	.for opt in ${OPTIONS_DEFINE_${ARCH}}	202	.for opt in ${OPTIONS_DEFINE_${ARCH}}
Lines 325-345 NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} Link Here
325	. endif	302	. endif
326	. sinclude "${OPTIONS_FILE}.local"	303	. sinclude "${OPTIONS_FILE}.local"
327		304
328	### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
329	# XXX once WITH_DEBUG is not magic any more, do remove the :NDEBUG from here.
330	.for opt in ${ALL_OPTIONS:NDEBUG}
331	.if defined(WITH_${opt})
332	OPTIONS_WARNINGS+= "WITH_${opt}"
333	OPTIONS_WARNINGS_SET+= ${opt}
334	PORT_OPTIONS+= ${opt}
335	.endif
336	.if defined(WITHOUT_${opt})
337	OPTIONS_WARNINGS+= "WITHOUT_${opt}"
338	OPTIONS_WARNINGS_UNSET+= ${opt}
339	PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
340	.endif
341	.endfor
342
343	_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}	305	_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}
344	.for _k in SET UNSET SET_FORCE UNSET_FORCE	306	.for _k in SET UNSET SET_FORCE UNSET_FORCE
345	.if defined(${_OPTIONS_UNIQUENAME}_${_k})	307	.if defined(${_OPTIONS_UNIQUENAME}_${_k})
Lines 348-375 WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" Link Here
348	.endif	310	.endif
349	.endfor	311	.endfor
350		312
351	.if defined(OPTIONS_WARNINGS)
352	WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}"
353	WARNING+= "If you added them on the command line, you should replace them by"
354	WARNING+= "WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\""
355	WARNING+= ""
356	WARNING+= "If they are global options set in your make.conf, you should replace them with:"
357	.if defined(OPTIONS_WARNINGS_SET)
358	WARNING+= "OPTIONS_SET=${OPTIONS_WARNINGS_SET}"
359	.endif
360	.if defined(OPTIONS_WARNINGS_UNSET)
361	WARNING+= "OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}"
362	.endif
363	WARNING+= ""
364	WARNING+= "If they are local to this port, you should use:"
365	.if defined(OPTIONS_WARNINGS_SET)
366	WARNING+= "${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}"
367	.endif
368	.if defined(OPTIONS_WARNINGS_UNSET)
369	WARNING+= "${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}"
370	.endif
371	.endif
372
373	## Finish by using the options set by the port config dialog, if any	313	## Finish by using the options set by the port config dialog, if any
374	. for opt in ${OPTIONS_FILE_SET}	314	. for opt in ${OPTIONS_FILE_SET}
375	. if !empty(COMPLETE_OPTIONS_LIST:M${opt})	315	. if !empty(COMPLETE_OPTIONS_LIST:M${opt})
Lines 471-481 PORT_OPTIONS:= ${PORT_OPTIONS:O:u} Link Here
471		411
472	## Now some compatibility	412	## Now some compatibility
473	.if empty(PORT_OPTIONS:MDOCS)	413	.if empty(PORT_OPTIONS:MDOCS)
474	NOPORTDOCS= yes	414	PLIST_SUB+= PORTDOCS="@comment "
		415	.else
		416	PLIST_SUB+= PORTDOCS=""
475	.endif	417	.endif
476		418
477	.if empty(PORT_OPTIONS:MEXAMPLES)	419	.if empty(PORT_OPTIONS:MEXAMPLES)
478	NOPORTEXAMPLES= yes	420	PLIST_SUB+= PORTEXAMPLES="@comment "
		421	.else
		422	PLIST_SUB+= PORTEXAMPLES=""
479	.endif	423	.endif
480		424
481	.if ${PORT_OPTIONS:MDEBUG}	425	.if ${PORT_OPTIONS:MDEBUG}

Lines 1767-1784 MAKE_ENV+= WITHOUT_DEBUG_FILES=yes Link Here

(-)Mk/bsd.port.mk (-13 / +1 lines)
1767	MAKE_ENV+= WITHOUT_KERNEL_SYMBOLS=yes	1767	MAKE_ENV+= WITHOUT_KERNEL_SYMBOLS=yes
1768	.endif	1768	.endif
1769		1769
1770	.if defined(NOPORTDOCS)
1771	PLIST_SUB+= PORTDOCS="@comment "
1772	.else
1773	PLIST_SUB+= PORTDOCS=""
1774	.endif
1775
1776	.if defined(NOPORTEXAMPLES)
1777	PLIST_SUB+= PORTEXAMPLES="@comment "
1778	.else
1779	PLIST_SUB+= PORTEXAMPLES=""
1780	.endif
1781
1782	CONFIGURE_SHELL?= ${SH}	1770	CONFIGURE_SHELL?= ${SH}
1783	MAKE_SHELL?= ${SH}	1771	MAKE_SHELL?= ${SH}
1784		1772
Lines 4514-4520 ${TMPPLIST}: Link Here
4514		4502
4515	.for _type in EXAMPLES DOCS	4503	.for _type in EXAMPLES DOCS
4516	.if !target(add-plist-${_type:tl})	4504	.if !target(add-plist-${_type:tl})
4517	.if defined(PORT${_type}) && !defined(NOPORT${_type})	4505	.if defined(PORT${_type}) && !empty(PORT_OPTIONS:M${_type})
4518	add-plist-${_type:tl}:	4506	add-plist-${_type:tl}:
4519	.for x in ${PORT${_type}}	4507	.for x in ${PORT${_type}}
4520	@if ${ECHO_CMD} "${x}"\| ${AWK} '$$1 ~ /(\*\|\\|\|\[\|\]\|\?\|\{\|\}\|\$$)/ { exit 1};'; then \	4508	@if ${ECHO_CMD} "${x}"\| ${AWK} '$$1 ~ /(\*\|\\|\|\[\|\]\|\?\|\{\|\}\|\$$)/ { exit 1};'; then \

Lines 13-21 Link Here

(-)Mk/Uses/bdb.mk (-8 lines)
13	# INVALID_BDB_VER	13	# INVALID_BDB_VER
14	# - This variable can be defined when the port does not	14	# - This variable can be defined when the port does not
15	# support one or more versions of Berkeley DB.	15	# support one or more versions of Berkeley DB.
16	# WITH_BDB_VER
17	# - User defined global variable to set Berkeley DB version.
18	# Deprecated, use DEFAULT_VERSIONS+=bdb=xx
19	# <BDB_UNIQUENAME>_WITH_BDB_VER	16	# <BDB_UNIQUENAME>_WITH_BDB_VER
20	# - User defined port specific variable to set Berkeley DB	17	# - User defined port specific variable to set Berkeley DB
21	# version.	18	# version.
Lines 60-70 _bdb_ARGS?= yes Link Here
60		57
61	BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME}	58	BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME}
62		59
63	.if defined(WITH_BDB_VER)
64	WARNING+= "WITH_BDB_VER is deprecated and will be removed on 2016-08-01. Use DEFAULT_VERSIONS+=bdb=${WITH_BDB_VER}"
65	BDB_DEFAULT:=${WITH_BDB_VER}
66	.endif
67
68	_BDB_DEFAULT_save:=${BDB_DEFAULT}	60	_BDB_DEFAULT_save:=${BDB_DEFAULT}
69		61
70	_DB_PORTS= 48 5 6	62	_DB_PORTS= 48 5 6

Lines 51-58 LINUX_DEFAULT?= c6_64 Link Here

(-)Mk/bsd.default-versions.mk (-8 / +4 lines)
51	LINUX_DEFAULT?= c6	51	LINUX_DEFAULT?= c6
52	.endif	52	.endif
53	.if defined(OVERRIDE_LINUX_BASE_PORT)	53	.if defined(OVERRIDE_LINUX_BASE_PORT)
54	LINUX_DEFAULT:= ${OVERRIDE_LINUX_BASE_PORT}	54	WARNING+= "OVERRIDE_LINUX_BASE_PORT is unsupported, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
55	WARNING+= "OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
56	.endif	55	.endif
57	# Possible values: 5.1, 5.2, 5.3	56	# Possible values: 5.1, 5.2, 5.3
58	LUA_DEFAULT?= 5.2	57	LUA_DEFAULT?= 5.2
Lines 93-107 SAMBA_DEFAULT?= 4.6 Link Here
93	# but give an installed port preference over it.	92	# but give an installed port preference over it.
94	. if defined(WITH_OPENSSL_PORT)	93	. if defined(WITH_OPENSSL_PORT)
95	. if defined(OPENSSL_PORT)	94	. if defined(OPENSSL_PORT)
96	SSL_DEFAULT:=${OPENSSL_PORT:T}	95	WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is unsupported, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf"
97	WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf"
98	. else	96	. else
99	SSL_DEFAULT=openssl	97	WARNING+= "Using WITH_OPENSSL_PORT in make.conf is unsupported, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf"
100	WARNING+= "Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf"
101	. endif	98	. endif
102	. elif defined(WITH_OPENSSL_BASE)	99	. elif defined(WITH_OPENSSL_BASE)
103	SSL_DEFAULT=base	100	WARNING+= "Using WITH_OPENSSL_BASE in make.conf is unsupported, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf"
104	WARNING+= "Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf"
105	. elif !defined(WITH_OPENSSL_BASE) && \	101	. elif !defined(WITH_OPENSSL_BASE) && \
106	!defined(WITH_OPENSSL_PORT) && \	102	!defined(WITH_OPENSSL_PORT) && \
107	!defined(SSL_DEFAULT) && \	103	!defined(SSL_DEFAULT) && \

Lines 4-12 Link Here

(-)Mk/bsd.sanity.mk (-1 / +18 lines)
4	#	4	#
5		5
6	.if defined(WITHOUT_NLS)	6	.if defined(WITHOUT_NLS)
7	WARNING+= "WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead"	7	WARNING+= "WITHOUT_NLS is unsupported use OPTIONS_UNSET=NLS instead"
8	.endif	8	.endif
9		9
		10	.if defined(NOPORTDOCS)
		11	WARNING+= "NOPORTDOCS is unsupported use OPTIONS_UNSET=DOCS instead"
		12	.endif
		13
		14	.if defined(NOPORTEXAMPLES)
		15	WARNING+= "NOPORTEXAMPLES is unsupported use OPTIONS_UNSET=EXAMPLES instead"
		16	.endif
		17
		18	.for opt in ${ALL_OPTIONS:NDEBUG}
		19	.if defined(WITH_${opt})
		20	WARNING+= "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port."
		21	.endif
		22	.if defined(WITHOUT_${opt})
		23	WARNING+= "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port."
		24	.endif
		25	.endfor
		26
10	.if defined(WITH_NEW_XORG) \|\| defined(WITHOUT_NEW_XORG)	27	.if defined(WITH_NEW_XORG) \|\| defined(WITHOUT_NEW_XORG)
11	WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect"	28	WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect"
12	.endif	29	.endif

Lines 35-51 X11_CONFIGURE_WITH= x Link Here

(-)chinese/libtabe/Makefile (-11 lines)
35		35
36	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
37		37
38	pre-everything::
39	.if defined(WITH_BDB_VER)
40	pre-everything::
41	@${ECHO_CMD} ""
42	@${ECHO_CMD} "WARNING:"
43	@${ECHO_CMD} " You have defined WITH_BDB_VER. Make sure you use the same"
44	@${ECHO_CMD} " db version for all ports that use libtabe, such as xcin."
45	@${ECHO_CMD} " Otherwise, ports that use libtabe may not work correctly."
46	@${ECHO_CMD} ""
47	.endif
48
49	post-patch-X11-off:	38	post-patch-X11-off:
50	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' \	39	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' \
51	${WRKSRC}/src/Makefile.in	40	${WRKSRC}/src/Makefile.in

Lines 20-37 OBSOLETE_BDB_VAR= WITH_DB Link Here

(-)chinese/p5-Lingua-ZH-TaBE/Makefile (-14 lines)
20		20
21	CONFIGURE_ARGS= DB="${BDB_LIB_NAME}"	21	CONFIGURE_ARGS= DB="${BDB_LIB_NAME}"
22		22
23	pre-everything::
24	@${ECHO_CMD} ""
25	@${ECHO_CMD} "You may specify db version to use:"
26	@${ECHO_CMD} ""
27	@${ECHO_CMD} " WITH_BDB_VER=version (Default 41)"
28	.if defined(WITH_BDB_VER)
29	@${ECHO_CMD} ""
30	@${ECHO_CMD} "WARNING:"
31	@${ECHO_CMD} " You have defined WITH_BDB_VER. Make sure you use the same"
32	@${ECHO_CMD} " db version that libtabe uses. Otherwise, this port may"
33	@${ECHO_CMD} " not work correctly."
34	.endif
35	@${ECHO_CMD} ""
36
37	.include <bsd.port.mk>	23	.include <bsd.port.mk>