diff options
| author | joerg <joerg> | 2006-04-09 13:39:52 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-04-09 13:39:52 +0000 |
| commit | 4989907b9db30d7bd4eabfa7aa61e9b85cb99e18 (patch) | |
| tree | 5375174cabc0ba8db3321bd7c342b52a99de42f0 /bootstrap | |
| parent | 804e479596646270a3ee105b2866adee0a81a567 (diff) | |
| download | pkgsrc-4989907b9db30d7bd4eabfa7aa61e9b85cb99e18.tar.gz | |
For DragonFly before the 1.4.0 release, default to $prefix/pkgdb to
avoid conflicts with FreeBSD ports. Later versions use pkgsrc by default,
so use the more natural /var/db/pkg location and match the install CD
thereby.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/mkbinarykit | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit index a6495974607..208706a36ac 100755 --- a/bootstrap/mkbinarykit +++ b/bootstrap/mkbinarykit @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: mkbinarykit,v 1.12 2005/02/18 00:26:07 xtraeme Exp $ +# $NetBSD: mkbinarykit,v 1.13 2006/04/09 13:39:52 joerg Exp $ # # Make a binary bootstrap kit and place it in targetdir (or current # working directory if not specified). The mk.conf.example file is @@ -38,8 +38,12 @@ AIX) pkgdbdir=$prefix/pkgdb ;; DragonFly) - # Don't use the ports /var/db/pkg - pkgdbdir=$prefix/pkgdb + case "$osrev" in + 1.0* | 1.1 | 1.1[^0-9]* | 1.2.* | 1.3.*) + # Don't use the ports /var/db/pkg + pkgdbdir=$prefix/pkgdb + ;; + esac ;; FreeBSD) # Don't use the ports /var/db/pkg |