5 files changed, 10 insertions, 32 deletions

diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index e16a993d02c3..18c4215ec52b 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	viewvc
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	devel python
-MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/34803/
+MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/37319/
 
 MAINTAINER=	jbq@caraldi.com
 COMMENT=	Web-based Version Control Repository Browsing
 
-FETCH_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 RUN_DEPENDS=	${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python
 
-DISABLE_SIZE=	yes	# Need because -S are not recognized by wget
-FETCH_CMD=	${LOCALBASE}/bin/wget -c
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
@@ -28,7 +25,7 @@ INSTDIR?=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR}
 
 do-install:
-	(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="")
+	(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="" --clean-mode=false)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/viewvc/distinfo b/devel/viewvc/distinfo
index e1ed2f0a148c..e086b5a8ffe9 100644
--- a/devel/viewvc/distinfo
+++ b/devel/viewvc/distinfo
@@ -1,3 +1,3 @@
-MD5 (viewvc-1.0.3.tar.gz) = 3d44ad485d38bf9f61d8111661260b4a
-SHA256 (viewvc-1.0.3.tar.gz) = 20cf5a8c5e46a147f4b484934f5f254d9acf74f149a4dc6326d0040527513ead
-SIZE (viewvc-1.0.3.tar.gz) = 406570
+MD5 (viewvc-1.0.4.tar.gz) = e55ba2864a23b0597f80ccf726966b96
+SHA256 (viewvc-1.0.4.tar.gz) = 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f
+SIZE (viewvc-1.0.4.tar.gz) = 383491
diff --git a/devel/viewvc/files/patch-viewvc-install b/devel/viewvc/files/patch-viewvc-install
deleted file mode 100644
index 8c9171bb729b..000000000000
--- a/devel/viewvc/files/patch-viewvc-install
+++ /dev/null
@@ -1,16 +0,0 @@
---- viewvc-install.orig	Thu Apr 20 15:14:37 2006
-+++ viewvc-install	Thu Apr 20 15:15:46 2006
-@@ -67,11 +67,11 @@
-     ("bin/mod_python/handler.py", "bin/mod_python/handler.py", 0755, 1, 0, 0),
-     ("bin/mod_python/.htaccess", "bin/mod_python/.htaccess", 0755, 0, 0, 0),
-     ("bin/standalone.py", "bin/standalone.py", 0755, 1, 0, 0),
--    ("viewvc.conf.dist", "viewvc.conf", 0644, 0,
-+    ("viewvc.conf.dist", "viewvc.conf.dist", 0644, 0,
- 	     """Note: If you are upgrading from viewcvs-0.7 or earlier: 
- The section [text] has been removed from viewcvs.conf.  The functionality
- went into the new files in subdirectory templates.""", 0),
--    ("cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0),
-+    ("cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 1, 0),
- 
-     ("bin/loginfo-handler", "bin/loginfo-handler", 0755, 1, 0, 0),
-     ("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0),
diff --git a/devel/viewvc/files/pkg-message.in b/devel/viewvc/files/pkg-message.in
index 8c7fd5231702..b77b77442ab8 100644
--- a/devel/viewvc/files/pkg-message.in
+++ b/devel/viewvc/files/pkg-message.in
@@ -5,12 +5,5 @@ you need to do is modify the configuration file, located at
 %%INSTDIR%%/viewvc.conf, to note where your
 CVSROOT is, and then copy the actual CGI (located at
 %%INSTDIR%%/bin/cgi/viewvc.cgi) to your cgi-bin.
-Please notice that  configuration files are installed as
-".dist" and must be copied to their actual names prior to
-be edited, e.g.:
-$ cd %%INSTDIR%%
-$ cp viewvc.conf.dist viewvc.conf
-$ cp cvsgraph.conf.dist cvsgraph.conf
-It's up to you to check the ".dist" files after upgrades.
 
 *****************************************************************
diff --git a/devel/viewvc/pkg-plist b/devel/viewvc/pkg-plist
index 028f2d922bf6..ad94a7bdb2d8 100644
--- a/devel/viewvc/pkg-plist
+++ b/devel/viewvc/pkg-plist
@@ -1,3 +1,5 @@
+@unexec if cmp -s %D/%%INSTDIR%%/cvsgraph.conf %D/%%INSTDIR%%/cvsgraph.conf.dist; then rm -f %D/%%INSTDIR%%/cvsgraph.conf; fi
+@unexec if cmp -s %D/%%INSTDIR%%/viewvc.conf %D/%%INSTDIR%%/viewvc.conf.dist; then rm -f %D/%%INSTDIR%%/viewvc.conf; fi
 %%INSTDIR%%/bin/cgi/query.cgi
 %%INSTDIR%%/bin/cgi/viewvc.cgi
 %%INSTDIR%%/bin/cvsdbadmin
@@ -10,6 +12,7 @@
 %%INSTDIR%%/bin/standalone.py
 %%INSTDIR%%/bin/svndbadmin
 %%INSTDIR%%/cvsgraph.conf.dist
+@exec [ -f %B/cvsgraph.conf ] || cp %B/%f %B/cvsgraph.conf
 %%INSTDIR%%/lib/PyFontify.py
 %%INSTDIR%%/lib/PyFontify.pyc
 %%INSTDIR%%/lib/accept.py
@@ -120,6 +123,7 @@
 %%INSTDIR%%/templates/roots.ezt
 %%INSTDIR%%/templates/rss.ezt
 %%INSTDIR%%/viewvc.conf.dist
+@exec [ -f %B/viewvc.conf ] || cp %B/%f %B/viewvc.conf
 @dirrm %%INSTDIR%%/templates/include
 @dirrm %%INSTDIR%%/templates/docroot/images
 @dirrm %%INSTDIR%%/templates/docroot