4 files changed, 37 insertions, 28 deletions
diff --git a/x11/Xbae/patches/patch-aa b/x11/Xbae/patches/patch-aa
new file mode 100644
index 00000000000..90e3fa55c7a
--- /dev/null
+++ b/x11/Xbae/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2004/11/23 17:04:15 wiz Exp $
+
+--- src/Makefile.in.orig	2004-10-29 22:08:37.000000000 +0200
++++ src/Makefile.in
+@@ -540,7 +540,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-htmlDATA install-man
++install-data-am: install-man
+ 
+ install-exec-am: install-libLTLIBRARIES
+ 
diff --git a/x11/Xbae/patches/patch-ac b/x11/Xbae/patches/patch-ac
index 04590928f5c..a3accd753da 100644
--- a/x11/Xbae/patches/patch-ac
+++ b/x11/Xbae/patches/patch-ac
@@ -1,24 +1,20 @@
-$NetBSD: patch-ac,v 1.3 2001/07/29 06:25:16 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2004/11/23 17:04:15 wiz Exp $
 
---- Makefile.in.orig	Wed May 23 16:51:44 2001
+--- Makefile.in.orig	2004-10-29 22:08:38.000000000 +0200
 +++ Makefile.in
-@@ -99,16 +99,16 @@
+@@ -230,13 +230,13 @@ target_alias = @target_alias@
+ x_includes = @x_includes@
  x_libraries = @x_libraries@
- 
  MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
--SUBDIRS = include src examples doc
-+SUBDIRS = include src doc
- 
- EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules FAQ.html 	CVSMake acconfig.h
- 
- 
--aclocaldir = @ACLOCALDIR@
-+aclocaldir = ${prefix}/share/aclocal
+-SUBDIRS = include src examples doc scripts
++SUBDIRS = include src doc scripts
+ EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules \
+ 	CVSMake
  
+ aclocaldir = @ACLOCALDIR@
  @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
- 
 -docdir = $(prefix)/Xbae
-+docdir = $(prefix)/share/doc/html/Xbae
- doc_DATA = FAQ.html NEWS README INSTALL
++docdir = $(datadir)/doc/Xbae
+ doc_DATA = NEWS README
  
  #
diff --git a/x11/Xbae/patches/patch-ad b/x11/Xbae/patches/patch-ad
index 7fab856c220..f95f76f068b 100644
--- a/x11/Xbae/patches/patch-ad
+++ b/x11/Xbae/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2001/07/29 06:25:16 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2004/11/23 17:04:15 wiz Exp $
 
---- doc/Makefile.in.orig	Wed May 23 16:51:48 2001
+--- doc/Makefile.in.orig	2004-10-29 22:08:32.000000000 +0200
 +++ doc/Makefile.in
-@@ -110,7 +110,7 @@
+@@ -224,7 +224,7 @@ SUBDIRS = images
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
--docdir = $(prefix)/Xbae
-+docdir = $(prefix)/share/doc/html/Xbae
- 
- doc_DATA =  	callbacks.html cellwidgets.html 	contents.html coverplus.html difffonts.html 	index.html main.html morelines.html 	psdriver.html rowheights.html scrolling.html 	spancells.html title.html
- 
+-docdir = $(datadir)/Xbae
++docdir = $(datadir)/doc/Xbae
+ doc_DATA = \
+       contents.html coverplus.html difffonts.html \
+       index.html main.html morelines.html \
diff --git a/x11/Xbae/patches/patch-ae b/x11/Xbae/patches/patch-ae
index d5c5af986d5..3b7224011dc 100644
--- a/x11/Xbae/patches/patch-ae
+++ b/x11/Xbae/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2001/07/29 06:25:16 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2004/11/23 17:04:15 wiz Exp $
 
---- doc/images/Makefile.in.orig	Wed May 23 16:51:48 2001
+--- doc/images/Makefile.in.orig	2004-10-29 22:08:32.000000000 +0200
 +++ doc/images/Makefile.in
-@@ -108,7 +108,7 @@
+@@ -213,7 +213,7 @@ x_libraries = @x_libraries@
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
--imagedir = $(exec_prefix)/Xbae/images
-+imagedir = $(prefix)/share/doc/html/Xbae/images
+-imagedir = $(datadir)/Xbae/images
++imagedir = $(datadir)/doc/Xbae/images
  
  #
  # Cut the distribution size, don't distribute these in a source