Attachment #147676 for bug #193931

Lines 13-19 _INCLUDE_USES_ADA_MK= yes Link Here

(-)Mk/Uses/ada.mk (-1 / +1 lines)
13		13
14	CC= ada	14	CC= ada
15		15
16	. if defined(ada_ARGS) && ${ada_ARGS} == 47	16	. if ${ada_ARGS} == 47
17	BUILD_DEPENDS+= ${LOCALBASE}/gcc47-aux/bin/ada:${PORTSDIR}/lang/gcc47-aux	17	BUILD_DEPENDS+= ${LOCALBASE}/gcc47-aux/bin/ada:${PORTSDIR}/lang/gcc47-aux
18	MAKE_ENV+= PATH=${LOCALBASE}/gcc47-aux/bin:${PATH}	18	MAKE_ENV+= PATH=${LOCALBASE}/gcc47-aux/bin:${PATH}
19	CONFIGURE_ENV+= PATH=${LOCALBASE}/gcc47-aux/bin:${PATH}	19	CONFIGURE_ENV+= PATH=${LOCALBASE}/gcc47-aux/bin:${PATH}




.if !defined(_INCLUDE_USES_AUTORECONF_MK)
_INCLUDE_USES_AUTORECONF_MK=	yes
_USES_POST+=		autoreconf
autoreconf_ARGS:=	${autoreconf_ARGS}

BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
		autoheader-2.69:${PORTSDIR}/devel/autoconf \

		aclocal-1.14:${PORTSDIR}/devel/automake \
		automake-1.14:${PORTSDIR}/devel/automake

.if ${USES:Mgettext} && empty(gettext_ARGS:Mrun)
.if ${USES:Mgettext} || (${USES:Mgettext\:*} && empty(USES:Mgettext\:run))
BUILD_DEPENDS+=	autopoint:${PORTSDIR}/devel/gettext
.endif

.if ${USES:Mlibtool} && empty(libtool_ARGS:Mbuild)
.if ${USES:Mlibtool} || (${USES:Mlibtool\:*} && empty(USES:Mlibtool\:*build*))
BUILD_DEPENDS+=	libtoolize:${PORTSDIR}/devel/libtool
.endif


Lines 13-19 _INCLUDE_USES_BISON_MK= yes Link Here

(-)Mk/Uses/bison.mk (-1 / +1 lines)
13		13
14	_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison	14	_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison
15		15
16	.if !defined(bison_ARGS)	16	.if empty(bison_ARGS)
17	bison_ARGS= build	17	bison_ARGS= build
18	.endif	18	.endif
19		19

Lines 11-17 Link Here

(-)Mk/Uses/charsetfix.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_CHARSETFIX_MK)	11	.if !defined(_INCLUDE_USES_CHARSETFIX_MK)
12	_INCLUDE_USES_CHARSETFIX_MK= yes	12	_INCLUDE_USES_CHARSETFIX_MK= yes
13		13
14	.if defined(charsetfix_ARGS)	14	.if !empty(charsetfix_ARGS)
15	IGNORE= USES=charsetfix does not require args	15	IGNORE= USES=charsetfix does not require args
16	.endif	16	.endif
17		17




_INCLUDE_USES_CMAKE_MK=	yes

_valid_ARGS=		outsource run
_cmake_ARGS=		${cmake_ARGS:C/\:/ /g}

# Sanity check
.for arg in ${cmake_ARGS}
.  for arg in ${_cmake_ARGS}
.    if empty(_valid_ARGS:M${arg})
IGNORE=	Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized
.    endif
.endfor
.endif

CMAKE_BIN=		${LOCALBASE}/bin/cmake
BUILD_DEPENDS+=		${CMAKE_BIN}:${PORTSDIR}/devel/cmake

.if ${cmake_ARGS:Mrun}
RUN_DEPENDS+=		${CMAKE_BIN}:${PORTSDIR}/devel/cmake
.endif


_CMAKE_MSG=		"===>  Performing in-source build"
CMAKE_SOURCE_PATH?=	${WRKSRC}

.if ${cmake_ARGS:Moutsource}
_CMAKE_MSG=		"===>  Performing out-of-source build"
CONFIGURE_WRKSRC=	${WRKDIR}/.build
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}

Lines 30-36 Link Here

(-)Mk/Uses/compiler.mk (-1 / +1 lines)
30	.if !defined(_INCLUDE_USES_COMPILER_MK)	30	.if !defined(_INCLUDE_USES_COMPILER_MK)
31	_INCLUDE_USES_COMPILER_MK= yes	31	_INCLUDE_USES_COMPILER_MK= yes
32		32
33	.if !defined(compiler_ARGS)	33	.if empty(compiler_ARGS)
34	compiler_ARGS= env	34	compiler_ARGS= env
35	.endif	35	.endif
36		36

Lines 13-20 Link Here

(-)Mk/Uses/cran.mk (-3 lines)
13	.if !defined(_INCLUDE_USES_CRAN_MK)	13	.if !defined(_INCLUDE_USES_CRAN_MK)
14	_INCLUDE_USES_CRAN_MK= yes	14	_INCLUDE_USES_CRAN_MK= yes
15		15
16	VALID_ARGS= auto-plist
17
18	MASTER_SITE_CRAN+= http://ftp.ctex.org/mirrors/CRAN/src/contrib/ \	16	MASTER_SITE_CRAN+= http://ftp.ctex.org/mirrors/CRAN/src/contrib/ \
19	http://cran.rakanu.com/src/contrib/ \	17	http://cran.rakanu.com/src/contrib/ \
20	http://cran.ms.unimelb.edu.au/src/contrib/ \	18	http://cran.ms.unimelb.edu.au/src/contrib/ \
Lines 30-36 MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE Link Here
30		28
31	MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}	29	MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
32		30
33	USES+= fortran
34	BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R	31	BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
35	RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R	32	RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
36		33

Lines 11-17 Link Here

(-)Mk/Uses/desktop-file-utils.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_DESKTOP_FILE_UTILS_MK)	11	.if !defined(_INCLUDE_USES_DESKTOP_FILE_UTILS_MK)
12	_INCLUDE_USES_DESKTOP_FILE_UTILS_MK= yes	12	_INCLUDE_USES_DESKTOP_FILE_UTILS_MK= yes
13		13
14	.if defined(desktop-file-utils_ARGS)	14	.if !empty(desktop-file-utils_ARGS)
15	IGNORE= USES=desktop-file-utils does not require args	15	IGNORE= USES=desktop-file-utils does not require args
16	.endif	16	.endif
17		17

Lines 11-17 Link Here

(-)Mk/Uses/desthack.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_DESTHACK_MK)	11	.if !defined(_INCLUDE_USES_DESTHACK_MK)
12	_INCLUDE_USES_DESTHACK_MK= yes	12	_INCLUDE_USES_DESTHACK_MK= yes
13		13
14	.if defined(_desthack_ARGS)	14	.if !empty(desthack_ARGS)
15	IGNORE= USES=desthack does not require args	15	IGNORE= USES=desthack does not require args
16	.endif	16	.endif
17		17

Lines 11-17 Link Here

(-)Mk/Uses/display.mk (-1 / +3 lines)
11	.if !defined(_INCLUDE_USES_DISPLAY_MK)	11	.if !defined(_INCLUDE_USES_DISPLAY_MK)
12	_INCLUDE_USES_DISPLAY_MK= yes	12	_INCLUDE_USES_DISPLAY_MK= yes
13		13
14	display_ARGS?= install	14	.if empty(display_ARGS)
		15	display_ARGS= install
		16	.endif
15		17
16	.if !defined(DISPLAY)	18	.if !defined(DISPLAY)
17	BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \	19	BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \




.if !defined(_INCLUDE_USES_DRUPAL_Mk)
_INCLUDE_USES_DRUPAL_Mk=	yes

.if ${drupal_ARGS:M[67]}
_DRUPAL_VERSION=	${drupal_ARGS:M[67]}
.if ${_drupal_ARGS:M[67]}
_DRUPAL_VERSION=	${_drupal_ARGS:M[67]}
.endif

VALID_VERSIONS=	6 7

.if ${drupal_ARGS:N[67]:Ntheme:Nmodule}
IGNORE=	Unknown argument for USES=drupal: ${drupal_ARGS:N[67]:Ntheme:Nmodule}
.endif

_DRUPAL_COMP=	${drupal_ARGS:N[67]}

.if !defined(_DRUPAL_VERSION) || ! ${VALID_VERSIONS:M${_DRUPAL_VERSION}}
IGNORE=	Missing or invalid argument for USES=drupal, a version must be provided: ${VALID_VERSIONS}
.endif

.if ${drupal_ARGS:Mmodule} && ${drupal_ARGS:Mtheme}
IGNORE=	theme and module arguments are mutually exclusive for USES=drupal
.endif


Lines 32-38 _HAVE_FAM= fam Link Here

