Resolve conflicts.

Add $FreeBSD$ tags. Configure cvsweb.conf and add some extra confs for freefall.
svn path=/www/; revision=7838
2000-08-14 04:55:19 +00:00 · 2000-08-14 04:55:19 +00:00 · ee63a4ae51 · 2020-12-08 03:00:23 +00:00
commit ee63a4ae51
parent 10aa3ca319
5 changed files with 2525 additions and 514 deletions
--- a/en/cgi/cvsweb.conf-freebsd
+++ b/en/cgi/cvsweb.conf-freebsd
@ -0,0 +1,30 @@
+# Set up for FreeBSD repo options.
+#
+# $FreeBSD$
+
+$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader';
+$ENV{'RCSINCEXC'}  = 'iFreeBSD';
+$ENV{'CVSROOT'}    = $cvsroot;
+
+##############
+# PR categoties
+##############
+@prcategories = qw(
+		   advocacy
+		   alpha
+		   bin
+		   conf
+		   docs
+		   gnu
+		   i386
+		   kern
+		   misc
+		   ports
+		   sparc
+		  );
+
+##############
+# query-pr.cgi
+##############
+$prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=";
+