aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editors/flim113-emacs/Makefile14
-rw-r--r--editors/flim113-emacs/pkg-descr5
-rw-r--r--editors/flim113-emacs20/Makefile4
-rw-r--r--editors/flim113-emacs20/pkg-descr4
-rw-r--r--editors/flim113-mule/Makefile4
-rw-r--r--editors/flim113-mule/pkg-descr5
-rw-r--r--editors/flim113-xemacs21-mule/Makefile4
-rw-r--r--editors/flim113-xemacs21-mule/pkg-descr4
-rw-r--r--editors/flim113/Makefile14
-rw-r--r--editors/flim113/pkg-descr5
-rw-r--r--editors/flim113/pkg-descr.emacs195
-rw-r--r--editors/flim113/pkg-descr.emacs204
-rw-r--r--editors/flim113/pkg-descr.mule5
-rw-r--r--editors/flim113/pkg-descr.xemacs21-mule4
-rw-r--r--editors/semi113-emacs/Makefile10
-rw-r--r--editors/semi113-emacs/pkg-descr5
-rw-r--r--editors/semi113-emacs20/Makefile4
-rw-r--r--editors/semi113-emacs20/pkg-descr4
-rw-r--r--editors/semi113-mule/Makefile4
-rw-r--r--editors/semi113-mule/pkg-descr5
-rw-r--r--editors/semi113-xemacs21-mule/Makefile4
-rw-r--r--editors/semi113-xemacs21-mule/pkg-descr4
-rw-r--r--editors/semi113/Makefile10
-rw-r--r--editors/semi113/pkg-descr.emacs195
-rw-r--r--editors/semi113/pkg-descr.emacs204
-rw-r--r--editors/semi113/pkg-descr.emacs214
-rw-r--r--editors/semi113/pkg-descr.mule5
-rw-r--r--editors/semi113/pkg-descr.xemacs21-mule4
28 files changed, 74 insertions, 79 deletions
diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
index 00f6ca37ab4d..9bf76fc9dac5 100644
--- a/editors/flim113-emacs/Makefile
+++ b/editors/flim113-emacs/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: flim-current for emacs
+# New ports collection makefile for: flim-1.13.x for emacs
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -8,13 +8,15 @@
PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
+MASTER_SITES= ftp://ftp.m17n.org/pub/mule/flim/flim-1.13/ \
+ ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
-MAINTAINER?= shige@FreeBSD.org
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+MAINTAINER?= shige@FreeBSD.org
+
PORTCLASS?= master
# distfile version
@@ -99,7 +101,7 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${MKDIR} ${LOCALBASE}/share/flim
@${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
@@ -114,7 +116,6 @@ post-install:
@${MAKE} doc-install
.endif
-
###############################################################################
#
# miscellaneous local functions
@@ -175,7 +176,6 @@ setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
@@ -196,7 +196,7 @@ info-package-install:
${INSTALL_DATA} ${WRKSRC}/$${i} \
${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
diff --git a/editors/flim113-emacs/pkg-descr b/editors/flim113-emacs/pkg-descr
index 8893698ed661..bb84f58126d8 100644
--- a/editors/flim113-emacs/pkg-descr
+++ b/editors/flim113-emacs/pkg-descr
@@ -8,12 +8,11 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
-
+ ${LOCALBASE}/share/emacs/site-lisp/flim/
To use flim, put the following setup into your ~/.emacs:
(require 'apel-setupel)
(require 'flim-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index ce2452d6506c..1f5b87c7afec 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: flim-current for emacs20
+# New ports collection makefile for: flim-1.13.x for emacs20
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
+MASTERDIR= ${.CURDIR}/../../editors/flim113-emacs
# emacs port setup
EMACS_PORT_NAME= emacs20
diff --git a/editors/flim113-emacs20/pkg-descr b/editors/flim113-emacs20/pkg-descr
index 2f54be83c580..c227a5dc068e 100644
--- a/editors/flim113-emacs20/pkg-descr
+++ b/editors/flim113-emacs20/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile
index d8503931a49e..e3dd02a0de77 100644
--- a/editors/flim113-mule/Makefile
+++ b/editors/flim113-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: flim-current for mule
+# New ports collection makefile for: flim-1.13.x for mule
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
+MASTERDIR= ${.CURDIR}/../../editors/flim113-emacs
# emacs port setup
EMACS_PORT_NAME= mule
diff --git a/editors/flim113-mule/pkg-descr b/editors/flim113-mule/pkg-descr
index d235eb18a260..099a5b10222c 100644
--- a/editors/flim113-mule/pkg-descr
+++ b/editors/flim113-mule/pkg-descr
@@ -8,12 +8,11 @@ FLIM, message representation or encoding emacs lisp library for mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/mule/site-lisp/flim/ --- FLIM
-
+ ${LOCALBASE}/share/mule/site-lisp/flim/
To use flim, put the following setup into your ~/.emacs:
(require 'apel-setupel)
(require 'flim-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index 648353d5799a..55f9dd8b0a45 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: flim for xemacs21-mule
+# New ports collection makefile for: flim-1.13.x for xemacs21-mule
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
+MASTERDIR= ${.CURDIR}/../../editors/flim113-emacs
# emacs port setup
EMACS_PORT_NAME= xemacs21-mule
diff --git a/editors/flim113-xemacs21-mule/pkg-descr b/editors/flim113-xemacs21-mule/pkg-descr
index 725bff5240b3..c2c2a9ab7933 100644
--- a/editors/flim113-xemacs21-mule/pkg-descr
+++ b/editors/flim113-xemacs21-mule/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/lib/xemacs/site-packages/lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-packages/lisp/flim/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige shige@FreeBSD.ORG
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 00f6ca37ab4d..9bf76fc9dac5 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: flim-current for emacs
+# New ports collection makefile for: flim-1.13.x for emacs
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -8,13 +8,15 @@
PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
+MASTER_SITES= ftp://ftp.m17n.org/pub/mule/flim/flim-1.13/ \
+ ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
-MAINTAINER?= shige@FreeBSD.org
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
+MAINTAINER?= shige@FreeBSD.org
+
PORTCLASS?= master
# distfile version
@@ -99,7 +101,7 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${MKDIR} ${LOCALBASE}/share/flim
@${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
@@ -114,7 +116,6 @@ post-install:
@${MAKE} doc-install
.endif
-
###############################################################################
#
# miscellaneous local functions
@@ -175,7 +176,6 @@ setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
@@ -196,7 +196,7 @@ info-package-install:
${INSTALL_DATA} ${WRKSRC}/$${i} \
${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
diff --git a/editors/flim113/pkg-descr b/editors/flim113/pkg-descr
index 8893698ed661..bb84f58126d8 100644
--- a/editors/flim113/pkg-descr
+++ b/editors/flim113/pkg-descr
@@ -8,12 +8,11 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
-
+ ${LOCALBASE}/share/emacs/site-lisp/flim/
To use flim, put the following setup into your ~/.emacs:
(require 'apel-setupel)
(require 'flim-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113/pkg-descr.emacs19 b/editors/flim113/pkg-descr.emacs19
index 8893698ed661..bb84f58126d8 100644
--- a/editors/flim113/pkg-descr.emacs19
+++ b/editors/flim113/pkg-descr.emacs19
@@ -8,12 +8,11 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
-
+ ${LOCALBASE}/share/emacs/site-lisp/flim/
To use flim, put the following setup into your ~/.emacs:
(require 'apel-setupel)
(require 'flim-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113/pkg-descr.emacs20 b/editors/flim113/pkg-descr.emacs20
index 2f54be83c580..c227a5dc068e 100644
--- a/editors/flim113/pkg-descr.emacs20
+++ b/editors/flim113/pkg-descr.emacs20
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113/pkg-descr.mule b/editors/flim113/pkg-descr.mule
index d235eb18a260..099a5b10222c 100644
--- a/editors/flim113/pkg-descr.mule
+++ b/editors/flim113/pkg-descr.mule
@@ -8,12 +8,11 @@ FLIM, message representation or encoding emacs lisp library for mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/share/mule/site-lisp/flim/ --- FLIM
-
+ ${LOCALBASE}/share/mule/site-lisp/flim/
To use flim, put the following setup into your ~/.emacs:
(require 'apel-setupel)
(require 'flim-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113/pkg-descr.xemacs21-mule b/editors/flim113/pkg-descr.xemacs21-mule
index 725bff5240b3..c2c2a9ab7933 100644
--- a/editors/flim113/pkg-descr.xemacs21-mule
+++ b/editors/flim113/pkg-descr.xemacs21-mule
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${LOCALBASE}/lib/xemacs/site-packages/lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-packages/lisp/flim/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige shige@FreeBSD.ORG
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index 64e742c6ccc8..838d576a69bf 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: semi-current for emacs
+# New ports collection makefile for: semi-1.13.x for emacs
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -8,7 +8,8 @@
PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
+MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/semi-1.13-for-flim-1.13/ \
+ ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
@@ -19,6 +20,7 @@ MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
# distfile version
+FLIM_TRUNK= 1.13
FLIM_VER= 1.13.2
SEMI_VER= 1.13.7
# setupel filename
@@ -46,8 +48,8 @@ PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
diff --git a/editors/semi113-emacs/pkg-descr b/editors/semi113-emacs/pkg-descr
index 6643b26f426b..69b4f38b51b1 100644
--- a/editors/semi113-emacs/pkg-descr
+++ b/editors/semi113-emacs/pkg-descr
@@ -20,8 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
-
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
To use flim, put the following setup into your ~/.emacs:
@@ -29,4 +28,4 @@ To use flim, put the following setup into your ~/.emacs:
(require 'flim-setupel)
(require 'semi-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index 3662fd6baaa2..b823eeda4f7e 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: semi-current for emacs20
+# New ports collection makefile for: semi-1.13.x for emacs20
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
+MASTERDIR= ${.CURDIR}/../../editors/semi113-emacs
# emacs port setup
EMACS_PORT_NAME= emacs20
diff --git a/editors/semi113-emacs20/pkg-descr b/editors/semi113-emacs20/pkg-descr
index 62b014e02da6..6cdf8aac2e11 100644
--- a/editors/semi113-emacs20/pkg-descr
+++ b/editors/semi113-emacs20/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index 8c35a505d77a..7b20077b68a4 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: semi-current for mule
+# New ports collection makefile for: semi-1.13.x for mule
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
+MASTERDIR= ${.CURDIR}/../../editors/semi113-emacs
# emacs port setup
EMACS_PORT_NAME= mule
diff --git a/editors/semi113-mule/pkg-descr b/editors/semi113-mule/pkg-descr
index e7727d684b63..8fa7e4591ac6 100644
--- a/editors/semi113-mule/pkg-descr
+++ b/editors/semi113-mule/pkg-descr
@@ -20,8 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
-
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
To use flim, put the following setup into your ~/.emacs:
@@ -29,4 +28,4 @@ To use flim, put the following setup into your ~/.emacs:
(require 'flim-setupel)
(require 'semi-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index fc0949f75dc8..0077ae6cebec 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: semi-current for xemacs21-mule
+# New ports collection makefile for: semi-1.13.x for xemacs21-mule
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -10,7 +10,7 @@ MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
-MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
+MASTERDIR= ${.CURDIR}/../../editors/semi113-emacs
# emacs port setup
EMACS_PORT_NAME= xemacs21-mule
diff --git a/editors/semi113-xemacs21-mule/pkg-descr b/editors/semi113-xemacs21-mule/pkg-descr
index a02894c10f25..49c1b5eb33ca 100644
--- a/editors/semi113-xemacs21-mule/pkg-descr
+++ b/editors/semi113-xemacs21-mule/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index 64e742c6ccc8..838d576a69bf 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: semi-current for emacs
+# New ports collection makefile for: semi-1.13.x for emacs
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
@@ -8,7 +8,8 @@
PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
+MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/semi-1.13-for-flim-1.13/ \
+ ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
@@ -19,6 +20,7 @@ MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
# distfile version
+FLIM_TRUNK= 1.13
FLIM_VER= 1.13.2
SEMI_VER= 1.13.7
# setupel filename
@@ -46,8 +48,8 @@ PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
diff --git a/editors/semi113/pkg-descr.emacs19 b/editors/semi113/pkg-descr.emacs19
index 6643b26f426b..69b4f38b51b1 100644
--- a/editors/semi113/pkg-descr.emacs19
+++ b/editors/semi113/pkg-descr.emacs19
@@ -20,8 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
-
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
To use flim, put the following setup into your ~/.emacs:
@@ -29,4 +28,4 @@ To use flim, put the following setup into your ~/.emacs:
(require 'flim-setupel)
(require 'semi-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/pkg-descr.emacs20 b/editors/semi113/pkg-descr.emacs20
index 62b014e02da6..6cdf8aac2e11 100644
--- a/editors/semi113/pkg-descr.emacs20
+++ b/editors/semi113/pkg-descr.emacs20
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/pkg-descr.emacs21 b/editors/semi113/pkg-descr.emacs21
index 62b014e02da6..6cdf8aac2e11 100644
--- a/editors/semi113/pkg-descr.emacs21
+++ b/editors/semi113/pkg-descr.emacs21
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/pkg-descr.mule b/editors/semi113/pkg-descr.mule
index e7727d684b63..8fa7e4591ac6 100644
--- a/editors/semi113/pkg-descr.mule
+++ b/editors/semi113/pkg-descr.mule
@@ -20,8 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
-
+ ${LOCALBASE}/share/emacs/site-lisp/semi/
To use flim, put the following setup into your ~/.emacs:
@@ -29,4 +28,4 @@ To use flim, put the following setup into your ~/.emacs:
(require 'flim-setupel)
(require 'semi-setupel)
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/pkg-descr.xemacs21-mule b/editors/semi113/pkg-descr.xemacs21-mule
index a02894c10f25..49c1b5eb33ca 100644
--- a/editors/semi113/pkg-descr.xemacs21-mule
+++ b/editors/semi113/pkg-descr.xemacs21-mule
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/
---- Porting by shige <shige@FreeBSD.ORG>
+Ported by shige@FreeBSD.ORG