9 files changed, 22 insertions, 15 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 15cb9bd8817f..ee25024c23b0 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 16:04:45 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:27:51 shige Exp $
 #
 
 DISTNAME=	flim-${FLIM_VER}
@@ -17,7 +17,7 @@ PORTCLASS?=	master
 # distfile version
 FLIM_VER=	1.12.5
 FLIMDOCDIR=	share/doc/flim
-FLIM_SETUPEL=	flim-setup.el
+FLIM_SETUPEL=	flim-setupel.el
 
 .if (${PORTCLASS} == "master")
 # for emacs
@@ -49,9 +49,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="${FLIM_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		FLIMDOCDIR=${FLIMDOCDIR}
+		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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/flim/files/flim-setupel.el.in b/editors/flim/files/flim-setupel.el.in
new file mode 100644
index 000000000000..e65e90116ba6
--- /dev/null
+++ b/editors/flim/files/flim-setupel.el.in
@@ -0,0 +1,8 @@
+;;
+;; @(#)flim-setupel.el -- flim emacs load-path setup elisp file.
+;;                                            --  by shige@FreeBSD.ORG
+
+(setq load-path (append '(
+	"@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ ) load-path))
+(provide 'flim-setupel)
diff --git a/editors/flim/pkg-descr b/editors/flim/pkg-descr
index 111259a2cdfb..af221dd2a4dd 100644
--- a/editors/flim/pkg-descr
+++ b/editors/flim/pkg-descr
@@ -13,7 +13,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim/pkg-descr.emacs20 b/editors/flim/pkg-descr.emacs20
index 111259a2cdfb..af221dd2a4dd 100644
--- a/editors/flim/pkg-descr.emacs20
+++ b/editors/flim/pkg-descr.emacs20
@@ -13,7 +13,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim/pkg-descr.emacs21 b/editors/flim/pkg-descr.emacs21
index 111259a2cdfb..af221dd2a4dd 100644
--- a/editors/flim/pkg-descr.emacs21
+++ b/editors/flim/pkg-descr.emacs21
@@ -13,7 +13,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index fd037c379efd..f5fa7444b2e5 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -32,7 +32,7 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR%%/site-lisp/flim-setup.el
+%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index fd037c379efd..f5fa7444b2e5 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -32,7 +32,7 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR%%/site-lisp/flim-setup.el
+%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index fd037c379efd..f5fa7444b2e5 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -32,7 +32,7 @@
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
 %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR%%/site-lisp/flim-setup.el
+%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
diff --git a/editors/flim/scripts/configure b/editors/flim/scripts/configure
index 16e40f15739a..a489484bfc4a 100644
--- a/editors/flim/scripts/configure
+++ b/editors/flim/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='flim-setup.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then