ports/79709: [MAINTAINER] devel/cvsweb: clean up

Sat Apr 9 12:10:16 UTC 2005

>Number:         79709
>Category:       ports
>Synopsis:       [MAINTAINER] devel/cvsweb: clean up
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 09 12:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Noack
>Release:        FreeBSD 5.4-RC1 i386
>Organization:
>Environment:
System: FreeBSD optimator.noacks.org 5.4-RC1 FreeBSD 5.4-RC1 #14: Fri Apr  8 03:15:05 CDT
>Description:
Clean up the port:
- Use DOCSDIR
- Use SUB_FILES/SUB_LIST to personalize pkg-message
- Sync style with devel/cvsweb3
- Conflicts with cvsweb-3*

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- cvsweb-2.0.6_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb/Makefile /usr/home/noackjr/cvsweb/ports/cvsweb/Makefile
--- /usr/ports/devel/cvsweb/Makefile	Sat Apr  9 05:05:52 2005
+++ /usr/home/noackjr/cvsweb/ports/cvsweb/Makefile	Sat Apr  9 06:55:03 2005
@@ -18,8 +18,9 @@
 MAINTAINER=	noackjr at 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 @@
 
 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,15 +71,17 @@
 	${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:
 .if defined(PACKAGE_BUILDING)
-	${ECHO_CMD} "@unexec rmdir %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb/files/pkg-message.in /usr/home/noackjr/cvsweb/ports/cvsweb/files/pkg-message.in
--- /usr/ports/devel/cvsweb/files/pkg-message.in	Wed Dec 31 18:00:00 1969
+++ /usr/home/noackjr/cvsweb/ports/cvsweb/files/pkg-message.in	Sat Apr  9 05:05:32 2005
@@ -0,0 +1,15 @@
+************************************************************
+Quickstart:
+	cd %%PREFIX%%/etc/cvsweb
+	cp cvsweb.conf.dist cvsweb.conf
+
+and you can browse your CVS repository via web if you set up
+your web server correctly.  The URL to get to the cvsweb
+will be like `http://localhost/cgi-bin/cvsweb.cgi/'.
+
+  To configure its appearance and repository entries to
+browse, edit cvsweb.conf* as you like.
+
+  For further information, please look into the directory
+`%%DOCSDIR%%'.
+************************************************************
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb/pkg-descr /usr/home/noackjr/cvsweb/ports/cvsweb/pkg-descr
--- /usr/ports/devel/cvsweb/pkg-descr	Sat Jul  6 13:28:38 2002
+++ /usr/home/noackjr/cvsweb/ports/cvsweb/pkg-descr	Sat Apr  9 05:10:12 2005
@@ -11,4 +11,4 @@
 improvements.
 
 WWW:	http://www.FreeBSD.org/projects/cvsweb.html
-Author:	the FreeBSD Project
+Author:	The FreeBSD Project <freebsd-cvsweb at FreeBSD dot org>
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb/pkg-message /usr/home/noackjr/cvsweb/ports/cvsweb/pkg-message
--- /usr/ports/devel/cvsweb/pkg-message	Sat Apr  9 05:05:52 2005
+++ /usr/home/noackjr/cvsweb/ports/cvsweb/pkg-message	Wed Dec 31 18:00:00 1969
@@ -1,15 +0,0 @@
-************************************************************
-Quickstart:
-	cd ${PREFIX}/etc/cvsweb
-	cp cvsweb.conf.dist cvsweb.conf
-
-and you can browse your CVS repository via web if you set up
-your web server correctly.  The URL to get to the cvsweb
-will be like `http://localhost/cgi-bin/cvsweb.cgi/'.
-
-  To configure its appearance and repository entries to
-browse, edit cvsweb.conf* as you like.
-
-  For further information, please look into the directory
-`${PREFIX}/share/doc/cvsweb/'.
-************************************************************
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb/pkg-plist /usr/home/noackjr/cvsweb/ports/cvsweb/pkg-plist
--- /usr/ports/devel/cvsweb/pkg-plist	Sat Apr  9 05:05:52 2005
+++ /usr/home/noackjr/cvsweb/ports/cvsweb/pkg-plist	Sat Apr  9 05:19:31 2005
@@ -4,13 +4,13 @@
 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
--- cvsweb-2.0.6_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

