aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editors/xemacs-basic-mule-packages/Makefile5
-rw-r--r--editors/xemacs-comm-packages/Makefile5
-rw-r--r--editors/xemacs-devel/Makefile5
-rw-r--r--editors/xemacs-games-packages/Makefile5
-rw-r--r--editors/xemacs-libs-packages/Makefile5
-rw-r--r--editors/xemacs-mule-packages/Makefile5
-rw-r--r--editors/xemacs-oa-packages/Makefile5
-rw-r--r--editors/xemacs-packages/Makefile5
-rw-r--r--editors/xemacs-prog-packages/Makefile5
-rw-r--r--editors/xemacs-wp-packages/Makefile5
-rw-r--r--editors/xemacs/Makefile5
-rw-r--r--editors/xemacs20/Makefile4
-rw-r--r--editors/xemacs21-mule-common/Makefile3
-rw-r--r--editors/xemacs21-mule-sumo/Makefile7
-rw-r--r--editors/xemacs21-mule/Makefile13
-rw-r--r--editors/xemacs21-sumo/Makefile7
-rw-r--r--editors/xemacs21/Makefile5
17 files changed, 39 insertions, 55 deletions
diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index d6ef97c29b31..b17eb75bae52 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages with Mule
-# Version required: 1.1
# Date created: 24 Oct 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xemacs-mule-packages
-PKGNAME= xemacs-mule-packages-1.1
+PORTNAME= xemacs-mule-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-comm-packages/Makefile b/editors/xemacs-comm-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-comm-packages/Makefile
+++ b/editors/xemacs-comm-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 2e899fbe35e4..eae405159686 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs
-# Version required: 21.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-${XEMACS_VER}
-PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1.9
+PORTNAME= xemacs
+PORTVERSION= ${XEMACS_VER}
CATEGORIES?= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index d6ef97c29b31..b17eb75bae52 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages with Mule
-# Version required: 1.1
# Date created: 24 Oct 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xemacs-mule-packages
-PKGNAME= xemacs-mule-packages-1.1
+PORTNAME= xemacs-mule-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-oa-packages/Makefile b/editors/xemacs-oa-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-oa-packages/Makefile
+++ b/editors/xemacs-oa-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-prog-packages/Makefile b/editors/xemacs-prog-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-prog-packages/Makefile
+++ b/editors/xemacs-prog-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index 9f3b85fe1cfe..5975f68419fb 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs Packages
-# Version required: 1.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-packages
-PKGNAME= xemacs-packages-1.1
+PORTNAME= xemacs-packages
+PORTVERSION= 1.1
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/packages/ \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 2e899fbe35e4..eae405159686 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs
-# Version required: 21.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-${XEMACS_VER}
-PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1.9
+PORTNAME= xemacs
+PORTVERSION= ${XEMACS_VER}
CATEGORIES?= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index ef184b6d48dd..c026c81f4353 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: X-Emacs
-# Version required: 20.4
# Date created: 26 August 1997
# Whom: Michael Elbel (me)
#
# $FreeBSD$
#
-DISTNAME= xemacs-20.4
+PORTNAME= xemacs
+PORTVERSION= 20.4
CATEGORIES= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/${DISTNAME}/ \
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index 5e754081d8f6..86892146ad3c 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: files except executables for xemacs with mule
-# Version required: 21.1
# Date created: 8 Dec 1999
# Whom: KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
#
@@ -58,7 +57,7 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER}
TMPPLIST= ${WRKDIR}/.PLIST.mktmp-${PKGNAME}
MULE_COMMON= yes
-PKGNAMEEXT= -mule-common
+PKGNAMESUFFIX= -mule-common
DESCR_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule-common/files/DESCR.tmpl
INSTALL_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule-common/files/INSTALL.tmpl
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) with mule, lisp files, info pages, etc (except executables)
diff --git a/editors/xemacs21-mule-sumo/Makefile b/editors/xemacs21-mule-sumo/Makefile
index 0e8e8732cff1..4faebfdf62d6 100644
--- a/editors/xemacs21-mule-sumo/Makefile
+++ b/editors/xemacs21-mule-sumo/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xemacs-${NAMEPREFIX}sumo${NAMEEXT}-${XEMACS_REL}
-PKGNAME= ${LANGPREFIX}${DISTNAME}
+PORTNAME= xemacs-${NAMEPREFIX}sumo
+PORTVERSION= ${XEMACS_REL}
CATEGORIES= editors
MASTER_SITES= # empty
DISTFILES= # empty
@@ -26,7 +25,7 @@ XEMACS_REL= 21.1
XEMACS_VER= 21.1.8
XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
-.if defined(LANGPREFIX) && (${LANGPREFIX} == "ja-")
+.if defined(PKGNAMEPREFIX) && (${PKGNAMEPREFIX} == "ja-")
RUN_DEP_LIST= ${PREFIX}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/japanese/xemacs${XEMACS_MAJOR_VER}${NAMEEXT}
.else
RUN_DEP_LIST= ${PREFIX}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index ed929f3a5fe7..16b5f4cde8f4 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: XEmacs with Mule
-# Version required: 21.1
# Date created: 8 Dec 1999
# Whom: KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
#
@@ -75,7 +74,7 @@ PLIST?= ${PKGLDIR}/PLIST
XEMACS_MAJOR_VER?= 21
MULE_PORT= yes
-PKGNAMEEXT?= -mule
+PKGNAMESUFFIX?= -mule
DESCR_TMPL?= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/files/DESCR.tmpl
COMMENT_TEXT?= XEmacs(version ${XEMACS_MAJOR_VER}) text editor with mule(Only the executables)
.if defined(MULE_SLAVE)
@@ -109,7 +108,7 @@ post-package:
#pre-arrange::
# @${MKDIR} ${PKGDIR}
# @${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
-#.if (${PKGNAMEEXT} == "-canna") || (${PKGNAMEEXT} == "-mule") || (${PKGNAMEEXT} == "-mule-common")
+#.if (${PKGNAMESUFFIX} == "-canna") || (${PKGNAMESUFFIX} == "-mule") || (${PKGNAMESUFFIX} == "-mule-common")
# @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
# -e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
# -e "s/%%XEMACS_MAJOR_VER%%/${XEMACS_MAJOR_VER}/g" \
@@ -119,13 +118,13 @@ post-package:
#
## for make PLIST (only maintainer use)
#arrange::
-#.if (${PKGNAMEEXT} == "-mule")||(${PKGNAMEEXT} == "-mule-common")
+#.if (${PKGNAMESUFFIX} == "-mule")||(${PKGNAMESUFFIX} == "-mule-common")
# ${RM} -f ${PLIST}
-#.if (${PKGNAMEEXT} == "-mule")
+#.if (${PKGNAMESUFFIX} == "-mule")
# ${MAKE} DIRRM2RMDIRS="lib/xemacs/mule-packages/etc lib/xemacs/mule-packages lib/xemacs/mule-packages/etc/app-defaults" \
# DIRRMDEPTH=2 plist
#.endif
-#.if (${PKGNAMEEXT} == "-mule-common")
+#.if (${PKGNAMESUFFIX} == "-mule-common")
# ${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER} etc/rc.d" DIRRMDEPTH=1 plist
#.for dirp in site mule xemacs
#.for dir in etc info man pkginfo
@@ -140,7 +139,7 @@ post-package:
#.endif
#.endif
#
-#.if (${PKGNAMEEXT} != "-mule-common")
+#.if (${PKGNAMESUFFIX} != "-mule-common")
#pre-plist:
# @${ECHO} "===> pre-plist of ${PKGNAME}"
# ${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults
diff --git a/editors/xemacs21-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index 0e8e8732cff1..4faebfdf62d6 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xemacs-${NAMEPREFIX}sumo${NAMEEXT}-${XEMACS_REL}
-PKGNAME= ${LANGPREFIX}${DISTNAME}
+PORTNAME= xemacs-${NAMEPREFIX}sumo
+PORTVERSION= ${XEMACS_REL}
CATEGORIES= editors
MASTER_SITES= # empty
DISTFILES= # empty
@@ -26,7 +25,7 @@ XEMACS_REL= 21.1
XEMACS_VER= 21.1.8
XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
-.if defined(LANGPREFIX) && (${LANGPREFIX} == "ja-")
+.if defined(PKGNAMEPREFIX) && (${PKGNAMEPREFIX} == "ja-")
RUN_DEP_LIST= ${PREFIX}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/japanese/xemacs${XEMACS_MAJOR_VER}${NAMEEXT}
.else
RUN_DEP_LIST= ${PREFIX}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 2e899fbe35e4..eae405159686 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: X-Emacs
-# Version required: 21.1
# Date created: 24 Apr 1999
# Whom: Michael Elbel (me@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= xemacs-${XEMACS_VER}
-PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1.9
+PORTNAME= xemacs
+PORTVERSION= ${XEMACS_VER}
CATEGORIES?= editors
MASTER_SITES= \
ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \