View | Details | Raw Unified | Return to bug 208294 | Differences between
and this patch

Collapse All | Expand All

(-)CHANGES (+12 lines)
Lines 10-15 in the release notes and/or placed into UPDATING. Link Here
10
10
11
All ports committers are allowed to commit to this file.
11
All ports committers are allowed to commit to this file.
12
12
13
20160331:
14
AUTHOR: jbeich@FreeBSD.org
15
16
  Introducing CONFIGURE_OUTSOURCE. It affects HAS_CONFIGURE and GNU_CONFIGURE
17
  by invoking configure script and later build outside of source tree e.g.,
18
19
    $ mkdir build
20
    $ cd build
21
    $ ../configure
22
    $ gmake
23
    $ gmake install
24
13
20160301:
25
20160301:
14
AUTHOR: mat@FreeBSD.org
26
AUTHOR: mat@FreeBSD.org
15
27
(-)Mk/Uses/autoreconf.mk (-3 / +4 lines)
Lines 65-70 BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool Link Here
65
.endif
65
.endif
66
66
67
AUTORECONF?=	${LOCALBASE}/bin/autoreconf
67
AUTORECONF?=	${LOCALBASE}/bin/autoreconf
68
AUTORECONF_WRKSRC?=	${WRKSRC}
68
69
69
.endif
70
.endif
70
71
Lines 76-91 _USES_configure+= 470:do-autoreconf Link Here
76
do-autoreconf:
77
do-autoreconf:
77
.for f in AUTHORS ChangeLog INSTALL NEWS README
78
.for f in AUTHORS ChangeLog INSTALL NEWS README
78
# Don't modify time stamps if the files already exist
79
# Don't modify time stamps if the files already exist
79
	@test -e ${CONFIGURE_WRKSRC}/${f} || ${TOUCH} ${CONFIGURE_WRKSRC}/${f}
80
	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
