--- elwix/Attic/build_pkgsrc.sh	2012/03/20 10:31:34	1.1.2.2
+++ elwix/Attic/build_pkgsrc.sh	2012/03/20 15:21:24	1.1.2.3
@@ -7,7 +7,7 @@
 #
 # ./build_package.sh <package_name>
 #
-# $Id: build_pkgsrc.sh,v 1.1.2.2 2012/03/20 10:31:34 misho Exp $
+# $Id: build_pkgsrc.sh,v 1.1.2.3 2012/03/20 15:21:24 misho Exp $
 #
 
 [ -r ./config/rc.pkg ] && . ./config/rc.pkg
@@ -18,6 +18,7 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	echo
 	exit 1
 fi
+[ -r ${CENV} ] && . ${CENV}
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -40,25 +41,4 @@ if [ "${USER}" != "root" ]; then
 	exit 1
 fi
 
-if [ -d ${PKGSRC_DIR}/bootstrap ]; then
-	install -d ${WORLD}/usr/pkgsrc
-else
-	echo
-	echo "pkgsrc not found or not configured"
-	echo
-	exit 1
-fi
-
-prepare_pkgsrc()
-{
-	echo ">>> Prepare ELWIX for pkgsrc"
-	MNTEXISTS=$(mount | awk -vpkgsrc="${PKGSRC_DIR}" -vdstmnt="${WORLD}/usr/pkgsrc" \
-		'($1 == pkgsrc && $3 == dstmnt) { printf("YES"); }')
-	if [ "${MNTEXISTS}" != "YES" ]; then
-		mount -t nullfs ${PKGSRC_DIR} ${WORLD}/usr/pkgsrc
-	fi
-}
-
 ### main
-
-prepare_pkgsrc