(-)Mk/Uses/fam.mk (-1 / +1 lines)
32	IGNORE= FAM mismatch: ${_HAVE_FAM} is installed, but ${WITH_FAM_SYSTEM} desired	32	IGNORE= FAM mismatch: ${_HAVE_FAM} is installed, but ${WITH_FAM_SYSTEM} desired
33	.endif	33	.endif
34		34
35	.if defined(fam_ARGS)	35	.if !empty(fam_ARGS)
36	.for _fam_ARGS in ${fam_ARGS}	36	.for _fam_ARGS in ${fam_ARGS}
37	. if ! ${_FAM_SYSTEMS:M${_fam_ARGS}}	37	. if ! ${_FAM_SYSTEMS:M${_fam_ARGS}}
38	IGNORE= Incorrect 'USES+= fam:${fam_ARGS}' usage: argument [${_fam_ARGS}] is not recognized	38	IGNORE= Incorrect 'USES+= fam:${fam_ARGS}' usage: argument [${_fam_ARGS}] is not recognized

Lines 10-16 Link Here

(-)Mk/Uses/fmake.mk (-1 / +1 lines)
10	.if !defined(_INCLUDE_USES_FMAKE_MK)	10	.if !defined(_INCLUDE_USES_FMAKE_MK)
11	_INCLUDE_USES_FMAKE_MK= yes	11	_INCLUDE_USES_FMAKE_MK= yes
12		12
13	.if defined(fmake_ARGS)	13	.if !empty(fmake_ARGS)
14	IGNORE= Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments	14	IGNORE= Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments
15	.endif	15	.endif
16		16

Lines 11-17 Link Here

(-)Mk/Uses/fortran.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_FORTRAN_MK)	11	.if !defined(_INCLUDE_USES_FORTRAN_MK)
12	_INCLUDE_USES_FORTRAN_MK= yes	12	_INCLUDE_USES_FORTRAN_MK= yes
13		13
14	.if !defined(fortran_ARGS)	14	.if empty(fortran_ARGS)
15	fortran_ARGS= gcc	15	fortran_ARGS= gcc
16	.endif	16	.endif
17		17

Lines 11-17 Link Here

(-)Mk/Uses/fuse.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_FUSE_MK)	11	.if !defined(_INCLUDE_USES_FUSE_MK)
12	_INCLUDE_USES_FUSE_MK= yes	12	_INCLUDE_USES_FUSE_MK= yes
13		13
14	.if defined(fuse_ARGS)	14	.if !empty(fuse_ARGS)
15	IGNORE= USES=fuse does not require args	15	IGNORE= USES=fuse does not require args
16	.endif	16	.endif
17		17




.if !defined(_INCLUDE_USES_GECKO_MK)
_INCLUDE_USES_GECKO_MK=	yes

.if empty(gecko_ARGS)
gecko_ARGS=	libxul
.else
_GECKO_ARGS=	${gecko_ARGS:S/,/ /g}
.endif

_GECKO_VERSION=	${gecko_ARGS:M[0-9][0-9]*}

.if ${gecko_ARGS:Mlibxul}
# Compat with older versions
GECKO=	libxul
GECKO_CONFING?=	${LOCALBASE}/bin/${GECKO}-config

BUILD_DEPENDS+=	libxul>=24:${PORTSDIR}/www/libxul
RUN_DEPENDS+=	libxul>=24:${PORTSDIR}/www/libxul

.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	31
_GECKO_VERSIONS=		31 32

_GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g}
.endif

.elif ${gecko_ARGS:Mseamonkey}

_GECKO_DEFAULT_VERSION=	29
_GECKO_VERSIONS=		29

# Dependence lines for different Seamonkey versions
29_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey

.elif ${gecko_ARGS:Mthunderbird}

_GECKO_DEFAULT_VERSION=	31
_GECKO_VERSIONS=	31

.endif


.if ${gecko_ARGS:Mbuild}
BUILD_DEPENDS+=	${${_GECKO_WANTED_VERSION}_DEPENDS}
.endif
RUN_DEPENDS+=	${${_GECKO_WANTED_VERSION}_DEPENDS}

Lines 13-19 _INCLUDE_USES_GETTEXT_MK= yes Link Here

(-)Mk/Uses/gettext.mk (-1 / +1 lines)
13		13
14	_GETTEXT_DEPENDS= xgettext:${PORTSDIR}/devel/gettext	14	_GETTEXT_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
15		15
16	.if !defined(gettext_ARGS)	16	.if empty(gettext_ARGS)
17	gettext_ARGS= lib	17	gettext_ARGS= lib
18	.endif	18	.endif
19		19




.if !defined(_INCLUDE_USES_GMAKE_MK)
_INCLUDE_USES_GMAKE_MK=	yes

.if defined(gmake_ARGS)
.if ${gmake_ARGS} == lite
_GMAKE_EXT=	-lite
.elif !empty(gmake_ARGS)
IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake has only one valid argument: lite
.endif
.endif

.if defined(DIET)
_GMAKE_EXT=	-lite

Lines 81-88 _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssa Link Here

(-)Mk/Uses/gssapi.mk (-2 / +4 lines)
81	_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5	81	_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5
82	_HEADERS= sys/types.h sys/stat.h stdint.h	82	_HEADERS= sys/types.h sys/stat.h stdint.h
83		83
84	gssapi_ARGS?= base	84	.if empty(gssapi_ARGS)
85	.for _A in ${gssapi_ARGS:S/,/ /g}	85	gssapi_ARGS= base
		86	.endif
		87	.for _A in ${gssapi_ARGS}
86	_local:= ${_A}	88	_local:= ${_A}
87	.if ${_local} == "base"	89	.if ${_local} == "base"
88	HEIMDAL_HOME= /usr	90	HEIMDAL_HOME= /usr

Lines 13-20 Link Here

(-)Mk/Uses/iconv.mk (-2 lines)
13	.if !defined(_INCLUDE_USES_ICONV_MK)	13	.if !defined(_INCLUDE_USES_ICONV_MK)
14	_INCLUDE_USES_ICONV_MK= yes	14	_INCLUDE_USES_ICONV_MK= yes
15		15
16	iconv_ARGS:= ${iconv_ARGS:S/,/ /g}
17
18	.if !exists(/usr/include/iconv.h) \|\| ${iconv_ARGS:Mwchar_t} \|\| ${iconv_ARGS:Mtranslit}	16	.if !exists(/usr/include/iconv.h) \|\| ${iconv_ARGS:Mwchar_t} \|\| ${iconv_ARGS:Mtranslit}
19		17
20	ICONV_CMD= ${LOCALBASE}/bin/iconv	18	ICONV_CMD= ${LOCALBASE}/bin/iconv




.if !defined(_INCLUDE_USES_IMAKE_MK)
_INCLUDE_USES_IMAKE_MK=	yes

.if defined(imake_ARGS)
imake_ARGS:=	${imake_ARGS:S/,/ /g}
.if ${imake_ARGS:Nnotall:Nenv:Nnoman}
IGNORE=		USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
.endif
.else
imake_ARGS=
.endif

BUILD_DEPENDS+=		imake:${PORTSDIR}/devel/imake


Lines 13-19 _INCLUDE_USES_KMOD_MK= yes Link Here

(-)Mk/Uses/kmod.mk (-1 / +1 lines)
13		13
14	_USES_POST+= kmod	14	_USES_POST+= kmod
15		15
16	.if defined(kmod_ARGS)	16	.if !empty(kmod_ARGS)
17	IGNORE= USES=kmod takes no arguments	17	IGNORE= USES=kmod takes no arguments
18	.endif	18	.endif
19		19

Lines 10-16 _INCLUDE_USES_LHA_MK= yes Link Here

(-)Mk/Uses/lha.mk (-1 / +1 lines)
10		10
11	EXTRACT_SUFX?= .lzh	11	EXTRACT_SUFX?= .lzh
12		12
13	.if defined(lha_ARGS)	13	.if !empty(lha_ARGS)
14	IGNORE= Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha'	14	IGNORE= Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha'
15	.endif	15	.endif
16		16

Lines 16-22 Link Here

(-)Mk/Uses/libtool.mk (-1 lines)
16	.if !defined(_INCLUDE_USES_LIBTOOL_MK)	16	.if !defined(_INCLUDE_USES_LIBTOOL_MK)
17	_INCLUDE_USES_LIBTOOL_MK= yes	17	_INCLUDE_USES_LIBTOOL_MK= yes
18	_USES_POST+= libtool	18	_USES_POST+= libtool
19	libtool_ARGS:= ${libtool_ARGS:C/,/ /}
20		19
21	.if ${libtool_ARGS:Mbuild}	20	.if ${libtool_ARGS:Mbuild}
22	BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool	21	BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool




IGNORE=	Invalid lua version ${LUA_DEFAULT}
.endif

_LUA_ARGS=	${lua_ARGS:S/,/ /g}

