Attachment #175159 for bug #212987

Lines 3-20 Link Here

(-)Mk/Uses/localbase.mk (-2 / +11 lines)
3	# handle enforcing localbase in path	3	# handle enforcing localbase in path
4	#	4	#
5	# Feature: localbase	5	# Feature: localbase
6	# Usage: USES=localbase	6	# Usage: USES=localbase or USES=localbase:args
7	# Valid ARGS: none	7	# Valid ARGS: ldflags Set LDFLAGS instead of LIBS
8	#	8	#
9	# MAINTAINER: portmgr@FreeBSD.org	9	# MAINTAINER: portmgr@FreeBSD.org
10		10
11	.if !defined(_INCLUDE_USES_LOCALBASE_MK)	11	.if !defined(_INCLUDE_USES_LOCALBASE_MK)
12	_INCLUDE_USES_LOCALBASE_MK= yes	12	_INCLUDE_USES_LOCALBASE_MK= yes
		13	_USES_POST+= localbase
		14	.endif
		15
		16	.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LOCALBASE_POST_MK)
		17	_INCLUDE_USES_LOCALBASE_POST_MK=yes
13		18
14	CPPFLAGS+= -isystem ${LOCALBASE}/include	19	CPPFLAGS+= -isystem ${LOCALBASE}/include
15	CFLAGS+= -isystem ${LOCALBASE}/include	20	CFLAGS+= -isystem ${LOCALBASE}/include
16	CXXFLAGS+= -isystem ${LOCALBASE}/include	21	CXXFLAGS+= -isystem ${LOCALBASE}/include
		22	.if ${localbase_ARGS:Mldflags}
17	LDFLAGS+= -L${LOCALBASE}/lib	23	LDFLAGS+= -L${LOCALBASE}/lib
		24	.else
		25	LIBS+= -L${LOCALBASE}/lib
		26	.endif
18		27
19	# Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs	28	# Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs
20	# this, and CMAKE_ARGS is not used when bootstrapping CMake.	29	# this, and CMAKE_ARGS is not used when bootstrapping CMake.

Lines 10-16 Link Here

(-)Mk/Uses/libarchive.mk (-1 / +1 lines)
10		10
11	.if !defined(_INCLUDE_USES_LIBARCHIVE_MK)	11	.if !defined(_INCLUDE_USES_LIBARCHIVE_MK)
12	_INCLUDE_USES_LIBARCHIVE_MK= yes	12	_INCLUDE_USES_LIBARCHIVE_MK= yes
13	.include "${USESDIR}/localbase.mk"	13	_USES_POST+= localbase
14		14
15	LIB_DEPENDS+= libarchive.so.13:archivers/libarchive	15	LIB_DEPENDS+= libarchive.so.13:archivers/libarchive
16	.endif	16	.endif

Lines 10-16 Link Here

(-)Mk/Uses/libedit.mk (-1 / +1 lines)
10		10
11	.if !defined(_INCLUDE_USES_LIBEDIT_MK)	11	.if !defined(_INCLUDE_USES_LIBEDIT_MK)
12	_INCLUDE_USES_LIBEDIT_MK= yes	12	_INCLUDE_USES_LIBEDIT_MK= yes
13	.include "${USESDIR}/localbase.mk"	13	_USES_POST+= localbase
14		14
15	LIB_DEPENDS+= libedit.so.0:devel/libedit	15	LIB_DEPENDS+= libedit.so.0:devel/libedit
16	.endif	16	.endif

Lines 90-97 UDF_SQL= src/extlib/ib_udf2.sql src/extl Link Here

(-)databases/firebird25-server/Makefile (-2 / +1 lines)
90	PKGINSTALL?= ${PKGDIR}/pkg-install-server	90	PKGINSTALL?= ${PKGDIR}/pkg-install-server
91	.else	91	.else
92	# Client part stuff	92	# Client part stuff
93	USES+= libedit	93	USES+= libedit
94	LDFLAGS+= -L${LOCALBASE}/lib # to link in lncurses pulled in by libedit
95		94
96	CONFIGURE_ARGS+= --with-system-editline	95	CONFIGURE_ARGS+= --with-system-editline
97	CONFIGURE_ENV+= ac_cv_lib_edit_readline="yes"	96	CONFIGURE_ENV+= ac_cv_lib_edit_readline="yes"

Return to bug 212987