Improve scripts/configure.

Fix pkg/DESCR (sync with apel/flim modification).

23 files changed, 40 insertions, 46 deletions

diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile
index 7aebc57100c7..e0896c088ce4 100644
--- a/editors/semi-emacs-current/Makefile
+++ b/editors/semi-emacs-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 15:54:03 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -50,7 +50,8 @@ 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="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
diff --git a/editors/semi-emacs-current/pkg-descr b/editors/semi-emacs-current/pkg-descr
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi-emacs-current/pkg-descr
+++ b/editors/semi-emacs-current/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-emacs-current/scripts/configure b/editors/semi-emacs-current/scripts/configure
index c19c60d2e1f0..a489484bfc4a 100644
--- a/editors/semi-emacs-current/scripts/configure
+++ b/editors/semi-emacs-current/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='semi-setupel.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index 575643cec01e..e741e4051e5f 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 15:42:58 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:29:59 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -50,7 +50,8 @@ 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="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
diff --git a/editors/semi-emacs/pkg-descr b/editors/semi-emacs/pkg-descr
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi-emacs/pkg-descr
+++ b/editors/semi-emacs/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-emacs/scripts/configure b/editors/semi-emacs/scripts/configure
index c19c60d2e1f0..a489484bfc4a 100644
--- a/editors/semi-emacs/scripts/configure
+++ b/editors/semi-emacs/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='semi-setupel.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
diff --git a/editors/semi-mule-current/pkg-descr b/editors/semi-mule-current/pkg-descr
index 30b3b9e91c26..0d7de9ab0b4d 100644
--- a/editors/semi-mule-current/pkg-descr
+++ b/editors/semi-mule-current/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-mule/pkg-descr b/editors/semi-mule/pkg-descr
index 30b3b9e91c26..0d7de9ab0b4d 100644
--- a/editors/semi-mule/pkg-descr
+++ b/editors/semi-mule/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 7aebc57100c7..e0896c088ce4 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 15:54:03 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -50,7 +50,8 @@ 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="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
diff --git a/editors/semi/pkg-descr.emacs20 b/editors/semi/pkg-descr.emacs20
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi/pkg-descr.emacs20
+++ b/editors/semi/pkg-descr.emacs20
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi/pkg-descr.emacs21 b/editors/semi/pkg-descr.emacs21
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi/pkg-descr.emacs21
+++ b/editors/semi/pkg-descr.emacs21
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi/scripts/configure b/editors/semi/scripts/configure
index c19c60d2e1f0..a489484bfc4a 100644
--- a/editors/semi/scripts/configure
+++ b/editors/semi/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='semi-setupel.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index 7aebc57100c7..e0896c088ce4 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 15:54:03 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -50,7 +50,8 @@ 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="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
diff --git a/editors/semi113-emacs/pkg-descr b/editors/semi113-emacs/pkg-descr
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi113-emacs/pkg-descr
+++ b/editors/semi113-emacs/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113-emacs/scripts/configure b/editors/semi113-emacs/scripts/configure
index c19c60d2e1f0..a489484bfc4a 100644
--- a/editors/semi113-emacs/scripts/configure
+++ b/editors/semi113-emacs/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='semi-setupel.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
diff --git a/editors/semi113-mule/pkg-descr b/editors/semi113-mule/pkg-descr
index 30b3b9e91c26..0d7de9ab0b4d 100644
--- a/editors/semi113-mule/pkg-descr
+++ b/editors/semi113-mule/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index 7aebc57100c7..e0896c088ce4 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 15:54:03 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -50,7 +50,8 @@ 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="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
diff --git a/editors/semi113/pkg-descr.emacs19 b/editors/semi113/pkg-descr.emacs19
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi113/pkg-descr.emacs19
+++ b/editors/semi113/pkg-descr.emacs19
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113/pkg-descr.mule b/editors/semi113/pkg-descr.mule
index 30b3b9e91c26..0d7de9ab0b4d 100644
--- a/editors/semi113/pkg-descr.mule
+++ b/editors/semi113/pkg-descr.mule
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113/scripts/configure b/editors/semi113/scripts/configure
index c19c60d2e1f0..a489484bfc4a 100644
--- a/editors/semi113/scripts/configure
+++ b/editors/semi113/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='semi-setupel.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index 7aebc57100c7..e0896c088ce4 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/05/10 15:54:03 shige Exp $
+# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -50,7 +50,8 @@ 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="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
diff --git a/editors/semi114-emacs20/pkg-descr b/editors/semi114-emacs20/pkg-descr
index db3d505620b2..2fde40381c18 100644
--- a/editors/semi114-emacs20/pkg-descr
+++ b/editors/semi114-emacs20/pkg-descr
@@ -25,8 +25,8 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
 
 To use flim, put the following setup into your ~/.emacs:
 
-	(require 'apel-setup)
-	(require 'flim-setup)
+	(require 'apel-setupel)
+	(require 'flim-setupel)
 	(require 'semi-setupel)
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi114-emacs20/scripts/configure b/editors/semi114-emacs20/scripts/configure
index c19c60d2e1f0..a489484bfc4a 100644
--- a/editors/semi114-emacs20/scripts/configure
+++ b/editors/semi114-emacs20/scripts/configure
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-TARGETS='semi-setupel.el'
-
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then