diff -ruN dirvish.orig/Makefile dirvish/Makefile
--- dirvish.orig/Makefile	Wed Jun  8 04:49:24 2005
+++ dirvish/Makefile	Thu Jun 16 14:34:23 2005
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	dirvish
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	sysutils archivers
 MASTER_SITES=	http://www.dirvish.org/
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lorenl@alzatex.com
 COMMENT=	Network backup system based off of rsync
@@ -21,8 +20,6 @@
 
 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
diff -ruN dirvish.orig/distinfo dirvish/distinfo
--- dirvish.orig/distinfo	Wed May  4 06:28:46 2005
+++ dirvish/distinfo	Thu Jun 16 14:16:45 2005
@@ -1,2 +1,2 @@
-MD5 (dirvish_1.2.orig.tar.gz) = 0b972fecae018a4fc96960ff0459b8c3
-SIZE (dirvish_1.2.orig.tar.gz) = 46131
+MD5 (dirvish-1.2.1.tgz) = 51dd3f38f0bddb45b67d69b29af333c0
+SIZE (dirvish-1.2.1.tgz) = 49132
diff -ruN dirvish.orig/files/patch-00-dirvish-freebsd dirvish/files/patch-00-dirvish-freebsd
--- dirvish.orig/files/patch-00-dirvish-freebsd	Wed May  4 06:28:47 2005
+++ dirvish/files/patch-00-dirvish-freebsd	Wed Dec 31 16:00:00 1969
@@ -1,78 +0,0 @@
-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" ]
diff -ruN dirvish.orig/files/patch-install.sh dirvish/files/patch-install.sh
--- dirvish.orig/files/patch-install.sh	Wed Dec 31 16:00:00 1969
+++ dirvish/files/patch-install.sh	Thu Jun 16 14:19:21 2005
@@ -0,0 +1,68 @@
+--- 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" ]