Date: Sat, 9 Apr 2005 08:00:49 -0500 (CDT) From: Jonathan Noack <noackjr@alumni.rice.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79710: [MAINTAINER] devel/cvsweb3: fix dependency on enscript and clean up Message-ID: <20050409130049.14D146142@optimator.noacks.org> Resent-Message-ID: <200504091310.j39DAIiN050381@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79710
>Category: ports
>Synopsis: [MAINTAINER] devel/cvsweb3: fix dependency on enscript and 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 13:10:18 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:
- Avoid a stale dependency on Enscript by using PAPERSIZE:
- Default to letter (see the print/enscript-letter master port).
- If you want a4, set PAPERSIZE=a4 in /etc/make.conf. Similarly,
use PAPERSIZE=letterdj for letterdj.
- If you have an incorrect version of Enscript installed:
1) Remove Enscript
2) Set PAPERSIZE in /etc/make.conf (if you don't want letter)
3) Reinstall Enscript
- Bump PORTREVISION
- Use SUB_FILES/SUB_LIST to personalize pkg-message
- Sort pkg-plist
- Conflicts with cvsweb-2*
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- cvsweb-3.0.5_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb3/Makefile /usr/home/noackjr/cvsweb/ports/cvsweb3/Makefile
--- /usr/ports/devel/cvsweb3/Makefile Sat Apr 9 05:32:46 2005
+++ /usr/home/noackjr/cvsweb/ports/cvsweb3/Makefile Sat Apr 9 07:57:11 2005
@@ -7,6 +7,7 @@
PORTNAME= cvsweb
PORTVERSION= 3.0.5
+PORTREVISION= 1
CATEGORIES= devel www
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.FreeBSD.org/~scop/cvsweb/
@@ -24,10 +25,15 @@
# best with them.
RUN_DEPENDS+= ${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
${SITE_PERL}/${PERL_ARCH}/String/Ediff.pm:${PORTSDIR}/devel/p5-String-Ediff \
- enscript:${PORTSDIR}/print/enscript-a4 \
cvsgraph:${PORTSDIR}/devel/cvsgraph
+# Use PAPERSIZE to avoid a stale dependency on Enscript.
+PAPERSIZE?= letter
+RUN_DEPENDS+= enscript:${PORTSDIR}/print/enscript-${PAPERSIZE}
+
LATEST_LINK= cvsweb3
+CONFLICTS= cvsweb-2.*
+
NO_BUILD= yes
USE_PERL5= yes
@@ -73,6 +79,9 @@
PLIST_SUB= CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" CSSDIR="${CSSDIR}"
+SUB_FILES= pkg-message
+SUB_LIST= PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}"
+
post-patch:
${PERL} -i -pe "\
s'!!PERL!!'${PERL}'g; \
@@ -95,6 +104,7 @@
${INSTALL_DATA} ${WRKSRC}/icons/* ${PREFIX}/${ICONSDIR}/cvsweb/
${MKDIR} ${PREFIX}/${CSSDIR}/cvsweb
${INSTALL_DATA} ${WRKSRC}/css/*.css ${PREFIX}/${CSSDIR}/cvsweb/
+ ${MKDIR} ${PREFIX}/share/enscript/hl
${INSTALL_DATA} ${WRKSRC}/enscript/*.st ${PREFIX}/share/enscript/hl/
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff -ruN --exclude=CVS /usr/ports/devel/cvsweb3/files/pkg-message.in /usr/home/noackjr/cvsweb/ports/cvsweb3/files/pkg-message.in
--- /usr/ports/devel/cvsweb3/files/pkg-message.in Wed Dec 31 18:00:00 1969
+++ /usr/home/noackjr/cvsweb/ports/cvsweb3/files/pkg-message.in Sat Apr 9 04:55:48 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/cvsweb3/pkg-message /usr/home/noackjr/cvsweb/ports/cvsweb3/pkg-message
--- /usr/ports/devel/cvsweb3/pkg-message Sat Apr 9 05:00:53 2005
+++ /usr/home/noackjr/cvsweb/ports/cvsweb3/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/cvsweb3/pkg-plist /usr/home/noackjr/cvsweb/ports/cvsweb3/pkg-plist
--- /usr/ports/devel/cvsweb3/pkg-plist Sat Apr 9 05:00:53 2005
+++ /usr/home/noackjr/cvsweb/ports/cvsweb3/pkg-plist Sat Apr 9 05:24:26 2005
@@ -4,6 +4,14 @@
etc/cvsweb/cvsweb.conf-netbsd.dist
etc/cvsweb/cvsweb.conf-ruby.dist
@dirrm etc/cvsweb
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/cvsweb-httpd.conf
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%CGIDIR%%/cvsweb.cgi
%%ICONSDIR%%/cvsweb/back.gif
%%ICONSDIR%%/cvsweb/binary.gif
@@ -18,11 +26,4 @@
@dirrm %%CSSDIR%%/cvsweb
share/enscript/hl/lang_cvsweb.st
share/enscript/hl/lang_cvsweb_diff.st
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/cvsweb-httpd.conf
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@unexec rmdir %D/share/enscript/hl 2>/dev/null || true
--- cvsweb-3.0.5_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050409130049.14D146142>