#
# Parse a ver+ argument
#
.if ${lua_ARGS:M*+}
_LUA_MIN_VERSION:=	${lua_ARGS:M*+:S/+//}
_LUA_WANTED_VERSION:=	${_LUA_DEFAULT_VERSION}
.endif

#
# Parse one or more ver arguments
#
.if ${lua_ARGS:M5[1-2]}
_LUA_WANTED_VERSIONS:=	${lua_ARGS:M5[1-2]}
.endif

#

		LUA_INCDIR=${LUA_INCDIR} \
		LUA_LIBDIR=${LUA_LIBDIR}

.if ${lua_ARGS:Mbuild}
BUILD_DEPENDS+=	${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
.elfif ${lua_ARGS:Mrun}
RUN_DEPENDS+=	${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
.else
LIB_DEPENDS+=	liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR}

Lines 11-17 Link Here

(-)Mk/Uses/makeinfo.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_MAKEINFO_MK)	11	.if !defined(_INCLUDE_USES_MAKEINFO_MK)
12	_INCLUDE_USES_MAKEINFO_MK= yes	12	_INCLUDE_USES_MAKEINFO_MK= yes
13		13
14	.if defined(makeinfo_ARGS)	14	.if !empty(makeinfo_ARGS)
15	IGNORE= USES=makeinfo - expects no arguments	15	IGNORE= USES=makeinfo - expects no arguments
16	.endif	16	.endif
17		17

Lines 10-16 Link Here

(-)Mk/Uses/makeself.mk (-1 / +1 lines)
10	.if !defined(_INCLUDE_USES_MAKESELF_Mk)	10	.if !defined(_INCLUDE_USES_MAKESELF_Mk)
11	_INCLUDE_USES_MAKESELF_MK= yes	11	_INCLUDE_USES_MAKESELF_MK= yes
12		12
13	.if defined(makeself_ARGS)	13	.if !empty(makeself_ARGS)
14	IGNORE= Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments	14	IGNORE= Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments
15	.endif	15	.endif
16		16

Lines 10-16 Link Here

(-)Mk/Uses/mono.mk (-1 / +1 lines)
10	.if !defined(_INCLUDE_USES_MONO_MK)	10	.if !defined(_INCLUDE_USES_MONO_MK)
11	_INCLUDE_USES_MONO_MK= yes	11	_INCLUDE_USES_MONO_MK= yes
12		12
13	.if defined(mono_ARGS)	13	.if !empty(mono_ARGS)
14	IGNORE= USES=mono takes no arguments	14	IGNORE= USES=mono takes no arguments
15	.endif	15	.endif
16		16

Lines 13-19 Link Here

(-)Mk/Uses/motif.mk (-1 / +1 lines)
13	.if !defined(_INCLUDE_USES_MOTIF_MK)	13	.if !defined(_INCLUDE_USES_MOTIF_MK)
14	_INCLUDE_USES_MOTIF_MK= yes	14	_INCLUDE_USES_MOTIF_MK= yes
15		15
16	.if defined(motif_ARGS)	16	.if !empty(motif_ARGS)
17	IGNORE= USES=motif takes no arguments	17	IGNORE= USES=motif takes no arguments
18	.endif	18	.endif
19		19

Lines 26-36 Link Here

(-)Mk/Uses/ncurses.mk (-2 / +3 lines)
26	.if !defined(_INCLUDE_USES_NCURSES_MK)	26	.if !defined(_INCLUDE_USES_NCURSES_MK)
27	_INCLUDE_USES_NCURSES_MK= yes	27	_INCLUDE_USES_NCURSES_MK= yes
28		28
29	.if !defined(ncurses_ARGS)	29	.if empty(ncurses_ARGS)
30	. if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/include/ncurses.h)	30	. if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/include/ncurses.h)
31	ncurses_ARGS= base	31	ncurses_ARGS= base
		32	. else
		33	ncurses_ARGS= port
32	. endif	34	. endif
33	ncurses_ARGS?= port
34	.endif	35	.endif
35		36
36	.if ${ncurses_ARGS} == base	37	.if ${ncurses_ARGS} == base

Lines 13-19 Link Here

(-)Mk/Uses/ninja.mk (-1 / +1 lines)
13	.if !defined(_INCLUDE_USES_NINJA_MK)	13	.if !defined(_INCLUDE_USES_NINJA_MK)
14	_INCLUDE_USES_NINJA_MK= yes	14	_INCLUDE_USES_NINJA_MK= yes
15		15
16	.if defined(ninja_ARGS)	16	.if !empty(ninja_ARGS)
17	IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments	17	IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
18	.endif	18	.endif
19		19

Lines 10-16 Link Here

(-)Mk/Uses/objc.mk (-1 / +1 lines)
10	.if !defined(_INCLUDE_USES_OBJC_MK)	10	.if !defined(_INCLUDE_USES_OBJC_MK)
11	_INCLUDE_USES_OBJC_MK= yes	11	_INCLUDE_USES_OBJC_MK= yes
12		12
13	.if defined(objc_ARGS)	13	.if !empty(objc_ARGS)
14	IGNORE= USES=objc takes no arguments	14	IGNORE= USES=objc takes no arguments
15	.endif	15	.endif
16		16




_INCLUDE_USES_OPENAL_MK=	yes

_valid_ARGS=	al si soft alut
_openal_ARGS=	${openal_ARGS:C/,/ /g}

_si_DEPENDS=	libopenal.so.0:${PORTSDIR}/audio/openal
_soft_DEPENDS=	libopenal.so.1:${PORTSDIR}/audio/openal-soft

.endif

# Be friendly
.if empty(openal_ARGS)
openal_ARGS=	${_DEFAULT_OPENAL}
.endif

# Sanity checks

IGNORE=	OpenAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired
.endif

.for _arg in ${openal_ARGS}
.  for _arg in ${_openal_ARGS}
.    if ! ${_valid_ARGS:M${_arg}}
IGNORE=	Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] is not recognized
.    endif
.    if ${_OPENAL_LIBS:M${_arg}} && ${openal_ARGS:Mal}
IGNORE=	Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] cannot be used together with al
.    endif
.    if ${_OPENAL_LIBS:M${_arg}} && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${_arg}

.    endif
.    if ${_OPENAL_LIBS:M${_arg}}
.      for _carg in ${_OPENAL_LIBS:N${_arg}}
.        if ${openal_ARGS:M${_carg}}
IGNORE=	Incorrect 'USES+= openal:${openal_ARGS}' usage: arguments [${_arg}] and [${_carg}] cannot be used together
.        endif
.      endfor
.    endif
.endfor
.endif

# Proceed
_USE_OPENAL=

.if ${openal_ARGS:Mal}
.if defined(_HAVE_OPENAL)
_USE_OPENAL=	${_HAVE_OPENAL}
.elif defined(WANT_OPENAL)

.endif
.endif

.for _arg in ${openal_ARGS:Nal}
_USE_OPENAL+=	${_arg}
.endfor


Lines 12-18 Link Here

(-)Mk/Uses/pathfix.mk (-1 / +1 lines)
12	.if !defined(_INCLUDE_USES_PATHFIX_MK)	12	.if !defined(_INCLUDE_USES_PATHFIX_MK)
13	_INCLUDE_USES_PATHFIX_MK= yes	13	_INCLUDE_USES_PATHFIX_MK= yes
14		14
15	.if defined(pathfix_ARGS)	15	.if !empty(pathfix_ARGS)
16	IGNORE= USES=pathfix does not require args	16	IGNORE= USES=pathfix does not require args
17	.endif	17	.endif
18		18

Lines 12-18 Link Here

(-)Mk/Uses/pear.mk (-1 / +1 lines)
12	_INCLUDE_USES_PEAR_MK= yes	12	_INCLUDE_USES_PEAR_MK= yes
13	_USES_POST+= pear	13	_USES_POST+= pear
14		14
15	.if defined(pear_ARGS)	15	.if !empty(pear_ARGS)
16	IGNORE+= USES=pear takes not arguments	16	IGNORE+= USES=pear takes not arguments
17	.endif	17	.endif
18		18

Lines 36-42 Link Here

(-)Mk/Uses/perl5.mk (-1 / +1 lines)
36	.if !defined(_INCLUDE_USES_PERL5_MK)	36	.if !defined(_INCLUDE_USES_PERL5_MK)
37	_INCLUDE_USES_PERL5_MK= yes	37	_INCLUDE_USES_PERL5_MK= yes
38		38
39	.if defined(perl5_ARGS)	39	.if !empty(perl5_ARGS)
40	IGNORE= Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments	40	IGNORE= Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments
41	.endif	41	.endif
42		42

