Make it work with xemacs.

5 files changed, 26 insertions, 29 deletions

diff --git a/net/zenicb/Makefile b/net/zenicb/Makefile
index ceed4d1fd79..5cc67bbd022 100644
--- a/net/zenicb/Makefile
+++ b/net/zenicb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/04 13:09:16 martin Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/04 18:50:36 martin Exp $
 #
 
 DISTNAME=		zenicb-19981202
@@ -15,14 +15,14 @@ MIRROR_DISTFILE=	no
 EMACS=			xemacs
 DEPENDS+=		xemacs-*:../../editors/xemacs
 MAKEFLAGS+=		USE_XEMACS=${USE_XEMACS}
+ELISPDIR=		lib/xemacs/lisp
 .else
 EMACS=			emacs
 DEPENDS+=		emacs-*:../../editors/emacs
+ELISPDIR=		share/emacs/site-lisp
 .endif
 
-ELISPDIR=		${PREFIX}/share/${EMACS}/site-lisp
-
-PLIST_SUBST+=		EMACS=${EMACS}
+PLIST_SUBST+=		ELISPDIR=${ELISPDIR}
 
 pre-configure:
 .if defined(USE_XEMACS)
@@ -31,14 +31,11 @@ pre-configure:
 	@${ECHO} "To install for Xemacs, set the environment variable USE_XEMACS."
 .endif
 
-pre-install:
-	${MKDIR} ${ELISPDIR}
-
 do-build:
 
 do-install:
 	@for file in ${WRKSRC}/src/*.el; do \
-		j="${INSTALL_DATA} $$file ${ELISPDIR}/"; \
+		j="${INSTALL_DATA} $$file ${PREFIX}/${ELISPDIR}/"; \
 		${ECHO} $$j; $$j; \
 	done
 
diff --git a/net/zenicb/files/md5 b/net/zenicb/files/md5
index 804525c5e73..194529bc711 100644
--- a/net/zenicb/files/md5
+++ b/net/zenicb/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/08/04 13:09:17 martin Exp $
+$NetBSD: md5,v 1.3 2000/08/04 18:50:37 martin Exp $
 
 MD5 (zenicb-19981202.tar.gz) = 542dc7145fa7645f879f382666c74e8e
diff --git a/net/zenicb/files/patch-sum b/net/zenicb/files/patch-sum
index 3e7f2eb3654..d833ccc8aac 100644
--- a/net/zenicb/files/patch-sum
+++ b/net/zenicb/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/08/08 18:52:52 sommerfeld Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/04 18:50:37 martin Exp $
 
-MD5 (patch-aa) = 0204ee4693c3caf2afb9a4916a567748
+MD5 (patch-aa) = a6d9a07a36c81157fe1ee3fa430254f4
diff --git a/net/zenicb/patches/patch-aa b/net/zenicb/patches/patch-aa
index 1988c01c45f..f18b7e9ff2b 100644
--- a/net/zenicb/patches/patch-aa
+++ b/net/zenicb/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1 1999/08/08 18:50:31 sommerfeld Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/04 18:50:37 martin Exp $
 
 --- src/zenicb.el-	Sun Jul 19 18:37:51 1998
-+++ src/zenicb.el	Sun Aug  8 14:40:39 1999
++++ src/zenicb.el	Fri Aug  4 17:34:34 2000
 @@ -211,6 +211,8 @@
  	      (if (not zenicb-process)
  		  ()
  		(set-marker (process-mark zenicb-process) (point-max))
-+		(set-buffer-multibyte nil)
++		(if (fboundp 'set-buffer-multibyte) (set-buffer-multibyte nil))
 +		(set-process-coding-system zenicb-process nil nil)
  		(set-process-buffer zenicb-process zenicb-buffer)
  		(set-process-filter zenicb-process 'zenicb-filter)
diff --git a/net/zenicb/pkg/PLIST b/net/zenicb/pkg/PLIST
index 87900f51455..3b134563749 100644
--- a/net/zenicb/pkg/PLIST
+++ b/net/zenicb/pkg/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/04 13:09:17 martin Exp $
-share/${EMACS}/site-lisp/zenicb-8ball.el
-share/${EMACS}/site-lisp/zenicb-add.el
-share/${EMACS}/site-lisp/zenicb-away.el
-share/${EMACS}/site-lisp/zenicb-example.el
-share/${EMACS}/site-lisp/zenicb-fortran.el
-share/${EMACS}/site-lisp/zenicb-history.el
-share/${EMACS}/site-lisp/zenicb-meditate.el
-share/${EMACS}/site-lisp/zenicb-nologout.el
-share/${EMACS}/site-lisp/zenicb-signal.el
-share/${EMACS}/site-lisp/zenicb-stamp.el
-share/${EMACS}/site-lisp/zenicb-trigger.el
-share/${EMACS}/site-lisp/zenicb-whereis.el
-share/${EMACS}/site-lisp/zenicb-yow.el
-share/${EMACS}/site-lisp/zenicb.el
+@comment $NetBSD: PLIST,v 1.3 2000/08/04 18:50:37 martin Exp $
+${ELISPDIR}/zenicb-8ball.el
+${ELISPDIR}/zenicb-add.el
+${ELISPDIR}/zenicb-away.el
+${ELISPDIR}/zenicb-example.el
+${ELISPDIR}/zenicb-fortran.el
+${ELISPDIR}/zenicb-history.el
+${ELISPDIR}/zenicb-meditate.el
+${ELISPDIR}/zenicb-nologout.el
+${ELISPDIR}/zenicb-signal.el
+${ELISPDIR}/zenicb-stamp.el
+${ELISPDIR}/zenicb-trigger.el
+${ELISPDIR}/zenicb-whereis.el
+${ELISPDIR}/zenicb-yow.el
+${ELISPDIR}/zenicb.el