From 9f655c4472e7f1b7bd4aaa3be737ef1561006277 Mon Sep 17 00:00:00 2001 From: jmmv Date: Sun, 5 Jan 2003 12:11:22 +0000 Subject: Install documentation under share/doc/html, not share/gtk-doc/html. Some PLIST fixes for libglade2 shared directories. Bump PKGREVISION to 1. --- graphics/libgnomecanvas/Makefile | 6 ++++- graphics/libgnomecanvas/PLIST | 42 +++++++++++++++++--------------- graphics/libgnomecanvas/distinfo | 4 +-- graphics/libgnomecanvas/patches/patch-aa | 24 ------------------ graphics/libgnomecanvas/patches/patch-ab | 24 ------------------ 5 files changed, 28 insertions(+), 72 deletions(-) delete mode 100644 graphics/libgnomecanvas/patches/patch-aa delete mode 100644 graphics/libgnomecanvas/patches/patch-ab (limited to 'graphics/libgnomecanvas') diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 0dd0fc6c537..1e826f154d8 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2003/01/03 21:39:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/05 12:11:22 jmmv Exp $ # DISTNAME= libgnomecanvas-2.0.5 +PKGREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.0/} EXTRACT_SUFX= .tar.bz2 @@ -22,6 +23,9 @@ USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomecanvas/libgnomecanvas-2.0.pc.in +CONFIGURE_ARGS+= --enable-gtk-doc=no +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html + .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/libglade2/buildlink2.mk" .include "../../graphics/libart2/buildlink2.mk" diff --git a/graphics/libgnomecanvas/PLIST b/graphics/libgnomecanvas/PLIST index 61478e0cb26..6d5d23f8675 100644 --- a/graphics/libgnomecanvas/PLIST +++ b/graphics/libgnomecanvas/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/01/03 21:39:58 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/05 12:11:22 jmmv Exp $ include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-bpath.h include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-line.h @@ -22,24 +22,25 @@ lib/libgnomecanvas-2.so lib/libgnomecanvas-2.so.0 lib/libgnomecanvas-2.so.0.0 lib/pkgconfig/libgnomecanvas-2.0.pc -share/gtk-doc/html/libgnomecanvas/c4.html -share/gtk-doc/html/libgnomecanvas/index.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvas.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasline.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaspathdef.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasre.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasrect.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvastext.html -share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html +share/doc/html/libgnomecanvas/c4.html +share/doc/html/libgnomecanvas/index.html +share/doc/html/libgnomecanvas/index.sgml +share/doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvas.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasline.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaspathdef.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasre.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasrect.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvastext.html +share/doc/html/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -76,6 +77,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo -@dirrm share/gtk-doc/html/libgnomecanvas +@dirrm share/doc/html/libgnomecanvas +@comment in libglade2: @dirrm lib/libglade/2.0 @dirrm include/libgnomecanvas-2.0/libgnomecanvas @dirrm include/libgnomecanvas-2.0 diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index f8ac4d34b06..a46c4187a07 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.2 2003/01/03 21:39:58 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2003/01/05 12:11:22 jmmv Exp $ SHA1 (libgnomecanvas-2.0.5.tar.bz2) = 4dc990fb229ff5be982e1c1c59b25cf82447faf9 Size (libgnomecanvas-2.0.5.tar.bz2) = 390093 bytes -SHA1 (patch-aa) = f1dbf041b9808130a8d0c06ba0e5e013c33cec67 -SHA1 (patch-ab) = 5aa4277d496d1264a3cd1e91b945c766154f9749 diff --git a/graphics/libgnomecanvas/patches/patch-aa b/graphics/libgnomecanvas/patches/patch-aa deleted file mode 100644 index 25996c84710..00000000000 --- a/graphics/libgnomecanvas/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/07 04:41:43 rh Exp $ - ---- docs/reference/Makefile.am.orig Fri Sep 6 13:11:13 2002 -+++ docs/reference/Makefile.am Fri Sep 6 13:11:33 2002 -@@ -151,8 +151,8 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+ echo '-- Installing $(srcdir)/html/index.html' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \ - fi) - - # -@@ -172,7 +172,7 @@ - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -- -cp $(srcdir)/html/index.sgml $(distdir)/html -+ -cp $(srcdir)/html/index.html $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ diff --git a/graphics/libgnomecanvas/patches/patch-ab b/graphics/libgnomecanvas/patches/patch-ab deleted file mode 100644 index fd1082d9070..00000000000 --- a/graphics/libgnomecanvas/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/09/07 04:41:43 rh Exp $ - ---- docs/reference/Makefile.in.orig Fri Sep 6 13:11:16 2002 -+++ docs/reference/Makefile.in Fri Sep 6 13:11:43 2002 -@@ -352,8 +352,8 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+ echo '-- Installing $(srcdir)/html/index.html' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \ - fi) - - # -@@ -370,7 +370,7 @@ - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -- -cp $(srcdir)/html/index.sgml $(distdir)/html -+ -cp $(srcdir)/html/index.html $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ -- cgit v1.2.3