1845c1845
< USE_LDCONFIG=	${DESTDIR}${PREFIX}/lib
---
> USE_LDCONFIG=	${PREFIX}/lib
2204,2208d2203
< .if defined(CROSS_COMPILE)
< .include "${PORTSDIR}/Mk/bsd.cross.mk"
< #CROSS_COMPILE?=        ${TARGET_ARCH}-freebsd-
< #CROSS_COMPILE:=        ${CROSS_COMPILE:S/^/'CROSS_COMPILE='/}
< .endif
2368,2386d2362
< #__DESTDIRD_PREFIX=
< #_USE_DESTDIR=
< #.for component in ${PREFIX}
< #.if ${__DESTDIRD_PREFIX:M${component}} != "" &&
< #.if ${DESTDIR} != "" &&
< #.if ${PREFIX} != ""
< #__DESTDIRD_PREFIX+= ${DESTDIR}${component}
< #PREFIX=${__DESTDIRD_PREFIX}
< #.endif
< #.endif
< #.endif
< #.endfor
< 
< #.for f in ${PREFIX}
< #	@${SED} -i.bak -i '' -e 's/^M$$/${DESTDIR}/' ${WRKSRC}/${f}
< #.endfor
< 
< 
< 
2959,2964c2935,2936
< #CONFIGURE_BUILD?=	${ARCH}-freebsd
< #CONFIGURE_BUILD:=	${CONFIGURE_BUILD:S/^/--build=/}
< #CONFIGURE_TARGET?=	${TARGET_ARCH}-freebsd
< #CONFIGURE_TARGET:=	${CONFIGURE_TARGET:S/--target=//}
< CONFIGURE_HOST?=	${TARGET_ARCH}-freebsd
< CONFIGURE_HOST:=	${CONFIGURE_HOST:S/^/--host=/}
---
> CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_TARGET:=	${CONFIGURE_TARGET:S/--build=//}
2991c2963
< 		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET} --with-sysroot=${WORLDDESTDIR}" ; \
---
> 		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \
3761c3733
< 	    CFLAGS+="${CFLAGS}" CPPFLAGS+="${CPPFLAGS}" CXXFLAGS+="${CXXFLAGS}" \
---
> 	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
3768c3740
< 	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_HOST}; then \
---
> 	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
3920c3892
< .if defined(USE_GMAKE) && !defined(TARGET_ARCH)
---
> .if defined(USE_GMAKE)
3929d3900
< #.endif
3932a3904
> 
4015c3987
< 		${MKDIR} -p ${PREFIX}${PKG_DBDIR}; \
---
> 		${MKDIR} ${PKG_DBDIR}; \
4029,4030c4001,4002
< 		if [ -d ${PREFIX}${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
< 				if [ -d ${PREFIX}${PKG_DBDIR}/${PKGNAME} ]; then \
---
> 		if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
> 				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
4058c4030
< 	@${MKDIR} ${DESTDIR}/${PREFIX}
---
> 	@${MKDIR} ${PREFIX}
4060c4032
< 		if [ -w ${DESTDIR}/${PREFIX}/ ]; then \
---
> 		if [ -w ${PREFIX}/ ]; then \
4063c4035
< 			${ECHO_MSG} "Error: ${DESTDIR}/${PREFIX}/ not writable."; \
---
> 			${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \
4074,4076c4046,4048
< 			${MTREE_CMD} ${MTREE_ARGS} ${DESTDIR}${PREFIX}/ >/dev/null; \
< 			if [ ${DESTDIR}${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \
< 				cd ${DESTDIR}${PREFIX}/share/nls; \
---
> 			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
> 			if [ ${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \
> 				cd ${PREFIX}/share/nls; \
4111c4083
< 	@${MKDIR} -p ${DESTDIR}${PREFIX}/${LDCONFIG_DIR}
---
> 	@${MKDIR} ${PREFIX}/${LDCONFIG_DIR}
4114c4086
< 		> ${DESTDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
---
> 		> ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
4134c4106
< 	@${MKDIR} ${DESTDIR}${PREFIX}/${LDCONFIG_32DIR}
---
> 	@${MKDIR} ${PREFIX}/${LDCONFIG_32DIR}
4137c4109
< 		> ${DESTDIR}${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
---
> 		> ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
4273c4245
< 		match($$0, /^@cwd /) { prefix = substr($$0, RSTART + RLENGTH); if (prefix == "/") prefix=""; if (destdir != "") prefix="$destdir"; next; } \
---
> 		match($$0, /^@cwd /) { prefix = substr($$0, RSTART + RLENGTH); if (prefix == "/") prefix=""; next; } \
4315c4287
< .if !defined(CHROOTED)
---
> .if defined(CHROOTED)
5698c5670
< 	@for i in ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}||}; do \
---
> 	@for i in ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||}; do \
5766c5738
< 		${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> 		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
5775c5747
< 		${SED} -ne 's,^${DESTDIR}${PREFIX},,p' >> ${TMPPLIST}
---
> 		${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
5777c5749
< 		${SED} -ne 's,^${DESTDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
---
> 		${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
5789c5761
< 		${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> 		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
5795c5767
< 			${SED} -e 's,^${DESTDIR}${PREFIX}/,,' >> ${TMPPLIST}; \
---
> 			${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
5802c5774
< 	@${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${DESTDIR}${PREFIX}/,,}" >> ${TMPPLIST}
---
> 	@${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
5813c5785
< 		${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> 		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
5819c5791
< 			${SED} -e 's,^${DESTDIR}/${PREFIX}/,,' >> ${TMPPLIST}; \
---
> 			${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
5823c5795
< 		${SED} -ne 's,^${DESTDIR}/${PREFIX}/,,p' >> ${TMPPLIST}
---
> 		${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
5825,5826c5797,5798
< 		${SED} -ne 's,^${DESTDIR}/${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
< 	@${ECHO_CMD} "@dirrm ${DATADIR:S,^${DESTDIR}/${PREFIX}/,,}" >> ${TMPPLIST}
---
> 		${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
> 	@${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
5844c5816
< 	install-info --quiet ${DESTDIR}/${PREFIX}/${INFO_PATH}/$i.info ${DESTDIR}/${PREFIX}/${INFO_PATH}/dir
---
> 	install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
5847c5819
< 	@${LS} ${DESTDIR}/${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${DESTDIR}/${PREFIX}/::g >> ${TMPPLIST}
---
> 	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
5881c5853
< 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}/etc/rc.d/$${i%.sh}; \
---
> 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
5884c5856
< 	@${ECHO_CMD} "@cwd ${DESTDIR}/${PREFIX}" >> ${TMPPLIST}
---
> 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5888c5860
< 	@${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}
---
> 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5890c5862
< 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}${PREFIX}/etc/rc.d/$${i%.sh}; \
---
> 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \
5935c5907
< 	@if [ ! -d ${DESTDIR}${PREFIX}${PKG_DBDIR} ]; then ${RM} -f ${DESTDIR}${PREFIX}${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
---
> 	@if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
5938,5939c5910,5911
< 	@if [ -e ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY ]; then \
< 		${CP} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY /tmp/${PKGNAME}-required-by; \
---
> 	@if [ -e ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY ]; then \
> 		${CP} ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY /tmp/${PKGNAME}-required-by; \
5941c5913
< 	@${RM} -rf ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}
---
> 	@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
5943,5948c5915,5920
< 	@if [ ! -d ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME} ]; then \
< 		${ECHO_MSG} "===>   Registering installation for ${DESTDIR}/${PKGNAME}"; \
< 		${MKDIR} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}; \
< 		${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
< 		${CP} ${DESCR} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+DESC; \
< 		${ECHO_CMD} ${COMMENT:Q} > ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
---
> 	@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
> 		${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"; \
> 		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
> 		${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
> 		${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
> 		${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
5950c5922
< 			${CP} ${PKGINSTALL} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+INSTALL; \
---
> 			${CP} ${PKGINSTALL} ${PKG_DBDIR}/${PKGNAME}/+INSTALL; \
5953c5925
< 			${CP} ${PKGDEINSTALL} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \
---
> 			${CP} ${PKGDEINSTALL} ${PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \
5956c5928
< 			${CP} ${PKGREQ} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRE; \
---
> 			${CP} ${PKGREQ} ${PKG_DBDIR}/${PKGNAME}/+REQUIRE; \
5959,5960c5931,5932
< 			${CP} ${PKGMESSAGE} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
< 			${ECHO_CMD} "@display +DISPLAY" >> ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
---
> 			${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
> 			${ECHO_CMD} "@display +DISPLAY" >> ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
5963,5964c5935,5936
< 			if [ -d ${DESTDIR}${PREFIX}${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \
< 				if ! ${GREP} ^${PKGNAME}$$ ${DESTDIR}${PREFIX}${PKG_DBDIR}/$$dep/+REQUIRED_BY \
---
> 			if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \
> 				if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
5966c5938
< 					${ECHO_CMD} ${PKGNAME} >> ${DESTDIR}${PREFIX}${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
---
> 					${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
5973c5945
< 		${CP} ${MTREE_FILE} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
---
> 		${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
5977c5949
< 		${CAT} /tmp/${PKGNAME}-required-by >> ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \
---
> 		${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \
6499c6471
< 		${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> 		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \