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

Collapse All | Expand All

(-)b/Mk/bsd.port.mk (-13 / +4 lines)
Lines 501-509 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here
501
#				  Installs all directories and files from ${WRKSRC}/doc
501
#				  Installs all directories and files from ${WRKSRC}/doc
502
#				  to ${DOCSDIR} except sed(1) backup files.
502
#				  to ${DOCSDIR} except sed(1) backup files.
503
#
503
#
504
# MANPREFIX		- The directory prefix for manual pages.
505
#				  Default: ${PREFIX}
506
#
507
# Set the following to specify all .info files your port installs.
504
# Set the following to specify all .info files your port installs.
508
#
505
#
509
# INFO			- A list of .info files (omitting the trailing ".info");
506
# INFO			- A list of .info files (omitting the trailing ".info");
Lines 752-758 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here
752
#				- Pass these args to configure if ${HAS_CONFIGURE} is set.
749
#				- Pass these args to configure if ${HAS_CONFIGURE} is set.
753
#				  Default: "--prefix=${GNU_CONFIGURE_PREFIX}
750
#				  Default: "--prefix=${GNU_CONFIGURE_PREFIX}
754
#				  --infodir=${PREFIX}/${INFO_PATH} --localstatedir=/var
751
#				  --infodir=${PREFIX}/${INFO_PATH} --localstatedir=/var
755
#				  --mandir=${MANPREFIX}/man --build=${CONFIGURE_TARGET}" if
752
#				  --mandir=${PREFIX}/man --build=${CONFIGURE_TARGET}" if
756
#				  GNU_CONFIGURE is set, "CC=${CC} CFLAGS=${CFLAGS}
753
#				  GNU_CONFIGURE is set, "CC=${CC} CFLAGS=${CFLAGS}
757
#				  PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib
754
#				  PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib
758
#				  INSTALLARCHLIB=${PREFIX}/lib" if USES=perl5 and
755
#				  INSTALLARCHLIB=${PREFIX}/lib" if USES=perl5 and
Lines 2028-2035 MAKE_ENV+= PREFIX=${PREFIX} \ Link Here
2028
			CC="${CC}" CFLAGS="${CFLAGS}" \
2025
			CC="${CC}" CFLAGS="${CFLAGS}" \
2029
			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
2026
			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
2030
			LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
2027
			LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
2031
			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
2028
			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
2032
			MANPREFIX="${MANPREFIX}"
2033
2029
2034
# Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
2030
# Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
2035
# gcc 4.x enable strict aliasing optimization with -O2 which is known to break
2031
# gcc 4.x enable strict aliasing optimization with -O2 which is known to break
Lines 2701-2707 CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax Link Here
2701
.      endif
2697
.      endif
2702
_EXPORTED_VARS+=	CONFIGURE_MAX_CMD_LEN
2698
_EXPORTED_VARS+=	CONFIGURE_MAX_CMD_LEN
2703
GNU_CONFIGURE_PREFIX?=	${PREFIX}
2699
GNU_CONFIGURE_PREFIX?=	${PREFIX}
2704
GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
2700
GNU_CONFIGURE_MANPREFIX?=	${PREFIX}
2705
CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
2701
CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
2706
.      if defined(CROSS_TOOLCHAIN)
2702
.      if defined(CROSS_TOOLCHAIN)
2707
CROSS_HOST=		${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
2703
CROSS_HOST=		${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
Lines 2745-2758 SCRIPTS_ENV+= CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \ Link Here
2745
SCRIPTS_ENV+=	BATCH=yes
2741
SCRIPTS_ENV+=	BATCH=yes
2746
.    endif
2742
.    endif
2747
2743
2748
.    if ${PREFIX} == /usr
2749
MANPREFIX?=	/usr/share
2750
.    else
2751
MANPREFIX?=	${PREFIX}
2752
MANDIRS+=	${PREFIX}/share/man
2744
MANDIRS+=	${PREFIX}/share/man
2753
.    endif
2754
2745
2755
MANDIRS+=	${MANPREFIX}/man
2746
MANDIRS+=	${PREFIX}/man
2756
INFO_PATH?=	share/info
2747
INFO_PATH?=	share/info
2757
2748
2758
.    if defined(INFO)
2749
.    if defined(INFO)

Return to bug 276551