diff options
| author | jhb <jhb@FreeBSD.org> | 2012-03-17 00:02:16 +0800 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2012-03-17 00:02:16 +0800 |
| commit | 1186456aa97aba2c47201908bdd992c56258db69 (patch) | |
| tree | 863da2505d880c33bff5ff6692a545d10019953d | |
| parent | 40aab47e3a213ffd4ab1f2df9aa8b342747dee94 (diff) | |
| download | freebsd-ports-gnome-1186456aa97aba2c47201908bdd992c56258db69.tar.gz freebsd-ports-gnome-1186456aa97aba2c47201908bdd992c56258db69.tar.zst freebsd-ports-gnome-1186456aa97aba2c47201908bdd992c56258db69.zip | |
- Change the default work directory to honor the destination directory
if it is set. That is, it will use DESTDIR/var/db/etcupdate by
default rather than always using /var/db/etcupdate as the default.
- Bump to 0.4.
Feature safe: yes
| -rw-r--r-- | sysutils/etcupdate/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/etcupdate/src/etcupdate.8 | 5 | ||||
| -rw-r--r-- | sysutils/etcupdate/src/etcupdate.sh | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile index c090019ed261..ae6406ace618 100644 --- a/sysutils/etcupdate/Makefile +++ b/sysutils/etcupdate/Makefile @@ -8,7 +8,7 @@ # PORTNAME= etcupdate -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= sysutils MASTER_SITES= # none DISTFILES= # none diff --git a/sysutils/etcupdate/src/etcupdate.8 b/sysutils/etcupdate/src/etcupdate.8 index ce4471e4aac6..3a3f08c12a4e 100644 --- a/sysutils/etcupdate/src/etcupdate.8 +++ b/sysutils/etcupdate/src/etcupdate.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2010 Advanced Computing Technologies LLC +.\" Copyright (c) 2010-2012 Advanced Computing Technologies LLC .\" Written by: John H. Baldwin <jhb@FreeBSD.org> .\" All rights reserved. .\" @@ -70,6 +70,7 @@ .Nm .Cm status .Op Fl d Ar workdir +.Op Fl D Ar destdir .Sh DESCRIPTION The .Nm @@ -360,7 +361,7 @@ and .Dq previous trees as well as unresolved conflicts. The default work directory is -.Pa /var/db/etcupdate . +.Pa <destdir>/var/db/etcupdate . .It Fl A Ar patterns Always install the new version of any files that match any of the patterns listed in diff --git a/sysutils/etcupdate/src/etcupdate.sh b/sysutils/etcupdate/src/etcupdate.sh index b2a9dddd4bf7..22168360d796 100644 --- a/sysutils/etcupdate/src/etcupdate.sh +++ b/sysutils/etcupdate/src/etcupdate.sh @@ -69,7 +69,7 @@ usage: etcupdate [-nBF] [-d workdir] [-r | -s source | -t tarball] [-A patterns] etcupdate extract [-B] [-d workdir] [-s source | -t tarball] [-L logfile] [-M options] etcupdate resolve [-d workdir] [-D destdir] [-L logfile] - etcupdate status [-d workdir] + etcupdate status [-d workdir] [-D destdir] EOF exit 1 } @@ -1494,9 +1494,6 @@ fi # Set default variable values. -# Where the "old" and "new" trees are stored. -WORKDIR=/var/db/etcupdate - # The path to the source tree used to build trees. SRCDIR=/usr/src @@ -1614,6 +1611,9 @@ if [ -n "$ignore" ]; then fi set +o noglob +# Where the "old" and "new" trees are stored. +WORKDIR=${WORKDIR:-$DESTDIR/var/db/etcupdate} + # Log file for verbose output from program that are run. The log file # is opened on fd '3'. LOGFILE=${LOGFILE:-$WORKDIR/log} |