Change from wemi-setup.el to wemi-setupel.el.

Use WEMI_SETUPEL in PLIST_SUB.
Improve scripts/configure.
Fix pkg/DESCR (sync with apel/flim modification).

7 files changed, 21 insertions, 14 deletions

diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile
index 251c133af396..6b8ee7141fa7 100644
--- a/editors/wemi-emacs-current/Makefile
+++ b/editors/wemi-emacs-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/10 14:44:23 shige Exp $
+# $Id: Makefile,v 1.2 1999/05/21 13:35:10 shige Exp $
 #
 
 DISTNAME=	wemi-${WEMI_VER}
@@ -18,7 +18,7 @@ PORTCLASS?=	master
 FLIM_VER=	1.12.5
 WEMI_VER=	1.13.3
 WEMIDOCDIR=	share/doc/semi
-WEMI_SETUPEL=	wemi-setup.el
+WEMI_SETUPEL=	wemi-setupel.el
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
@@ -50,9 +50,10 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
+SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		TARGETS="${WEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		WEMIDOCDIR=${WEMIDOCDIR}
+		WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
diff --git a/editors/wemi-emacs-current/files/wemi-setupel.el.in b/editors/wemi-emacs-current/files/wemi-setupel.el.in
new file mode 100644
index 000000000000..0affa03ed64d
--- /dev/null
+++ b/editors/wemi-emacs-current/files/wemi-setupel.el.in
@@ -0,0 +1,8 @@
+;;
+;; @(#)wemi-setupel.el -- wemi emacs load-path setup elisp file.
+;;                                            --  by shige@FreeBSD.ORG
+
+(setq load-path (append '(
+	"@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ ) load-path))
+(provide 'wemi-setupel)
diff --git a/editors/wemi-emacs-current/pkg-descr b/editors/wemi-emacs-current/pkg-descr
index 2fb2b904e653..b6288fb1c74a 100644
--- a/editors/wemi-emacs-current/pkg-descr
+++ b/editors/wemi-emacs-current/pkg-descr
@@ -40,8 +40,8 @@ WEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use wemi, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
-	(require 'wemi-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
+	(require 'wemi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/wemi-emacs-current/pkg-plist b/editors/wemi-emacs-current/pkg-plist
index 197c42377a3e..9697a3d97269 100644
--- a/editors/wemi-emacs-current/pkg-plist
+++ b/editors/wemi-emacs-current/pkg-plist
@@ -20,7 +20,7 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR%%/site-lisp/wemi-setup.el
+%%EMACS_LIBDIR%%/site-lisp/%%WEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%WEMIDOCDIR%%/ChangeLog
 %%WEMIDOCDIR%%/NEWS
diff --git a/editors/wemi-emacs-current/scripts/configure b/editors/wemi-emacs-current/scripts/configure
index a54b4831cebf..a489484bfc4a 100644
--- a/editors/wemi-emacs-current/scripts/configure
+++ b/editors/wemi-emacs-current/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='wemi-setup.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
diff --git a/editors/wemi-mule-current/pkg-descr b/editors/wemi-mule-current/pkg-descr
index 2db0c91a0c69..1836868a944c 100644
--- a/editors/wemi-mule-current/pkg-descr
+++ b/editors/wemi-mule-current/pkg-descr
@@ -40,8 +40,8 @@ WEMI, Library of MIME feature for GNU Emacs for mule.
 
 To use wemi, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
-	(require 'wemi-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
+	(require 'wemi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/wemi-mule-current/pkg-plist b/editors/wemi-mule-current/pkg-plist
index 16e65b4dcfd3..1f0a37a3f973 100644
--- a/editors/wemi-mule-current/pkg-plist
+++ b/editors/wemi-mule-current/pkg-plist
@@ -22,7 +22,7 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR%%/site-lisp/wemi-setup.el
+%%EMACS_LIBDIR%%/site-lisp/%%WEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%WEMIDOCDIR%%/ChangeLog
 %%WEMIDOCDIR%%/NEWS