Attachment #54410 for bug #82341

View | Details | Raw Unified | Return to bug 82341
Collapse All | Expand All




#

PORTNAME=	dirvish
PORTVERSION=	1.2.1
PORTREVISION=	1
CATEGORIES=	sysutils archivers
MASTER_SITES=	http://www.dirvish.org/
EXTRACT_SUFX=	.tgz

MAINTAINER=	lorenl@alzatex.com
COMMENT=	Network backup system based off of rsync


MAN5=		dirvish.conf.5
MAN8=		dirvish.8 dirvish-expire.8 dirvish-locate.8 dirvish-runall.8

WRKSRC=		${WRKDIR}/Dirvish-${PORTVERSION}

NO_BUILD=	yes
USE_PERL5_RUN=	yes

Lines 1-2 Link Here

(-)dirvish/distinfo (-2 / +2 lines)
1	MD5 (dirvish_1.2.orig.tar.gz) = 0b972fecae018a4fc96960ff0459b8c3	1	MD5 (dirvish-1.2.1.tgz) = 51dd3f38f0bddb45b67d69b29af333c0
2	SIZE (dirvish_1.2.orig.tar.gz) = 46131	2	SIZE (dirvish-1.2.1.tgz) = 49132




diff -ru origin/install.sh ./install.sh
--- origin/install.sh	Tue Feb 24 18:42:15 2004
+++ ./install.sh	Thu Apr 28 22:58:39 2005
@@ -7,6 +7,8 @@
   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
+ECHO_N=
+
 EXECUTABLES="dirvish dirvish-runall dirvish-expire dirvish-locate"
 MANPAGES="dirvish.8 dirvish-runall.8 dirvish-expire.8 dirvish-locate.8"
 MANPAGES="$MANPAGES dirvish.conf.5"
@@ -27,6 +29,7 @@
 
 	until [ -n "$PREFIX_OK" ]
 	do
+		PREFIX="/usr/local"
 		EXECDIR="/usr/sbin"
 		CONFDIR="/etc/dirvish"
 		MANDIR="/usr/share/man"
@@ -36,7 +39,7 @@
 		if [ -n "$ans" ] 
 		then
 			PREFIX="$ans"
-			if [ "$PREFIX" == "/" ]
+			if [ "$PREFIX" = "/" ]
 			then
 				PREFIX=""
 			fi
@@ -58,9 +61,9 @@
 
 		if [ -d "$PREFIX/sbin" ]
 		then
-			BINDIR=$PREFIX/sbin
+			BINDIR="$PREFIX/sbin"
 		else
-			BINDIR=$PREFIX/bin
+			BINDIR="$PREFIX/bin"
 		fi
 
 		if [ -d "$PREFIX/share/man" ]
@@ -71,13 +74,16 @@
 			MANDIR=$PREFIX/usr/share/man
 		elif [ -d "$PREFIX/usr/man" ]
 		then
-			MANDIR="$PREFIX/usr/man" ]
+			MANDIR="$PREFIX/usr/man"
 		else
-			MANDIR=$PREFIX/man
+			MANDIR="$PREFIX/man"
 		fi
 		if [ `expr "$PREFIX" : '.*dirvish.*'` -gt 0 ]
 		then
 			CONFDIR="$PREFIX/etc"
+		elif [ -d "$PREFIX/etc" ]
+		then
+			CONFDIR="$PREFIX/etc/dirvish"
 		else
 			CONFDIR="/etc/dirvish"
 		fi
@@ -121,7 +127,7 @@
 	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
 	then
 		exit
-	elif [ `expr "$ans" : '[yY]'` -ne 0 ]
+	elif [ `expr "$ans" : '[nN]'` -eq 0 ]
 	then
 		break
 	fi
@@ -147,7 +153,7 @@
 
 echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
 read ans
-if [ `expr "$ans" : '[yY]'` -ne 0 ]
+if [ `expr "$ans" : '[nN]'` -eq 0 ]
 then
 	echo
 	if [ -n "$CREATE_PREFIX" ]




