aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/apel-emacs/Makefile6
-rw-r--r--editors/apel-emacs20/Makefile1
-rw-r--r--editors/apel-mule/Makefile1
-rw-r--r--editors/apel-xemacs/Makefile1
-rw-r--r--editors/apel-xemacs20/Makefile1
-rw-r--r--editors/apel-xemacs21-mule/Makefile1
-rw-r--r--editors/apel/Makefile6
-rw-r--r--editors/bitmap-emacs20/Makefile6
-rw-r--r--editors/bitmap-mule/Makefile6
-rw-r--r--editors/bitmap/Makefile6
-rw-r--r--editors/custom-emacs/Makefile6
-rw-r--r--editors/custom-mule/Makefile1
-rw-r--r--editors/flim-emacs-current/Makefile6
-rw-r--r--editors/flim-emacs/Makefile6
-rw-r--r--editors/flim-emacs20-current/Makefile1
-rw-r--r--editors/flim-emacs20/Makefile1
-rw-r--r--editors/flim-mule-current/Makefile1
-rw-r--r--editors/flim-mule/Makefile1
-rw-r--r--editors/flim-xemacs-current/Makefile1
-rw-r--r--editors/flim-xemacs/Makefile1
-rw-r--r--editors/flim-xemacs20-current/Makefile1
-rw-r--r--editors/flim-xemacs20/Makefile1
-rw-r--r--editors/flim-xemacs21-mule-current/Makefile1
-rw-r--r--editors/flim-xemacs21-mule/Makefile1
-rw-r--r--editors/flim/Makefile6
-rw-r--r--editors/flim113-emacs/Makefile6
-rw-r--r--editors/flim113-emacs20/Makefile1
-rw-r--r--editors/flim113-mule/Makefile1
-rw-r--r--editors/flim113-xemacs/Makefile1
-rw-r--r--editors/flim113-xemacs20/Makefile1
-rw-r--r--editors/flim113-xemacs21-mule/Makefile1
-rw-r--r--editors/flim113/Makefile6
-rw-r--r--editors/flim114-emacs20/Makefile6
-rw-r--r--editors/mule-common/Makefile5
-rw-r--r--editors/nvi-m17n/Makefile2
-rw-r--r--editors/nvi-perl/Makefile6
-rw-r--r--editors/offix-editor/Makefile6
-rw-r--r--editors/psgml-emacs/Makefile6
-rw-r--r--editors/psgml-mule/Makefile1
-rw-r--r--editors/psgml-xemacs21-mule/Makefile1
-rw-r--r--editors/psgml/Makefile6
-rw-r--r--editors/semi-emacs-current/Makefile6
-rw-r--r--editors/semi-emacs/Makefile6
-rw-r--r--editors/semi-emacs20-current/Makefile1
-rw-r--r--editors/semi-emacs20/Makefile1
-rw-r--r--editors/semi-mule-current/Makefile1
-rw-r--r--editors/semi-mule/Makefile1
-rw-r--r--editors/semi-xemacs-current/Makefile1
-rw-r--r--editors/semi-xemacs/Makefile1
-rw-r--r--editors/semi-xemacs20-current/Makefile1
-rw-r--r--editors/semi-xemacs20/Makefile1
-rw-r--r--editors/semi-xemacs21-mule-current/Makefile1
-rw-r--r--editors/semi-xemacs21-mule/Makefile1
-rw-r--r--editors/semi/Makefile6
-rw-r--r--editors/semi113-emacs/Makefile6
-rw-r--r--editors/semi113-emacs20/Makefile1
-rw-r--r--editors/semi113-mule/Makefile1
-rw-r--r--editors/semi113-xemacs/Makefile1
-rw-r--r--editors/semi113-xemacs20/Makefile1
-rw-r--r--editors/semi113-xemacs21-mule/Makefile1
-rw-r--r--editors/semi113/Makefile6
-rw-r--r--editors/semi114-emacs20/Makefile6
-rw-r--r--editors/wemi-emacs-current/Makefile6
-rw-r--r--editors/wemi-emacs/Makefile6
-rw-r--r--editors/wemi-emacs20-current/Makefile1
-rw-r--r--editors/wemi-emacs20/Makefile1
-rw-r--r--editors/wemi-mule-current/Makefile1
-rw-r--r--editors/wemi-mule/Makefile1
-rw-r--r--editors/wemi-xemacs-current/Makefile1
-rw-r--r--editors/wemi-xemacs/Makefile1
-rw-r--r--editors/wemi-xemacs20-current/Makefile1
-rw-r--r--editors/wemi-xemacs20/Makefile1
-rw-r--r--editors/wemi-xemacs21-mule-current/Makefile1
-rw-r--r--editors/wemi-xemacs21-mule/Makefile1
-rw-r--r--editors/xenon/Makefile4
-rw-r--r--editors/xvile/Makefile6
-rw-r--r--editors/yudit/Makefile4
-rw-r--r--textproc/coco/Makefile5
78 files changed, 86 insertions, 132 deletions
diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile
index 692f92d2831e..4739dd821463 100644
--- a/editors/apel-emacs/Makefile
+++ b/editors/apel-emacs/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: apel for emacs
-# Version required: 9.23
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= apel-${APEL_VER}
+PORTNAME= apel-${EMACS_PORT}
+PORTVERSION= ${APEL_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/apel/ \
ftp://ftp.center.osaka-u.ac.jp/mule/apel/
+DISTNAME= apel-${APEL_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -38,7 +39,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= apel-${EMACS_PORT}-${APEL_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index 8b4232aa9e43..dd2842b8a084 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: apel for emacs20
-# Version required: 9.23
# Date created: 22 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile
index e75b4de7f6cb..440172bcf444 100644
--- a/editors/apel-mule/Makefile
+++ b/editors/apel-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: apel for mule
-# Version required: 9.23
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/apel-xemacs/Makefile b/editors/apel-xemacs/Makefile
index 350e59ab84f2..d5e7eff43b1a 100644
--- a/editors/apel-xemacs/Makefile
+++ b/editors/apel-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: apel for xemacs
-# Version required: 9.23
# Date created: 13 June 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/apel-xemacs20/Makefile b/editors/apel-xemacs20/Makefile
index a626b4f2288f..5f736f52371c 100644
--- a/editors/apel-xemacs20/Makefile
+++ b/editors/apel-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: apel for xemacs20
-# Version required: 9.23
# Date created: 13 June 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index 11de20cd3ceb..2a3c3bf5d5db 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: apel for xemacs21-mule
-# Version required: 9.23
# Date created: 13 June 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 692f92d2831e..4739dd821463 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: apel for emacs
-# Version required: 9.23
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= apel-${APEL_VER}
+PORTNAME= apel-${EMACS_PORT}
+PORTVERSION= ${APEL_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/apel/ \
ftp://ftp.center.osaka-u.ac.jp/mule/apel/
+DISTNAME= apel-${APEL_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -38,7 +39,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= apel-${EMACS_PORT}-${APEL_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile
index 32a581722eb2..e42e303ae253 100644
--- a/editors/bitmap-emacs20/Makefile
+++ b/editors/bitmap-emacs20/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: bitmap for emacs20
-# Version required: 8.2
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bitmap-mule-${BITMAP_VER}
+PORTNAME= bitmap-${EMACS_PORT}
+PORTVERSION= ${BITMAP_PKG_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/
+DISTNAME= bitmap-mule-${BITMAP_VER}
MAINTAINER= shige@FreeBSD.org
@@ -28,7 +29,6 @@ EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
# target name for make build
ALL_TARGET= elc
-PKGNAME= bitmap-${EMACS_PORT}-${BITMAP_PKG_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
uncompface:${PORTSDIR}/mail/faces
diff --git a/editors/bitmap-mule/Makefile b/editors/bitmap-mule/Makefile
index a91c5c6e888f..7d3efe59e7a0 100644
--- a/editors/bitmap-mule/Makefile
+++ b/editors/bitmap-mule/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: bitmap for mule
-# Version required: 8.2
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bitmap-mule-${BITMAP_VER}
+PORTNAME= bitmap-${EMACS_PORT}
+PORTVERSION= ${BITMAP_PKG_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/
+DISTNAME= bitmap-mule-${BITMAP_VER}
MAINTAINER= shige@FreeBSD.org
@@ -29,7 +30,6 @@ EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
# target name for make build
ALL_TARGET?= elc
-PKGNAME= bitmap-${EMACS_PORT}-${BITMAP_PKG_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
uncompface:${PORTSDIR}/mail/faces
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index 32a581722eb2..e42e303ae253 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: bitmap for emacs20
-# Version required: 8.2
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bitmap-mule-${BITMAP_VER}
+PORTNAME= bitmap-${EMACS_PORT}
+PORTVERSION= ${BITMAP_PKG_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/
+DISTNAME= bitmap-mule-${BITMAP_VER}
MAINTAINER= shige@FreeBSD.org
@@ -28,7 +29,6 @@ EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
# target name for make build
ALL_TARGET= elc
-PKGNAME= bitmap-${EMACS_PORT}-${BITMAP_PKG_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
uncompface:${PORTSDIR}/mail/faces
diff --git a/editors/custom-emacs/Makefile b/editors/custom-emacs/Makefile
index 931a0a80f77f..ea10d6836f85 100644
--- a/editors/custom-emacs/Makefile
+++ b/editors/custom-emacs/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: custom for emacs
-# Version required: 1.9962
# Date created: 27 December 1998
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= custom-${CUSTOM_VER}
+PORTNAME= custom-${EMACS_PORT}
+PORTVERSION= ${CUSTOM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/ \
ftp://ftp.win.ne.jp/pub/word/elisp/
+DISTNAME= custom-${CUSTOM_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -31,7 +32,6 @@ HAVE_COMMON_PORT= NO
.endif
.if defined(EMACS_PORT)
-PKGNAME= custom-${EMACS_PORT}-${CUSTOM_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
diff --git a/editors/custom-mule/Makefile b/editors/custom-mule/Makefile
index caaeb2c6eb82..ef41f077304a 100644
--- a/editors/custom-mule/Makefile
+++ b/editors/custom-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: custom for mule
-# Version required: 1.9962
# Date created: 27 December 1998
# Whom: shige
#
diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile
index a35ee3ae6c3e..75b435e7ccee 100644
--- a/editors/flim-emacs-current/Makefile
+++ b/editors/flim-emacs-current/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: flim-current for emacs
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= flim-${FLIM_VER}
+PORTNAME= flim-${EMACS_PORT}
+PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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
+DISTNAME= flim-${FLIM_VER}
PORTCLASS?= master
@@ -39,7 +40,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= flim-${EMACS_PORT}-${FLIM_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile
index fda4a099c159..a1f2e4fb22dd 100644
--- a/editors/flim-emacs/Makefile
+++ b/editors/flim-emacs/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: flim for emacs
-# Version required: 1.12.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= flim-${FLIM_VER}
+PORTNAME= flim-${EMACS_PORT}
+PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.12/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.12/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.12/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.12/
MAINTAINER?= shige@FreeBSD.org
+DISTNAME= flim-${FLIM_VER}
PORTCLASS?= master
@@ -39,7 +40,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= flim-${EMACS_PORT}-${FLIM_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile
index e59b12712ddd..4925cc7efd76 100644
--- a/editors/flim-emacs20-current/Makefile
+++ b/editors/flim-emacs20-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for emacs20
-# Version required: 1.13.2
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index ef642c7c002c..e2ca82f7d2ea 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for emacs20
-# Version required: 1.12.7
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-mule-current/Makefile b/editors/flim-mule-current/Makefile
index 01364a0b382a..a6360de02b1e 100644
--- a/editors/flim-mule-current/Makefile
+++ b/editors/flim-mule-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for mule
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-mule/Makefile b/editors/flim-mule/Makefile
index 45a8e103cad6..893f2c08131a 100644
--- a/editors/flim-mule/Makefile
+++ b/editors/flim-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for mule
-# Version required: 1.12.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-xemacs-current/Makefile b/editors/flim-xemacs-current/Makefile
index a2d913320bf7..d2ebea473323 100644
--- a/editors/flim-xemacs-current/Makefile
+++ b/editors/flim-xemacs-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for xemacs
-# Version required: 1.13.2
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-xemacs/Makefile b/editors/flim-xemacs/Makefile
index a9d8de69cfc6..1cd68e1c9756 100644
--- a/editors/flim-xemacs/Makefile
+++ b/editors/flim-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for xemacs
-# Version required: 1.12.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-xemacs20-current/Makefile b/editors/flim-xemacs20-current/Makefile
index bf862e8a8338..6061cb980fd2 100644
--- a/editors/flim-xemacs20-current/Makefile
+++ b/editors/flim-xemacs20-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for xemacs20
-# Version required: 1.13.2
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-xemacs20/Makefile b/editors/flim-xemacs20/Makefile
index e2c7b1e9ea39..f6f3d6192cab 100644
--- a/editors/flim-xemacs20/Makefile
+++ b/editors/flim-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for xemacs20
-# Version required: 1.12.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-xemacs21-mule-current/Makefile b/editors/flim-xemacs21-mule-current/Makefile
index 280da5379a9d..3661ed39ce9e 100644
--- a/editors/flim-xemacs21-mule-current/Makefile
+++ b/editors/flim-xemacs21-mule-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for xemacs21-mule
-# Version required: 1.13.2
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index 065568b1c0b1..de5e92741f3f 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for xemacs21-mule
-# Version required: 1.12.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index a35ee3ae6c3e..75b435e7ccee 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: flim-current for emacs
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= flim-${FLIM_VER}
+PORTNAME= flim-${EMACS_PORT}
+PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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
+DISTNAME= flim-${FLIM_VER}
PORTCLASS?= master
@@ -39,7 +40,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= flim-${EMACS_PORT}-${FLIM_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
index a35ee3ae6c3e..75b435e7ccee 100644
--- a/editors/flim113-emacs/Makefile
+++ b/editors/flim113-emacs/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: flim-current for emacs
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= flim-${FLIM_VER}
+PORTNAME= flim-${EMACS_PORT}
+PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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
+DISTNAME= flim-${FLIM_VER}
PORTCLASS?= master
@@ -39,7 +40,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= flim-${EMACS_PORT}-${FLIM_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index e59b12712ddd..4925cc7efd76 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for emacs20
-# Version required: 1.13.2
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile
index 01364a0b382a..a6360de02b1e 100644
--- a/editors/flim113-mule/Makefile
+++ b/editors/flim113-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for mule
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim113-xemacs/Makefile b/editors/flim113-xemacs/Makefile
index a2d913320bf7..d2ebea473323 100644
--- a/editors/flim113-xemacs/Makefile
+++ b/editors/flim113-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for xemacs
-# Version required: 1.13.2
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim113-xemacs20/Makefile b/editors/flim113-xemacs20/Makefile
index bf862e8a8338..6061cb980fd2 100644
--- a/editors/flim113-xemacs20/Makefile
+++ b/editors/flim113-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim-current for xemacs20
-# Version required: 1.13.2
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index 280da5379a9d..3661ed39ce9e 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: flim for xemacs21-mule
-# Version required: 1.13.2
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index a35ee3ae6c3e..75b435e7ccee 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: flim-current for emacs
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= flim-${FLIM_VER}
+PORTNAME= flim-${EMACS_PORT}
+PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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
+DISTNAME= flim-${FLIM_VER}
PORTCLASS?= master
@@ -39,7 +40,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= flim-${EMACS_PORT}-${FLIM_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile
index a35ee3ae6c3e..75b435e7ccee 100644
--- a/editors/flim114-emacs20/Makefile
+++ b/editors/flim114-emacs20/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: flim-current for emacs
-# Version required: 1.13.2
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= flim-${FLIM_VER}
+PORTNAME= flim-${EMACS_PORT}
+PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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
+DISTNAME= flim-${FLIM_VER}
PORTCLASS?= master
@@ -39,7 +40,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= flim-${EMACS_PORT}-${FLIM_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 577bdb1b8599..9ef0d94b2343 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -6,13 +6,14 @@
# $FreeBSD$
#
-DISTNAME= mule-2.3
-PKGNAME= mule-common-2.3
+PORTNAME= mule-common
+PORTVERSION= 2.3
CATEGORIES= editors japanese
MASTER_SITES= ftp://etlport.etl.go.jp/pub/mule/ \
ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
ftp://ftp.iij.ad.jp/pub/misc/mule/ \
http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
+DISTNAME= mule-${PORTVERSION}
DISTFILES= emacs-19.34b.tar.gz mule-2.3-19.34.patch-981002.tar.gz
PATCH_SITES= ftp://etlport.etl.go.jp/pub/mule/
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index f6bc57e08da6..a9dd2fb7e285 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: nvi-1.79 + multilingual patch(none)
-# Version required: 1.79
# Date created: 6 Mar 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
@@ -12,6 +11,7 @@ PORTVERSION= 1.79.19991117
CATEGORIES= editors
MASTER_SITES= ftp://sleepy.vwh.net/pub/\
ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
+PKGNAMESUFFIX?= -m17n
DISTNAME= nvi-1.79
PATCH_SITES= ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
diff --git a/editors/nvi-perl/Makefile b/editors/nvi-perl/Makefile
index dfedcc695802..1cd5905aad67 100644
--- a/editors/nvi-perl/Makefile
+++ b/editors/nvi-perl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: nvi-1.79 + perl
-# Version required: 1.79
# Date created: 18 Feb 1998
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-DISTNAME= nvi-1.79
-PKGNAME?= nvi-perl-1.79
+PORTNAME= nvi-perl
+PORTVERSION= 1.79
CATEGORIES= editors
MASTER_SITES= ftp://sleepy.vwh.net/pub/ \
ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
+DISTNAME= nvi-${PORTVERSION}
MAINTAINER= itojun@itojun.org
diff --git a/editors/offix-editor/Makefile b/editors/offix-editor/Makefile
index d8b1d23f1f11..c50af5b938ba 100644
--- a/editors/offix-editor/Makefile
+++ b/editors/offix-editor/Makefile
@@ -1,16 +1,16 @@
# ports collection makefile for: Editor
-# Version required: 2.4
# Date created: 28 Jun 1997
# Whom: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
#
# $FreeBSD$
#
-DISTNAME= Editor-2.4
-PKGNAME= offix-editor-2.4
+PORTNAME= offix-editor
+PORTVERSION= 2.4
CATEGORIES= editors offix
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= desktop_managers/OffiX
+DISTNAME= Editor-${PORTVERSION}
MAINTAINER= ruslan@shevchenko.kiev.ua
diff --git a/editors/psgml-emacs/Makefile b/editors/psgml-emacs/Makefile
index 57519124dbd8..58be165a72b2 100644
--- a/editors/psgml-emacs/Makefile
+++ b/editors/psgml-emacs/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: psgml for emacs
-# Version required: 1.2.0
# Date created: 23 January 1999
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= psgml-${PSGML_VER}
+PORTNAME= psgml-${EMACS_PORT}
+PORTVERSION= ${PSGML_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/
+DISTNAME= psgml-${PSGML_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -36,7 +37,6 @@ HAS_COMMON_PORT= NO
# emacs ports setup
#
.if defined(EMACS_PORT)
-PKGNAME= psgml-${EMACS_PORT}-${PSGML_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile
index 9fa35f527792..7b2f9c81e975 100644
--- a/editors/psgml-mule/Makefile
+++ b/editors/psgml-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: psgml for mule
-# Version required: 1.2.0
# Date created: 23 January 1999
# Whom: shige
#
diff --git a/editors/psgml-xemacs21-mule/Makefile b/editors/psgml-xemacs21-mule/Makefile
index c9d3988ac74a..225a4209678c 100644
--- a/editors/psgml-xemacs21-mule/Makefile
+++ b/editors/psgml-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: psgml for xemacs-mule
-# Version required: 1.2.0
# Date created: 26 May 1999
# Whom: kuriyama
#
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 57519124dbd8..58be165a72b2 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: psgml for emacs
-# Version required: 1.2.0
# Date created: 23 January 1999
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= psgml-${PSGML_VER}
+PORTNAME= psgml-${EMACS_PORT}
+PORTVERSION= ${PSGML_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/
+DISTNAME= psgml-${PSGML_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -36,7 +37,6 @@ HAS_COMMON_PORT= NO
# emacs ports setup
#
.if defined(EMACS_PORT)
-PKGNAME= psgml-${EMACS_PORT}-${PSGML_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile
index 50a7ee31e75f..f37fae3164a5 100644
--- a/editors/semi-emacs-current/Makefile
+++ b/editors/semi-emacs-current/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: semi-current for emacs
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= semi-${SEMI_VER}
+PORTNAME= semi-${EMACS_PORT}
+PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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/
+DISTNAME= semi-${SEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= semi-${EMACS_PORT}-${SEMI_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index 0a0ad3b09d98..4693812ceeae 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: semi for emacs
-# Version required: 1.13.4
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= semi-${SEMI_VER}
+PORTNAME= semi-${EMACS_PORT}
+PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/
+DISTNAME= semi-${SEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= semi-${EMACS_PORT}-${SEMI_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile
index 46bdae0a6baa..400214fe4eeb 100644
--- a/editors/semi-emacs20-current/Makefile
+++ b/editors/semi-emacs20-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for emacs20
-# Version required: 1.13.7
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index e729f763ed10..a42ad11d4ffd 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi for emacs
-# Version required: 1.13.4
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-mule-current/Makefile b/editors/semi-mule-current/Makefile
index 97a18b22d36e..b1f65136686c 100644
--- a/editors/semi-mule-current/Makefile
+++ b/editors/semi-mule-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for mule
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-mule/Makefile b/editors/semi-mule/Makefile
index deb8f21bc31e..047faf8afb92 100644
--- a/editors/semi-mule/Makefile
+++ b/editors/semi-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi for mule
-# Version required: 1.13.4
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-xemacs-current/Makefile b/editors/semi-xemacs-current/Makefile
index ba9d00a35141..7a8fae700a68 100644
--- a/editors/semi-xemacs-current/Makefile
+++ b/editors/semi-xemacs-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for xemacs
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-xemacs/Makefile b/editors/semi-xemacs/Makefile
index 67795b85dbff..6f2521b00be4 100644
--- a/editors/semi-xemacs/Makefile
+++ b/editors/semi-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi for xemacs
-# Version required: 1.13.4
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-xemacs20-current/Makefile b/editors/semi-xemacs20-current/Makefile
index 60b45487febd..7eb072bdee27 100644
--- a/editors/semi-xemacs20-current/Makefile
+++ b/editors/semi-xemacs20-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for xemacs20
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-xemacs20/Makefile b/editors/semi-xemacs20/Makefile
index 8531469bb1b4..fd6c17a327f3 100644
--- a/editors/semi-xemacs20/Makefile
+++ b/editors/semi-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi for xemacs20
-# Version required: 1.13.4
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile
index 81dfbc00940a..3b9056578c8c 100644
--- a/editors/semi-xemacs21-mule-current/Makefile
+++ b/editors/semi-xemacs21-mule-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for xemacs21-mule
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index 9f571d2e5bd8..d017135a1855 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi for xemacs21-mule
-# Version required: 1.13.4
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 50a7ee31e75f..f37fae3164a5 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: semi-current for emacs
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= semi-${SEMI_VER}
+PORTNAME= semi-${EMACS_PORT}
+PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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/
+DISTNAME= semi-${SEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= semi-${EMACS_PORT}-${SEMI_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index 50a7ee31e75f..f37fae3164a5 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: semi-current for emacs
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= semi-${SEMI_VER}
+PORTNAME= semi-${EMACS_PORT}
+PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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/
+DISTNAME= semi-${SEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= semi-${EMACS_PORT}-${SEMI_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index 46bdae0a6baa..400214fe4eeb 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for emacs20
-# Version required: 1.13.7
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index 97a18b22d36e..b1f65136686c 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for mule
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi113-xemacs/Makefile b/editors/semi113-xemacs/Makefile
index ba9d00a35141..7a8fae700a68 100644
--- a/editors/semi113-xemacs/Makefile
+++ b/editors/semi113-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for xemacs
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi113-xemacs20/Makefile b/editors/semi113-xemacs20/Makefile
index 60b45487febd..7eb072bdee27 100644
--- a/editors/semi113-xemacs20/Makefile
+++ b/editors/semi113-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for xemacs20
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index 81dfbc00940a..3b9056578c8c 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: semi-current for xemacs21-mule
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index 50a7ee31e75f..f37fae3164a5 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: semi-current for emacs
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= semi-${SEMI_VER}
+PORTNAME= semi-${EMACS_PORT}
+PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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/
+DISTNAME= semi-${SEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= semi-${EMACS_PORT}-${SEMI_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index 50a7ee31e75f..f37fae3164a5 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: semi-current for emacs
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= semi-${SEMI_VER}
+PORTNAME= semi-${EMACS_PORT}
+PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= 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/
+DISTNAME= semi-${SEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= semi-${EMACS_PORT}-${SEMI_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile
index 44bb106f233e..a76ecc50905d 100644
--- a/editors/wemi-emacs-current/Makefile
+++ b/editors/wemi-emacs-current/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: wemi-current for emacs
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wemi-${WEMI_VER}
+PORTNAME= wemi-${EMACS_PORT}
+PORTVERSION= ${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/wemi/
+DISTNAME= wemi-${WEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -40,7 +41,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= wemi-${EMACS_PORT}-${WEMI_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile
index 9cf2e1214908..5e93a88bc591 100644
--- a/editors/wemi-emacs/Makefile
+++ b/editors/wemi-emacs/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: wemi for emacs
-# Version required: 1.13.4
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wemi-${WEMI_VER}
+PORTNAME= wemi-${EMACS_PORT}
+PORTVERSION= ${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/wemi/ \
${MASTER_SITE_PORTS_JP} \
http://people.FreeBSD.org/~shige/ports/distfiles/
+DISTNAME= wemi-${WEMI_VER}
MAINTAINER?= shige@FreeBSD.org
@@ -42,7 +43,6 @@ REQUIRE_SETUPEL= YES
ALL_TARGET?= elc
.if defined(EMACS_PORT)
-PKGNAME= wemi-${EMACS_PORT}-${WEMI_VER}
EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
diff --git a/editors/wemi-emacs20-current/Makefile b/editors/wemi-emacs20-current/Makefile
index d887c00a388d..5d8fcd259d4a 100644
--- a/editors/wemi-emacs20-current/Makefile
+++ b/editors/wemi-emacs20-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi-current for emacs20
-# Version required: 1.13.7
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-emacs20/Makefile b/editors/wemi-emacs20/Makefile
index 7e64307e9cce..5b42968bdfc5 100644
--- a/editors/wemi-emacs20/Makefile
+++ b/editors/wemi-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi for emacs20
-# Version required: 1.13.4
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-mule-current/Makefile b/editors/wemi-mule-current/Makefile
index 16324eef56a2..f36d585bfcb6 100644
--- a/editors/wemi-mule-current/Makefile
+++ b/editors/wemi-mule-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi-current for mule
-# Version required: 1.13.7
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-mule/Makefile b/editors/wemi-mule/Makefile
index fde8d6659fba..b6c7dd004231 100644
--- a/editors/wemi-mule/Makefile
+++ b/editors/wemi-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi for mule
-# Version required: 1.13.4
# Date created: 9 May 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-xemacs-current/Makefile b/editors/wemi-xemacs-current/Makefile
index 18af385bcf15..7410a48e7e4b 100644
--- a/editors/wemi-xemacs-current/Makefile
+++ b/editors/wemi-xemacs-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi-current for xemacs
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-xemacs/Makefile b/editors/wemi-xemacs/Makefile
index 807cb0989359..f75fadcfceca 100644
--- a/editors/wemi-xemacs/Makefile
+++ b/editors/wemi-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi for xemacs
-# Version required: 1.13.4
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-xemacs20-current/Makefile b/editors/wemi-xemacs20-current/Makefile
index d3d6a108a6f1..1dde14fc124a 100644
--- a/editors/wemi-xemacs20-current/Makefile
+++ b/editors/wemi-xemacs20-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi-current for xemacs20
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-xemacs20/Makefile b/editors/wemi-xemacs20/Makefile
index 3c81256e6370..a9c81d596061 100644
--- a/editors/wemi-xemacs20/Makefile
+++ b/editors/wemi-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi for xemacs20
-# Version required: 1.13.4
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-xemacs21-mule-current/Makefile b/editors/wemi-xemacs21-mule-current/Makefile
index c8955ccbdb10..7a2faaf5eec3 100644
--- a/editors/wemi-xemacs21-mule-current/Makefile
+++ b/editors/wemi-xemacs21-mule-current/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi-current for xemacs21-mule
-# Version required: 1.13.7
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile
index 037253dcf05d..12655f1bc114 100644
--- a/editors/wemi-xemacs21-mule/Makefile
+++ b/editors/wemi-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: wemi for xemacs21-mule
-# Version required: 1.13.4
# Date created: 25 July 1999
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index c217884eb9d3..96e538a9e4ff 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xenon
-# Version required: 0.6.7
# Date created: 22 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= xenon-0.6.7
+PORTNAME= xenon
+PORTVERSION= 0.6.7
CATEGORIES= editors
MASTER_SITES= ftp://ftp.proximity.com.au/pub/xenon/
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 9d3381969608..b6395d99e5ef 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xvile
-# Version required: 9.1
# Date created: Wed Nov 26, 1996
# Whom: pgf
#
# $FreeBSD$
#
-DISTNAME= vile-9.1
-PKGNAME= xvile-9.1
+PORTNAME= xvile
+PORTVERSION= 9.1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.phred.org/pub/vile/ \
ftp://id.wing.net/pub/pgf/vile/
+DISTNAME= vile-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= gj@freebsd.org
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index bb7d5eb5f87f..b897339fb1ab 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: yudit
-# Version required: 1.3
# Date created: October 3, 1998
# Whom: rch@richard.eu.org
#
@@ -9,7 +8,8 @@
#
#
-DISTNAME= yudit-1.5
+PORTNAME= yudit
+PORTVERSION= 1.5
CATEGORIES= editors converters print
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/editors/X
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 577bdb1b8599..9ef0d94b2343 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -6,13 +6,14 @@
# $FreeBSD$
#
-DISTNAME= mule-2.3
-PKGNAME= mule-common-2.3
+PORTNAME= mule-common
+PORTVERSION= 2.3
CATEGORIES= editors japanese
MASTER_SITES= ftp://etlport.etl.go.jp/pub/mule/ \
ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
ftp://ftp.iij.ad.jp/pub/misc/mule/ \
http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
+DISTNAME= mule-${PORTVERSION}
DISTFILES= emacs-19.34b.tar.gz mule-2.3-19.34.patch-981002.tar.gz
PATCH_SITES= ftp://etlport.etl.go.jp/pub/mule/