10 files changed, 190 insertions, 128 deletions

diff --git a/devel/viewcvs/Makefile b/devel/viewcvs/Makefile
index f9587f13726e..733c06beb023 100644
--- a/devel/viewcvs/Makefile
+++ b/devel/viewcvs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	viewcvs
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,16 +16,14 @@ MAINTAINER=	ports@FreeBSD.org
 USE_PYTHON=	yes
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-pre-install:
-	@ ${PERL} -pi -e "s:${PREFIX}/viewcvs-dev:${PREFIX}/${PORTNAME}-${PORTVERSION}:g" \
-	  ${WRKSRC}/viewcvs-install
+INSTDIR?=	${PORTNAME}-${PORTVERSION}
+PLIST_SUB=	INSTDIR=${INSTDIR}
 
 do-install:
-	@ cd ${WRKSRC} && ${PYTHON_CMD} viewcvs-install
+	@ cd ${WRKSRC} && INSTDIR=${PREFIX}/${INSTDIR} ${PYTHON_CMD} viewcvs-install
 
 post-install:
-	@ ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" pkg-message >${PKGMESSAGE}
+	@ ${SED} -e "s:%%INSTDIR%%:${PREFIX}/${INSTDIR}:g" pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
 	@ ${ECHO}
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/devel/viewcvs/distinfo b/devel/viewcvs/distinfo
index 94ea573a62d0..2573b5de0424 100644
--- a/devel/viewcvs/distinfo
+++ b/devel/viewcvs/distinfo
@@ -1 +1 @@
-MD5 (viewcvs-0.8.tar.gz) = 5778486247e28f9e9bcd90cf86bab1e9
+MD5 (viewcvs-0.9.tar.gz) = d0d73062e4e0d6273eff38993fc5fe47
diff --git a/devel/viewcvs/files/patch-aa b/devel/viewcvs/files/patch-aa
index 9a7770ced514..f6924c80db22 100644
--- a/devel/viewcvs/files/patch-aa
+++ b/devel/viewcvs/files/patch-aa
@@ -1,6 +1,24 @@
---- viewcvs-install	Fri May 12 06:26:11 2000
-+++ viewcvs-install.new	Sun Jul  2 19:59:28 2000
-@@ -159,10 +159,10 @@
+--- viewcvs-install.orig	Fri Dec 21 20:59:45 2001
++++ viewcvs-install	Mon Dec 24 02:16:56 2001
+@@ -51,7 +51,7 @@
+ """ % version
+ 
+ ## installer defaults
+-ROOT_DIR = "/usr/local/viewcvs-" + version
++ROOT_DIR = os.environ['INSTDIR']
+ 
+ 
+ ## list of files for installation
+@@ -192,7 +192,7 @@
+     if type(prompt_replace) == type(""):
+       print prompt_replace
+     while 1:
+-      temp = raw_input("\n    File %s\n    exists and is different from source file.\n      DO YOU WANT TO,\n        overwrite [o]\n        do not overwrite [d]\n        view differences [v]: " % (dest_path))
++      temp = 'o'
+       print
+ 
+       temp = string.lower(temp[0])
+@@ -245,10 +245,10 @@
      print INFO_TEXT
      
      ## get the install path
diff --git a/devel/viewcvs/pkg-message b/devel/viewcvs/pkg-message
index 941ffa1d94b7..ac1d1f45867e 100644
--- a/devel/viewcvs/pkg-message
+++ b/devel/viewcvs/pkg-message
@@ -1,5 +1,5 @@
 If you would like to set up ViewCVS in a usable manner, all
 you need to do is modify the configuration file, located at
-%%PREFIX%%/share/viewcvs/viewcvs.conf, to note where your
+%%INSTDIR%%/viewcvs.conf, to note where your
 CVSROOT is, and then copy the actual CGI (located at
-%%PREFIX%%/share/viewcvs/cgi/viewcvs.cgi) to your cgi-bin.
+%%INSTDIR%%/cgi/viewcvs.cgi) to your cgi-bin.
diff --git a/devel/viewcvs/pkg-plist b/devel/viewcvs/pkg-plist
index df2b34603ba3..786e2ef62f65 100644
--- a/devel/viewcvs/pkg-plist
+++ b/devel/viewcvs/pkg-plist
@@ -1,51 +1,66 @@
-viewcvs-0.8/cvsdbadmin
-viewcvs-0.8/loginfo-handler
-viewcvs-0.8/make-database
-viewcvs-0.8/standalone.py
-viewcvs-0.8/cgi/viewcvs.cgi
-viewcvs-0.8/cgi/query.cgi
-viewcvs-0.8/doc/help_rootview.html
-viewcvs-0.8/doc/help_dirview.html
-viewcvs-0.8/doc/images/logo.png
-viewcvs-0.8/doc/images/chalk.jpg
-viewcvs-0.8/doc/images/cvsgraph_16x16.png
-viewcvs-0.8/doc/images/cvsgraph_32x32.png
-viewcvs-0.8/lib/PyFontify.py
-viewcvs-0.8/lib/PyFontify.pyc
-viewcvs-0.8/lib/blame.py
-viewcvs-0.8/lib/blame.pyc
-viewcvs-0.8/lib/compat.py
-viewcvs-0.8/lib/compat.pyc
-viewcvs-0.8/lib/config.py
-viewcvs-0.8/lib/config.pyc
-viewcvs-0.8/lib/cvsdb.py
-viewcvs-0.8/lib/cvsdb.pyc
-viewcvs-0.8/lib/dbi.py
-viewcvs-0.8/lib/dbi.pyc
-viewcvs-0.8/lib/debug.py
-viewcvs-0.8/lib/debug.pyc
-viewcvs-0.8/lib/popen.py
-viewcvs-0.8/lib/popen.pyc
-viewcvs-0.8/lib/py2html.py
-viewcvs-0.8/lib/py2html.pyc
-viewcvs-0.8/lib/query.py
-viewcvs-0.8/lib/query.pyc
-viewcvs-0.8/lib/rcsparse.py
-viewcvs-0.8/lib/rcsparse.pyc
-viewcvs-0.8/lib/rlog.py
-viewcvs-0.8/lib/rlog.pyc
-viewcvs-0.8/lib/viewcvs.py
-viewcvs-0.8/lib/viewcvs.pyc
-viewcvs-0.8/lib/ezt.py
-viewcvs-0.8/lib/ezt.pyc
-viewcvs-0.8/lib/apache_icons.py
-viewcvs-0.8/lib/apache_icons.pyc
-viewcvs-0.8/templates/directory.ezt
-viewcvs-0.8/templates/log.ezt
-viewcvs-0.8/templates/log_table.ezt
-viewcvs-0.8/templates/query.ezt
-@dirrm viewcvs-0.8/cgi
-@dirrm viewcvs-0.8/doc/images
-@dirrm viewcvs-0.8/doc
-@dirrm viewcvs-0.8/lib
-@dirrm viewcvs-0.8/templates
+%%INSTDIR%%/cgi/query.cgi
+%%INSTDIR%%/cgi/viewcvs.cgi
+%%INSTDIR%%/cvsdbadmin
+%%INSTDIR%%/cvsgraph.conf
+%%INSTDIR%%/doc/help_dirview.html
+%%INSTDIR%%/doc/help_log.html
+%%INSTDIR%%/doc/help_logtable.html
+%%INSTDIR%%/doc/help_query.html
+%%INSTDIR%%/doc/help_rootview.html
+%%INSTDIR%%/doc/images/chalk.jpg
+%%INSTDIR%%/doc/images/cvsgraph_16x16.png
+%%INSTDIR%%/doc/images/cvsgraph_32x32.png
+%%INSTDIR%%/doc/images/logo.png
+%%INSTDIR%%/lib/PyFontify.py
+%%INSTDIR%%/lib/PyFontify.pyc
+%%INSTDIR%%/lib/accept.py
+%%INSTDIR%%/lib/accept.pyc
+%%INSTDIR%%/lib/apache_icons.py
+%%INSTDIR%%/lib/apache_icons.pyc
+%%INSTDIR%%/lib/blame.py
+%%INSTDIR%%/lib/blame.pyc
+%%INSTDIR%%/lib/compat.py
+%%INSTDIR%%/lib/compat.pyc
+%%INSTDIR%%/lib/config.py
+%%INSTDIR%%/lib/config.pyc
+%%INSTDIR%%/lib/cvsdb.py
+%%INSTDIR%%/lib/cvsdb.pyc
+%%INSTDIR%%/lib/dbi.py
+%%INSTDIR%%/lib/dbi.pyc
+%%INSTDIR%%/lib/debug.py
+%%INSTDIR%%/lib/debug.pyc
+%%INSTDIR%%/lib/ezt.py
+%%INSTDIR%%/lib/ezt.pyc
+%%INSTDIR%%/lib/popen.py
+%%INSTDIR%%/lib/popen.pyc
+%%INSTDIR%%/lib/py2html.py
+%%INSTDIR%%/lib/py2html.pyc
+%%INSTDIR%%/lib/query.py
+%%INSTDIR%%/lib/query.pyc
+%%INSTDIR%%/lib/rcsparse.py
+%%INSTDIR%%/lib/rcsparse.pyc
+%%INSTDIR%%/lib/rlog.py
+%%INSTDIR%%/lib/rlog.pyc
+%%INSTDIR%%/lib/viewcvs.py
+%%INSTDIR%%/lib/viewcvs.pyc
+%%INSTDIR%%/loginfo-handler
+%%INSTDIR%%/make-database
+%%INSTDIR%%/standalone.py
+%%INSTDIR%%/templates/annotate.ezt
+%%INSTDIR%%/templates/diff.ezt
+%%INSTDIR%%/templates/dir_alternate.ezt
+%%INSTDIR%%/templates/directory.ezt
+%%INSTDIR%%/templates/footer.ezt
+%%INSTDIR%%/templates/graph.ezt
+%%INSTDIR%%/templates/header.ezt
+%%INSTDIR%%/templates/log.ezt
+%%INSTDIR%%/templates/log_table.ezt
+%%INSTDIR%%/templates/markup.ezt
+%%INSTDIR%%/templates/query.ezt
+%%INSTDIR%%/viewcvs.conf
+@dirrm %%INSTDIR%%/templates
+@dirrm %%INSTDIR%%/lib
+@dirrm %%INSTDIR%%/doc/images
+@dirrm %%INSTDIR%%/doc
+@dirrm %%INSTDIR%%/cgi
+@dirrm %%INSTDIR%%
diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index f9587f13726e..733c06beb023 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	viewcvs
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,16 +16,14 @@ MAINTAINER=	ports@FreeBSD.org
 USE_PYTHON=	yes
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-pre-install:
-	@ ${PERL} -pi -e "s:${PREFIX}/viewcvs-dev:${PREFIX}/${PORTNAME}-${PORTVERSION}:g" \
-	  ${WRKSRC}/viewcvs-install
+INSTDIR?=	${PORTNAME}-${PORTVERSION}
+PLIST_SUB=	INSTDIR=${INSTDIR}
 
 do-install:
-	@ cd ${WRKSRC} && ${PYTHON_CMD} viewcvs-install
+	@ cd ${WRKSRC} && INSTDIR=${PREFIX}/${INSTDIR} ${PYTHON_CMD} viewcvs-install
 
 post-install:
-	@ ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" pkg-message >${PKGMESSAGE}
+	@ ${SED} -e "s:%%INSTDIR%%:${PREFIX}/${INSTDIR}:g" pkg-message >${PKGMESSAGE}
 .if !defined(BATCH)
 	@ ${ECHO}
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/devel/viewvc/distinfo b/devel/viewvc/distinfo
index 94ea573a62d0..2573b5de0424 100644
--- a/devel/viewvc/distinfo
+++ b/devel/viewvc/distinfo
@@ -1 +1 @@
-MD5 (viewcvs-0.8.tar.gz) = 5778486247e28f9e9bcd90cf86bab1e9
+MD5 (viewcvs-0.9.tar.gz) = d0d73062e4e0d6273eff38993fc5fe47
diff --git a/devel/viewvc/files/patch-aa b/devel/viewvc/files/patch-aa
index 9a7770ced514..f6924c80db22 100644
--- a/devel/viewvc/files/patch-aa
+++ b/devel/viewvc/files/patch-aa
@@ -1,6 +1,24 @@
---- viewcvs-install	Fri May 12 06:26:11 2000
-+++ viewcvs-install.new	Sun Jul  2 19:59:28 2000
-@@ -159,10 +159,10 @@
+--- viewcvs-install.orig	Fri Dec 21 20:59:45 2001
++++ viewcvs-install	Mon Dec 24 02:16:56 2001
+@@ -51,7 +51,7 @@
+ """ % version
+ 
+ ## installer defaults
+-ROOT_DIR = "/usr/local/viewcvs-" + version
++ROOT_DIR = os.environ['INSTDIR']
+ 
+ 
+ ## list of files for installation
+@@ -192,7 +192,7 @@
+     if type(prompt_replace) == type(""):
+       print prompt_replace
+     while 1:
+-      temp = raw_input("\n    File %s\n    exists and is different from source file.\n      DO YOU WANT TO,\n        overwrite [o]\n        do not overwrite [d]\n        view differences [v]: " % (dest_path))
++      temp = 'o'
+       print
+ 
+       temp = string.lower(temp[0])
+@@ -245,10 +245,10 @@
      print INFO_TEXT
      
      ## get the install path
