Install documentation under share/doc/html, not share/gtk-doc/html.

Do not depend on gtk-doc, as the package ships with pregenerated docs.
Bump PKGREVISION to 2.

4 files changed, 30 insertions, 21 deletions

diff --git a/net/linc/Makefile b/net/linc/Makefile
index 71fc7113f59..1c6218a7da5 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/12/24 06:10:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/04 20:03:21 jmmv Exp $
 #
 
 DISTNAME=		linc-0.7.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/linc/0.7/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,14 +11,15 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		network client/server library
 
-BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
-
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/linc.pc.in
 
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 
diff --git a/net/linc/PLIST b/net/linc/PLIST
index f90db6a9190..6f8b33a7d45 100644
--- a/net/linc/PLIST
+++ b/net/linc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/04 20:03:21 jmmv Exp $
 bin/linc-cleanup-sockets
 bin/linc-config
 include/linc-1.0/linc/linc-config.h
@@ -14,16 +14,16 @@ lib/liblinc.so.1
 lib/liblinc.so.1.0
 lib/pkgconfig/linc.pc
 share/aclocal/linc.m4
-share/gtk-doc/html/linc/c4.html
-share/gtk-doc/html/linc/index.html
-share/gtk-doc/html/linc/linc-config.html
-share/gtk-doc/html/linc/linc-linc-config.html
-share/gtk-doc/html/linc/linc-linc-private.html
-share/gtk-doc/html/linc/linc-linc-protocol.html
-share/gtk-doc/html/linc/linc-linc-types.html
-share/gtk-doc/html/linc/linc-linc.html
-share/gtk-doc/html/linc/linc-lincconnection.html
-share/gtk-doc/html/linc/linc-lincserver.html
-@dirrm share/gtk-doc/html/linc
+share/doc/html/linc/c4.html
+share/doc/html/linc/index.html
+share/doc/html/linc/linc-config.html
+share/doc/html/linc/linc-linc-config.html
+share/doc/html/linc/linc-linc-private.html
+share/doc/html/linc/linc-linc-protocol.html
+share/doc/html/linc/linc-linc-types.html
+share/doc/html/linc/linc-linc.html
+share/doc/html/linc/linc-lincconnection.html
+share/doc/html/linc/linc-lincserver.html
+@dirrm share/doc/html/linc
 @dirrm include/linc-1.0/linc
 @dirrm include/linc-1.0
diff --git a/net/linc/distinfo b/net/linc/distinfo
index 8eca74aa76e..967f47b61aa 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/10/30 03:09:37 rh Exp $
+$NetBSD: distinfo,v 1.7 2003/01/04 20:03:21 jmmv Exp $
 
 SHA1 (linc-0.7.0.tar.bz2) = 0e5670a952bf7ca74f27a8c82148391868f8d500
 Size (linc-0.7.0.tar.bz2) = 181681 bytes
-SHA1 (patch-aa) = 1643b8decf11568a2aaaf8cbe8c0e0989a897196
+SHA1 (patch-aa) = e891b344b9c2d8638a52cf56948c0481d77965b2
diff --git a/net/linc/patches/patch-aa b/net/linc/patches/patch-aa
index 0b4ac827b3b..326ee67efe9 100644
--- a/net/linc/patches/patch-aa
+++ b/net/linc/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/23 12:17:22 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/04 20:03:22 jmmv Exp $
 
---- docs/Makefile.in.orig	Tue Apr 23 20:27:20 2002
+--- docs/Makefile.in.orig	Fri Oct 18 12:00:50 2002
 +++ docs/Makefile.in
-@@ -327,8 +327,6 @@
+@@ -267,6 +267,7 @@ mostlyclean-generic distclean-generic cl
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
++@ENABLE_GTK_DOC_FALSE@all-local:
+ @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+ 
+ #### scan ####
+@@ -338,8 +339,6 @@ install-data-local:
  	    echo '-- Installing '$$i ; \
  	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
  	  done; \