DragonFly submit List (threaded) for 2009-09
DragonFly BSD
DragonFly submit List (threaded) for 2009-09
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

make nrelease: get rid of cvsup; we no longer depend on it


From: YONETANI Tomokazu <qhwt+dfly@xxxxxxxxxx>
Date: Wed, 9 Sep 2009 14:34:42 +0900

make nrelease: get rid of cvsup; we no longer depend on it

---
 nrelease/Makefile |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 62379a2..b56f836 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -34,7 +34,6 @@ PKGBIN_PKG_ADMIN?=	${PKGSRC_PREFIX}/sbin/pkg_admin
 PKGBIN_MKISOFS?=	${PKGSRC_PREFIX}/bin/mkisofs
 PKGSRC_PKG_PATH?=	${ISODIR}/packages
 PKGSRC_BOOTSTRAP_URL?=	http://avalon.dragonflybsd.org/DragonFly-pkgsrc-packages/i386/1.12.0-RELEASE-BUILD
-CVSUP_BOOTSTRAP_KIT?=	cvsup-bootstrap-20070716
 
 # We use env -i in the chroot, so that environment variables won't
 # disturb any (pkgsrc) build.  This has happened for TARGET_ARCH,
@@ -179,10 +178,6 @@ check:
 	@echo "You never bootstrapped pkgsrc on your machine.  You can install it with:"
 	@echo "    make pkgsrc_bootstrap"
 .endif
-.if !exists(${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}.tgz)
-	@echo "The cvsup bootstrap kit is not installed.  You can install it with:"
-	@echo "    make fetch"
-.endif
 .if !exists (${PKGBIN_MKISOFS})
 	@echo
 	@echo "Your machine does not have cdrtools installed.  You can install it with:"
@@ -193,9 +188,6 @@ check:
 	@echo "package building.  For example /usr/pkgsrc.  See the Makefile"
 	@echo "in /usr if you are unfamiliar with pkgsrc."
 .endif
-.if !exists(${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}.tgz)
-	@exit 1
-.endif
 .if !exists (${PKGBIN_MKISOFS})
 	@exit 1
 .endif
@@ -302,9 +294,6 @@ customizeiso:
 	@test -O ${.CURDIR} || echo "chowning copied files to root:wheel"
 	@test -O ${.CURDIR} || ((cd ${ROOTSKEL} && find .) | fgrep -v cpignore | (cd ${ISOROOT} && xargs chown root:wheel))
 .endfor
-	(cd ${PKGSRC_PKG_PATH}; tar xzpf ${CVSUP_BOOTSTRAP_KIT}.tgz)
-	cp -p ${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}/usr/local/bin/cvsup ${ISOROOT}/usr/local/bin/cvsup
-	cp -p ${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}/usr/local/man/man1/cvsup.1 ${ISOROOT}/usr/local/man/man1/cvsup.1
 	pwd_mkdb -p -d ${ISOROOT}/etc ${ISOROOT}/etc/master.passwd
 .for UPGRADE_ITEM in Makefile			\
 		     etc.${MACHINE_ARCH} 	\
@@ -472,9 +461,6 @@ realclean:	clean
 
 fetch:
 	@if [ ! -d ${PKGSRC_PKG_PATH} ]; then mkdir -p ${PKGSRC_PKG_PATH}; fi
-.if !exists(${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}.tgz)
-	(cd ${PKGSRC_PKG_PATH}; fetch ${PKGSRC_BOOTSTRAP_URL}/${CVSUP_BOOTSTRAP_KIT}.tgz)
-.endif
 
 pkgsrc_bootstrap:
 .if !exists(${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT}.tgz)
-- 
1.6.4




[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]