diff --git a/devel/viewvc/pkg-message b/devel/viewvc/pkg-message
index 941ffa1d94b7..ac1d1f45867e 100644
--- a/devel/viewvc/pkg-message
+++ b/devel/viewvc/pkg-message
@@ -1,5 +1,5 @@
 If you would like to set up ViewCVS in a usable manner, all
 you need to do is modify the configuration file, located at
-%%PREFIX%%/share/viewcvs/viewcvs.conf, to note where your
+%%INSTDIR%%/viewcvs.conf, to note where your
 CVSROOT is, and then copy the actual CGI (located at
-%%PREFIX%%/share/viewcvs/cgi/viewcvs.cgi) to your cgi-bin.
+%%INSTDIR%%/cgi/viewcvs.cgi) to your cgi-bin.
diff --git a/devel/viewvc/pkg-plist b/devel/viewvc/pkg-plist
index df2b34603ba3..786e2ef62f65 100644
--- a/devel/viewvc/pkg-plist
+++ b/devel/viewvc/pkg-plist
@@ -1,51 +1,66 @@
-viewcvs-0.8/cvsdbadmin
-viewcvs-0.8/loginfo-handler
-viewcvs-0.8/make-database
-viewcvs-0.8/standalone.py
-viewcvs-0.8/cgi/viewcvs.cgi
-viewcvs-0.8/cgi/query.cgi
-viewcvs-0.8/doc/help_rootview.html
-viewcvs-0.8/doc/help_dirview.html
-viewcvs-0.8/doc/images/logo.png
-viewcvs-0.8/doc/images/chalk.jpg
-viewcvs-0.8/doc/images/cvsgraph_16x16.png
-viewcvs-0.8/doc/images/cvsgraph_32x32.png
-viewcvs-0.8/lib/PyFontify.py
-viewcvs-0.8/lib/PyFontify.pyc
-viewcvs-0.8/lib/blame.py
-viewcvs-0.8/lib/blame.pyc
-viewcvs-0.8/lib/compat.py
-viewcvs-0.8/lib/compat.pyc
-viewcvs-0.8/lib/config.py
-viewcvs-0.8/lib/config.pyc
-viewcvs-0.8/lib/cvsdb.py
-viewcvs-0.8/lib/cvsdb.pyc
-viewcvs-0.8/lib/dbi.py
-viewcvs-0.8/lib/dbi.pyc
-viewcvs-0.8/lib/debug.py
-viewcvs-0.8/lib/debug.pyc
-viewcvs-0.8/lib/popen.py
-viewcvs-0.8/lib/popen.pyc
-viewcvs-0.8/lib/py2html.py
-viewcvs-0.8/lib/py2html.pyc
-viewcvs-0.8/lib/query.py
-viewcvs-0.8/lib/query.pyc
-viewcvs-0.8/lib/rcsparse.py
-viewcvs-0.8/lib/rcsparse.pyc
-viewcvs-0.8/lib/rlog.py
-viewcvs-0.8/lib/rlog.pyc
-viewcvs-0.8/lib/viewcvs.py
-viewcvs-0.8/lib/viewcvs.pyc
-viewcvs-0.8/lib/ezt.py
-viewcvs-0.8/lib/ezt.pyc
-viewcvs-0.8/lib/apache_icons.py
-viewcvs-0.8/lib/apache_icons.pyc
-viewcvs-0.8/templates/directory.ezt
-viewcvs-0.8/templates/log.ezt
-viewcvs-0.8/templates/log_table.ezt
-viewcvs-0.8/templates/query.ezt
-@dirrm viewcvs-0.8/cgi
-@dirrm viewcvs-0.8/doc/images
-@dirrm viewcvs-0.8/doc
-@dirrm viewcvs-0.8/lib
-@dirrm viewcvs-0.8/templates
+%%INSTDIR%%/cgi/query.cgi
+%%INSTDIR%%/cgi/viewcvs.cgi
+%%INSTDIR%%/cvsdbadmin
+%%INSTDIR%%/cvsgraph.conf
+%%INSTDIR%%/doc/help_dirview.html
+%%INSTDIR%%/doc/help_log.html
+%%INSTDIR%%/doc/help_logtable.html
+%%INSTDIR%%/doc/help_query.html
+%%INSTDIR%%/doc/help_rootview.html
+%%INSTDIR%%/doc/images/chalk.jpg
+%%INSTDIR%%/doc/images/cvsgraph_16x16.png
+%%INSTDIR%%/doc/images/cvsgraph_32x32.png
+%%INSTDIR%%/doc/images/logo.png
+%%INSTDIR%%/lib/PyFontify.py
+%%INSTDIR%%/lib/PyFontify.pyc
+%%INSTDIR%%/lib/accept.py
+%%INSTDIR%%/lib/accept.pyc
+%%INSTDIR%%/lib/apache_icons.py
+%%INSTDIR%%/lib/apache_icons.pyc
+%%INSTDIR%%/lib/blame.py
+%%INSTDIR%%/lib/blame.pyc
+%%INSTDIR%%/lib/compat.py
+%%INSTDIR%%/lib/compat.pyc
+%%INSTDIR%%/lib/config.py
+%%INSTDIR%%/lib/config.pyc
+%%INSTDIR%%/lib/cvsdb.py
+%%INSTDIR%%/lib/cvsdb.pyc
+%%INSTDIR%%/lib/dbi.py
+%%INSTDIR%%/lib/dbi.pyc
+%%INSTDIR%%/lib/debug.py
+%%INSTDIR%%/lib/debug.pyc
+%%INSTDIR%%/lib/ezt.py
+%%INSTDIR%%/lib/ezt.pyc
+%%INSTDIR%%/lib/popen.py
+%%INSTDIR%%/lib/popen.pyc
+%%INSTDIR%%/lib/py2html.py
+%%INSTDIR%%/lib/py2html.pyc
+%%INSTDIR%%/lib/query.py
+%%INSTDIR%%/lib/query.pyc
+%%INSTDIR%%/lib/rcsparse.py
+%%INSTDIR%%/lib/rcsparse.pyc
+%%INSTDIR%%/lib/rlog.py
+%%INSTDIR%%/lib/rlog.pyc
+%%INSTDIR%%/lib/viewcvs.py
+%%INSTDIR%%/lib/viewcvs.pyc
+%%INSTDIR%%/loginfo-handler
+%%INSTDIR%%/make-database
+%%INSTDIR%%/standalone.py
+%%INSTDIR%%/templates/annotate.ezt
+%%INSTDIR%%/templates/diff.ezt
+%%INSTDIR%%/templates/dir_alternate.ezt
+%%INSTDIR%%/templates/directory.ezt
+%%INSTDIR%%/templates/footer.ezt
+%%INSTDIR%%/templates/graph.ezt
+%%INSTDIR%%/templates/header.ezt
+%%INSTDIR%%/templates/log.ezt
+%%INSTDIR%%/templates/log_table.ezt
+%%INSTDIR%%/templates/markup.ezt
+%%INSTDIR%%/templates/query.ezt
+%%INSTDIR%%/viewcvs.conf
+@dirrm %%INSTDIR%%/templates
+@dirrm %%INSTDIR%%/lib
+@dirrm %%INSTDIR%%/doc/images
+@dirrm %%INSTDIR%%/doc
+@dirrm %%INSTDIR%%/cgi
+@dirrm %%INSTDIR%%