>Number:         19727
>Category:       pkg
>Synopsis:       patch for lang/eieio to use emacs.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 07 07:18:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        NetBSD 1.6L
>Organization:
	
>Environment:
	
	
System: NetBSD orinoco.my.domain 1.6L NetBSD 1.6L (Orinoco) #6: Tue Jan 7 23:08:40 JST 2003 root@orinoco.my.domain:/sys/arch/i386/compile/Orinoco i386
Architecture: i386
Machine: i386
>Description:
This patch converts lang/eieio to use emacs.mk.

>How-To-Repeat:
	
>Fix:
	
diff -uNr eieio.orig/Makefile eieio/Makefile
--- eieio.orig/Makefile	Fri Dec 27 21:34:01 2002
+++ eieio/Makefile	Fri Dec 27 21:34:06 2002
@@ -10,19 +10,14 @@
 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
@@ -33,9 +28,9 @@
 	eieio-doc.el eieio-base.el compare-strings.el
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
+	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
-			${PREFIX}/${LISPDIR}
+			${EMACS_LISPPREFIX}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
 
 .include "../../mk/texinfo.mk"
diff -uNr eieio.orig/PLIST eieio/PLIST
--- eieio.orig/PLIST	Fri Dec 27 21:34:02 2002
+++ eieio/PLIST	Fri Dec 27 21:34:05 2002
@@ -1,19 +1,19 @@
-@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.3 2002/02/18 15:14:24 seb Exp $
+${EMACS_LISPPREFIX}/eieio.el
+${EMACS_LISPPREFIX}/eieio.elc
+${EMACS_LISPPREFIX}/eieio-comp.el
+${EMACS_LISPPREFIX}/eieio-comp.elc
+${EMACS_LISPPREFIX}/eieio-opt.el
+${EMACS_LISPPREFIX}/eieio-opt.elc
+${EMACS_LISPPREFIX}/eieio-custom.el
+${EMACS_LISPPREFIX}/eieio-custom.elc
+${EMACS_LISPPREFIX}/eieio-doc.el
+${EMACS_LISPPREFIX}/eieio-doc.elc
+${EMACS_LISPPREFIX}/eieio-base.el
+${EMACS_LISPPREFIX}/eieio-base.elc
+${EMACS_LISPPREFIX}/compare-strings.el
+${EMACS_LISPPREFIX}/compare-strings.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}
+@unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: