Update eieio to 0.17. Patch from Yoshifumi Hiramatsu in PR19727.

Changes are unknown.  (ChangeLog doesn't mention version numbers...)

Convert to use emacs.mk.

4 files changed, 49 insertions, 53 deletions

diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index 29d94d54d42..9a1419737b0 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:24 seb Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/11 08:53:48 uebayasi Exp $
 #
 
-DISTNAME=	eieio-0.16
+DISTNAME=	eieio-0.17
 CATEGORIES=	lang editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
@@ -9,33 +9,30 @@ MAINTAINER=	cjones@netbsd.org
 HOMEPAGE=	http://cedet.sourceforge.net/eieio.shtml
 COMMENT=	Enhanced Integration of Emacs Interpreted Objects
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/emacs.mk"
 
-.if defined(USE_XEMACS)
-DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
-EMACS=			xemacs
-LISPDIR=		lib/xemacs/xemacs-packages/lisp/eieio
-.else
-DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
-EMACS=			emacs
-LISPDIR=		share/emacs/site-lisp/eieio
+.if ${EMACS_FLAVOR} == "emacs"
+.elif ${EMACS_FLAVOR} == "xemacs"
+DEPENDS+=	xemacs-packages:../../editors/xemacs-packages
 .endif
 
-BUILD_ENV+=	EMACS=${EMACS}
-PLIST_SUBST+=	LISPDIR=${LISPDIR}
+MAKEFLAGS+=	EMACS=${EMACS_BIN}
 
 NO_CONFIGURE=	# set
 USE_GMAKE=	# set
 
 INFO_FILES=	eieio.info
 
-SRCS=	eieio.el eieio-comp.el eieio-opt.el eieio-custom.el	\
-	eieio-doc.el eieio-base.el compare-strings.el
+# XXX $cd ${WRKSRC}; ${MAKE} -V eieio_LISP
+SRCS=	eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el \
+	eieio-base.el
+# XXX $cd ${WRKSRC}; ${MAKE} -V examples_LISP
+SRCS+=	tree.el call-tree.el chart.el eieio-speedbar.el linemark.el
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
+	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/eieio
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
-			${PREFIX}/${LISPDIR}
+			${EMACS_LISPPREFIX}/eieio
 	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
 
 .include "../../mk/texinfo.mk"
diff --git a/lang/eieio/PLIST b/lang/eieio/PLIST
index fc8e9a485c1..99f49e56f14 100644
--- a/lang/eieio/PLIST
+++ b/lang/eieio/PLIST
@@ -1,19 +1,27 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:30 tron Exp $
-${LISPDIR}/eieio.el
-${LISPDIR}/eieio.elc
-${LISPDIR}/eieio-comp.el
-${LISPDIR}/eieio-comp.elc
-${LISPDIR}/eieio-opt.el
-${LISPDIR}/eieio-opt.elc
-${LISPDIR}/eieio-custom.el
-${LISPDIR}/eieio-custom.elc
-${LISPDIR}/eieio-doc.el
-${LISPDIR}/eieio-doc.elc
-${LISPDIR}/eieio-base.el
-${LISPDIR}/eieio-base.elc
-${LISPDIR}/compare-strings.el
-${LISPDIR}/compare-strings.elc
+@comment $NetBSD: PLIST,v 1.5 2003/01/11 08:53:48 uebayasi Exp $
+${EMACS_LISPPREFIX}/eieio/call-tree.el
+${EMACS_LISPPREFIX}/eieio/call-tree.elc
+${EMACS_LISPPREFIX}/eieio/chart.el
+${EMACS_LISPPREFIX}/eieio/chart.elc
+${EMACS_LISPPREFIX}/eieio/eieio-base.el
+${EMACS_LISPPREFIX}/eieio/eieio-base.elc
+${EMACS_LISPPREFIX}/eieio/eieio-comp.el
+${EMACS_LISPPREFIX}/eieio/eieio-comp.elc
+${EMACS_LISPPREFIX}/eieio/eieio-custom.el
+${EMACS_LISPPREFIX}/eieio/eieio-custom.elc
+${EMACS_LISPPREFIX}/eieio/eieio-doc.el
+${EMACS_LISPPREFIX}/eieio/eieio-doc.elc
+${EMACS_LISPPREFIX}/eieio/eieio-opt.el
+${EMACS_LISPPREFIX}/eieio/eieio-opt.elc
+${EMACS_LISPPREFIX}/eieio/eieio-speedbar.el
+${EMACS_LISPPREFIX}/eieio/eieio-speedbar.elc
+${EMACS_LISPPREFIX}/eieio/eieio.el
+${EMACS_LISPPREFIX}/eieio/eieio.elc
+${EMACS_LISPPREFIX}/eieio/linemark.el
+${EMACS_LISPPREFIX}/eieio/linemark.elc
+${EMACS_LISPPREFIX}/eieio/tree.el
+${EMACS_LISPPREFIX}/eieio/tree.elc
 @unexec ${INSTALL_INFO} --delete %D/info/eieio.info %D/info/dir
 info/eieio.info
 @exec ${INSTALL_INFO} %D/info/eieio.info %D/info/dir
-@unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || ${TRUE}
+@dirrm ${EMACS_LISPPREFIX}/eieio
diff --git a/lang/eieio/distinfo b/lang/eieio/distinfo
index 3ce63fc4fc9..15d0de2a953 100644
--- a/lang/eieio/distinfo
+++ b/lang/eieio/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/02/18 15:14:24 seb Exp $
+$NetBSD: distinfo,v 1.3 2003/01/11 08:53:48 uebayasi Exp $
 
-SHA1 (eieio-0.16.tar.gz) = efad4e46a8c699241eb9e1e09796f7ac86430e9e
-Size (eieio-0.16.tar.gz) = 77843 bytes
-SHA1 (patch-aa) = fa4f0bd7cb20224997d08d15d4051514c862299d
+SHA1 (eieio-0.17.tar.gz) = 4ad41e1c9aab4976808927896b2ec35a6b7dd206
+Size (eieio-0.17.tar.gz) = 120643 bytes
+SHA1 (patch-aa) = 1f18390681f90b08cb070f7d613162dc07a935a0
diff --git a/lang/eieio/patches/patch-aa b/lang/eieio/patches/patch-aa
index c488acc545f..8cc128e46bc 100644
--- a/lang/eieio/patches/patch-aa
+++ b/lang/eieio/patches/patch-aa
@@ -1,21 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:24 seb Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/11 08:53:49 uebayasi Exp $
 
---- Makefile.orig	Mon Feb 19 18:43:10 2001
+--- Makefile.orig	Thu Aug  8 10:12:47 2002
 +++ Makefile
-@@ -12,7 +12,6 @@
- EMACS=emacs
- examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el
+@@ -14,7 +14,6 @@
+ LOADPATH=
+ examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el linemark.el
  eieio_info_TEXINFOS=eieio.texi
 -MAKEINFO=makeinfo
  test_LISP=eieio-tests.el
- Misc_MISC=INSTALL
- VERSION=0.16
-@@ -43,7 +42,7 @@
- 	$(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^
- 
- eieio.info: $(eieio_info_TEXINFOS)
--	makeinfo -o $@ $<
-+	$(MAKEINFO) -o $@ $<
- 
- test: $(test_LISP)
- 	@echo "(add-to-list 'load-path nil)" > $@-compile-script
+ Misc_MISC=INSTALL ChangeLog
+ VERSION=0.17