Lines 67-73 _PGSQL_VER!= ${PG_CONFIG} --version \| ${ Link Here

(-)Mk/Uses/pgsql.mk (-1 / +1 lines)
67	. endif	67	. endif
68		68
69	# Handle the + and - version stuff	69	# Handle the + and - version stuff
70	. if defined(pgsql_ARGS)	70	. if !empty(pgsql_ARGS)
71	. if ${pgsql_ARGS:M*+}	71	. if ${pgsql_ARGS:M*+}
72	. for version in ${VALID_PGSQL_VER}	72	. for version in ${VALID_PGSQL_VER}
73	. if ${pgsql_ARGS:S/+//} <= ${version}	73	. if ${pgsql_ARGS:S/+//} <= ${version}

Lines 13-19 _INCLUDE_USES_PKGCONFIG_MK= yes Link Here

(-)Mk/Uses/pkgconfig.mk (-1 / +1 lines)
13		13
14	_PKGCONFIG_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf	14	_PKGCONFIG_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf
15		15
16	.if !defined(pkgconfig_ARGS)	16	.if empty(pkgconfig_ARGS)
17	pkgconfig_ARGS= build	17	pkgconfig_ARGS= build
18	.endif	18	.endif
19		19




_INCLUDE_USES_PURE_MK=	yes

_valid_ARGS=		ffi
_pure_ARGS=		${pure_ARGS:C/\:/ /g}

# Sanity check
.for arg in ${pure_ARGS}
.  for arg in ${_pure_ARGS}
.    if empty(_valid_ARGS:M${arg})
IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not recognized
.    endif
.endfor
.endif

LIB_DEPENDS+=	libpure.so:${PORTSDIR}/lang/pure
.include "${USESDIR}/gmake.mk"

.if ${pure_ARGS:Mffi}
RUN_DEPENDS+=	${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi
.endif


Lines 237-247 _PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VE Link Here

(-)Mk/Uses/python.mk (-5 lines)
237	_PYTHON_BASECMD= ${LOCALBASE}/bin/python	237	_PYTHON_BASECMD= ${LOCALBASE}/bin/python
238	_PYTHON_RELPORTDIR= ${PORTSDIR}/lang/python	238	_PYTHON_RELPORTDIR= ${PORTSDIR}/lang/python
239		239
240	# Check the passed arguments
241	.if !defined(python_ARGS)
242	python_ARGS= #empty
243	.endif
244
245	# COMPAT KNOBS, remove them, once the tree is cleaned	240	# COMPAT KNOBS, remove them, once the tree is cleaned
246	.undef _PY_COMPAT_OLD	241	.undef _PY_COMPAT_OLD
247	# We will reuse USE_PYTHON with a different meaning, so make sure that, while	242	# We will reuse USE_PYTHON with a different meaning, so make sure that, while

Lines 20-26 _INCLUDE_QMAIL_MK= yes Link Here

(-)Mk/Uses/qmail.mk (-1 / +1 lines)
20		20
21	QMAIL_PREFIX?= /var/qmail	21	QMAIL_PREFIX?= /var/qmail
22		22
23	.if !defined(qmail_ARGS)	23	.if empty(qmail_ARGS)
24	qmail_ARGS= both	24	qmail_ARGS= both
25	.endif	25	.endif
26		26




# targets (currently, only qmake-configure), without qmake being added to the
# configure stage.
_VALID_ARGS=	norecursive outsource _env
_qmake_ARGS=	${qmake_ARGS:S/\:/ /g}

.for arg in ${qmake_ARGS}
. for arg in ${_qmake_ARGS}
.  if empty(_VALID_ARGS:M${arg})
IGNORE=	Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized
.  endif
.endfor
.endif

.if ! ${qmake_ARGS:M_env}
USE_QT${_QT_VERSION:R:R}+=	qmake_build
.endif


.endif # defined(WITH_DEBUG)

# We set -recursive by default to keep qmake from running in the build stage.
.if ! ${qmake_ARGS:Mnorecursive}
QMAKE_ARGS+=	-recursive
.endif


# use it for both qtbase and USES=qmake ports. They are private, not supposed to
# be used anywhere else.
_QMAKE_WRKSRC?=	${CONFIGURE_WRKSRC}
.if ${qmake_ARGS:Moutsource}
CONFIGURE_WRKSRC=	${WRKDIR}/.build
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
INSTALL_WRKSRC=		${BUILD_WRKSRC}

QMAKE_SOURCE_PATH?=	# empty
.endif

.if ! ${qmake_ARGS:M_env}
DESTDIRNAME=	INSTALL_ROOT
.endif


	@cd ${_QMAKE_WRKSRC} && \
		${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}

.if !target(do-configure) && ! ${qmake_ARGS:M_env}
do-configure: qmake-configure
	@${DO_NADA}
.endif

Lines 15-21 _INCLUDE_USES_READLINE_MK= yes Link Here

(-)Mk/Uses/readline.mk (-1 / +1 lines)
15	readline_ARGS= port	15	readline_ARGS= port
16	.endif	16	.endif
17		17
18	.if defined(readline_ARGS) && ${readline_ARGS} == port	18	.if ${readline_ARGS} == port
19	LIB_DEPENDS+= libreadline.so.6:${PORTSDIR}/devel/readline	19	LIB_DEPENDS+= libreadline.so.6:${PORTSDIR}/devel/readline
20	CPPFLAGS+= -I${LOCALBASE}/include	20	CPPFLAGS+= -I${LOCALBASE}/include
21	LDFLAGS+= -L${LOCALBASE}/lib	21	LDFLAGS+= -L${LOCALBASE}/lib

Lines 10-16 Link Here

(-)Mk/Uses/scons.mk (-1 / +1 lines)
10	.if !defined(_INCLUDE_USES_SCONS_MK)	10	.if !defined(_INCLUDE_USES_SCONS_MK)
11	_INCLUDE_USES_SCONS_MK= yes	11	_INCLUDE_USES_SCONS_MK= yes
12		12
13	.if defined(scons_ARGS)	13	.if !empty(scons_ARGS)
14	IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments	14	IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments
15	.endif	15	.endif
16		16

Lines 11-17 Link Here

(-)Mk/Uses/shared-mime-info.mk (-1 / +1 lines)
11	.if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK)	11	.if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK)
12	_INCLUDE_USES_SHARED_MIME_INFO_MK= yes	12	_INCLUDE_USES_SHARED_MIME_INFO_MK= yes
13		13
14	.if defined(shared-mime-info_ARGS)	14	.if !empty(shared-mime-info_ARGS)
15	IGNORE= USES=shared-mime-info does not require args	15	IGNORE= USES=shared-mime-info does not require args
16	.endif	16	.endif
17		17

Lines 10-17 Link Here

(-)Mk/Uses/tar.mk (-3 / +1 lines)
10	.if !defined(_INCLUDE_USES_TAR_MK)	10	.if !defined(_INCLUDE_USES_TAR_MK)
11	_INCLUDE_USES_TAR_MK= yes	11	_INCLUDE_USES_TAR_MK= yes
12		12
13	tar_ARGS?= none
14
15	.if ${tar_ARGS} == xz	13	.if ${tar_ARGS} == xz
16	EXTRACT_SUFX?= .tar.xz	14	EXTRACT_SUFX?= .tar.xz
17	.elif ${tar_ARGS} == lzma	15	.elif ${tar_ARGS} == lzma
Lines 26-32 EXTRACT_SUFX?= .tgz Link Here
26	EXTRACT_SUFX?= .tbz	24	EXTRACT_SUFX?= .tbz
27	.elif ${tar_ARGS} == Z	25	.elif ${tar_ARGS} == Z
28	EXTRACT_SUFX?= .tar.Z	26	EXTRACT_SUFX?= .tar.Z
29	.elif ${tar_ARGS} == none	27	.elif empty(tar_ARGS)
30	EXTRACT_SUFX?= .tar	28	EXTRACT_SUFX?= .tar
31	.else	29	.else
32	IGNORE= Incorrect 'USES+=tar:${tar_ARGS}'	30	IGNORE= Incorrect 'USES+=tar:${tar_ARGS}'




_TCLTK_PORT?=	tcl

#
# Build a make(1)-friendly list of arguments (i.e., space separated).
#
_TCL_ARGS=	${tcl_ARGS:S/,/ /g}

#
# Parse a ver+ argument.
#
.if ${tcl_ARGS:M*+}
_TCLTK_MIN_VERSION:=	${tcl_ARGS:M*+:S/+//}
_TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
.endif

#
# Parse one or more ver arguments.
#
.if ${tcl_ARGS:M8[4-6]}
_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-6]}
.endif

#
# It makes little sense to specify both the wrapper and a specific version.
#
.if ${tcl_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS)
IGNORE=	USES=${_TCLTK_PORT}: it is not possible to specify both a version and the wrapper: ${tcl_ARGS}
.endif


_TCLTK_LIB_DEPENDS=

# Construct the correct dependency lines (wrapper)
.if ${tcl_ARGS:Mwrapper}
.  if ${_TCLTK_PORT} == "tcl"
_TCLTK_WRAPPER_PORT=	tclsh:${PORTSDIR}/lang/tcl-wrapper
.  elif ${_TCLTK_PORT} == "tk"

_TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}
.endif

.if ${tcl_ARGS:Mbuild}
BUILD_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
		${_TCLTK_EXE_LINE}
.elif ${tcl_ARGS:Mrun}
RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
		${_TCLTK_EXE_LINE}
.else

Lines 3-11 Link Here

(-)Mk/Uses/tk.mk (-3 / +1 lines)
3	# vim: ts=8 noexpandtab	3	# vim: ts=8 noexpandtab
4	#	4	#
5		5
6	.if defined(tk_ARGS)	6	tcl_ARGS= ${tk_ARGS}
7	tcl_ARGS:= ${tk_ARGS}
8	.endif
9		7
10	_TCLTK_PORT= tk	8	_TCLTK_PORT= tk
11		9




.if !defined(_INCLUDE_USES_TWISTED_MK)
_INCLUDE_USES_TWISTED_MK=	yes

# Assume both if neither build nor run are specified.
.if ${twisted_ARGS:Mbuild} || empty(twisted_ARGS:Mrun)
.endif

_TWISTED_ARGS=	${twisted_ARGS:S/,/ /g}

