Attachment #59807 for bug #89938

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




NO_BUILD=	yes
USE_PERL5_RUN=	yes

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

EXECUTABLES=	dirvish   dirvish-expire   dirvish-locate   dirvish-runall

do-patch:
	@${SED} -e 's:%%CONFDIR%%:${PREFIX}/etc/dirvish:' \
	        -e 's:%%PERL%%:${PERL5}:' \
	        ${FILESDIR}/header.pl \
	        > ${WRKDIR}/header.pl
.for _E in ${EXECUTABLES}
	@(cd ${WRKSRC} && ${CAT} ${WRKDIR}/header.pl ${_E}.pl loadconfig.pl \
	    > ${_E} && ${CHMOD} 755 ${_E})
.endfor

do-install:
	@(cd ${INSTALL_WRKSRC} && ${SH} install.sh < /dev/null)
	${MKDIR} ${PREFIX}/etc/dirvish
.for _E in ${EXECUTABLES}
	${INSTALL_SCRIPT} ${WRKSRC}/${_E} ${PREFIX}/sbin
.endfor
.for _M in ${MAN5}
	${INSTALL_MAN} ${WRKSRC}/${_M} ${PREFIX}/man/man5
.endfor
.for _M in ${MAN8}
	${INSTALL_MAN} ${WRKSRC}/${_M} ${PREFIX}/man/man8
.endfor
	${INSTALL_DATA} ${FILESDIR}/master.conf.dist ${PREFIX}/etc/dirvish
	${INSTALL_DATA} ${FILESDIR}/default.conf.dist ${PREFIX}/etc/dirvish


Lines 1-2 Link Here

(-)dirvish/distinfo (+1 lines)
1	MD5 (dirvish-1.2.1.tgz) = 51dd3f38f0bddb45b67d69b29af333c0	1	MD5 (dirvish-1.2.1.tgz) = 51dd3f38f0bddb45b67d69b29af333c0
		2	SHA256 (dirvish-1.2.1.tgz) = d6068b0644f9302fb1ec676928f60145877ac316b5aa29d5a5a0204c59935527
2	SIZE (dirvish-1.2.1.tgz) = 49132	3	SIZE (dirvish-1.2.1.tgz) = 49132

Line 0 Link Here

(-)dirvish/files/header.pl (+4 lines)
	1	#!%%PERL%%
	2
	3	$CONFDIR = "%%CONFDIR%%";
	4




--- 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
 		eli [ -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 89938

Lines 24-32 Link Here

(-)dirvish/Makefile (-1 / +24 lines)
24	NO_BUILD= yes	24	NO_BUILD= yes
25	USE_PERL5_RUN= yes	25	USE_PERL5_RUN= yes
26		26
		27	MAN5= dirvish.conf.5
		28	MAN8= dirvish.8 dirvish-expire.8 dirvish-locate.8 dirvish-runall.8
		29
		30	EXECUTABLES= dirvish dirvish-expire dirvish-locate dirvish-runall
		31
		32	do-patch:
		33	@${SED} -e 's:%%CONFDIR%%:${PREFIX}/etc/dirvish:' \
		34	-e 's:%%PERL%%:${PERL5}:' \
		35	${FILESDIR}/header.pl \
		36	> ${WRKDIR}/header.pl
		37	.for _E in ${EXECUTABLES}
		38	@(cd ${WRKSRC} && ${CAT} ${WRKDIR}/header.pl ${_E}.pl loadconfig.pl \
		39	> ${_E} && ${CHMOD} 755 ${_E})
		40	.endfor
		41
27	do-install:	42	do-install:
28	@(cd ${INSTALL_WRKSRC} && ${SH} install.sh < /dev/null)
29	${MKDIR} ${PREFIX}/etc/dirvish	43	${MKDIR} ${PREFIX}/etc/dirvish
		44	.for _E in ${EXECUTABLES}
		45	${INSTALL_SCRIPT} ${WRKSRC}/${_E} ${PREFIX}/sbin
		46	.endfor
		47	.for _M in ${MAN5}
		48	${INSTALL_MAN} ${WRKSRC}/${_M} ${PREFIX}/man/man5
		49	.endfor
		50	.for _M in ${MAN8}
		51	${INSTALL_MAN} ${WRKSRC}/${_M} ${PREFIX}/man/man8
		52	.endfor
30	${INSTALL_DATA} ${FILESDIR}/master.conf.dist ${PREFIX}/etc/dirvish	53	${INSTALL_DATA} ${FILESDIR}/master.conf.dist ${PREFIX}/etc/dirvish
31	${INSTALL_DATA} ${FILESDIR}/default.conf.dist ${PREFIX}/etc/dirvish	54	${INSTALL_DATA} ${FILESDIR}/default.conf.dist ${PREFIX}/etc/dirvish
32		55

Lines 1-68 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	eli [ -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" ]