From: Sascha Wildner Date: Sat, 14 Jan 2006 22:23:40 +0000 (+0000) Subject: * Remove example supfile for dfports. X-Git-Tag: v2.0.1~5380 X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/a2023ec805e599ed1eb2cb950f4c34a7202868c8 * Remove example supfile for dfports. * Add a sentence of documentation about the release example supfiles. * Replace ports/dfports section in the upgrading notes with some information about pkgsrc. --- diff --git a/UPDATING b/UPDATING index 470d800a75..02689db8d3 100644 --- a/UPDATING +++ b/UPDATING @@ -1,4 +1,4 @@ -$DragonFly: src/UPDATING,v 1.17 2006/01/06 02:44:53 drhodus Exp $ +$DragonFly: src/UPDATING,v 1.18 2006/01/14 22:23:40 swildner Exp $ Updating Information for DragonFly users. @@ -61,7 +61,6 @@ object hierarchy is necessary. cd /usr rm -rf src cvs -R -d /home/dcvs checkout -P src - cvs -R -d /home/dcvs checkout -P dfports # build it (500MB used in /usr/obj) # @@ -123,7 +122,6 @@ the hour and minute in the cron job a bit to avoid pileups. # install the source from the CVS hierarchy cd /usr cvs -R -d /home/dcvs checkout -P src - cvs -R -d /home/dcvs checkout -P dfports Once you have the repository and broken out sources you can decide whether to update your sources from the repository automatically or manually. Since @@ -168,23 +166,26 @@ and buildkernel as shown above, before asking for help. Kerberos IV (eBones) was removed from the tree, please consider moving to Kerberos 5 (Heimdal). -> FreeBSD and DragonFly ports ------------------------------ +> Package Management System +--------------------------- -DragonFly will eventually have its own package management system but at the -moment we leverage off of the FreeBSD ports system. You should maintain -/usr/ports from the FreeBSD cvs repository via cvsup just like you do now. +Starting with the 1.4 release, DragonFly uses NetBSD's pkgsrc package +management system. The necessary tools to build and maintain packages +are provided in /usr/pkg/bin and /usr/pkg/sbin. Make sure that these +directories are in your PATH variable. -DragonFly has its own 'port overrides' hierarchy in /usr/dfports. You can -check this out of the DragonFly cvs repository using: +In order to obtain a reasonably current snapshot of the pkgsrc tree, use +the tarball from NetBSD: -cd /usr -cvs -R -d /home/dcvs checkout -P dfports + fetch -o /tmp/pkgsrc.tar.gz ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc.tar.gz + cd /usr; tar -xzf /tmp/pkgsrc.tar.gz; chown -R root:wheel pkgsrc -Be sure that you have installed 'relpath' from the DragonFly sources -(/usr/src/usr.bin/relpath) as well as the updated /usr/share/mk files from -/usr/src/share/mk. As a test you can cd into /usr/ports/sysutils/cpdup and -build the port. Dragonfly should contain an override and you should see a -warning message that the DragonFly override is being build instead when you -build it from the FreeBSD ports. +This tree can then be kept up to date with cvs update: + cd /usr/pkgsrc; cvs up + +NOTE! If you upgraded from a pre-1.4 system to 1.4 or later, you need to +build and install the pkgsrc bootstrap manually: + + cd /usr/pkgsrc/bootstrap + ./bootstrap --pkgdbdir /var/db/pkg --prefix /usr/pkg diff --git a/etc/Makefile b/etc/Makefile index 00058bb673..97a11eeda2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.101 2006/01/11 01:04:34 corecode Exp $ +# $DragonFly: src/etc/Makefile,v 1.102 2006/01/14 22:23:39 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -386,6 +386,7 @@ upgrade_etc: preupgrade .endif rm -f ${DESTDIR}/etc/rc.d/altqd csh -c "rm -f ${DESTDIR}/etc/rc.d/network{,1,2,3}" + rm -f ${DESTDIR}/usr/share/examples/cvsup/DragonFly-dfports-supfile ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NO_MAKEDEV) diff --git a/share/examples/cvsup/DragonFly-dfports-supfile b/share/examples/cvsup/DragonFly-dfports-supfile deleted file mode 100644 index 4b1a76ec71..0000000000 --- a/share/examples/cvsup/DragonFly-dfports-supfile +++ /dev/null @@ -1,45 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/Attic/DragonFly-dfports-supfile,v 1.4 2005/10/04 11:12:20 corecode Exp $ -# -# DRAGONFLY-DFPORTS-SUPFILE -# -# This file will by default maintain a copy of the DragonFly BSD dfports tree -# in /usr/dfports. -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 2 DragonFly-dfports-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. If you leave it at its default a random -# mirror site will be used. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/home/ncvs" will place all of the files -# requested in /home/ncvs (e.g., "/home/ncvs/src/bin", -# "/home/ncvs/ports/archivers"). The prefix directory -# must exist in order to run CVSup. -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=. -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-dfports diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README index f04ec58216..d255c667bc 100644 --- a/share/examples/cvsup/README +++ b/share/examples/cvsup/README @@ -1,20 +1,20 @@ # $FreeBSD: src/share/examples/cvsup/README,v 1.15.2.5 2002/12/03 05:58:04 kuriyama Exp $ -# $DragonFly: src/share/examples/cvsup/README,v 1.4 2005/04/06 20:52:55 dillon Exp $ +# $DragonFly: src/share/examples/cvsup/README,v 1.5 2006/01/14 22:23:39 swildner Exp $ This directory contains sample "supfiles" for obtaining and updating the various BSD's via the Internet. These supfiles will work with CVSup version 14.0 or later. For general information on CVSup itself, please see http://www.freebsd.org/doc/handbook/cvsup.html -To maintain the sources for DragonFlyBSD, use: +To maintain the sources for DragonFlyBSD, use one of: DragonFly-cvs-supfile Main CVS repository for DragonFly BSD DragonFly-preview-supfile A recent development snapshot of the DragonFly source tree. - DragonFly-dfports-supfile Latest DragonFly ports override for - the FreeBSD ports tree. + DragonFly-releaseX_Y-supfile The source tree for release X.Y of + DragonFly. To maintain the sources for FreeBSD, use: