summaryrefslogtreecommitdiff
path: root/sysutils/tob
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-10-19 23:56:13 +0000
committerrillig <rillig@pkgsrc.org>2006-10-19 23:56:13 +0000
commitbc5b8cdfc85f5d9e4729b0e49ec69134a2390071 (patch)
tree0aaafa21882e32fb24746fae52d8defcdb23925a /sysutils/tob
parente5291e1d03b0dabe8d08f3b2a208b84d6d3d4e7c (diff)
downloadpkgsrc-bc5b8cdfc85f5d9e4729b0e49ec69134a2390071.tar.gz
Fixed "test ==" and VARBASE. PKGREVISION++.
Diffstat (limited to 'sysutils/tob')
-rw-r--r--sysutils/tob/Makefile19
-rw-r--r--sysutils/tob/distinfo4
-rw-r--r--sysutils/tob/patches/patch-aa40
3 files changed, 45 insertions, 18 deletions
diff --git a/sysutils/tob/Makefile b/sysutils/tob/Makefile
index 3ed9a79a3f3..54e093ebf6e 100644
--- a/sysutils/tob/Makefile
+++ b/sysutils/tob/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/04/13 00:11:47 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/19 23:56:13 rillig Exp $
DISTNAME= tob-0.25
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://tinyplanet.ca/projects/tob/
EXTRACT_SUFX= .tgz
@@ -14,29 +15,29 @@ CONF_FILES= ${EGDIR}/tob.rc ${PKG_SYSCONFDIR}/tob/tob.rc
CONF_FILES+= ${EGDIR}/example.exclude ${PKG_SYSCONFDIR}/tob/volumes/example.exclude
CONF_FILES+= ${EGDIR}/example.startdir ${PKG_SYSCONFDIR}/tob/volumes/example.startdir
-INSTALLATION_DIRS= man/man8 sbin
+INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin ${EGDIR}
-REPLACE_INTERPRETER+= bash
-REPLACE.bash.old= /bin/bash
-REPLACE.bash.new= ${SH}
-REPLACE_FILES.bash= tob
+REPLACE_SH+= tob
+USE_TOOLS+= sh:run
SUBST_CLASSES+= confdir
SUBST_STAGE.confdir= do-build
SUBST_MESSAGE.confdir= Adjusting configuration directory
SUBST_FILES.confdir= tob tob.rc
SUBST_SED.confdir= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
+SUBST_SED.confdir+= -e 's|@VARBASE@|${VARBASE}|g'
+
+BUILD_DEFS+= VARBASE
do-build:
@${DO_NADA}
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tob ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/tob.8 ${PREFIX}/man/man8/
+ ${INSTALL_MAN} ${WRKSRC}/tob.8 ${PREFIX}/${PKGMANDIR}/man8/
${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/tob
${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/tob/volumes
- ${INSTALL_DATA_DIR} /var/tob
- ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA_DIR} ${VARBASE}/tob
${INSTALL_DATA} ${WRKSRC}/tob.rc ${EGDIR}/tob.rc
${INSTALL_DATA} ${WRKSRC}/example.exclude ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/example.startdir ${EGDIR}
diff --git a/sysutils/tob/distinfo b/sysutils/tob/distinfo
index e1d1dc26536..54b85ef34a9 100644
--- a/sysutils/tob/distinfo
+++ b/sysutils/tob/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/03/09 14:50:31 ghen Exp $
+$NetBSD: distinfo,v 1.4 2006/10/19 23:56:13 rillig Exp $
SHA1 (tob-0.25.tgz) = 71a5bb9dac7c2d4aa800392213b11e9616370b80
RMD160 (tob-0.25.tgz) = 31ce5e85a10835909834853f1f95077cd3ad9542
Size (tob-0.25.tgz) = 107423 bytes
-SHA1 (patch-aa) = 746a93edb629023107dd67ad7193c8d6ca589bce
+SHA1 (patch-aa) = b1c758fbe293a25e22a7f4849fe82ed60277a883
SHA1 (patch-ab) = a4c27f1b93a669f2be0a6f2579e528c583393be8
diff --git a/sysutils/tob/patches/patch-aa b/sysutils/tob/patches/patch-aa
index 85f0ebaad90..281ea3f92e6 100644
--- a/sysutils/tob/patches/patch-aa
+++ b/sysutils/tob/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2006/03/09 14:50:31 ghen Exp $
+$NetBSD: patch-aa,v 1.3 2006/10/19 23:56:13 rillig Exp $
---- tob 2003/06/27 11:08:36 1.1
-+++ tob 2003/06/27 11:13:55
+--- tob.orig 2003-06-06 22:05:57.000000000 +0200
++++ tob 2006-10-20 01:48:50.000000000 +0200
@@ -13,8 +13,8 @@
#
# File locations
-TOBLISTS=/var/lib/tob
-TOBHOME=/etc/tob
-+TOBLISTS=/var/tob
++TOBLISTS=@VARBASE@/tob
+TOBHOME=@PKG_SYSCONFDIR@/tob
############################################################################
# Global settings, most of which can be overruled in the resource file:
-@@ -77,13 +77,17 @@
+@@ -77,13 +77,17 @@ then
fi
elif [ -x /usr/bin/mktemp ]
then
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2006/03/09 14:50:31 ghen Exp $
rc4=$?
if [ $rc1 -ne 0 -o $rc2 -ne 0 -o $rc3 -ne 0 -o $rc4 -ne 0 ]
then
-@@ -131,7 +135,7 @@
+@@ -131,7 +135,7 @@ POSTCMD=''
VER=0.25
# RCLIST: list of resource files which tob will search for
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.2 2006/03/09 14:50:31 ghen Exp $
############################################################################
# show a message to the screen
-@@ -189,6 +193,10 @@
+@@ -189,6 +193,10 @@ checkenv ()
if [ "$EXT" = "" ] ; then
error "variable EXT is undefined"
fi
@@ -55,3 +55,29 @@ $NetBSD: patch-aa,v 1.2 2006/03/09 14:50:31 ghen Exp $
if [ "$NEEDROOT" = "yes" ] ; then
if [ $UID -ne 0 ]; then
+@@ -583,10 +591,10 @@ full ()
+
+ cd $BACKUPDIR
+ for i in `find ${VOLUMENAME}_* -mtime +$MAXBACKUPAGE -exec echo {} \;`; do
+- if [ $i == $UPTO ]; then
++ if [ $i = $UPTO ]; then
+ SEEN=1
+ fi
+- if [ $SEEN == '0' ]; then
++ if [ $SEEN = '0' ]; then
+ message "Deleted old backup $i"
+ $RM -f $i
+ fi
+@@ -652,10 +660,10 @@ differential ()
+ cd $BACKUPDIR
+ $RM -f ${VOLUMENAME}_*inc*
+ for i in `find ${VOLUMENAME}_*diff* -mtime +$MAXBACKUPAGE -exec echo {} \;`; do
+- if [ $i == $UPTO ]; then
++ if [ $i = $UPTO ]; then
+ SEEN=1
+ fi
+- if [ $SEEN == '0' ]; then
++ if [ $SEEN = '0' ]; then
+ message "Deleting old backup $i"
+ $RM -f $i
+ fi