Update speedbar to 0.14beta4. Changes are unknown.

Convert to use emacs.mk.

5 files changed, 36 insertions, 55 deletions

diff --git a/editors/speedbar/DESCR b/editors/speedbar/DESCR
index ebcd3c80840..16200b1a6a4 100644
--- a/editors/speedbar/DESCR
+++ b/editors/speedbar/DESCR
@@ -5,26 +5,11 @@ files into your emacs frame, or expand the files to display all the
 tags that are in them and jump to those tags. You can also expand
 multiple directories into your speedbar frame.
 
-Using Shift with the mouse is considered a "power click" which will
-ignore any cached data that might be related to the navigation
-desired. When loading a file, a power click will pull that file into a
-new frame.
-
-For PC users with two button mice, a button1 double click acts as the
-mouse-2 click most emacs users are familiar with.
-
-Additional keyboard commands are available for friendly file IO
-functions such as Rename/Copy/Delete, Loading lisp files, and
-compiling lisp files.
-
-Speedbar is more than just file browsing, however. Speedbar is a
-generalized browser. Speedbar supports:
+In addition to file browsing, Speedbar supports:
 
 * multiple tagging methods for files (such as etags, imenu, and
   semantic)
-
 * multiple major display modes (such as buffer lists, project lists,
   and EIEIO class browsing,)
-
 * multiple minor display modes that appear when you view special
   files, such as Info pages, or read mail with RMAIL.
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 7f83732aa68..0b41ac4e9a8 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:17 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/11 08:51:09 uebayasi Exp $
 #
 
-DISTNAME=	speedbar-0.13a
+DISTNAME=	speedbar-0.14beta4
+PKGNAME=	speedbar-0.14rc4
 CATEGORIES=	editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
@@ -9,20 +10,9 @@ MAINTAINER=	cjones@netbsd.org
 HOMEPAGE=	http://cedet.sourceforge.net/speedbar.shtml
 COMMENT=	Directory and code browser for emacs
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_XEMACS)
-DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
-EMACS=			xemacs
-LISPDIR=		lib/xemacs/xemacs-packages/lisp/speedbar
-.else
-DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
-EMACS=			emacs
-LISPDIR=		share/emacs/site-lisp/speedbar
-.endif
+.include "../../mk/emacs.mk"
 
 BUILD_ENV+=	EMACS=${EMACS}
-PLIST_SUBST+=	LISPDIR=${LISPDIR}
 
 NO_CONFIGURE=	# set
 USE_GMAKE=	# set
@@ -30,10 +20,13 @@ USE_GMAKE=	# set
 INFO_FILES=	speedbar.info
 
 SRCS=	speedbar.el dframe.el
-IMAGES=	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
+# XXX cd ${WRKSRC}; ${MAKE} -V opt_IMAGES
+IMAGES=	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
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST
index eece3d57090..d54f37467dc 100644
--- a/editors/speedbar/PLIST
+++ b/editors/speedbar/PLIST
@@ -1,14 +1,26 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:20 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/11 08:51:09 uebayasi Exp $
 ${LISPDIR}/dframe.el
 ${LISPDIR}/dframe.elc
+${LISPDIR}/sb-box-minus.xpm
+${LISPDIR}/sb-box-plus.xpm
+${LISPDIR}/sb-box.xpm
+${LISPDIR}/sb-chk.xpm
 ${LISPDIR}/sb-dir-minus.xpm
 ${LISPDIR}/sb-dir-plus.xpm
 ${LISPDIR}/sb-dir.xpm
+${LISPDIR}/sb-doc-minus.xpm
+${LISPDIR}/sb-doc-plus.xpm
+${LISPDIR}/sb-doc.xpm
 ${LISPDIR}/sb-image.el
+${LISPDIR}/sb-info.xpm
+${LISPDIR}/sb-label.xpm
 ${LISPDIR}/sb-mail.xpm
+${LISPDIR}/sb-obj.xpm
+${LISPDIR}/sb-objod.xpm
 ${LISPDIR}/sb-pg-minus.xpm
 ${LISPDIR}/sb-pg-plus.xpm
 ${LISPDIR}/sb-pg.xpm
+${LISPDIR}/sb-ro.xpm
 ${LISPDIR}/sb-tag-gt.xpm
 ${LISPDIR}/sb-tag-minus.xpm
 ${LISPDIR}/sb-tag-plus.xpm
diff --git a/editors/speedbar/distinfo b/editors/speedbar/distinfo
index 85279ed0b31..94905364e88 100644
--- a/editors/speedbar/distinfo
+++ b/editors/speedbar/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/02/18 15:14:18 seb Exp $
+$NetBSD: distinfo,v 1.3 2003/01/11 08:51:10 uebayasi Exp $
 
-SHA1 (speedbar-0.13a.tar.gz) = 10adb4af2bef3cd1bd301103f79143fa0b21b231
-Size (speedbar-0.13a.tar.gz) = 79535 bytes
-SHA1 (patch-aa) = 70473a7400582616e70be72215cf50e1fbb7722b
+SHA1 (speedbar-0.14beta4.tar.gz) = 58b246bab82d475c452ce3dea5a1d404ed1eca1f
+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
index f4c7a20d2d3..4c3270c52e9 100644
--- a/editors/speedbar/patches/patch-aa
+++ b/editors/speedbar/patches/patch-aa
@@ -1,21 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:18 seb Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/11 08:51:10 uebayasi Exp $
 
---- Makefile.orig	Mon Oct  9 06:21:34 2000
+--- Makefile.orig	Sun Mar 17 20:52:55 2002
 +++ Makefile
-@@ -11,7 +11,6 @@
- speedbar_LISP=dframe.el speedbar.el
+@@ -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
- aux_AUX=INSTALL
- 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
-@@ -35,7 +34,7 @@
- 	$(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^
- 
- speedbar.info: $(info_TEXINFOS)
--	makeinfo -o $@ $<
-+	$(MAKEINFO) -o $@ $<
- 
- opt: $(opt_LISP)
- 	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+ 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