Added support for XEmacs. To install as an XEmacs package put USE_XEMACS=YES

in /etc/mk.conf.

3 files changed, 39 insertions, 27 deletions

diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile
index a4c0aedd1da..396ddb3bd73 100644
--- a/devel/haskell-mode/Makefile
+++ b/devel/haskell-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/30 02:29:27 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/28 03:27:59 jtb Exp $
 
 DISTNAME=		haskell-mode-20001129
 CATEGORIES=		devel editors
@@ -7,21 +7,36 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.haskell.org/haskell-mode/
 
-DEPENDS+=		emacs-[0-9]*:../../editors/emacs
+NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(USE_XEMACS)
+DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
+EMACS=			xemacs
+LISPDIR=		lib/xemacs/xemacs-packages/lisp/prog-modes
+.else
+DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
+EMACS=			emacs
+LISPDIR=		share/emacs/site-lisp/haskell-mode
+.endif
+
+PLIST_SUBST+=		LISPDIR="${LISPDIR}"
 
 SRCS= 	haskell-doc.el haskell-mode.el haskell-font-lock.el		\
 	haskell-simple-indent.el haskell-hugs.el haskell-decl-scan.el	\
 	haskell-indent.el
 
 do-build:
-	@for f in ${SRCS} ; do \
-	emacs -batch -f batch-byte-compile ${WRKSRC}/$$f 2>/dev/null ; \
-	${ECHO} "byte-compiled file" $$f ; done
+	for f in ${SRCS}; do \
+	${EMACS} --no-init-file --no-site-file -batch -f batch-byte-compile ${WRKSRC}/$$f; \
+	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/haskell-mode
-	@for f in ${SRCS} ${SRCS:.el=.elc} ; do \
-	${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/emacs/site-lisp/haskell-mode ; \
+	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
+	@for f in ${SRCS} ${SRCS:.el=.elc} ; do				\
+		i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/${LISPDIR}";	\
+		${ECHO} $$i; $$i;					\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/haskell-mode/pkg/MESSAGE b/devel/haskell-mode/pkg/MESSAGE
index bb0f59f89a1..617f8e5259e 100644
--- a/devel/haskell-mode/pkg/MESSAGE
+++ b/devel/haskell-mode/pkg/MESSAGE
@@ -13,7 +13,4 @@ default.el) file to autoload Haskell mode for Emacs.
 (autoload 'literate-haskell-mode "haskell-mode"
   "Major mode for editing literate Haskell scripts." t)
 
-This is taken from the haskell-mode.el file (in the 'site-lisp/haskell-mode/'
-directory) which you should consult for details of further customizations.
-
 =============================================================================
diff --git a/devel/haskell-mode/pkg/PLIST b/devel/haskell-mode/pkg/PLIST
index e836a7cbf36..34e2c779cdc 100644
--- a/devel/haskell-mode/pkg/PLIST
+++ b/devel/haskell-mode/pkg/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/30 02:29:27 jtb Exp $
-share/emacs/site-lisp/haskell-mode/haskell-decl-scan.el
-share/emacs/site-lisp/haskell-mode/haskell-decl-scan.elc
-share/emacs/site-lisp/haskell-mode/haskell-doc.el
-share/emacs/site-lisp/haskell-mode/haskell-doc.elc
-share/emacs/site-lisp/haskell-mode/haskell-font-lock.el
-share/emacs/site-lisp/haskell-mode/haskell-font-lock.elc
-share/emacs/site-lisp/haskell-mode/haskell-hugs.el
-share/emacs/site-lisp/haskell-mode/haskell-hugs.elc
-share/emacs/site-lisp/haskell-mode/haskell-indent.el
-share/emacs/site-lisp/haskell-mode/haskell-indent.elc
-share/emacs/site-lisp/haskell-mode/haskell-mode.el
-share/emacs/site-lisp/haskell-mode/haskell-mode.elc
-share/emacs/site-lisp/haskell-mode/haskell-simple-indent.el
-share/emacs/site-lisp/haskell-mode/haskell-simple-indent.elc
-@dirrm share/emacs/site-lisp/haskell-mode
+@comment $NetBSD: PLIST,v 1.2 2001/01/28 03:28:00 jtb Exp $
+${LISPDIR}/haskell-decl-scan.el
+${LISPDIR}/haskell-decl-scan.elc
+${LISPDIR}/haskell-doc.el
+${LISPDIR}/haskell-doc.elc
+${LISPDIR}/haskell-font-lock.el
+${LISPDIR}/haskell-font-lock.elc
+${LISPDIR}/haskell-hugs.el
+${LISPDIR}/haskell-hugs.elc
+${LISPDIR}/haskell-indent.el
+${LISPDIR}/haskell-indent.elc
+${LISPDIR}/haskell-mode.el
+${LISPDIR}/haskell-mode.elc
+${LISPDIR}/haskell-simple-indent.el
+${LISPDIR}/haskell-simple-indent.elc
+@unexec rmdir %D/${LISPDIR} 2>/dev/null || true