.if ${_TWISTED_ARGS:Mbuild}
_TWISTED_BUILD_DEP=	yes
_TWISTED_ARGS:=		${_TWISTED_ARGS:Nbuild}
.endif
.if ${_TWISTED_ARGS:Mrun}
_TWISTED_RUN_DEP=	yes
_TWISTED_ARGS:=		${_TWISTED_ARGS:Nrun}
.endif

.if !defined(_TWISTED_BUILD_DEP) && !defined(_TWISTED_RUN_DEP)
# The port only seems to specify components, but neither run or build.
# Assume them to be build and run dependencies.
_TWISTED_BUILD_DEP=	yes
_TWISTED_RUN_DEP=	yes
.endif

.if defined(_TWISTED_BUILD_DEP)
BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
.endif
.if ${twisted_ARGS:Mrun} || empty(twisted_ARGS:Mbuild)
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
.endif


web_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
words_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords

.for component in ${twisted_ARGS:Nbuild:Nrun}
.  if ${_TWISTED_COMPONENTS:M${component}}==""
IGNORE=	cannot install unknown twisted component ${component}
.  endif

Lines 64-73 Link Here

(-)Mk/Uses/uniquefiles.mk (-4 lines)
64	.if !defined(_INCLUDE_USES_UNIQUEFILES_MK)	64	.if !defined(_INCLUDE_USES_UNIQUEFILES_MK)
65	_INCLUDE_USES_UNIQUEFILES_MK= yes	65	_INCLUDE_USES_UNIQUEFILES_MK= yes
66		66
67	.if !defined(uniquefiles_ARGS)
68	uniquefiles_ARGS= #empty
69	.endif
70
71	UNIQUE_PREFIX?= ${PKGNAMEPREFIX}	67	UNIQUE_PREFIX?= ${PKGNAMEPREFIX}
72	UNIQUE_SUFFIX?= ${PKGNAMESUFFIX}	68	UNIQUE_SUFFIX?= ${PKGNAMESUFFIX}
73	UNIQUE_PREFIX_FILES?= # empty	69	UNIQUE_PREFIX_FILES?= # empty




_WEBPLUGIN_APPS_ALL=		${_WEBPLUGIN_APPS_ALL_LINUX} \
				${_WEBPLUGIN_APPS_ALL_NATIVE}

webplugin_ARGS?=	all
_WEBPLUGIN_ARGS=	${webplugin_ARGS:C/,/ /}
_WEBPLUGIN_TEST=	${_WEBPLUGIN_APPS_ALL}
.if ${webplugin_ARGS} == all || empty(webplugin_ARGS)
_WEBPLUGIN_PATTERN=	*
.elif ${webplugin_ARGS} == native
_WEBPLUGIN_PATTERN=	*
_WEBPLUGIN_TEST=	${_WEBPLUGIN_APPS_ALL_NATIVE}
.elif ${webplugin_ARGS} == linux
_WEBPLUGIN_PATTERN=	*
_WEBPLUGIN_TEST=	${_WEBPLUGIN_APPS_ALL_LINUX}
.else
_WEBPLUGIN_PATTERN=	${webplugin_ARGS}
.endif

.if !defined(WEBPLUGIN_FILES)

Lines 10-17 Link Here

(-)Mk/Uses/zip.mk (-3 / +1 lines)
10	.if !defined(_INCLUDE_USES_ZIP_Mk)	10	.if !defined(_INCLUDE_USES_ZIP_Mk)
11	_INCLUDE_USES_ZIP_MK= yes	11	_INCLUDE_USES_ZIP_MK= yes
12		12
13	zip_ARGS?= none
14
15	EXTRACT_SUFX?= .zip	13	EXTRACT_SUFX?= .zip
16		14
17	EXTRACT_BEFORE_ARGS?= -qo	15	EXTRACT_BEFORE_ARGS?= -qo
Lines 20-26 EXTRACT_AFTER_ARGS?= -d ${WRKDIR} Link Here
20	.if ${zip_ARGS} == infozip	18	.if ${zip_ARGS} == infozip
21	EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip	19	EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
22	EXTRACT_CMD?= ${UNZIP_CMD}	20	EXTRACT_CMD?= ${UNZIP_CMD}
23	.elif ${zip_ARGS} == none	21	.elif empty(zip_ARGS)
24	EXTRACT_CMD?= ${UNZIP_NATIVE_CMD}	22	EXTRACT_CMD?= ${UNZIP_NATIVE_CMD}
25	.else	23	.else
26	IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'	24	IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'

Lines 1493-1503 QA_ENV+= USESSHAREDMIMEINFO=yes Link Here

(-)Mk/bsd.port.mk (-9 / +10 lines)
1493		1493
1494	# Loading features	1494	# Loading features
1495	.for f in ${USES}	1495	.for f in ${USES}
1496	_f=${f:C/\:.*//g}	1496	${f:C/\:.//}_ARGS:= ${f:C/^[^\:](\:\|\$)//:S/,/ /g}
1497	.if ${_f} != ${f}	1497	.endfor
1498	${_f}_ARGS:= ${f:C/^[^\:]*\://g}	1498	.for f in ${USES}
1499	.endif	1499	.include "${USESDIR}/${f:C/\:.*//}.mk"
1500	.include "${USESDIR}/${_f}.mk"
1501	.endfor	1500	.endfor
1502		1501
1503	.if defined(USE_BZIP2)	1502	.if defined(USE_BZIP2)
Lines 1917-1927 USE_SUBMAKE= yes Link Here
1917		1916
1918	# Loading features	1917	# Loading features
1919	.for f in ${_USES_POST}	1918	.for f in ${_USES_POST}
1920	_f=${f:C/\:.*//g}	1919	_f:= ${f:C/\:.*//}
1921	.if ${_f} != ${f}	1920	.if !defined(${_f}_ARGS) \|\| ${_f} != ${f}
1922	${_f}_ARGS:= ${f:C/^[^\:]*\://g}	1921	${_f}_ARGS:= ${f:C/^[^\:]*(\:\|\$)//:S/,/ /g}
1923	.endif	1922	.endif
1924	.include "${USESDIR}/${_f}.mk"	1923	.endfor
		1924	.for f in ${_USES_POST}
		1925	.include "${USESDIR}/${f:C/\:.*//}.mk"
1925	.endfor	1926	.endfor
1926		1927
1927	.if defined(USE_XORG)	1928	.if defined(USE_XORG)

Return to bug 193931

Lines 53-59 Link Here

(-)Mk/Uses/autoreconf.mk (-5 / +2 lines)
53	.if !defined(_INCLUDE_USES_AUTORECONF_MK)	53	.if !defined(_INCLUDE_USES_AUTORECONF_MK)
54	_INCLUDE_USES_AUTORECONF_MK= yes	54	_INCLUDE_USES_AUTORECONF_MK= yes
55	_USES_POST+= autoreconf	55	_USES_POST+= autoreconf
56	autoreconf_ARGS:= ${autoreconf_ARGS}
57		56
58	BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \	57	BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \
59	autoheader-2.69:${PORTSDIR}/devel/autoconf \	58	autoheader-2.69:${PORTSDIR}/devel/autoconf \
Lines 61-73 BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR Link Here
61	aclocal-1.14:${PORTSDIR}/devel/automake \	60	aclocal-1.14:${PORTSDIR}/devel/automake \
62	automake-1.14:${PORTSDIR}/devel/automake	61	automake-1.14:${PORTSDIR}/devel/automake
63		62
64	# Depend on autopoint if USES contains gettext* but not gettext:run	63	.if ${USES:Mgettext} && empty(gettext_ARGS:Mrun)
65	.if ${USES:Mgettext} \|\| (${USES:Mgettext\:*} && empty(USES:Mgettext\:run))
66	BUILD_DEPENDS+= autopoint:${PORTSDIR}/devel/gettext	64	BUILD_DEPENDS+= autopoint:${PORTSDIR}/devel/gettext
67	.endif	65	.endif
68		66
69	# Depend on libtoolize if USES contains libtool* but not libtool:build	67	.if ${USES:Mlibtool} && empty(libtool_ARGS:Mbuild)
70	.if ${USES:Mlibtool} \|\| (${USES:Mlibtool\:} && empty(USES:Mlibtool\:build*))
71	BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool	68	BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool
72	.endif	69	.endif
73		70

Lines 41-61 Link Here

(-)Mk/Uses/cmake.mk (-7 / +4 lines)
41	_INCLUDE_USES_CMAKE_MK= yes	41	_INCLUDE_USES_CMAKE_MK= yes
42		42
43	_valid_ARGS= outsource run	43	_valid_ARGS= outsource run
44	_cmake_ARGS= ${cmake_ARGS:C/\:/ /g}
45		44
46	# Sanity check	45	# Sanity check
47	.if defined(cmake_ARGS)	46	.for arg in ${cmake_ARGS}
48	. for arg in ${_cmake_ARGS}
49	. if empty(_valid_ARGS:M${arg})	47	. if empty(_valid_ARGS:M${arg})
50	IGNORE= Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized	48	IGNORE= Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized
51	. endif	49	. endif
52	. endfor	50	.endfor
53	.endif
54		51
55	CMAKE_BIN= ${LOCALBASE}/bin/cmake	52	CMAKE_BIN= ${LOCALBASE}/bin/cmake
56	BUILD_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake	53	BUILD_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake
57		54
58	.if ${_cmake_ARGS:Mrun}	55	.if ${cmake_ARGS:Mrun}
59	RUN_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake	56	RUN_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake
60	.endif	57	.endif
61		58
Lines 109-115 CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOO Link Here
109	_CMAKE_MSG= "===> Performing in-source build"	106	_CMAKE_MSG= "===> Performing in-source build"
110	CMAKE_SOURCE_PATH?= ${WRKSRC}	107	CMAKE_SOURCE_PATH?= ${WRKSRC}
111		108
112	.if ${_cmake_ARGS:Moutsource}	109	.if ${cmake_ARGS:Moutsource}
113	_CMAKE_MSG= "===> Performing out-of-source build"	110	_CMAKE_MSG= "===> Performing out-of-source build"
114	CONFIGURE_WRKSRC= ${WRKDIR}/.build	111	CONFIGURE_WRKSRC= ${WRKDIR}/.build
115	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}	112	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}

Lines 13-37 Link Here

(-)Mk/Uses/drupal.mk (-8 / +6 lines)
13	.if !defined(_INCLUDE_USES_DRUPAL_Mk)	13	.if !defined(_INCLUDE_USES_DRUPAL_Mk)
14	_INCLUDE_USES_DRUPAL_Mk= yes	14	_INCLUDE_USES_DRUPAL_Mk= yes
15		15
16	_drupal_ARGS= ${drupal_ARGS:S/,/ /g}	16	.if ${drupal_ARGS:M[67]}
17		17	_DRUPAL_VERSION= ${drupal_ARGS:M[67]}
18	.if ${_drupal_ARGS:M[67]}
19	_DRUPAL_VERSION= ${_drupal_ARGS:M[67]}
20	.endif	18	.endif
21		19
22	VALID_VERSIONS= 6 7	20	VALID_VERSIONS= 6 7
23		21
24	.if ${_drupal_ARGS:N[67]:Ntheme:Nmodule}	22	.if ${drupal_ARGS:N[67]:Ntheme:Nmodule}
25	IGNORE= Unknown argument for USES=drupal: ${_drupal_ARGS:N[67]:Ntheme:Nmodule}	23	IGNORE= Unknown argument for USES=drupal: ${drupal_ARGS:N[67]:Ntheme:Nmodule}
26	.endif	24	.endif
27		25
28	_DRUPAL_COMP= ${_drupal_ARGS:N[67]}	26	_DRUPAL_COMP= ${drupal_ARGS:N[67]}
29		27
30	.if !defined(_DRUPAL_VERSION) \|\| ! ${VALID_VERSIONS:M${_DRUPAL_VERSION}}	28	.if !defined(_DRUPAL_VERSION) \|\| ! ${VALID_VERSIONS:M${_DRUPAL_VERSION}}
31	IGNORE= Missing or invalid argument for USES=drupal, a version must be provided: ${VALID_VERSIONS}	29	IGNORE= Missing or invalid argument for USES=drupal, a version must be provided: ${VALID_VERSIONS}
32	.endif	30	.endif
33		31
34	.if ${_drupal_ARGS:Mmodule} && ${_drupal_ARGS:Mtheme}	32	.if ${drupal_ARGS:Mmodule} && ${drupal_ARGS:Mtheme}
35	IGNORE= theme and module arguments are mutually exclusive for USES=drupal	33	IGNORE= theme and module arguments are mutually exclusive for USES=drupal
36	.endif	34	.endif
37		35

Lines 18-32 Link Here

(-)Mk/Uses/gecko.mk (-10 / +8 lines)
18	.if !defined(_INCLUDE_USES_GECKO_MK)	18	.if !defined(_INCLUDE_USES_GECKO_MK)
19	_INCLUDE_USES_GECKO_MK= yes	19	_INCLUDE_USES_GECKO_MK= yes
20		20
21	.if !defined(gecko_ARGS)	21	.if empty(gecko_ARGS)
22	_GECKO_ARGS= libxul	22	gecko_ARGS= libxul
23	.else
24	_GECKO_ARGS= ${gecko_ARGS:S/,/ /g}
25	.endif	23	.endif
26		24
27	_GECKO_VERSION= ${_GECKO_ARGS:M[0-9][0-9]*}	25	_GECKO_VERSION= ${gecko_ARGS:M[0-9][0-9]*}
28		26
29	.if ${_GECKO_ARGS:Mlibxul}	27	.if ${gecko_ARGS:Mlibxul}
30	# Compat with older versions	28	# Compat with older versions
31	GECKO= libxul	29	GECKO= libxul
32	GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config	30	GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config
Lines 36-42 XPIDL_INCL?= `${GECKO_CONFIG} --idlflags Link Here
36	BUILD_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul	34	BUILD_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul
37	RUN_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul	35	RUN_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul
38		36
39	.elif ${_GECKO_ARGS:Mfirefox}	37	.elif ${gecko_ARGS:Mfirefox}
40		38
41	_GECKO_DEFAULT_VERSION= 31	39	_GECKO_DEFAULT_VERSION= 31
42	_GECKO_VERSIONS= 31 32	40	_GECKO_VERSIONS= 31 32
Lines 51-57 _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/ Link Here
51	_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]:C/([0-9][0-9])./\1/g}	49	_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]:C/([0-9][0-9])./\1/g}
52	.endif	50	.endif
53		51
54	.elif ${_GECKO_ARGS:Mseamonkey}	52	.elif ${gecko_ARGS:Mseamonkey}
55		53
56	_GECKO_DEFAULT_VERSION= 29	54	_GECKO_DEFAULT_VERSION= 29
57	_GECKO_VERSIONS= 29	55	_GECKO_VERSIONS= 29
Lines 65-71 _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE Link Here
65	# Dependence lines for different Seamonkey versions	63	# Dependence lines for different Seamonkey versions
66	29_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey	64	29_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
67		65
68	.elif ${_GECKO_ARGS:Mthunderbird}	66	.elif ${gecko_ARGS:Mthunderbird}
69		67
70	_GECKO_DEFAULT_VERSION= 31	68	_GECKO_DEFAULT_VERSION= 31
71	_GECKO_VERSIONS= 31	69	_GECKO_VERSIONS= 31
Lines 119-125 _GECKO_WANTED_VERSION:= ${_GECKO_HIGHEST Link Here
119	.endif	117	.endif
120		118
121		119
122	.if ${_GECKO_ARGS:Mbuild}	120	.if ${gecko_ARGS:Mbuild}
123	BUILD_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS}	121	BUILD_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS}
124	.endif	122	.endif
125	RUN_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS}	123	RUN_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS}

Lines 10-22 Link Here

(-)Mk/Uses/gmake.mk (-3 / +1 lines)
10	.if !defined(_INCLUDE_USES_GMAKE_MK)	10	.if !defined(_INCLUDE_USES_GMAKE_MK)
11	_INCLUDE_USES_GMAKE_MK= yes	11	_INCLUDE_USES_GMAKE_MK= yes
12		12
13	.if defined(gmake_ARGS)
14	.if ${gmake_ARGS} == lite	13	.if ${gmake_ARGS} == lite
15	_GMAKE_EXT= -lite	14	_GMAKE_EXT= -lite
16	.else	15	.elif !empty(gmake_ARGS)
17	IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake has only one valid argument: lite	16	IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake has only one valid argument: lite
18	.endif	17	.endif
19	.endif
20		18
21	.if defined(DIET)	19	.if defined(DIET)
22	_GMAKE_EXT= -lite	20	_GMAKE_EXT= -lite

Lines 14-27 Link Here

(-)Mk/Uses/imake.mk (-5 lines)
14	.if !defined(_INCLUDE_USES_IMAKE_MK)	14	.if !defined(_INCLUDE_USES_IMAKE_MK)
15	_INCLUDE_USES_IMAKE_MK= yes	15	_INCLUDE_USES_IMAKE_MK= yes
16		16
17	.if defined(imake_ARGS)
18	imake_ARGS:= ${imake_ARGS:S/,/ /g}
19	.if ${imake_ARGS:Nnotall:Nenv:Nnoman}	17	.if ${imake_ARGS:Nnotall:Nenv:Nnoman}
20	IGNORE= USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument	18	IGNORE= USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
21	.endif	19	.endif
22	.else
23	imake_ARGS=
24	.endif
25		20
26	BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake	21	BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake
27		22

Lines 15-35 _LUA_DEFAULT_VERSION= ${LUA_DEFAULT:S/./ Link Here

(-)Mk/Uses/lua.mk (-8 / +6 lines)
15	IGNORE= Invalid lua version ${LUA_DEFAULT}	15	IGNORE= Invalid lua version ${LUA_DEFAULT}
16	.endif	16	.endif
17		17
18	_LUA_ARGS= ${lua_ARGS:S/,/ /g}
19
20	#	18	#
21	# Parse a ver+ argument	19	# Parse a ver+ argument
22	#	20	#
23	.if ${_LUA_ARGS:M*+}	21	.if ${lua_ARGS:M*+}
24	_LUA_MIN_VERSION:= ${_LUA_ARGS:M*+:S/+//}	22	_LUA_MIN_VERSION:= ${lua_ARGS:M*+:S/+//}
25	_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION}	23	_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION}
26	.endif	24	.endif
27		25
28	#	26	#
29	# Parse one or more ver arguments	27	# Parse one or more ver arguments
30	#	28	#
31	.if ${_LUA_ARGS:M5[1-2]}	29	.if ${lua_ARGS:M5[1-2]}
32	_LUA_WANTED_VERSIONS:= ${_LUA_ARGS:M5[1-2]}	30	_LUA_WANTED_VERSIONS:= ${lua_ARGS:M5[1-2]}
33	.endif	31	.endif
34		32
35	#	33	#
Lines 95-103 MAKE_ENV+= LUA_MODLIBDIR=${LUA_MODLIBDIR Link Here
95	LUA_INCDIR=${LUA_INCDIR} \	93	LUA_INCDIR=${LUA_INCDIR} \
96	LUA_LIBDIR=${LUA_LIBDIR}	94	LUA_LIBDIR=${LUA_LIBDIR}
97		95
98	.if ${_LUA_ARGS:Mbuild}	96	.if ${lua_ARGS:Mbuild}
99	BUILD_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}	97	BUILD_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
100	.elfif ${_LUA_ARGS:Mrun}	98	.elfif ${lua_ARGS:Mrun}
101	RUN_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}	99	RUN_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
102	.else	100	.else
103	LIB_DEPENDS+= liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR}	101	LIB_DEPENDS+= liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR}

Lines 16-22 Link Here

(-)Mk/Uses/openal.mk (-11 / +8 lines)
16	_INCLUDE_USES_OPENAL_MK= yes	16	_INCLUDE_USES_OPENAL_MK= yes
17		17
18	_valid_ARGS= al si soft alut	18	_valid_ARGS= al si soft alut
19	_openal_ARGS= ${openal_ARGS:C/,/ /g}
20		19
21	_si_DEPENDS= libopenal.so.0:${PORTSDIR}/audio/openal	20	_si_DEPENDS= libopenal.so.0:${PORTSDIR}/audio/openal
22	_soft_DEPENDS= libopenal.so.1:${PORTSDIR}/audio/openal-soft	21	_soft_DEPENDS= libopenal.so.1:${PORTSDIR}/audio/openal-soft
Lines 32-39 _HAVE_OPENAL= soft Link Here
32	.endif	31	.endif
33		32
34	# Be friendly	33	# Be friendly
35	.if ! defined(openal_ARGS)	34	.if empty(openal_ARGS)
36	_openal_ARGS= ${_DEFAULT_OPENAL}	35	openal_ARGS= ${_DEFAULT_OPENAL}
37	.endif	36	.endif
38		37
39	# Sanity checks	38	# Sanity checks
Lines 41-52 _openal_ARGS= ${_DEFAULT_OPENAL} Link Here
41	IGNORE= OpenAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired	40	IGNORE= OpenAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired
42	.endif	41	.endif
43		42
44	.if defined(_openal_ARGS)	43	.for _arg in ${openal_ARGS}
45	. for _arg in ${_openal_ARGS}
46	. if ! ${_valid_ARGS:M${_arg}}	44	. if ! ${_valid_ARGS:M${_arg}}
47	IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] is not recognized	45	IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] is not recognized
48	. endif	46	. endif
49	. if ${_OPENAL_LIBS:M${_arg}} && ${_openal_ARGS:Mal}	47	. if ${_OPENAL_LIBS:M${_arg}} && ${openal_ARGS:Mal}
50	IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] cannot be used together with al	48	IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] cannot be used together with al
51	. endif	49	. endif
52	. if ${_OPENAL_LIBS:M${_arg}} && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${_arg}	50	. if ${_OPENAL_LIBS:M${_arg}} && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${_arg}
Lines 57-74 IGNORE= OpenAL mismatch: port wants to u Link Here
57	. endif	55	. endif
58	. if ${_OPENAL_LIBS:M${_arg}}	56	. if ${_OPENAL_LIBS:M${_arg}}
59	. for _carg in ${_OPENAL_LIBS:N${_arg}}	57	. for _carg in ${_OPENAL_LIBS:N${_arg}}
60	. if ${_openal_ARGS:M${_carg}}	58	. if ${openal_ARGS:M${_carg}}
61	IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: arguments [${_arg}] and [${_carg}] cannot be used together	59	IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: arguments [${_arg}] and [${_carg}] cannot be used together
62	. endif	60	. endif
63	. endfor	61	. endfor
64	. endif	62	. endif
65	. endfor	63	.endfor
66	.endif
67		64
68	# Proceed	65	# Proceed
69	_USE_OPENAL=	66	_USE_OPENAL=
70		67
71	.if ${_openal_ARGS:Mal}	68	.if ${openal_ARGS:Mal}
72	.if defined(_HAVE_OPENAL)	69	.if defined(_HAVE_OPENAL)
73	_USE_OPENAL= ${_HAVE_OPENAL}	70	_USE_OPENAL= ${_HAVE_OPENAL}
74	.elif defined(WANT_OPENAL)	71	.elif defined(WANT_OPENAL)
Lines 78-84 _USE_OPENAL= ${_DEFAULT_OPENAL} Link Here
78	.endif	75	.endif
79	.endif	76	.endif
80		77
81	.for _arg in ${_openal_ARGS:Nal}	78	.for _arg in ${openal_ARGS:Nal}
82	_USE_OPENAL+= ${_arg}	79	_USE_OPENAL+= ${_arg}
83	.endfor	80	.endfor
84		81

Lines 15-35 Link Here

(-)Mk/Uses/pure.mk (-6 / +3 lines)
15	_INCLUDE_USES_PURE_MK= yes	15	_INCLUDE_USES_PURE_MK= yes
16		16
17	_valid_ARGS= ffi	17	_valid_ARGS= ffi
18	_pure_ARGS= ${pure_ARGS:C/\:/ /g}
19		18
20	# Sanity check	19	# Sanity check
21	.if defined(pure_ARGS)	20	.for arg in ${pure_ARGS}
22	. for arg in ${_pure_ARGS}
23	. if empty(_valid_ARGS:M${arg})	21	. if empty(_valid_ARGS:M${arg})
24	IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not recognized	22	IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not recognized
25	. endif	23	. endif
26	. endfor	24	.endfor
27	.endif
28		25
29	LIB_DEPENDS+= libpure.so:${PORTSDIR}/lang/pure	26	LIB_DEPENDS+= libpure.so:${PORTSDIR}/lang/pure
30	.include "${USESDIR}/gmake.mk"	27	.include "${USESDIR}/gmake.mk"
31		28
32	.if ${_pure_ARGS:Mffi}	29	.if ${pure_ARGS:Mffi}
33	RUN_DEPENDS+= ${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi	30	RUN_DEPENDS+= ${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi
34	.endif	31	.endif
35		32

Lines 38-54 IGNORE= 'USES+= qmake' must be accompani Link Here

(-)Mk/Uses/qmake.mk (-10 / +7 lines)
38	# targets (currently, only qmake-configure), without qmake being added to the	38	# targets (currently, only qmake-configure), without qmake being added to the
39	# configure stage.	39	# configure stage.
40	_VALID_ARGS= norecursive outsource _env	40	_VALID_ARGS= norecursive outsource _env
41	_qmake_ARGS= ${qmake_ARGS:S/\:/ /g}
42		41
43	.if defined(qmake_ARGS)	42	.for arg in ${qmake_ARGS}
44	. for arg in ${_qmake_ARGS}
45	. if empty(_VALID_ARGS:M${arg})	43	. if empty(_VALID_ARGS:M${arg})
46	IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized	44	IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized
47	. endif	45	. endif
48	. endfor	46	.endfor
49	.endif
50		47
51	.if ! ${_qmake_ARGS:M_env}	48	.if ! ${qmake_ARGS:M_env}
52	USE_QT${_QT_VERSION:R:R}+= qmake_build	49	USE_QT${_QT_VERSION:R:R}+= qmake_build
53	.endif	50	.endif
54		51
Lines 76-82 QMAKE_ARGS+= CONFIG+="release" \ Link Here
76	.endif # defined(WITH_DEBUG)	73	.endif # defined(WITH_DEBUG)
77		74
78	# We set -recursive by default to keep qmake from running in the build stage.	75	# We set -recursive by default to keep qmake from running in the build stage.
79	.if ! ${_qmake_ARGS:Mnorecursive}	76	.if ! ${qmake_ARGS:Mnorecursive}
80	QMAKE_ARGS+= -recursive	77	QMAKE_ARGS+= -recursive
81	.endif	78	.endif
82		79
Lines 88-94 QMAKE_ARGS+= -d Link Here
88	# use it for both qtbase and USES=qmake ports. They are private, not supposed to	85	# use it for both qtbase and USES=qmake ports. They are private, not supposed to
89	# be used anywhere else.	86	# be used anywhere else.
90	_QMAKE_WRKSRC?= ${CONFIGURE_WRKSRC}	87	_QMAKE_WRKSRC?= ${CONFIGURE_WRKSRC}
91	.if ${_qmake_ARGS:Moutsource}	88	.if ${qmake_ARGS:Moutsource}
92	CONFIGURE_WRKSRC= ${WRKDIR}/.build	89	CONFIGURE_WRKSRC= ${WRKDIR}/.build
93	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}	90	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
94	INSTALL_WRKSRC= ${BUILD_WRKSRC}	91	INSTALL_WRKSRC= ${BUILD_WRKSRC}
Lines 97-103 QMAKE_SOURCE_PATH?= ${WRKSRC} Link Here
97	QMAKE_SOURCE_PATH?= # empty	94	QMAKE_SOURCE_PATH?= # empty
98	.endif	95	.endif
99		96
100	.if ! ${_qmake_ARGS:M_env}	97	.if ! ${qmake_ARGS:M_env}
101	DESTDIRNAME= INSTALL_ROOT	98	DESTDIRNAME= INSTALL_ROOT
102	.endif	99	.endif
103		100
Lines 108-114 qmake-configure: Link Here
108	@cd ${_QMAKE_WRKSRC} && \	105	@cd ${_QMAKE_WRKSRC} && \
109	${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}	106	${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}
110		107
111	.if !target(do-configure) && ! ${_qmake_ARGS:M_env}	108	.if !target(do-configure) && ! ${qmake_ARGS:M_env}
112	do-configure: qmake-configure	109	do-configure: qmake-configure
113	@${DO_NADA}	110	@${DO_NADA}
114	.endif	111	.endif

Lines 86-114 IGNORE= Invalid tcltk version ${TCLTK_DE Link Here

(-)Mk/Uses/tcl.mk (-13 / +8 lines)
86	_TCLTK_PORT?= tcl	86	_TCLTK_PORT?= tcl
87		87
88	#	88	#
89	# Build a make(1)-friendly list of arguments (i.e., space separated).
90	#
91	_TCL_ARGS= ${tcl_ARGS:S/,/ /g}
92
93	#
94	# Parse a ver+ argument.	89	# Parse a ver+ argument.
95	#	90	#
96	.if ${_TCL_ARGS:M*+}	91	.if ${tcl_ARGS:M*+}
97	_TCLTK_MIN_VERSION:= ${_TCL_ARGS:M*+:S/+//}	92	_TCLTK_MIN_VERSION:= ${tcl_ARGS:M*+:S/+//}
98	_TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}	93	_TCLTK_WANTED_VERSIONS:=${_TCLTK_DEFAULT_VERSION}
99	.endif	94	.endif
100		95
101	#	96	#
102	# Parse one or more ver arguments.	97	# Parse one or more ver arguments.
103	#	98	#
104	.if ${_TCL_ARGS:M8[4-6]}	99	.if ${tcl_ARGS:M8[4-6]}
105	_TCLTK_WANTED_VERSIONS:=${_TCL_ARGS:M8[4-6]}	100	_TCLTK_WANTED_VERSIONS:=${tcl_ARGS:M8[4-6]}
106	.endif	101	.endif
107		102
108	#	103	#
109	# It makes little sense to specify both the wrapper and a specific version.	104	# It makes little sense to specify both the wrapper and a specific version.
110	#	105	#
111	.if ${_TCL_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS)	106	.if ${tcl_ARGS:Mwrapper} && defined(_TCLTK_WANTED_VERSIONS)
112	IGNORE= USES=${_TCLTK_PORT}: it is not possible to specify both a version and the wrapper: ${tcl_ARGS}	107	IGNORE= USES=${_TCLTK_PORT}: it is not possible to specify both a version and the wrapper: ${tcl_ARGS}
113	.endif	108	.endif
114		109
Lines 175-181 _TCLTK_RUN_DEPENDS= Link Here
175	_TCLTK_LIB_DEPENDS=	170	_TCLTK_LIB_DEPENDS=
176		171
177	# Construct the correct dependency lines (wrapper)	172	# Construct the correct dependency lines (wrapper)
178	.if ${_TCL_ARGS:Mwrapper}	173	.if ${tcl_ARGS:Mwrapper}
179	. if ${_TCLTK_PORT} == "tcl"	174	. if ${_TCLTK_PORT} == "tcl"
180	_TCLTK_WRAPPER_PORT= tclsh:${PORTSDIR}/lang/tcl-wrapper	175	_TCLTK_WRAPPER_PORT= tclsh:${PORTSDIR}/lang/tcl-wrapper
181	. elif ${_TCLTK_PORT} == "tk"	176	. elif ${_TCLTK_PORT} == "tk"
Lines 192-201 _TCLTK_EXE_LINE= wish${TK_VER}:${PORTSDI Link Here
192	_TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}	187	_TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}
193	.endif	188	.endif
194		189
195	.if ${_TCL_ARGS:Mbuild}	190	.if ${tcl_ARGS:Mbuild}
196	BUILD_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \	191	BUILD_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \
197	${_TCLTK_EXE_LINE}	192	${_TCLTK_EXE_LINE}
198	.elif ${_TCL_ARGS:Mrun}	193	.elif ${tcl_ARGS:Mrun}
199	RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \	194	RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \
200	${_TCLTK_EXE_LINE}	195	${_TCLTK_EXE_LINE}
201	.else	196	.else

Lines 24-55 Link Here

(-)Mk/Uses/twisted.mk (-25 / +4 lines)
24	.if !defined(_INCLUDE_USES_TWISTED_MK)	24	.if !defined(_INCLUDE_USES_TWISTED_MK)
25	_INCLUDE_USES_TWISTED_MK= yes	25	_INCLUDE_USES_TWISTED_MK= yes
26		26
27	.if !defined(twisted_ARGS)	27	# Assume both if neither build nor run are specified.
28	twisted_ARGS= build,run	28	.if ${twisted_ARGS:Mbuild} \|\| empty(twisted_ARGS:Mrun)
29	.endif
30
31	_TWISTED_ARGS= ${twisted_ARGS:S/,/ /g}
32
33	.if ${_TWISTED_ARGS:Mbuild}
34	_TWISTED_BUILD_DEP= yes
35	_TWISTED_ARGS:= ${_TWISTED_ARGS:Nbuild}
36	.endif
37	.if ${_TWISTED_ARGS:Mrun}
38	_TWISTED_RUN_DEP= yes
39	_TWISTED_ARGS:= ${_TWISTED_ARGS:Nrun}
40	.endif
41
42	.if !defined(_TWISTED_BUILD_DEP) && !defined(_TWISTED_RUN_DEP)
43	# The port only seems to specify components, but neither run or build.
44	# Assume them to be build and run dependencies.
45	_TWISTED_BUILD_DEP= yes
46	_TWISTED_RUN_DEP= yes
47	.endif
48
49	.if defined(_TWISTED_BUILD_DEP)
50	BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore	29	BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
51	.endif	30	.endif
52	.if defined(_TWISTED_RUN_DEP)	31	.if ${twisted_ARGS:Mrun} \|\| empty(twisted_ARGS:Mbuild)
53	RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore	32	RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
54	.endif	33	.endif
55		34
Lines 67-73 web2_DEPENDS= ${PYTHON_SITELIBDIR}/twist Link Here
67	web_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb	46	web_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
68	words_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords	47	words_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
69		48
70	.for component in ${_TWISTED_ARGS}	49	.for component in ${twisted_ARGS:Nbuild:Nrun}
71	. if ${_TWISTED_COMPONENTS:M${component}}==""	50	. if ${_TWISTED_COMPONENTS:M${component}}==""
72	IGNORE= cannot install unknown twisted component ${component}	51	IGNORE= cannot install unknown twisted component ${component}
73	. endif	52	. endif

Lines 113-131 _WEBPLUGIN_APPS_ALL_NATIVE= gecko opera Link Here

(-)Mk/Uses/webplugin.mk (-6 / +4 lines)
113	_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_LINUX} \	113	_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_LINUX} \
114	${_WEBPLUGIN_APPS_ALL_NATIVE}	114	${_WEBPLUGIN_APPS_ALL_NATIVE}
115		115
116	webplugin_ARGS?= all
117	_WEBPLUGIN_ARGS= ${webplugin_ARGS:C/,/ /}
118	_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL}	116	_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL}
119	.if ${_WEBPLUGIN_ARGS} == all	117	.if ${webplugin_ARGS} == all \|\| empty(webplugin_ARGS)
120	_WEBPLUGIN_PATTERN= *	118	_WEBPLUGIN_PATTERN= *
121	.elif ${_WEBPLUGIN_ARGS} == native	119	.elif ${webplugin_ARGS} == native
122	_WEBPLUGIN_PATTERN= *	120	_WEBPLUGIN_PATTERN= *
123	_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE}	121	_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE}
124	.elif ${_WEBPLUGIN_ARGS} == linux	122	.elif ${webplugin_ARGS} == linux
125	_WEBPLUGIN_PATTERN= *	123	_WEBPLUGIN_PATTERN= *
126	_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_LINUX}	124	_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_LINUX}
127	.else	125	.else
128	_WEBPLUGIN_PATTERN= ${_WEBPLUGIN_ARGS}	126	_WEBPLUGIN_PATTERN= ${webplugin_ARGS}
129	.endif	127	.endif
130		128
131	.if !defined(WEBPLUGIN_FILES)	129	.if !defined(WEBPLUGIN_FILES)