Remove a patch made unnecessary since the tools framework already

appropriately hides "makeinfo".  Install possibly split info files
correctly, and install them all into ${EMACS_INFOPREFIX}, which is
correct for either Emacs or XEmacs.  List the info files in the PLIST.
Bump the PKGREVISION to 2.

4 files changed, 11 insertions, 21 deletions

diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index aa01a1e3ef2..702db399faa 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/20 04:59:08 jlam Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
@@ -17,8 +17,7 @@ BUILD_ENV+=	EMACS=${EMACS}
 
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-
-INFO_FILES=	speedbar.info
+INFO_FILES=	# PLIST
 
 SRCS=	speedbar.el dframe.el
 # XXX cd ${WRKSRC}; ${MAKE} -V opt_IMAGES
@@ -29,13 +28,16 @@ IMAGES=	sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm 	\
 	sb-label.xpm sb-ro.xpm sb-doc.xpm sb-info.xpm sb-doc-plus.xpm 	\
 	sb-doc-minus.xpm sb-box.xpm sb-box-plus.xpm sb-box-minus.xpm
 
-INSTALLATION_DIRS=	info
+INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 
 do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/speedbar
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
 			${EMACS_LISPPREFIX}/speedbar
 	cd ${WRKSRC} && ${INSTALL_DATA} ${IMAGES} ${EMACS_LISPPREFIX}/speedbar
-	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
+	cd ${WRKSRC}; for file in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$file" ||				\
+		${INSTALL_DATA} "$$file" ${EMACS_INFOPREFIX};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST
index 4c0f1dd4d9a..c98df71922e 100644
--- a/editors/speedbar/PLIST
+++ b/editors/speedbar/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2004/02/17 00:00:02 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/20 04:59:08 jlam Exp $
+${EMACS_INFOPREFIX}/speedbar.info
 ${EMACS_LISPPREFIX}/speedbar/dframe.el
 ${EMACS_LISPPREFIX}/speedbar/dframe.elc
 ${EMACS_LISPPREFIX}/speedbar/sb-box-minus.xpm
diff --git a/editors/speedbar/distinfo b/editors/speedbar/distinfo
index 2795f850ba0..1a56277dafe 100644
--- a/editors/speedbar/distinfo
+++ b/editors/speedbar/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:12 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/03/20 04:59:08 jlam Exp $
 
 SHA1 (speedbar-0.14beta4.tar.gz) = 58b246bab82d475c452ce3dea5a1d404ed1eca1f
 RMD160 (speedbar-0.14beta4.tar.gz) = 0c6845fec1bc3bd8fc4c1076ad5d8bd047a9c7da
 Size (speedbar-0.14beta4.tar.gz) = 114994 bytes
-SHA1 (patch-aa) = 0dfc29d15eaf43c13a942a8e40de2a8da6aeed16
diff --git a/editors/speedbar/patches/patch-aa b/editors/speedbar/patches/patch-aa
deleted file mode 100644
index 4c3270c52e9..00000000000
--- a/editors/speedbar/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/11 08:51:10 uebayasi Exp $
-
---- Makefile.orig	Sun Mar 17 20:52:55 2002
-+++ Makefile
-@@ -13,7 +13,6 @@
- EMACS=emacs
- LOADPATH=
- info_TEXINFOS=speedbar.texi
--MAKEINFO=makeinfo
- opt_LISP=rpm.el sb-gud.el sb-info.el sb-rmail.el sb-w3.el sb-texinfo.el bigclock.el sb-html.el sb-ant.el
- aux_AUX=INSTALL ChangeLog
- images_MISC=sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm sb-pg-minus.xpm sb-pg.xpm sb-mail.xpm sb-tag-plus.xpm sb-tag-minus.xpm sb-tag.xpm sb-tag-gt.xpm sb-tag-v.xpm sb-tag-type.xpm sb-image.el sb-obj.xpm sb-chk.xpm sb-objod.xpm sb-label.xpm sb-ro.xpm sb-doc.xpm sb-info.xpm sb-doc-plus.xpm sb-doc-minus.xpm sb-box.xpm sb-box-plus.xpm sb-box-minus.xpm