Only depend on rman if not in base system, and install HTML documentation

under ${PREFIX}/share/doc/html.

4 files changed, 25 insertions, 23 deletions

diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile
index 1b45ab49b8f..c3e7cdd6a3e 100644
--- a/www/cgilib/Makefile
+++ b/www/cgilib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/03/27 03:20:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/03 14:23:36 jlam Exp $
 #
 
 DISTNAME=	cgilib-0.5
@@ -9,6 +9,8 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://www.infodrom.north.de/cgilib/
 COMMENT=	Common gateway interface library
 
-BUILD_DEPENDS+= rman-3.0.9:../../textproc/rman
-
 .include "../../mk/bsd.pkg.mk"
+
+.if !exists(${X11BASE}/bin/rman)
+BUILD_DEPENDS+=	rman>=3.0.9:../../textproc/rman
+.endif
diff --git a/www/cgilib/distinfo b/www/cgilib/distinfo
index 7b79a499ad7..a34adab5d1c 100644
--- a/www/cgilib/distinfo
+++ b/www/cgilib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:34 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/03 14:23:36 jlam Exp $
 
 SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
 Size (cgilib-0.5.tar.gz) = 13991 bytes
 SHA1 (patch-aa) = 697abdf17ee09793360d216097cfb46b3630ae8b
-SHA1 (patch-ab) = 11c101c15567d0afd5e6538bcfac92f8817cf629
+SHA1 (patch-ab) = f8b0d736c1dbe49ab8a3017d137951cf49c4d708
diff --git a/www/cgilib/patches/patch-ab b/www/cgilib/patches/patch-ab
index 9e6068f85c8..53b5f1463a8 100644
--- a/www/cgilib/patches/patch-ab
+++ b/www/cgilib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1999/11/08 17:25:00 wennmach Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/03 14:23:36 jlam Exp $
 --- Makefile.orig	Fri Aug 20 23:14:07 1999
 +++ Makefile	Mon Nov  8 18:06:31 1999
 @@ -14,30 +14,38 @@
@@ -40,9 +40,9 @@ $NetBSD: patch-ab,v 1.2 1999/11/08 17:25:00 wennmach Exp $
 +	install -c -m 755 jumpto ${PREFIX}/libexec/cgi-bin
 +	install -c -m 444 libcgi.a ${PREFIX}/lib
 +	install -c -m 444 cgi.h ${PREFIX}/include
-+	-mkdir -p ${PREFIX}/share/doc/cgilib
++	-mkdir -p ${PREFIX}/share/doc/html/cgilib
 +	for i in *.html; do \
-+          install -c -m 444 $$i ${PREFIX}/share/doc/cgilib ; \
++          install -c -m 444 $$i ${PREFIX}/share/doc/html/cgilib ; \
 +        done
  
  clean:
diff --git a/www/cgilib/pkg/PLIST b/www/cgilib/pkg/PLIST
index 4205556b19f..2ed487bae3c 100644
--- a/www/cgilib/pkg/PLIST
+++ b/www/cgilib/pkg/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/06 16:50:47 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/03 14:23:37 jlam Exp $
 include/cgi.h
 lib/libcgi.a
 libexec/cgi-bin/cgitest
 libexec/cgi-bin/jumpto
-share/doc/cgilib/cgi.5.html
-share/doc/cgilib/cgiDebug.3.html
-share/doc/cgilib/cgiFree.3.html
-share/doc/cgilib/cgiFreeList.3.html
-share/doc/cgilib/cgiGetCookie.3.html
-share/doc/cgilib/cgiGetCookies.3.html
-share/doc/cgilib/cgiGetValue.3.html
-share/doc/cgilib/cgiGetVariables.3.html
-share/doc/cgilib/cgiHeader.3.html
-share/doc/cgilib/cgiInit.3.html
-share/doc/cgilib/cgiRedirect.3.html
-share/doc/cgilib/cgiSetHeader.3.html
-share/doc/cgilib/cgiSetType.3.html
-@dirrm share/doc/cgilib
+share/doc/html/cgilib/cgi.5.html
+share/doc/html/cgilib/cgiDebug.3.html
+share/doc/html/cgilib/cgiFree.3.html
+share/doc/html/cgilib/cgiFreeList.3.html
+share/doc/html/cgilib/cgiGetCookie.3.html
+share/doc/html/cgilib/cgiGetCookies.3.html
+share/doc/html/cgilib/cgiGetValue.3.html
+share/doc/html/cgilib/cgiGetVariables.3.html
+share/doc/html/cgilib/cgiHeader.3.html
+share/doc/html/cgilib/cgiInit.3.html
+share/doc/html/cgilib/cgiRedirect.3.html
+share/doc/html/cgilib/cgiSetHeader.3.html
+share/doc/html/cgilib/cgiSetType.3.html
+@dirrm share/doc/html/cgilib