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

Collapse All | Expand All

(-)b/Mk/bsd.port.mk (-1 / +2 lines)
Lines 1635-1641 PKG_NOTE_flavor= ${FLAVOR} Link Here
1635
.    endif
1635
.    endif
1636
1636
1637
WRK_ENV+=		HOME=${WRKDIR} \
1637
WRK_ENV+=		HOME=${WRKDIR} \
1638
				PWD="$${PWD}"
1638
				PWD="$${PWD}" \
1639
				__MAKE_CONF=${NONEXISTENT}
1639
.    for e in OSVERSION PATH TERM TMPDIR \
1640
.    for e in OSVERSION PATH TERM TMPDIR \
1640
				UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \
1641
				UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \
1641
				UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v
1642
				UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v
(-)b/archivers/libcabinet/Makefile (-1 / +1 lines)
Lines 11-17 USES= uidfix Link Here
11
USE_LDCONFIG=	yes
11
USE_LDCONFIG=	yes
12
SRCFILE=	${WRKSRC}/listcab.cpp
12
SRCFILE=	${WRKSRC}/listcab.cpp
13
PROGFILE=	${SRCFILE:S/.cpp$//}
13
PROGFILE=	${SRCFILE:S/.cpp$//}
14
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
14
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
15
15
16
post-build:
16
post-build:
17
	${CXX} ${CXXFLAGS} -o ${PROGFILE} ${SRCFILE} -L${WRKSRC} -lcabinet -lz
17
	${CXX} ${CXXFLAGS} -o ${PROGFILE} ${SRCFILE} -L${WRKSRC} -lcabinet -lz
(-)b/devel/libpdel/Makefile (-1 / +1 lines)
Lines 17-23 LIB_DEPENDS= libexpat.so:textproc/expat2 Link Here
17
USES=		tar:bz2
17
USES=		tar:bz2
18
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
19
19
20
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
20
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
21
21
22
WRKSRC_SUBDIR=	pdel
22
WRKSRC_SUBDIR=	pdel
23
23
(-)b/devel/libshhmsg/Makefile (-1 / +1 lines)
Lines 13-19 LICENSE= ART10 Link Here
13
USES=		uidfix
13
USES=		uidfix
14
MAKEFILE=	${FILESDIR}/Makefile.lib
14
MAKEFILE=	${FILESDIR}/Makefile.lib
15
USE_LDCONFIG=	yes
15
USE_LDCONFIG=	yes
16
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
16
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
17
17
18
OPTIONS_DEFINE=		DOCS
18
OPTIONS_DEFINE=		DOCS
19
19
(-)b/devel/libxalloc/Makefile (-1 / +1 lines)
Lines 14-20 USES= uidfix Link Here
14
14
15
MAKEFILE=	${FILESDIR}/Makefile.lib
15
MAKEFILE=	${FILESDIR}/Makefile.lib
16
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
17
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
17
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
18
18
19
post-install:
19
post-install:
20
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
20
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
(-)b/devel/linux_libusb/Makefile (-7 / +7 lines)
Lines 34-40 MAKE_ARGS+= LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h Link Here
34
MAKE_ARGS+=	WITHOUT_PROFILE=yes
34
MAKE_ARGS+=	WITHOUT_PROFILE=yes
35
MAKE_ARGS+=	WITHOUT_SSP=yes
35
MAKE_ARGS+=	WITHOUT_SSP=yes
36
MAKE_ARGS+=	WITHOUT_WERROR=yes
36
MAKE_ARGS+=	WITHOUT_WERROR=yes
37
MAKE_ARGS+=	__MAKE_CONF=""
38
MAKE_ENV+=	LDADD="-lrt"
37
MAKE_ENV+=	LDADD="-lrt"
39
38
40
.include <bsd.port.pre.mk>
39
.include <bsd.port.pre.mk>
Lines 49-62 PLIST_FILES+= usr/lib/libusb.so.3 \ Link Here
49
48
50
do-build:
49
do-build:
51
	${MKDIR} ${WRKSRC}/${LIBDIR_${ARCH}}
50
	${MKDIR} ${WRKSRC}/${LIBDIR_${ARCH}}
52
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} MAKEOBJDIR=${LIBDIR_${ARCH}} \
51
	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
53
		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} \
52
		MAKEOBJDIR=${LIBDIR_${ARCH}} ${MAKE_CMD} ${MAKE_FLAGS} \
