PERFORCE change 122197 for review

[Gabor Kovesdan]

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

Change 122197 by gabor at gabor_server on 2007/06/23 10:11:18

	- Revert the DESTDIR_ENV part, I'll do it in an other way
	- Add some commented out lines for checking if PORTSDIR is already
	  mounted

Affected files ...

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

Differences ...

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

@@ -1089,60 +1089,29 @@
 
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
-# These need to be absolute since we don't know how deep in the ports
-# tree we are and thus can't go relative.  They can, of course, be overridden
-# by individual Makefiles or local system make configuration.
-PORTSDIR?=	/usr/ports
-LOCALBASE?=	/usr/local
-X11BASE?=	${LOCALBASE}
-LINUXBASE?=	/compat/linux
-DISTDIR?=	${PORTSDIR}/distfiles
-_DISTDIR?=	${DISTDIR}/${DIST_SUBDIR}
-INDEXDIR?=	${PORTSDIR}
-INDEXFILE?=	INDEX-${OSVERSION:C/([0-9]).*/\1/}
-
-PACKAGES?=	${PORTSDIR}/packages
-TEMPLATES?=	${PORTSDIR}/Templates
-
-.if defined(USE_X_PREFIX)
-PREFIX?=	${X11BASE}
-.elif defined(USE_LINUX_PREFIX)
-PREFIX?=	${LINUXBASE}
-NO_MTREE=	yes
-.else
-PREFIX?=	${LOCALBASE}
-.endif
-
-# where pkg_add records its dirty deeds.
-PKG_DBDIR?=	/var/db/pkg
-
-# where 'make config' records user configuration options
-PORT_DBDIR?=    /var/db/ports
-
 #
 # DESTDIR section to start a chrooted process if invoked with DESTDIR set
 #
 
 .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED)
-
-DESTDIR_ENV=	LOCALBASE=${LOCALBASE} LINUXBASE=${LINUXBASE} \
-		X11BASE=${X11BASE} PREFIX=${PREFIX} PORTSDIR=${PORTSDIR} \
-		DISTDIR=${DISTDIR} PACKAGES=${PACKAGES} TEMPLATES=${TEMPLATES} \
-		WRKDIRPREFIX=${WRKDIRPREFIX} PKG_DBDIR=${PKG_DBDIR} \
-		PORT_DBDIR=${PORT_DBDIR} DESTDIR= CHROOTED=YES
-
 .BEGIN:
 	${MKDIR} ${DESTDIR}${PORTSDIR}
-.if !exists(${DESTDIR}${PORTSDIR}/Makefile)
-	${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \
-	${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR}
-.endif
+#	found=0; \
+#	for i in `${MOUNT} | ${AWK} {'print $$3'}` ; do \
+#		if [ `${REALPATH} ${DESTDIR}${PORTSDIR}` == `${REALPATH} $${i}` ]; then \
+#			found=1; \
+#		fi ; \
+#	done ; \
+#	if [ $${found} != 1 ]; then \
+#		${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \
+#		${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR}; \
+#	fi
 .if !exists (${DESTDIR}/dev/null)
 	${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \
 	${MOUNT} -t devfs devfs ${DESTDIR}/dev
 .endif
 	${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
-	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"
+	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})"
 .else
 
 # Look for ${WRKSRC}/.../*.orig files, and (re-)create
@@ -1268,6 +1237,9 @@
 USE_SUBMAKE=	yes
 .endif
 
+# where 'make config' records user configuration options
+PORT_DBDIR?=	/var/db/ports
+
 LDCONFIG_DIR=	libdata/ldconfig
 LDCONFIG32_DIR=	libdata/ldconfig32
 
@@ -1357,6 +1329,18 @@
 PKGNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
 DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
+# These need to be absolute since we don't know how deep in the ports
+# tree we are and thus can't go relative.  They can, of course, be overridden
+# by individual Makefiles or local system make configuration.
+PORTSDIR?=		/usr/ports
+LOCALBASE?=		/usr/local
+X11BASE?=		${LOCALBASE}
+LINUXBASE?=		/compat/linux
+DISTDIR?=		${PORTSDIR}/distfiles
+_DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
+INDEXDIR?=		${PORTSDIR}
+INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
+
 DOCSDIR?=		${PREFIX}/share/doc/${PORTNAME}
 EXAMPLESDIR?=		${PREFIX}/share/examples/${PORTNAME}
 DATADIR?=		${PREFIX}/share/${PORTNAME}
@@ -1397,6 +1381,8 @@
 .else
 EXTRACT_SUFX?=			.tar.gz
 .endif
+PACKAGES?=		${PORTSDIR}/packages
+TEMPLATES?=		${PORTSDIR}/Templates
 
 PATCHDIR?=		${MASTERDIR}/files
 FILESDIR?=		${MASTERDIR}/files
@@ -1412,6 +1398,14 @@
 .if defined(USE_X_PREFIX)
 USE_XLIB=		yes
 .endif
+.if defined(USE_X_PREFIX)
+PREFIX?=		${X11BASE}
+.elif defined(USE_LINUX_PREFIX)
+PREFIX?=		${LINUXBASE}
+NO_MTREE=		yes
+.else
+PREFIX?=		${LOCALBASE}
+.endif
 
 .if defined(USE_LINUX_PREFIX)
 LDCONFIG_CMD?=			${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE}
@@ -2351,6 +2345,8 @@
 .else
 PKG_SUFX?=		.tbz
 .endif
+# where pkg_add records its dirty deeds.
+PKG_DBDIR?=		/var/db/pkg
 
 MOTIFLIB?=	-L${X11BASE}/lib -lXm -lXp