4 files changed, 20 insertions, 14 deletions

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index cc0fcd3a81d2..dcbdcf136495 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -18,8 +18,9 @@ MASTER_SITE_SUBDIR=	scop
 MAINTAINER=	noackjr@alumni.rice.edu
 COMMENT=	WWW CGI script to browse CVS repository trees
 
-NO_BUILD=	yes
+CONFLICTS=	cvsweb-3.*
 
+NO_BUILD=	yes
 USE_PERL5=	yes
 
 # Specify where your repository belongs.
@@ -48,6 +49,9 @@ CONFFILES=	cvsweb.conf \
 
 PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}"
 
+SUB_FILES=	pkg-message
+SUB_LIST=	PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}"
+
 post-patch:
 	${PERL} -i -pe "\
 		s'!!PERL!!'${PERL}'g; \
@@ -67,10 +71,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/cvsweb/${f}.dist
 .endfor
 	${MKDIR} ${PREFIX}/${ICONSDIR}/cvsweb
-	cd ${WRKSRC}/icons && ${INSTALL_DATA} * ${PREFIX}/${ICONSDIR}/cvsweb/
+	${INSTALL_DATA} ${WRKSRC}/icons/* ${PREFIX}/${ICONSDIR}/cvsweb/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/cvsweb
-	cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog INSTALL README README.FreeBSD TODO TODO.FreeBSD ${PREFIX}/share/doc/cvsweb/
+	${MKDIR} ${DOCSDIR}
+.for f in ChangeLog INSTALL README README.FreeBSD TODO TODO.FreeBSD
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
 .endif
 
 post-install:
diff --git a/devel/cvsweb/pkg-message b/devel/cvsweb/files/pkg-message.in
index ee9705c7ed50..942d80831845 100644
--- a/devel/cvsweb/pkg-message
+++ b/devel/cvsweb/files/pkg-message.in
@@ -1,6 +1,6 @@
 ************************************************************
 Quickstart:
-	cd ${PREFIX}/etc/cvsweb
+	cd %%PREFIX%%/etc/cvsweb
 	cp cvsweb.conf.dist cvsweb.conf
 
 and you can browse your CVS repository via web if you set up
@@ -11,5 +11,5 @@ will be like `http://localhost/cgi-bin/cvsweb.cgi/'.
 browse, edit cvsweb.conf* as you like.
 
   For further information, please look into the directory
-`${PREFIX}/share/doc/cvsweb/'.
+`%%DOCSDIR%%'.
 ************************************************************
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index a803ebf17e71..e06d06eb5d9b 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -11,4 +11,4 @@ brought it back to the FreeBSD community and made further
 improvements.
 
 WWW:	http://www.FreeBSD.org/projects/cvsweb.html
-Author:	the FreeBSD Project
+Author:	The FreeBSD Project <freebsd-cvsweb at FreeBSD dot org>
diff --git a/devel/cvsweb/pkg-plist b/devel/cvsweb/pkg-plist
index 616f8a0ac59f..2fba7b9a80db 100644
--- a/devel/cvsweb/pkg-plist
+++ b/devel/cvsweb/pkg-plist
@@ -4,13 +4,13 @@ etc/cvsweb/cvsweb.conf-openbsd.dist
 etc/cvsweb/cvsweb.conf-netbsd.dist
 etc/cvsweb/cvsweb.conf-ruby.dist
 @dirrm etc/cvsweb
-%%PORTDOCS%%share/doc/cvsweb/ChangeLog
-%%PORTDOCS%%share/doc/cvsweb/INSTALL
-%%PORTDOCS%%share/doc/cvsweb/README
-%%PORTDOCS%%share/doc/cvsweb/README.FreeBSD
-%%PORTDOCS%%share/doc/cvsweb/TODO
-%%PORTDOCS%%share/doc/cvsweb/TODO.FreeBSD
-%%PORTDOCS%%@dirrm share/doc/cvsweb
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/TODO.FreeBSD
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%CGIDIR%%/cvsweb.cgi
 %%ICONSDIR%%/cvsweb/back.gif
 %%ICONSDIR%%/cvsweb/dir.gif