54
		${MAKE_ARGS:N${DESTDIRNAME}=*}
53
		${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
55
.if ${ARCH} == amd64
54
.if ${ARCH} == amd64
56
	${MKDIR} ${WRKSRC}/lib
55
	${MKDIR} ${WRKSRC}/lib
57
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NCC=*} CC="${CC} -m32" \
56
	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV:NCC=*} \
58
		MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
57
		CC="${CC} -m32" MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} \
59
		${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} COMPAT_32BIT=yes
58
		${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} \
59
		COMPAT_32BIT=yes
60
.endif
60
.endif
61
61
62
do-install:
62
do-install:
(-)b/emulators/vmw/Makefile (-1 / +1 lines)
Lines 14-20 BUILD_DEPENDS= as:devel/binutils Link Here
14
14
15
WRKSRC=		${WRKDIR}/${PORTNAME}/src
15
WRKSRC=		${WRKDIR}/${PORTNAME}/src
16
USES=		iconv
16
USES=		iconv
17
MAKE_ENV+=	__MAKE_CONF=/dev/null ASFLAGS="${ASFLAGS}"
17
MAKE_ENV+=	ASFLAGS="${ASFLAGS}"
18
MAKE_ENV+=	LD="${CC}"
18
MAKE_ENV+=	LD="${CC}"
19
19
20
SBINS=		vmw vmshrink vmftp
20
SBINS=		vmw vmshrink vmftp
(-)b/finance/libstocks/Makefile (-3 / +3 lines)
Lines 9-15 WWW= https://libstocks.sourceforge.net/ Link Here
9
9
10
USE_LDCONFIG=	yes
10
USE_LDCONFIG=	yes
11
REINPLACE_ARGS=	-i ""
11
REINPLACE_ARGS=	-i ""
12
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
12
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
13
MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
13
MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
14
USES=		uidfix
14
USES=		uidfix
15
15
Lines 23-30 post-patch: Link Here
23
23
24
do-build do-install:
24
do-build do-install:
25
.for d in lib client
25
.for d in lib client
26
	cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} -j2 \
26
	cd ${WRKSRC}/$d && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} \
