Update gail to 1.1.6. Changes since 0.17 are mostly bugfixes and cleanup.

7 files changed, 27 insertions, 81 deletions

diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index 934f97c369f..7c2b12ea05d 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,30 +1,29 @@
-# $NetBSD: Makefile,v 1.4 2003/01/03 15:26:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/05 18:12:19 jmmv Exp $
 #
 
-DISTNAME=	gail-0.17
-PKGREVISION=	1
+DISTNAME=	gail-1.1.6
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gail/0.17/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gail/1.1/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@netbsd.org
 HOMEPAGE=	http://developer.gnome.org/projects/gap/
 COMMENT=	GNOME Accessibility Implementation Library
 
-BUILD_DEPENDS+=		gtk-doc>=0.6:../../textproc/gtk-doc
-
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
-USE_GNU_GETTEXT=	yes
 USE_X11=		yes
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-post-extract:
-	${MV} ${WRKSRC}/docs/reference/libgail-util/html/book1.html \
-	    ${WRKSRC}/docs/reference/libgail-util/html/index.html
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gail
+	${INSTALL_DATA} ${WRKSRC}/docs/reference/libgail-util/*.txt \
+	    ${PREFIX}/share/doc/gail
 
 .include "../../devel/atk/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/devel/gail/PLIST b/devel/gail/PLIST
index 9417880827c..d33f0479bb2 100644
--- a/devel/gail/PLIST
+++ b/devel/gail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/05 10:07:11 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/05 18:12:19 jmmv Exp $
 include/gail-1.0/libgail-util/gail-util.h
 include/gail-1.0/libgail-util/gailmisc.h
 include/gail-1.0/libgail-util/gailtextutil.h
@@ -11,12 +11,9 @@ lib/libgailutil.so
 lib/libgailutil.so.17
 lib/libgailutil.so.17.0
 lib/pkgconfig/gail.pc
-share/gtk-doc/html/gail-libgail-util/gail-libgail-util-gailmisc.html
-share/gtk-doc/html/gail-libgail-util/gail-libgail-util-gailtextutil.html
-share/gtk-doc/html/gail-libgail-util/index.html
-share/gtk-doc/html/gail-libgail-util/libgail-util-main.html
-@dirrm share/gtk-doc/html/gail-libgail-util
-@unexec ${RMDIR} share/gtk-doc/html 2>/dev/null || ${TRUE}
+share/doc/gail/gail-libgail-util-overrides.txt
+share/doc/gail/gail-libgail-util-sections.txt
+@dirrm share/doc/gail
 @comment in gtk2: @dirrm lib/gtk-2.0/modules
 @dirrm include/gail-1.0/libgail-util
 @dirrm include/gail-1.0
diff --git a/devel/gail/distinfo b/devel/gail/distinfo
index 896f95c1e21..fa94aa7dc50 100644
--- a/devel/gail/distinfo
+++ b/devel/gail/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/21 01:04:23 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/01/05 18:12:19 jmmv Exp $
 
-SHA1 (gail-0.17.tar.bz2) = 85b160fd5be05ef6c60a394aaf73f8d5a1ec4e90
-Size (gail-0.17.tar.bz2) = 306937 bytes
-SHA1 (patch-aa) = 775ebe6acc22fc4cf26075341edacfff6cf6fe92
-SHA1 (patch-ab) = e37c3eb515b194704430dd25fdfafd843057f3e1
-SHA1 (patch-ac) = d917b9f183fd2deae3f0b69542b9713c98a7aef6
-SHA1 (patch-ad) = bd12e46d61b36fcb1902077ebb9b67cbff371280
+SHA1 (gail-1.1.6.tar.bz2) = 24d5cb5dc1a43de8aa463708ee4802352920ec10
+Size (gail-1.1.6.tar.bz2) = 307675 bytes
+SHA1 (patch-aa) = afaff96dbaf8ebe5cd4d4d32ea0050b87bd9a9be
+SHA1 (patch-ab) = d8084c193aa92242b4ba0547922faff32865f2e0
diff --git a/devel/gail/patches/patch-aa b/devel/gail/patches/patch-aa
index 549bc4fd0a8..69b0cd46259 100644
--- a/devel/gail/patches/patch-aa
+++ b/devel/gail/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/21 01:04:24 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/05 18:12:20 jmmv Exp $
 
---- Makefile.am.orig	Sat Sep  7 14:18:57 2002
-+++ Makefile.am	Sat Sep  7 14:19:03 2002
+--- Makefile.am.orig	Wed Jun 19 17:32:35 2002
++++ Makefile.am
 @@ -1,6 +1,6 @@
  # Process this file with automake to create Makefile.in.
  
 -SUBDIRS=libgail-util gail tests docs
-+SUBDIRS=libgail-util gail docs
++SUBDIRS=libgail-util gail
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA= gail.pc
diff --git a/devel/gail/patches/patch-ab b/devel/gail/patches/patch-ab
index fe548a43d91..4a941ff8569 100644
--- a/devel/gail/patches/patch-ab
+++ b/devel/gail/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/21 01:04:24 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/05 18:12:20 jmmv Exp $
 
---- Makefile.in.orig	Sat Sep  7 14:19:08 2002
-+++ Makefile.in	Sat Sep  7 14:19:16 2002
-@@ -91,7 +91,7 @@
+--- Makefile.in.orig	Fri Jan  3 17:05:03 2003
++++ Makefile.in
+@@ -86,7 +86,7 @@ STRIP = @STRIP@
  VERSION = @VERSION@
  ms_librarian = @ms_librarian@
  
 -SUBDIRS = libgail-util gail tests docs
-+SUBDIRS = libgail-util gail docs
++SUBDIRS = libgail-util gail
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = gail.pc
diff --git a/devel/gail/patches/patch-ac b/devel/gail/patches/patch-ac
deleted file mode 100644
index 5e765297d6c..00000000000
--- a/devel/gail/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/21 01:04:24 rh Exp $
-
---- docs/reference/libgail-util/Makefile.am.orig	Sat Sep  7 13:58:48 2002
-+++ docs/reference/libgail-util/Makefile.am	Sat Sep  7 13:59:04 2002
-@@ -127,8 +127,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)
- 
- #
-@@ -148,7 +148,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/devel/gail/patches/patch-ad b/devel/gail/patches/patch-ad
deleted file mode 100644
index 4cd8d2e2cc3..00000000000
--- a/devel/gail/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/09/21 01:04:24 rh Exp $
-
---- docs/reference/libgail-util/Makefile.in.orig	Sat Sep  7 13:58:50 2002
-+++ docs/reference/libgail-util/Makefile.in	Sat Sep  7 13:59:16 2002
-@@ -304,8 +304,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)
- 
- #
-@@ -322,7 +322,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) ;			\