PERFORCE change 118095 for review

[Gabor Kovesdan]

http://perforce.freebsd.org/chv.cgi?CH=118095

Change 118095 by gabor at gabor_server on 2007/04/14 12:47:59

	Roll back current DESTDIR implementation, final step. It's done now.
	I did it with the best care I could do, but I broke something around
	the distfile extraction part, thus I have to investigate what's wrong
	before I can add some fully chrooted code for the new DESTDIR.

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#11 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#11 (text+ko) ====

@@ -4683,34 +4683,18 @@
 		else \
 			dir=$${dir%%:*}; \
 		fi; \
-		if [ -z "${DESTDIR}" ] ; then \
-			${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
-			if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
-				${ECHO_MSG} " - found"; \
-				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
-					${ECHO_MSG} "       (but building it anyway)"; \
-					notfound=1; \
-				else \
-					notfound=0; \
-				fi; \
+		${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
+		if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
+			${ECHO_MSG} " - found"; \
+			if [ ${_DEPEND_ALWAYS} = 1 ]; then \
+				${ECHO_MSG} "       (but building it anyway)"; \
+				notfound=1; \
 			else \
-				${ECHO_MSG} " - not found"; \
-				notfound=1; \
+				notfound=0; \
 			fi; \
 		else \
-			${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library in ${DESTDIR}: $$lib"; \
-			if ${CHROOT} ${DESTDIR} ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
-				${ECHO_MSG} " - found"; \
-				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
-					${ECHO_MSG} "       (but building it anyway)"; \
-					notfound=1; \
-				else \
-					notfound=0; \
-				fi; \
-			else \
-				${ECHO_MSG} " - not found"; \
-				notfound=1; \
-			fi; \
+			${ECHO_MSG} " - not found"; \
+			notfound=1; \
 		fi; \
 		if [ $$notfound != 0 ]; then \
 			${ECHO_MSG} "===>    Verifying $$target for $$lib in $$dir"; \