80
.endfor
81
.endfor
81
.if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
82
.if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
82
	@(cd ${CONFIGURE_WRKSRC} && \
83
	@(cd ${AUTORECONF_WRKSRC} && \
83
		if test -f configure.ac; then configure=configure.ac; \
84
		if test -f configure.ac; then configure=configure.ac; \
84
		else configure=configure.in; fi && \
85
		else configure=configure.in; fi && \
85
		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
86
		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
86
		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
87
		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
87
.endif
88
.endif
88
	@(cd ${CONFIGURE_WRKSRC} && ${AUTORECONF} -f -i)
89
	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
89
.endif
90
.endif
90
91
91
.endif
92
.endif
(-)Mk/Uses/perl5.mk (-1 / +1 lines)
Lines 255-261 do-configure: Link Here
255
	fi
255
	fi
256
	@cd ${CONFIGURE_WRKSRC} && \
256
	@cd ${CONFIGURE_WRKSRC} && \
257
		${SETENV} ${CONFIGURE_ENV} \
257
		${SETENV} ${CONFIGURE_ENV} \
258
		${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
258
		${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
259
.if !${_USE_PERL5:Mmodbuild*}
259
.if !${_USE_PERL5:Mmodbuild*}
260
	@cd ${CONFIGURE_WRKSRC} && \
260
	@cd ${CONFIGURE_WRKSRC} && \
261
		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
261
		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
(-)Mk/bsd.port.mk (-4 / +14 lines)
Lines 778-783 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here
778
#				  configure stage will not do anything if this is not set.
778
#				  configure stage will not do anything if this is not set.
779
# GNU_CONFIGURE	- If set, you are using GNU configure (optional).  Implies
779
# GNU_CONFIGURE	- If set, you are using GNU configure (optional).  Implies
780
#				  HAS_CONFIGURE.
780
#				  HAS_CONFIGURE.
781
# CONFIGURE_OUTSOURCE - If set, this port builds outside of WRKSRC.
781
# CONFIGURE_WRKSRC
782
# CONFIGURE_WRKSRC
782
#				- Directory to run configure in.
783
#				- Directory to run configure in.
783
#				  Default: ${WRKSRC}
784
#				  Default: ${WRKSRC}
Lines 1552-1557 EXTRACT_WRKDIR:= ${WRKDIR} Link Here
1552
WRKSRC:=		${WRKSRC}/${WRKSRC_SUBDIR}
1553
WRKSRC:=		${WRKSRC}/${WRKSRC_SUBDIR}
1553
.endif
1554
.endif
1554
1555
1556
.if defined(CONFIGURE_OUTSOURCE)
1557
CONFIGURE_CMD?=		${WRKSRC}/${CONFIGURE_SCRIPT}
1558
CONFIGURE_WRKSRC?=	${WRKDIR}/.build
1559
BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
1560
INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
1561
TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
1562
.endif
1563
1555
PATCH_WRKSRC?=	${WRKSRC}
1564
PATCH_WRKSRC?=	${WRKSRC}
1556
CONFIGURE_WRKSRC?=	${WRKSRC}
1565
CONFIGURE_WRKSRC?=	${WRKSRC}
1557
BUILD_WRKSRC?=	${WRKSRC}
1566
BUILD_WRKSRC?=	${WRKSRC}
Lines 2601-2616 HAS_CONFIGURE= yes Link Here
2601
SET_LATE_CONFIGURE_ARGS= \
2610
SET_LATE_CONFIGURE_ARGS= \
2602
     _LATE_CONFIGURE_ARGS="" ; \
2611
     _LATE_CONFIGURE_ARGS="" ; \
2603
	if [ -z "${CONFIGURE_ARGS:M--localstatedir=*:Q}" ] && \
2612
	if [ -z "${CONFIGURE_ARGS:M--localstatedir=*:Q}" ] && \
2604
	   ./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \
2613
	   ${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \
2605
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --localstatedir=/var" ; \
2614
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --localstatedir=/var" ; \
2606
	fi ; \
2615
	fi ; \
2607
	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \
2616
	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \
2608
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \
2617
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \
2609
	fi ; \
2618
	fi ; \
2610
	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \
2619
	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \
2611
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \
2620
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \
2612
	fi ; \
2621
	fi ; \
2613
	if [ -z "`./${CONFIGURE_SCRIPT} --version 2>&1 | ${EGREP} -i '(autoconf.*2\.13|Unrecognized option)'`" ]; then \
2622
	if [ -z "`${CONFIGURE_CMD} --version 2>&1 | ${EGREP} -i '(autoconf.*2\.13|Unrecognized option)'`" ]; then \
2614
		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --build=${CONFIGURE_TARGET}" ; \
2623
		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --build=${CONFIGURE_TARGET}" ; \
2615
	else \
2624
	else \
2616
		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \
2625
		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \
Lines 3332-3337 do-configure: Link Here
3332
	done
3341
	done
3333
.endif
3342
.endif
3334
.if defined(HAS_CONFIGURE)
3343
.if defined(HAS_CONFIGURE)
3344
	@${MKDIR} ${CONFIGURE_WRKSRC}
3335
	@(cd ${CONFIGURE_WRKSRC} && \
3345
	@(cd ${CONFIGURE_WRKSRC} && \
3336
	    ${SET_LATE_CONFIGURE_ARGS} \
3346
	    ${SET_LATE_CONFIGURE_ARGS} \
3337
		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
3347
		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
(-)databases/p5-Class-DBI-Plugin-Senna/Makefile (-1 / +1 lines)
Lines 22-27 BROKEN_ia64= fails to configure with coredump Link Here
22
do-configure:
22
do-configure:
23
	cd ${CONFIGURE_WRKSRC} && \
23
	cd ${CONFIGURE_WRKSRC} && \
24
		${SETENV} ${CONFIGURE_ENV} \
24
		${SETENV} ${CONFIGURE_ENV} \
25
		${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
25
		${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
26
26
27
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)devel/fb-adb/Makefile (-22 / +2 lines)
Lines 18-30 RUN_DEPENDS= adb:devel/android-tools-adb Link Here
18
USE_GITHUB=	yes
18
USE_GITHUB=	yes
19
GH_ACCOUNT=	facebook
19
GH_ACCOUNT=	facebook
20
20
21
USES=		autoreconf:outsource gmake ncurses perl5 python:3,build
21
USES=		autoreconf gmake ncurses perl5 python:3,build
22
USE_PERL5=	build # pod2man
22
USE_PERL5=	build # pod2man
23
BASH_CMD?=	bash # can be zsh
23
BASH_CMD?=	bash # can be zsh
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
CONFIGURE_OUTSOURCE=	yes
25
CONFIGURE_ENV=	PYTHON3="${PYTHON_CMD}"
26
CONFIGURE_ENV=	PYTHON3="${PYTHON_CMD}"
26
# XXX D4158: --mandir as SET_LATE_CONFIGURE_ARGS doesn't respect CONFIGURE_CMD
27
CONFIGURE_ARGS=	--mandir="${MANPREFIX}/man"
28
INSTALL_TARGET=	install-strip
27
INSTALL_TARGET=	install-strip
29
PLIST_FILES=	bin/${PORTNAME} \
28
PLIST_FILES=	bin/${PORTNAME} \
30
		man/man1/${PORTNAME}.1.gz
29
		man/man1/${PORTNAME}.1.gz
Lines 92-116 post-patch-NDK-off: Link Here
92
	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \
91
	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \
93
		${WRKSRC}/stub-*/configure
92
		${WRKSRC}/stub-*/configure
94
93
95
# XXX D4157: Similar to USES=qmake:outsource, merge into Mk/Uses/autoreconf.mk
96
.if defined(USES) && ${USES:Mautoreconf\:outsource}
97
USES:=			autoreconf:build ${USES:Nautoreconf*}
98
CONFIGURE_CMD=		${AUTORECONF_WRKSRC}/${CONFIGURE_SCRIPT}
99
CONFIGURE_WRKSRC=	${WRKDIR}/.build
100
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
101
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
102
AUTORECONF_WRKSRC?=	${WRKSRC}
103
104
_USES_configure+=	470:do-autoreconf
105
do-autoreconf:
106
.for f in AUTHORS ChangeLog INSTALL NEWS README
107
# Don't modify time stamps if the files already exist
108
	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
109
.endfor
110
	@(cd ${AUTORECONF_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
111
	@${MKDIR} ${CONFIGURE_WRKSRC}
112
.endif
113
114
.include <bsd.port.mk>
94
.include <bsd.port.mk>
115
95
116
# XXX Bug 204615: Teach USE_LINUX about build-only deps
96
# XXX Bug 204615: Teach USE_LINUX about build-only deps
(-)devel/qmake5/Makefile (-1 / +1 lines)
Lines 56-62 post-build: Link Here
56
	@cd ${WRKSRC} && \
56
	@cd ${WRKSRC} && \
57
		${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
57
		${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
58
		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
58
		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
59
		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
59
		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
60
# Cleanup qmodule.pri to make it module agnostic.
60
# Cleanup qmodule.pri to make it module agnostic.
61
	@${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \
61
	@${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \
62
		${WRKSRC}/mkspecs/qmodule.pri
62
		${WRKSRC}/mkspecs/qmodule.pri
(-)games/eboard/Makefile (-1 / +1 lines)
Lines 76-82 post-install: Link Here
76
.endfor
76
.endfor
77
.endif
77
.endif
78
.for extra in ${EXTRAS}
78
.for extra in ${EXTRAS}
79
	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} EBOARDCONFIG=${STAGEDIR}${PREFIX}/bin/eboard-config ./${CONFIGURE_SCRIPT} --prefix=${PREFIX}
79
	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} EBOARDCONFIG=${STAGEDIR}${PREFIX}/bin/eboard-config ${CONFIGURE_CMD} --prefix=${PREFIX}
80
	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} ${MAKE_ENV} ${MAKE} install DATADIR=${STAGEDIR}${DATADIR}
80
	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} ${MAKE_ENV} ${MAKE} install DATADIR=${STAGEDIR}${DATADIR}
81
.endfor
81
.endfor
82
	@${INSTALL_DATA} ${WRKSRC}/icon-eboard.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/eboard.xpm
82
	@${INSTALL_DATA} ${WRKSRC}/icon-eboard.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/eboard.xpm
(-)games/nimuh/Makefile (-1 / +1 lines)
Lines 30-36 post-patch: Link Here
30
	@${REINPLACE_CMD} -e '/LIBS/ s|-lSDL_[a-z]*|& $${SDL_LIBS}|' ${WRKSRC}/configure
30
	@${REINPLACE_CMD} -e '/LIBS/ s|-lSDL_[a-z]*|& $${SDL_LIBS}|' ${WRKSRC}/configure
31
31
32
post-configure:
32
post-configure:
33
	@cd ${DATA_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
33
	@cd ${DATA_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
34
34
35
post-install:
35
post-install:
36
	@cd ${DATA_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
36
	@cd ${DATA_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
(-)games/volleyball/Makefile (-1 / +1 lines)
Lines 41-47 post-patch: Link Here
41
41
42
post-configure:
42
post-configure:
43
	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
43
	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
44
		${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
44
		${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
45
45
46
post-install:
46
post-install:
47
	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
47
	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
(-)graphics/p5-ming/Makefile (+1 lines)
Lines 31-36 SHEBANG_FILES= examples/*.cgi Link Here
31
31
32
PORTEXAMPLES=	*
32
PORTEXAMPLES=	*
33
33
34
AUTORECONF_WRKSRC=	${CONFIGURE_WRKSRC}
34
CONFIGURE_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
35
CONFIGURE_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
35
WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/perl_ext
36
WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/perl_ext
36
37
(-)graphics/py-ming/Makefile (+1 lines)
Lines 29-34 GNU_CONFIGURE= yes Link Here
29
USE_PYTHON=	autoplist concurrent distutils
29
USE_PYTHON=	autoplist concurrent distutils
30
USES=		autoreconf libtool localbase python
30
USES=		autoreconf libtool localbase python
31
31
32
AUTORECONF_WRKSRC=	${CONFIGURE_WRKSRC}
32
CONFIGURE_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
33
CONFIGURE_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
33
WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/py_ext
34
WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/py_ext
34
35
(-)irc/inspircd/Makefile (-1 / +1 lines)
Lines 139-145 PLIST_SUB+= POSIX="@comment " Link Here
139
139
140
pre-configure:
140
pre-configure:
141
	@if [ ${EXTRAS} ]; then \
141
	@if [ ${EXTRAS} ]; then \
142
		cd ${WRKSRC} && ./${CONFIGURE_SCRIPT} --enable-extras=${EXTRAS} ; \
142
		cd ${WRKSRC} && ${CONFIGURE_CMD} --enable-extras=${EXTRAS} ; \
143
	fi
143
	fi
144
144
145
post-patch:
145
post-patch:
(-)lang/ghc/Makefile (-1 / +1 lines)
Lines 272-278 post-patch: Link Here
272
pre-configure:
272
pre-configure:
273
	@${MKDIR} ${TMPDIR}
273
	@${MKDIR} ${TMPDIR}
274
.if empty(PORT_OPTIONS:MBOOT)
274
.if empty(PORT_OPTIONS:MBOOT)
275
	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT})
275
	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS_BOOT})
276
	@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
276
	@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
277
.endif
277
.endif
278
278
(-)multimedia/ffmpeg/Makefile (-4 / +5 lines)
Lines 17-22 BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ Link Here
17
		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
17
		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
18
18
19
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
20
CONFIGURE_OUTSOURCE=	yes
20
USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
21
USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
21
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
22
USE_PERL5=	build
23
USE_PERL5=	build
Lines 441-456 post-patch: Link Here
441
		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
442
		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
442
		s|%%LOCALBASE%%|${LOCALBASE}|g; \
443
		s|%%LOCALBASE%%|${LOCALBASE}|g; \
443
		s|gsm/gsm.h|gsm.h|g" \
444
		s|gsm/gsm.h|gsm.h|g" \
444
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
445
		${WRKSRC}/${CONFIGURE_SCRIPT}
445
	@${REINPLACE_CMD} -e 's|-ldl||' \
446
	@${REINPLACE_CMD} -e 's|-ldl||' \
446
		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
447
		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
447
		-e 's|freetype/freetype.h|freetype.h|g' \
448
		-e 's|freetype/freetype.h|freetype.h|g' \
448
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
449
		${WRKSRC}/${CONFIGURE_SCRIPT}
449
450
450
post-patch-SDL-on:
451
post-patch-SDL-on:
451
	@${REINPLACE_CMD} -E \
452
	@${REINPLACE_CMD} -E \
452
		-e 's|sdl-config|${SDL_CONFIG}|g' \
453
		-e 's|sdl-config|${SDL_CONFIG}|g' \
453
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
454
		${WRKSRC}/${CONFIGURE_SCRIPT}
454
	@${FIND} ${WRKSRC} -type f | \
455
	@${FIND} ${WRKSRC} -type f | \
455
		${XARGS} -n 10 ${REINPLACE_CMD} -E \
456
		${XARGS} -n 10 ${REINPLACE_CMD} -E \
456
		-e 's|#include <SDL|#include <SDL/SDL|'
457
		-e 's|#include <SDL|#include <SDL/SDL|'
Lines 458-464 post-patch-SDL-on: Link Here
458
post-configure-THEORA-off:
459
post-configure-THEORA-off:
459
	@${REINPLACE_CMD} -E \
460
	@${REINPLACE_CMD} -E \
460
		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
461
		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
461
		${WRKSRC}/config.mak
462
		${CONFIGURE_WRKSRC}/config.mak
462
463
463
post-install:
464
post-install:
464
	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
465
	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
(-)sysutils/fusefs-simple-mtpfs/Makefile (+1 lines)
Lines 18-23 GH_ACCOUNT= phatina Link Here
18
18
19
USES=		autoreconf compiler:c++11-lib fuse localbase pkgconfig
19
USES=		autoreconf compiler:c++11-lib fuse localbase pkgconfig
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_OUTSOURCE=	yes
21
CONFIGURE_ARGS=	--disable-silent-rules
22
CONFIGURE_ARGS=	--disable-silent-rules
22
MAKEFILE=	makefile
23
MAKEFILE=	makefile
23
INSTALL_TARGET=	install-strip
24
INSTALL_TARGET=	install-strip
(-)textproc/groff/Makefile (-1 / +1 lines)
Lines 80-86 post-configure: Link Here
80
	    INSTALL_LIB="${INSTALL_LIB}" \
80
	    INSTALL_LIB="${INSTALL_LIB}" \
81
	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
81
	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
82
	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
82
	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
83
	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
83
	    ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; then \
84
		 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
84
		 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
85
		 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
85
		 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
86
		 ${FALSE}; \
86
		 ${FALSE}; \
(-)textproc/p5-XML-DifferenceMarkup/Makefile (-1 / +1 lines)
Lines 28-33 post-patch: Link Here
28
do-configure:
28
do-configure:
29
	@cd ${CONFIGURE_WRKSRC} && \
29
	@cd ${CONFIGURE_WRKSRC} && \
30
		${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS} \
30
		${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS} \
31
		${PERL5} ./${CONFIGURE_SCRIPT}
31
		${PERL5} ${CONFIGURE_CMD}
32
32
33
.include <bsd.port.mk>
33
.include <bsd.port.mk>
(-)www/interchange/Makefile (-1 / +1 lines)
Lines 59-65 do-configure: Link Here
59
# INTERCH_CONFIGURE_ARGS instead of CONFIGURE_ARGS.
59
# INTERCH_CONFIGURE_ARGS instead of CONFIGURE_ARGS.
60
	@cd ${CONFIGURE_WRKSRC} && \
60
	@cd ${CONFIGURE_WRKSRC} && \
61
		${SETENV} ${CONFIGURE_ENV} \
61
		${SETENV} ${CONFIGURE_ENV} \
62
		${PERL5} ./${CONFIGURE_SCRIPT} ${INTERCH_CONFIGURE_ARGS}
62
		${PERL5} ${CONFIGURE_CMD} ${INTERCH_CONFIGURE_ARGS}
63
63
64
post-install:
64
post-install:
65
# This directory has to be created here for check-plist to pass, otherwise it
65
# This directory has to be created here for check-plist to pass, otherwise it
(-)www/nginx-devel/Makefile (-1 / +1 lines)
Lines 1105-1111 post-patch: Link Here
1105
pre-configure:
1105
pre-configure:
1106
.if ${PORT_OPTIONS:MMODSECURITY}
1106
.if ${PORT_OPTIONS:MMODSECURITY}
1107
	( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \
1107
	( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \
1108
		CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \
1108
		CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \
1109
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
1109
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
1110
.endif
1110
.endif
1111
.if ${PORT_OPTIONS:MSMALL_LIGHT}
1111
.if ${PORT_OPTIONS:MSMALL_LIGHT}
(-)www/nginx/Makefile (-1 / +1 lines)
Lines 1055-1061 post-patch: Link Here
1055
pre-configure:
1055
pre-configure:
1056
.if ${PORT_OPTIONS:MMODSECURITY}
1056
.if ${PORT_OPTIONS:MMODSECURITY}
1057
	( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \
1057
	( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \
1058
		CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \
1058
		CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \
1059
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
1059
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
1060
.endif
1060
.endif
1061
.if ${PORT_OPTIONS:MSMALL_LIGHT}
1061
.if ${PORT_OPTIONS:MSMALL_LIGHT}
(-)www/p5-RT-Authen-ExternalAuth/Makefile (-1 / +1 lines)
Lines 54-60 PLIST_SUB+= RTHOME=share/rt${RT_VER} Link Here
54
do-configure:
54
do-configure:
55
	@cd ${CONFIGURE_WRKSRC} && \
55
	@cd ${CONFIGURE_WRKSRC} && \
56
	    unset PREFIX && \
56
	    unset PREFIX && \
57
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
57
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \
58
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//;' Makefile
58
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//;' Makefile
59
59
60
post-configure:
60
post-configure:
(-)www/p5-RT-Extension-LDAPImport/Makefile (-1 / +1 lines)
Lines 53-59 PLIST_SUB+= RTHOME=share/rt${RT_VER} Link Here
53
do-configure:
53
do-configure:
54
	@cd ${CONFIGURE_WRKSRC} && \
54
	@cd ${CONFIGURE_WRKSRC} && \
55
	    unset PREFIX && \
55
	    unset PREFIX && \
56
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
56
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \
57
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
57
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
58
58
59
post-configure:
59
post-configure:
(-)www/p5-RT-Extension-MandatoryOnTransition/Makefile (-1 / +1 lines)
Lines 46-52 PLIST_SUB+= RT_VER=${RT_VER} Link Here
46
do-configure:
46
do-configure:
47
	@cd ${CONFIGURE_WRKSRC} && \
47
	@cd ${CONFIGURE_WRKSRC} && \
48
		unset PREFIX && \
48
		unset PREFIX && \
49
		${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
49
		${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \
50
		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
50
		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
51
51
52
post-configure:
52
post-configure:
(-)www/p5-RT-Extension-SLA/Makefile (-1 / +1 lines)
Lines 55-61 SUB_FILES+= pkg-message Link Here
55
do-configure:
55
do-configure:
56
	@cd ${CONFIGURE_WRKSRC} && \
56
	@cd ${CONFIGURE_WRKSRC} && \
57
	    unset PREFIX && \
57
	    unset PREFIX && \
58
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
58
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \
59
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
59
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
60
60
61
post-configure:
61
post-configure:
(-)www/p5-RTx-Calendar/Makefile (-1 / +1 lines)
Lines 56-62 post-patch: Link Here
56
do-configure:
56
do-configure:
57
	@cd ${CONFIGURE_WRKSRC} && \
57
	@cd ${CONFIGURE_WRKSRC} && \
58
	    unset PREFIX && \
58
	    unset PREFIX && \
59
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \
59
	    ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ${CONFIGURE_CMD} && \
60
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
60
	    ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
61
61
62
post-configure:
62
post-configure:
(-)www/tengine/Makefile (-1 / +1 lines)
Lines 824-830 post-patch: Link Here
824
pre-configure:
824
pre-configure:
825
.if ${PORT_OPTIONS:MMODSECURITY}
825
.if ${PORT_OPTIONS:MMODSECURITY}
826
	( cd ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION} && \
826
	( cd ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION} && \
827
		CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \
827
		CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \
828
		${MAKE} )
828
		${MAKE} )
829
.endif
829
.endif
830
830
(-)x11-toolkits/tix/Makefile (-1 / +1 lines)
Lines 34-40 pre-configure: Link Here
34
	    INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
34
	    INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
35
	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
35
	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
36
	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
36
	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
37
	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
37
	    ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS})
38
38
39
post-configure:
39
post-configure:
40
	@${REINPLACE_CMD} -e "s|package require Tcl 8\.4|package require Tcl ${TCL_VER}|g" ${WRKSRC}/Makefile
40
	@${REINPLACE_CMD} -e "s|package require Tcl 8\.4|package require Tcl ${TCL_VER}|g" ${WRKSRC}/Makefile

Return to bug 208294