27
		-f ${FILESDIR}/Makefile.$d ${.TARGET:S/do-//}
27
		${MAKEFLAGS} -j2 -f ${FILESDIR}/Makefile.$d ${.TARGET:S/do-//}
28
.endfor
28
.endfor
29
29
30
post-install:
30
post-install:
(-)b/games/libshhcards/Makefile (-1 / +1 lines)
Lines 14-20 USES= xorg Link Here
14
USE_XORG=	xpm
14
USE_XORG=	xpm
15
MAKEFILE=	${FILESDIR}/Makefile.lib
15
MAKEFILE=	${FILESDIR}/Makefile.lib
16
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
17
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
17
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
18
18
19
OPTIONS_DEFINE=	DOCS
19
OPTIONS_DEFINE=	DOCS
20
20
(-)b/lang/lua51/Makefile (-8 lines)
Lines 14-27 LICENSE= MIT Link Here
14
USES=		cpe libedit lua:core,51
14
USES=		cpe libedit lua:core,51
15
USE_LDCONFIG=	yes
15
USE_LDCONFIG=	yes
16
16
17
# Overriding __MAKE_CONF makes sure that we don't re-parse
18
# /etc/make.conf during do-build, which would jeopardize the build
19
# if, for instance, the user set CFLAGS=mumble
20
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21
# have its settings when we get here.
22
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
24
25
# liblua.so requires libm, so make sure it has an explicit dependency
17
# liblua.so requires libm, so make sure it has an explicit dependency
26
# so that applications need not second-guess lua's dependencies.
18
# so that applications need not second-guess lua's dependencies.
27
CPPFLAGS+=	-I${LOCALBASE}/include
19
CPPFLAGS+=	-I${LOCALBASE}/include
(-)b/lang/lua52/Makefile (-8 lines)
Lines 14-27 LICENSE= MIT Link Here
14
USES=		cpe libedit lua:core,52
14
USES=		cpe libedit lua:core,52
15
USE_LDCONFIG=	yes
15
USE_LDCONFIG=	yes
16
16
17
# Overriding __MAKE_CONF makes sure that we don't re-parse
18
# /etc/make.conf during do-build, which would jeopardize the build
19
# if, for instance, the user set CFLAGS=mumble
20
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21
# have its settings when we get here.
22
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
24
25
# liblua.so requires libm, so make sure it has an explicit dependency
17
# liblua.so requires libm, so make sure it has an explicit dependency
26
# so that applications need not second-guess lua's dependencies.
18
# so that applications need not second-guess lua's dependencies.
27
CPPFLAGS+=	-I${LOCALBASE}/include
19
CPPFLAGS+=	-I${LOCALBASE}/include
(-)b/lang/lua53/Makefile (-8 lines)
Lines 14-27 LICENSE= MIT Link Here
14
USES=		cpe lua:core,53
14
USES=		cpe lua:core,53
15
USE_LDCONFIG=	yes
15
USE_LDCONFIG=	yes
16
16
17
# Overriding __MAKE_CONF makes sure that we don't re-parse
18
# /etc/make.conf during do-build, which would jeopardize the build
19
# if, for instance, the user set CFLAGS=mumble
20
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21
# have its settings when we get here.
22
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
24
25
# using the "bsd" target rather than "freebsd" saves patching out the
17
# using the "bsd" target rather than "freebsd" saves patching out the
26
# assumption of using base libedit in order to make it configurable. "bsd"
18
# assumption of using base libedit in order to make it configurable. "bsd"
27
# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;
19
# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;
(-)b/lang/lua54/Makefile (-8 lines)
Lines 14-27 LICENSE= MIT Link Here
14
USES=		cpe lua:core,54
14
USES=		cpe lua:core,54
15
USE_LDCONFIG=	yes
15
USE_LDCONFIG=	yes
16
16
17
# Overriding __MAKE_CONF makes sure that we don't re-parse
18
# /etc/make.conf during do-build, which would jeopardize the build
19
# if, for instance, the user set CFLAGS=mumble
20
# NOTE: /etc/make.conf is read BEFORE Makefile, so we already
21
# have its settings when we get here.
22
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
24
25
# using the "bsd" target rather than "freebsd" saves patching out the
17
# using the "bsd" target rather than "freebsd" saves patching out the
26
# assumption of using base libedit in order to make it configurable. "bsd"
18
# assumption of using base libedit in order to make it configurable. "bsd"
27
# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;
19
# is "generic" plus the POSIX and DLOPEN options, plus -Wl,-E at link time;
(-)b/mail/dma/Makefile (-2 / +1 lines)
Lines 18-25 GH_ACCOUNT= corecode Link Here
18
GH_TAGNAME=	92937587bbfeab53653b841afe76af2fa6dad345
18
GH_TAGNAME=	92937587bbfeab53653b841afe76af2fa6dad345
19
USE_RC_SUBR=	dma_flushq
19
USE_RC_SUBR=	dma_flushq
20
20
21
MAKE_ENV=	__MAKE_CONF=/dev/null \
21
MAKE_ENV=	MANDIR=${PREFIX}/share/man/man \
22
		MANDIR=${PREFIX}/share/man/man \
23
		MK_WERROR=no \
22
		MK_WERROR=no \
24
		SRCCONF=/dev/null
23
		SRCCONF=/dev/null
25
24
(-)b/mail/spamilter/Makefile (-1 lines)
Lines 17-23 CONFIGURE_ARGS= --have-resn Link Here
17
USE_RC_SUBR=	spamilter
17
USE_RC_SUBR=	spamilter
18
18
19
LDFLAGS+=	-lpthread
19
LDFLAGS+=	-lpthread
20
MAKE_ENV+=	__MAKE_CONF=/dev/null
21
20
22
BINFILES=	spamilter-system-report spamilter-user-report
21
BINFILES=	spamilter-system-report spamilter-user-report
23
SHEBANG_FILES=	${BINFILES}
22
SHEBANG_FILES=	${BINFILES}
(-)b/math/libmissing/Makefile (-4 / +5 lines)
Lines 15-21 USE_LDCONFIG= yes Link Here
15
USES=		tar:xz uidfix
15
USES=		tar:xz uidfix
16
16
17
MAKE_ENV=	LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
17
MAKE_ENV=	LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
18
		SRCCONF=/dev/null SRCS="${SRCS}" __MAKE_CONF=/dev/null
18
		SRCCONF=/dev/null SRCS="${SRCS}"
19
19
20
OPTIONS_DEFINE=	PROFILE EXAMPLES
20
OPTIONS_DEFINE=	PROFILE EXAMPLES
21
21
Lines 61-70 post-patch: Link Here
61
		${WRKSRC}/c/sp/Makefile
61
		${WRKSRC}/c/sp/Makefile
62
62
63
do-test:
63
do-test:
64
	@cd ${WRKSRC}/c; ${SETENV} ${MAKE_ENV} XCFLAGS="${CFLAGS} -frounding-math" \
64
	@cd ${WRKSRC}/c; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
65
		XINCLUDES="-I${WRKSRC}" XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
65
		XCFLAGS="${CFLAGS} -frounding-math" XINCLUDES="-I${WRKSRC}" \
66
		XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
66
		LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
67
		LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
67
		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all3
68
		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} all3
68
.for t in d q s
69
.for t in d q s
69
	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
70
	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
70
	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx
71
	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx
(-)b/math/linpack/Makefile (-1 / +1 lines)
Lines 11-17 WWW= https://www.netlib.org/linpack/ Link Here
11
11
12
LIB_DEPENDS=	libblas.so:math/blas
12
LIB_DEPENDS=	libblas.so:math/blas
13
13
14
MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
14
MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
15
MAKEFILE=	${FILESDIR}/Makefile.lib
15
MAKEFILE=	${FILESDIR}/Makefile.lib
16
16
17
USES=		fortran uidfix
17
USES=		fortran uidfix
(-)b/ports-mgmt/dialog4ports/Makefile (-1 / +1 lines)
Lines 19-25 USES= uidfix Link Here
19
# CCACHE has options, so may need d4p, make d4p not ccache friendly
19
# CCACHE has options, so may need d4p, make d4p not ccache friendly
20
# to avoid circular dependency
20
# to avoid circular dependency
21
NO_CCACHE=	yes
21
NO_CCACHE=	yes
22
MAKE_ENV+=	__MAKE_CONF=/dev/null SRCCONF=/dev/null
22
MAKE_ENV+=	SRCCONF=/dev/null
23
23
24
.if !exists(/usr/lib/libdialog.so)
24
.if !exists(/usr/lib/libdialog.so)
25
BROKEN=		Requires libdialog in base
25
BROKEN=		Requires libdialog in base
(-)b/sysutils/dirdiff/Makefile (-5 lines)
Lines 18-28 PLIST_FILES= bin/dirdiff lib/libfilecmp.so.0.0 Link Here
18
18
19
CFLAGS+=	-fPIC -I${TCL_INCLUDEDIR}
19
CFLAGS+=	-fPIC -I${TCL_INCLUDEDIR}
20
20
21
# When bsdmake is used to build the port, the ports infrastructure should call
22
# it with MAKE_ENV+=  __MAKE_CONF=/dev/null to avoid sourcing make.conf twice.
23
# This is a workaround to make sure CFLAGS are passed through.
24
MAKE_ARGS=	CFLAGS="${CFLAGS}"
25
26
post-patch:
21
post-patch:
27
	@${REINPLACE_CMD} -e \
22
	@${REINPLACE_CMD} -e \
28
		's|.0.0|.0|g ; \
23
		's|.0.0|.0|g ; \
(-)b/sysutils/pfstat/Makefile (-1 lines)
Lines 18-24 USES= iconv jpeg Link Here
18
USE_RC_SUBR=	pfstatd
18
USE_RC_SUBR=	pfstatd
19
19
20
MAKE_ARGS=	"LD_GD=gd"
20
MAKE_ARGS=	"LD_GD=gd"
21
MAKE_ENV+=	__MAKE_CONF=/dev/null
22
21
23
PLIST_FILES=	bin/pfstat \
22
PLIST_FILES=	bin/pfstat \
24
		bin/pfstatd \
23
		bin/pfstatd \
(-)b/sysutils/pftop/Makefile (-2 lines)
Lines 29-35 CFLAGS+= -DHAVE_ALTQ=1 Link Here
29
.endif
29
.endif
30
30
31
MAKE_ARGS+=	CSTD=gnu89
31
MAKE_ARGS+=	CSTD=gnu89
32
MAKE_ENV+=	__MAKE_CONF=/dev/null
33
32
34
PLIST_FILES=	man/man8/pftop.8.gz \
33
PLIST_FILES=	man/man8/pftop.8.gz \
35
		sbin/pftop
34
		sbin/pftop
36
- 

Return to bug 277455