--- install.sh.orig	Fri Feb 18 16:56:13 2005
+++ install.sh	Thu Jun 16 14:17:32 2005
@@ -9,6 +9,8 @@ case `echo "testing\c"; echo 1,2,3`,`ech
   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
+ECHO_N=
+
 EXECUTABLES="dirvish dirvish-runall dirvish-expire dirvish-locate"
 MANPAGES="dirvish.8 dirvish-runall.8 dirvish-expire.8 dirvish-locate.8"
 MANPAGES="$MANPAGES dirvish.conf.5"
@@ -29,6 +31,7 @@ do
 
 	until [ -n "$PREFIX_OK" ]
 	do
+		PREFIX="/usr/local"
 		EXECDIR="/usr/sbin"
 		CONFDIR="/etc/dirvish"
 		MANDIR="/usr/share/man"
@@ -61,9 +64,9 @@ do
 
 		if [ -d "$PREFIX/sbin" ]
 		then
-			BINDIR=$PREFIX/sbin
+			BINDIR="$PREFIX/sbin"
 		else
-			BINDIR=$PREFIX/bin
+			BINDIR="$PREFIX/bin"
 		fi
 
 		if [ -d "$PREFIX/share/man" ]
@@ -74,13 +77,16 @@ do
 			MANDIR=$PREFIX/usr/share/man
 		elif [ -d "$PREFIX/usr/man" ]
 		then
-			MANDIR="$PREFIX/usr/man" ]
+			MANDIR="$PREFIX/usr/man"
 		else
-			MANDIR=$PREFIX/man
+			MANDIR="$PREFIX/man"
 		fi
 		if [ `expr "$PREFIX" : '.*dirvish.*'` -gt 0 ]
 		then
 			CONFDIR="$PREFIX/etc"
+		elif [ -d "$PREFIX/etc" ]
+		then
+			CONFDIR="$PREFIX/etc/dirvish"
 		else
 			CONFDIR="/etc/dirvish"
 		fi
@@ -124,7 +130,7 @@ EOSTAT
 	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
 	then
 		exit
-	elif [ `expr "$ans" : '[yY]'` -ne 0 ]
+	elif [ `expr "$ans" : '[nN]'` -eq 0 ]
 	then
 		break
 	fi
@@ -150,7 +156,7 @@ echo
 
 echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
 read ans
-if [ `expr "$ans" : '[yY]'` -ne 0 ]
+if [ `expr "$ans" : '[nN]'` -eq 0 ]
 then
 	echo
 	if [ -n "$CREATE_PREFIX" ]

Return to bug 82341

Lines 6-16 Link Here

(-)dirvish/Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= dirvish	8	PORTNAME= dirvish
9	PORTVERSION= 1.2	9	PORTVERSION= 1.2.1
10	PORTREVISION= 1
11	CATEGORIES= sysutils archivers	10	CATEGORIES= sysutils archivers
12	MASTER_SITES= http://www.dirvish.org/	11	MASTER_SITES= http://www.dirvish.org/
13	DISTNAME= ${PORTNAME}_${PORTVERSION}.orig	12	EXTRACT_SUFX= .tgz
14		13
15	MAINTAINER= lorenl@alzatex.com	14	MAINTAINER= lorenl@alzatex.com
16	COMMENT= Network backup system based off of rsync	15	COMMENT= Network backup system based off of rsync
Lines 21-28 Link Here
21		20
22	MAN5= dirvish.conf.5	21	MAN5= dirvish.conf.5
23	MAN8= dirvish.8 dirvish-expire.8 dirvish-locate.8 dirvish-runall.8	22	MAN8= dirvish.8 dirvish-expire.8 dirvish-locate.8 dirvish-runall.8
24
25	WRKSRC= ${WRKDIR}/Dirvish-${PORTVERSION}
26		23
27	NO_BUILD= yes	24	NO_BUILD= yes
28	USE_PERL5_RUN= yes	25	USE_PERL5_RUN= yes

Lines 1-78 Link Here

(-)dirvish/files/patch-00-dirvish-freebsd (-78 lines)
1	diff -ru origin/install.sh ./install.sh
2	--- origin/install.sh Tue Feb 24 18:42:15 2004
3	+++ ./install.sh Thu Apr 28 22:58:39 2005
4	@@ -7,6 +7,8 @@
5	*) ECHO_N= ECHO_C='\c' ECHO_T= ;;
6	esac
7
8	+ECHO_N=
9	+
10	EXECUTABLES="dirvish dirvish-runall dirvish-expire dirvish-locate"
11	MANPAGES="dirvish.8 dirvish-runall.8 dirvish-expire.8 dirvish-locate.8"
12	MANPAGES="$MANPAGES dirvish.conf.5"
13	@@ -27,6 +29,7 @@
14
15	until [ -n "$PREFIX_OK" ]
16	do
17	+ PREFIX="/usr/local"
18	EXECDIR="/usr/sbin"
19	CONFDIR="/etc/dirvish"
20	MANDIR="/usr/share/man"
21	@@ -36,7 +39,7 @@
22	if [ -n "$ans" ]
23	then
24	PREFIX="$ans"
25	- if [ "$PREFIX" == "/" ]
26	+ if [ "$PREFIX" = "/" ]
27	then
28	PREFIX=""
29	fi
30	@@ -58,9 +61,9 @@
31
32	if [ -d "$PREFIX/sbin" ]
33	then
34	- BINDIR=$PREFIX/sbin
35	+ BINDIR="$PREFIX/sbin"
36	else
37	- BINDIR=$PREFIX/bin
38	+ BINDIR="$PREFIX/bin"
39	fi
40
41	if [ -d "$PREFIX/share/man" ]
42	@@ -71,13 +74,16 @@
43	MANDIR=$PREFIX/usr/share/man
44	elif [ -d "$PREFIX/usr/man" ]
45	then
46	- MANDIR="$PREFIX/usr/man" ]
47	+ MANDIR="$PREFIX/usr/man"
48	else
49	- MANDIR=$PREFIX/man
50	+ MANDIR="$PREFIX/man"
51	fi
52	if [ `expr "$PREFIX" : '.dirvish.'` -gt 0 ]
53	then
54	CONFDIR="$PREFIX/etc"
55	+ elif [ -d "$PREFIX/etc" ]
56	+ then
57	+ CONFDIR="$PREFIX/etc/dirvish"
58	else
59	CONFDIR="/etc/dirvish"
60	fi
61	@@ -121,7 +127,7 @@
62	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
63	then
64	exit
65	- elif [ `expr "$ans" : '[yY]'` -ne 0 ]
66	+ elif [ `expr "$ans" : '[nN]'` -eq 0 ]
67	then
68	break
69	fi
70	@@ -147,7 +153,7 @@
71
72	echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
73	read ans
74	-if [ `expr "$ans" : '[yY]'` -ne 0 ]
75	+if [ `expr "$ans" : '[nN]'` -eq 0 ]
76	then
77	echo
78	if [ -n "$CREATE_PREFIX" ]

Line 0 Link Here

(-)dirvish/files/patch-install.sh (+68 lines)
		1	--- install.sh.orig Fri Feb 18 16:56:13 2005
		2	+++ install.sh Thu Jun 16 14:17:32 2005
		3	@@ -9,6 +9,8 @@ case `echo "testing\c"; echo 1,2,3`,`ech
		4	*) ECHO_N= ECHO_C='\c' ECHO_T= ;;
		5	esac
		6
		7	+ECHO_N=
		8	+
		9	EXECUTABLES="dirvish dirvish-runall dirvish-expire dirvish-locate"
		10	MANPAGES="dirvish.8 dirvish-runall.8 dirvish-expire.8 dirvish-locate.8"
		11	MANPAGES="$MANPAGES dirvish.conf.5"
		12	@@ -29,6 +31,7 @@ do
		13
		14	until [ -n "$PREFIX_OK" ]
		15	do
		16	+ PREFIX="/usr/local"
		17	EXECDIR="/usr/sbin"
		18	CONFDIR="/etc/dirvish"
		19	MANDIR="/usr/share/man"
		20	@@ -61,9 +64,9 @@ do
		21
		22	if [ -d "$PREFIX/sbin" ]
		23	then
		24	- BINDIR=$PREFIX/sbin
		25	+ BINDIR="$PREFIX/sbin"
		26	else
		27	- BINDIR=$PREFIX/bin
		28	+ BINDIR="$PREFIX/bin"
		29	fi
		30
		31	if [ -d "$PREFIX/share/man" ]
		32	@@ -74,13 +77,16 @@ do
		33	MANDIR=$PREFIX/usr/share/man
		34	elif [ -d "$PREFIX/usr/man" ]
		35	then
		36	- MANDIR="$PREFIX/usr/man" ]
		37	+ MANDIR="$PREFIX/usr/man"
		38	else
		39	- MANDIR=$PREFIX/man
		40	+ MANDIR="$PREFIX/man"
		41	fi
		42	if [ `expr "$PREFIX" : '.dirvish.'` -gt 0 ]
		43	then
		44	CONFDIR="$PREFIX/etc"
		45	+ elif [ -d "$PREFIX/etc" ]
		46	+ then
		47	+ CONFDIR="$PREFIX/etc/dirvish"
		48	else
		49	CONFDIR="/etc/dirvish"
		50	fi
		51	@@ -124,7 +130,7 @@ EOSTAT
		52	if [ `expr "$ans" : '[qQ]'` -ne 0 ]
		53	then
		54	exit
		55	- elif [ `expr "$ans" : '[yY]'` -ne 0 ]
		56	+ elif [ `expr "$ans" : '[nN]'` -eq 0 ]
		57	then
		58	break
		59	fi
		60	@@ -150,7 +156,7 @@ echo
		61
		62	echo $ECHO_N "Install executables and manpages? (no/yes) $ECHO_C"
		63	read ans
		64	-if [ `expr "$ans" : '[yY]'` -ne 0 ]
65	+if [ `expr "$ans" : '[nN]'` -eq 0 ]
66	then
67	echo
68	if [ -n "$CREATE_PREFIX" ]