Index: head/editors/apel/Makefile
===================================================================
--- head/editors/apel/Makefile	(revision 27505)
+++ head/editors/apel/Makefile	(revision 27506)
@@ -1,135 +1,135 @@
 # 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
 
 # distfile version
 APEL_VER=	9.23
 # setupel filename
 APEL_SETUPEL=	apel-setupel.el
 # document install directory by install-doc target
 APELDOCDIR?=	share/doc/apel
 
 # This is a master port.
 PORTCLASS?=	master
 
 # emacs port setup
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 
 # depends on custom: emacs-19.34 or mule-19.34
 .if (${EMACS_VER} == "19.34")
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
 .endif
 
 SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${APEL_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} manifest-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # local functions
 #
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${APELDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog README.* ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${APELDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.mk>

Property changes on: head/editors/apel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/editors/apel-emacs/Makefile
===================================================================
--- head/editors/apel-emacs/Makefile	(revision 27505)
+++ head/editors/apel-emacs/Makefile	(revision 27506)
@@ -1,135 +1,135 @@
 # 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
 
 # distfile version
 APEL_VER=	9.23
 # setupel filename
 APEL_SETUPEL=	apel-setupel.el
 # document install directory by install-doc target
 APELDOCDIR?=	share/doc/apel
 
 # This is a master port.
 PORTCLASS?=	master
 
 # emacs port setup
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 
 # depends on custom: emacs-19.34 or mule-19.34
 .if (${EMACS_VER} == "19.34")
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-sumo-packages
 .endif
 
 SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${APEL_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} manifest-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # local functions
 #
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${APELDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog README.* ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${APELDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.mk>

Property changes on: head/editors/apel-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/editors/apel-emacs20/Makefile
===================================================================
--- head/editors/apel-emacs20/Makefile	(revision 27505)
+++ head/editors/apel-emacs20/Makefile	(revision 27506)
@@ -1,26 +1,25 @@
 # New ports collection makefile for:	apel for emacs20
-# Version required:	9.23
 # Date created:		22 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/apel-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/editors/apel-mule/Makefile
===================================================================
--- head/editors/apel-mule/Makefile	(revision 27505)
+++ head/editors/apel-mule/Makefile	(revision 27506)
@@ -1,31 +1,30 @@
 # New ports collection makefile for:	apel for mule
-# Version required:	9.23
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
 # emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/apel-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/editors/apel-xemacs/Makefile
===================================================================
--- head/editors/apel-xemacs/Makefile	(revision 27505)
+++ head/editors/apel-xemacs/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	apel for xemacs
-# Version required:	9.23
 # Date created:		13 June 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/apel-xemacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/apel-xemacs20/Makefile
===================================================================
--- head/editors/apel-xemacs20/Makefile	(revision 27505)
+++ head/editors/apel-xemacs20/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	apel for xemacs20
-# Version required:	9.23
 # Date created:		13 June 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/apel-xemacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/apel-xemacs21-mule/Makefile
===================================================================
--- head/editors/apel-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/apel-xemacs21-mule/Makefile	(revision 27506)
@@ -1,58 +1,57 @@
 # New ports collection makefile for:	apel for xemacs21-mule
-# Version required:	9.23
 # Date created:		13 June 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_LIBDIR=	lib/${EMACS_NAME}
 EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS=	lisp pkginfo
 
 # how to install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.apel
 
 # xemacs package
 XEMACS_PKGNAME=	apel
 XEMACS_PKGVER=	1.16
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME}
 
 # package documents
 APELDOCDIR=	${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}
 
 .if defined(PARALLEL_PACKAGE_BUILD)
 FORBIDDEN=	hang
 .endif
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/apel-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/bitmap/Makefile
===================================================================
--- head/editors/bitmap/Makefile	(revision 27505)
+++ head/editors/bitmap/Makefile	(revision 27506)
@@ -1,57 +1,57 @@
 # 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
 
 # distfile version
 BITMAP_VER=		8.2
 BITMAP_PKG_VER=		${BITMAP_VER}
 BITMAPDOCDIR=	share/doc/bitmap
 BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
 
 # emacs20
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 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
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
 		${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER}
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		BITMAPDOCDIR=${BITMAPDOCDIR}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 
 # depends on apel
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
 	done)
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/editors/bitmap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/bitmap-emacs20/Makefile
===================================================================
--- head/editors/bitmap-emacs20/Makefile	(revision 27505)
+++ head/editors/bitmap-emacs20/Makefile	(revision 27506)
@@ -1,57 +1,57 @@
 # 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
 
 # distfile version
 BITMAP_VER=		8.2
 BITMAP_PKG_VER=		${BITMAP_VER}
 BITMAPDOCDIR=	share/doc/bitmap
 BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
 
 # emacs20
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 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
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
 		${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER}
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		BITMAPDOCDIR=${BITMAPDOCDIR}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 
 # depends on apel
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
 	done)
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/editors/bitmap-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/bitmap-mule/Makefile
===================================================================
--- head/editors/bitmap-mule/Makefile	(revision 27505)
+++ head/editors/bitmap-mule/Makefile	(revision 27506)
@@ -1,65 +1,65 @@
 # 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
 
 # distfile version
 BITMAP_VER=		8.2
 BITMAP_PKG_VER=		${BITMAP_VER}
 BITMAPDOCDIR=	share/doc/bitmap
 BITMAP_SETUPEL=	bitmap-setupel.el
 BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
 
 # mule-19.34
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 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
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common \
 		${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS=${BITMAP_SETUPEL}
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		BITMAP_SETUPEL=${BITMAP_SETUPEL} \
 		BITMAPDOCDIR=${BITMAPDOCDIR}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 
 # depends on apel
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 
 pre-configure:
 	@${CP} ${FILESDIR}/${BITMAP_SETUPEL}.in ${WRKDIR}
 
 post-install:
 	@${INSTALL_DATA} ${WRKDIR}/${BITMAP_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
 	done)
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/editors/bitmap-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/editors/custom-emacs/Makefile
===================================================================
--- head/editors/custom-emacs/Makefile	(revision 27505)
+++ head/editors/custom-emacs/Makefile	(revision 27506)
@@ -1,68 +1,68 @@
 # 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
 
 # custom library
 CUSTOM_VER=	1.9962
 CUSTOMDOCDIR=	share/doc/custom
 CUSTOM_ELS=	cus-edit.el cus-face.el custom.el \
 		wid-browse.el wid-edit.el widget-example.el widget.el
 
 # This is a master port.
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
 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")
 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}
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		CUSTOMDOCDIR=${CUSTOMDOCDIR}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
 	@${FALSE}
 .endif
 
 
 do-install:
 	@for i in ${CUSTOM_ELS} ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/ ; \
 		${INSTALL_DATA} ${WRKSRC}/$${i}c \
 			${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/ ; \
 	done
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${CUSTOMDOCDIR}
 	@for i in ChangeLog TODO ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${CUSTOMDOCDIR} ; \
 	done
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/editors/custom-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/custom-mule/Makefile
===================================================================
--- head/editors/custom-mule/Makefile	(revision 27505)
+++ head/editors/custom-mule/Makefile	(revision 27506)
@@ -1,28 +1,27 @@
 # New ports collection makefile for:	custom for mule
-# Version required:	1.9962
 # Date created:		27 December 1998
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/custom-emacs
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
 HAVE_COMMON_PORT= YES
 
 # pkg/* files but PLIST are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 PATCHDIR=	${.CURDIR}/patches
 PLIST=		${MASTERDIR}/pkg/PLIST
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/custom-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/flim/Makefile
===================================================================
--- head/editors/flim/Makefile	(revision 27505)
+++ head/editors/flim/Makefile	(revision 27506)
@@ -1,230 +1,230 @@
 # 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
 
 # distfile version
 FLIM_VER=	1.13.2
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 # install package-cookie
 	@${MKDIR} -p ${PREFIX}/share/flim
 	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
  
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/flim/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/editors/flim-emacs/Makefile
===================================================================
--- head/editors/flim-emacs/Makefile	(revision 27505)
+++ head/editors/flim-emacs/Makefile	(revision 27506)
@@ -1,230 +1,230 @@
 # 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
 
 # distfile version
 FLIM_VER=	1.12.7
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 # install package-cookie
 	@${MKDIR} -p ${PREFIX}/share/flim
 	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/flim-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/flim-emacs-current/Makefile
===================================================================
--- head/editors/flim-emacs-current/Makefile	(revision 27505)
+++ head/editors/flim-emacs-current/Makefile	(revision 27506)
@@ -1,230 +1,230 @@
 # 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
 
 # distfile version
 FLIM_VER=	1.13.2
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 # install package-cookie
 	@${MKDIR} -p ${PREFIX}/share/flim
 	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
  
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/flim-emacs-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/editors/flim-emacs20/Makefile
===================================================================
--- head/editors/flim-emacs20/Makefile	(revision 27505)
+++ head/editors/flim-emacs20/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # New ports collection makefile for:	flim for emacs20
-# Version required:	1.12.7
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/flim-emacs20-current/Makefile
===================================================================
--- head/editors/flim-emacs20-current/Makefile	(revision 27505)
+++ head/editors/flim-emacs20-current/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-emacs20-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/flim-mule/Makefile
===================================================================
--- head/editors/flim-mule/Makefile	(revision 27505)
+++ head/editors/flim-mule/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # New ports collection makefile for:	flim for mule
-# Version required:	1.12.7
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/editors/flim-mule-current/Makefile
===================================================================
--- head/editors/flim-mule-current/Makefile	(revision 27505)
+++ head/editors/flim-mule-current/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-mule-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/flim-xemacs/Makefile
===================================================================
--- head/editors/flim-xemacs/Makefile	(revision 27505)
+++ head/editors/flim-xemacs/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	flim for xemacs
-# Version required:	1.12.7
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=	lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-xemacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/flim-xemacs-current/Makefile
===================================================================
--- head/editors/flim-xemacs-current/Makefile	(revision 27505)
+++ head/editors/flim-xemacs-current/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-xemacs-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/flim-xemacs20/Makefile
===================================================================
--- head/editors/flim-xemacs20/Makefile	(revision 27505)
+++ head/editors/flim-xemacs20/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	flim for xemacs20
-# Version required:	1.12.7
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-xemacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/flim-xemacs20-current/Makefile
===================================================================
--- head/editors/flim-xemacs20-current/Makefile	(revision 27505)
+++ head/editors/flim-xemacs20-current/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-xemacs20-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/flim-xemacs21-mule/Makefile
===================================================================
--- head/editors/flim-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/flim-xemacs21-mule/Makefile	(revision 27506)
@@ -1,65 +1,64 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS=	info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.flim
 
 # xemacs package
 XEMACS_PKGNAME=	flim
 XEMACS_PKGVER=	1.12
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-en.info info/mime-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/flim-xemacs21-mule-current/Makefile
===================================================================
--- head/editors/flim-xemacs21-mule-current/Makefile	(revision 27505)
+++ head/editors/flim-xemacs21-mule-current/Makefile	(revision 27506)
@@ -1,65 +1,64 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.flim
 
 # xemacs package
 XEMACS_PKGNAME=	flim
 XEMACS_PKGVER=	1.13
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-en.info info/mime-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim-xemacs21-mule-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/flim113/Makefile
===================================================================
--- head/editors/flim113/Makefile	(revision 27505)
+++ head/editors/flim113/Makefile	(revision 27506)
@@ -1,230 +1,230 @@
 # 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
 
 # distfile version
 FLIM_VER=	1.13.2
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 # install package-cookie
 	@${MKDIR} -p ${PREFIX}/share/flim
 	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
  
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/flim113/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/editors/flim113-emacs/Makefile
===================================================================
--- head/editors/flim113-emacs/Makefile	(revision 27505)
+++ head/editors/flim113-emacs/Makefile	(revision 27506)
@@ -1,230 +1,230 @@
 # 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
 
 # distfile version
 FLIM_VER=	1.13.2
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 # install package-cookie
 	@${MKDIR} -p ${PREFIX}/share/flim
 	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
  
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/flim113-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/editors/flim113-emacs20/Makefile
===================================================================
--- head/editors/flim113-emacs20/Makefile	(revision 27505)
+++ head/editors/flim113-emacs20/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim113-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/flim113-mule/Makefile
===================================================================
--- head/editors/flim113-mule/Makefile	(revision 27505)
+++ head/editors/flim113-mule/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim113-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/flim113-xemacs/Makefile
===================================================================
--- head/editors/flim113-xemacs/Makefile	(revision 27505)
+++ head/editors/flim113-xemacs/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim113-xemacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/flim113-xemacs20/Makefile
===================================================================
--- head/editors/flim113-xemacs20/Makefile	(revision 27505)
+++ head/editors/flim113-xemacs20/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim113-xemacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/flim113-xemacs21-mule/Makefile
===================================================================
--- head/editors/flim113-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/flim113-xemacs21-mule/Makefile	(revision 27506)
@@ -1,65 +1,64 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.flim
 
 # xemacs package
 XEMACS_PKGNAME=	flim
 XEMACS_PKGVER=	1.13
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-en.info info/mime-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/flim113-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/flim114-emacs20/Makefile
===================================================================
--- head/editors/flim114-emacs20/Makefile	(revision 27505)
+++ head/editors/flim114-emacs20/Makefile	(revision 27506)
@@ -1,230 +1,230 @@
 # 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
 
 # distfile version
 FLIM_VER=	1.13.2
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
 		FLIM_COOKIE=${FLIM_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 # makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 # install package-cookie
 	@${MKDIR} -p ${PREFIX}/share/flim
 	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
  
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/flim114-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/editors/mule-common/Makefile
===================================================================
--- head/editors/mule-common/Makefile	(revision 27505)
+++ head/editors/mule-common/Makefile	(revision 27506)
@@ -1,165 +1,166 @@
 # New ports collection makefile for:	files except executables for mule 2.3@19.34
 # Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $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/
 PATCHFILES=	mule-23-1934-alpha01.diff.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	taoka@FreeBSD.org
 
 .include <bsd.port.pre.mk>
 
 WRKDIRBASE!=	${ECHO} ${WRKDIRPREFIX}${.CURDIR} | sed s:/editors/mule-common$$::
 
 .for dir in 	chinese/mule-wnn4 \
 		editors/mule \
 		japanese/mule-canna+sj3+wnn4 \
 		japanese/mule-canna+sj3+wnn6 \
 		japanese/mule-canna+sj3 \
 		japanese/mule-canna+wnn4 \
 		japanese/mule-canna+wnn6 \
 		japanese/mule-canna \
 		japanese/mule-sj3+wnn4 \
 		japanese/mule-sj3+wnn6 \
 		japanese/mule-sj3 \
 		japanese/mule-wnn4 \
 		japanese/mule-wnn6 \
 		korean/mule-wnn4
 .if exists(${WRKDIRBASE}/${dir}/work/.install_done)
 WRKDIR=		${WRKDIRBASE}/${dir}/work
 .elif exists(${WRKDIRBASE}/${dir}/work/.build_done)
 WRKDIR?=	${WRKDIRBASE}/${dir}/work
 .endif
 .endfor
 WRKSRC= ${WRKDIR}/emacs-19.34
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/mule.sh
 
 .if !defined(WRKDIR)
 .if defined(PACKAGE_BUILDING)
 # XXX
 WRKDIR=	${WRKDIRBASE}/editors/mule/work
 pre-build:
 	@cd ${.CURDIR}/../mule; make
 .else
 BROKEN=		You should build install one of the other mule ports first
 .endif
 .endif
 
 INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
 PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${CONFIGURE_TARGET}
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
 CONFIGURE_ARGS=	--with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
 STRIP=
 MAN1=		coco.1 ctags.1 etags.1 m2ps.1 emacs.1 mule.1
 
 INSTALL_TARGET=	install-arch-indep
 
 COMP_ELC=	egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc
 ELC_DIR=	../lisp
 
 # ORIGINAL, MEW_ORG_PATCH and MEW_PATCH are used for debugging.
 #
 #   ORIGINAL: original mule 2.3 based on emacs 19.34
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${MKDIR} ${WRKSRC}/lisp/its
 	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
 .endif
 
 .if !defined(ORIGINAL)
 post-patch:
 .if !defined(MEW_ORG_PATCH)
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/patch-19.34
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/Mule-2.3-19.34.patch
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/extra.patch
 .if defined(MEW_PATCH)
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch-for_katayama
 .endif
 .else
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch
 .endif
 .if defined(MEW_PATCH) || defined(MEW_ORG_PATCH)
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/canna.el-19.34.patch
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/sj3-egg.el.patch
 .endif
 .endif
 
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.34.*
 
 post-build:
 # bytecompile elisps for Japanese input method
 	for file in ${COMP_ELC}; do \
 		target="$$target ${ELC_DIR}/$$file"; \
 	done; \
 	cd ${WRKSRC}/src; \
 	./temacs -batch -l mule-inst.el $$target
 
 post-install:
 # note that any2ps rcs-checkin are scripts
 .for file in b2m coco ctags emacsclient etags m2ps
 	strip ${PREFIX}/bin/${file}
 .endfor
 	if [ ! -f ${PREFIX}/share/mule/19.34/info/dir ]; then \
 	  ${MKDIR} ${PREFIX}/share/mule/19.34/info; \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/share/mule/19.34/info/dir; \
 	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
 	if [ ! -f ${STARTUP_SCRIPT} ]; then \
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
 		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; \
 		${ECHO} '#${ECHO} -n " Mule"' >> ${STARTUP_SCRIPT}; \
 		${ECHO} 'if [ -d /var/run/emacs/lock ]; then' >> ${STARTUP_SCRIPT}; \
 		${ECHO} '     rm -f /var/run/emacs/lock/*' >> ${STARTUP_SCRIPT}; \
 		${ECHO} "else" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "     mkdir -p /var/run/emacs/lock" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "fi" >> ${STARTUP_SCRIPT} ; \
 		${ECHO} "${CHMOD} 1777 /var/run/emacs/lock${lockdir}" >> ${STARTUP_SCRIPT} ; \
 		${CHMOD} 755 ${STARTUP_SCRIPT} ;				\
 		${CHOWN} bin.bin ${STARTUP_SCRIPT};			\
 	fi
 
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/mule-common/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.45
\ No newline at end of property
+1.46
\ No newline at end of property
Index: head/editors/nvi-m17n/Makefile
===================================================================
--- head/editors/nvi-m17n/Makefile	(revision 27505)
+++ head/editors/nvi-m17n/Makefile	(revision 27506)
@@ -1,36 +1,36 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 
 PORTNAME=	nvi
 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/
 PATCHFILES=	nvi-1.79.m17n-19991117.diff.gz
 
 MAINTAINER=	itojun@itojun.org
 
 #LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p1 -f
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
 CONFIGURE_ARGS=	--enable-multibyte --program-prefix=n
 
 post-install:
 	@${CP} ${WRKSRC}/../docs.m17n/README.english \
 		${PREFIX}/share/vi/
 	@${CP} ${WRKSRC}/../docs.m17n/README.japanese \
 		${PREFIX}/share/vi/
 
 .include <bsd.port.mk>

Property changes on: head/editors/nvi-m17n/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/nvi-perl/Makefile
===================================================================
--- head/editors/nvi-perl/Makefile	(revision 27505)
+++ head/editors/nvi-perl/Makefile	(revision 27506)
@@ -1,27 +1,27 @@
 # 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
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 # can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC}
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0
 PATCH_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0
 
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
 CONFIGURE_ARGS=	--enable-perlinterp --program-prefix=pn
 
 .include <bsd.port.mk>

Property changes on: head/editors/nvi-perl/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/editors/offix-editor/Makefile
===================================================================
--- head/editors/offix-editor/Makefile	(revision 27505)
+++ head/editors/offix-editor/Makefile	(revision 27506)
@@ -1,25 +1,25 @@
 # 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
 
 LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
 MAN1=		editor.1
 
 .include <bsd.port.mk>

Property changes on: head/editors/offix-editor/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/editors/psgml/Makefile
===================================================================
--- head/editors/psgml/Makefile	(revision 27505)
+++ head/editors/psgml/Makefile	(revision 27506)
@@ -1,84 +1,84 @@
 # 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
 
 # distfile version
 PSGML_VER=		1.2.0
 PSGML_STARTUPEL=	psgml-startup.el
 CATALOG=		${PREFIX}/share/sgml/catalog
 
 # This is a master port.
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
 .endif
 
 # if RUN_DEPENDS emacs port name has the suffix `-common'
 .if !defined(HAS_COMMON_PORT)
 HAS_COMMON_PORT=	NO
 .endif
 
 #
 # 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")
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/psgml \
 		--infodir=${PREFIX}/info
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 SCRIPTS_ENV=	TARGETS="${PSGML_STARTUPEL}" \
 		EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
 	@${FALSE}
 .endif
 
 #
 # DTD catalogs
 #
 RUN_DEPENDS+=	${CATALOG}:${PORTSDIR}/textproc/dtd-catalogs
 
 pre-configure:
 	(cd ${WRKSRC} ; \
 	  for i in psgml.el psgml.texi ; do \
 	      ${RM} -f $${i}.in ; \
 	      ${MV} $${i} $${i}.in ; \
 	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${PREFIX};g" > $${i} ; \
 	  done)
 	${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
 
 post-install:
 	@(cd ${WRKSRC} ; \
 		${MAKE} install-info ; \
 	)
 	@${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
 			${PREFIX}/${EMACS_LIBDIR}/site-lisp
 
 .include <bsd.port.mk>

Property changes on: head/editors/psgml/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/editors/psgml-emacs/Makefile
===================================================================
--- head/editors/psgml-emacs/Makefile	(revision 27505)
+++ head/editors/psgml-emacs/Makefile	(revision 27506)
@@ -1,84 +1,84 @@
 # 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
 
 # distfile version
 PSGML_VER=		1.2.0
 PSGML_STARTUPEL=	psgml-startup.el
 CATALOG=		${PREFIX}/share/sgml/catalog
 
 # This is a master port.
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
 .endif
 
 # if RUN_DEPENDS emacs port name has the suffix `-common'
 .if !defined(HAS_COMMON_PORT)
 HAS_COMMON_PORT=	NO
 .endif
 
 #
 # 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")
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/psgml \
 		--infodir=${PREFIX}/info
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 SCRIPTS_ENV=	TARGETS="${PSGML_STARTUPEL}" \
 		EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
 	@${FALSE}
 .endif
 
 #
 # DTD catalogs
 #
 RUN_DEPENDS+=	${CATALOG}:${PORTSDIR}/textproc/dtd-catalogs
 
 pre-configure:
 	(cd ${WRKSRC} ; \
 	  for i in psgml.el psgml.texi ; do \
 	      ${RM} -f $${i}.in ; \
 	      ${MV} $${i} $${i}.in ; \
 	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${PREFIX};g" > $${i} ; \
 	  done)
 	${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
 
 post-install:
 	@(cd ${WRKSRC} ; \
 		${MAKE} install-info ; \
 	)
 	@${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
 			${PREFIX}/${EMACS_LIBDIR}/site-lisp
 
 .include <bsd.port.mk>

Property changes on: head/editors/psgml-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/editors/psgml-mule/Makefile
===================================================================
--- head/editors/psgml-mule/Makefile	(revision 27505)
+++ head/editors/psgml-mule/Makefile	(revision 27506)
@@ -1,28 +1,27 @@
 # New ports collection makefile for:	psgml for mule
-# Version required:	1.2.0
 # Date created:		23 January 1999
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/psgml-emacs
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
 
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 
 # pkg/* files are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/psgml-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/psgml-xemacs21-mule/Makefile
===================================================================
--- head/editors/psgml-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/psgml-xemacs21-mule/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # New ports collection makefile for:	psgml for xemacs-mule
-# Version required:	1.2.0
 # Date created:		26 May 1999
 # Whom:			kuriyama
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../psgml-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_VER=	21.1.9
 EMACS_LIBDIR=	lib/xemacs
 
 # pkg/* files are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/psgml-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/editors/semi/Makefile
===================================================================
--- head/editors/semi/Makefile	(revision 27505)
+++ head/editors/semi/Makefile	(revision 27506)
@@ -1,233 +1,233 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.13.2
 SEMI_VER=	1.13.7
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/semi/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi-emacs/Makefile
===================================================================
--- head/editors/semi-emacs/Makefile	(revision 27505)
+++ head/editors/semi-emacs/Makefile	(revision 27506)
@@ -1,233 +1,233 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.12.7
 SEMI_VER=	1.13.4
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/semi-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/semi-emacs-current/Makefile
===================================================================
--- head/editors/semi-emacs-current/Makefile	(revision 27505)
+++ head/editors/semi-emacs-current/Makefile	(revision 27506)
@@ -1,233 +1,233 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.13.2
 SEMI_VER=	1.13.7
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/semi-emacs-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi-emacs20/Makefile
===================================================================
--- head/editors/semi-emacs20/Makefile	(revision 27505)
+++ head/editors/semi-emacs20/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # New ports collection makefile for:	semi for emacs
-# Version required:	1.13.4
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi-emacs20-current/Makefile
===================================================================
--- head/editors/semi-emacs20-current/Makefile	(revision 27505)
+++ head/editors/semi-emacs20-current/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-emacs20-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi-mule/Makefile
===================================================================
--- head/editors/semi-mule/Makefile	(revision 27505)
+++ head/editors/semi-mule/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # New ports collection makefile for:	semi for mule
-# Version required:	1.13.4
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs has mule feature
 HAS_MULE=               YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/semi-mule-current/Makefile
===================================================================
--- head/editors/semi-mule-current/Makefile	(revision 27505)
+++ head/editors/semi-mule-current/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs has mule feature
 HAS_MULE=               YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-mule-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/editors/semi-xemacs/Makefile
===================================================================
--- head/editors/semi-xemacs/Makefile	(revision 27505)
+++ head/editors/semi-xemacs/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	semi for xemacs
-# Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-xemacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/semi-xemacs-current/Makefile
===================================================================
--- head/editors/semi-xemacs-current/Makefile	(revision 27505)
+++ head/editors/semi-xemacs-current/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-xemacs-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/semi-xemacs20/Makefile
===================================================================
--- head/editors/semi-xemacs20/Makefile	(revision 27505)
+++ head/editors/semi-xemacs20/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	semi for xemacs20
-# Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-xemacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/semi-xemacs20-current/Makefile
===================================================================
--- head/editors/semi-xemacs20-current/Makefile	(revision 27505)
+++ head/editors/semi-xemacs20-current/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-xemacs20-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/semi-xemacs21-mule/Makefile
===================================================================
--- head/editors/semi-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/semi-xemacs21-mule/Makefile	(revision 27506)
@@ -1,65 +1,64 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
 
 # xemacs package
 XEMACS_PKGNAME=	semi
 XEMACS_PKGVER=	1.13
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-ui-en.info info/mime-ui-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/semi-xemacs21-mule-current/Makefile
===================================================================
--- head/editors/semi-xemacs21-mule-current/Makefile	(revision 27505)
+++ head/editors/semi-xemacs21-mule-current/Makefile	(revision 27506)
@@ -1,65 +1,64 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
 
 # xemacs package
 XEMACS_PKGNAME=	semi
 XEMACS_PKGVER=	1.18
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-ui-en.info info/mime-ui-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi-xemacs21-mule-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/semi113/Makefile
===================================================================
--- head/editors/semi113/Makefile	(revision 27505)
+++ head/editors/semi113/Makefile	(revision 27506)
@@ -1,233 +1,233 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.13.2
 SEMI_VER=	1.13.7
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/semi113/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi113-emacs/Makefile
===================================================================
--- head/editors/semi113-emacs/Makefile	(revision 27505)
+++ head/editors/semi113-emacs/Makefile	(revision 27506)
@@ -1,233 +1,233 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.13.2
 SEMI_VER=	1.13.7
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/semi113-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi113-emacs20/Makefile
===================================================================
--- head/editors/semi113-emacs20/Makefile	(revision 27505)
+++ head/editors/semi113-emacs20/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi113-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/semi113-mule/Makefile
===================================================================
--- head/editors/semi113-mule/Makefile	(revision 27505)
+++ head/editors/semi113-mule/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs has mule feature
 HAS_MULE=               YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi113-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/editors/semi113-xemacs/Makefile
===================================================================
--- head/editors/semi113-xemacs/Makefile	(revision 27505)
+++ head/editors/semi113-xemacs/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi113-xemacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/semi113-xemacs20/Makefile
===================================================================
--- head/editors/semi113-xemacs20/Makefile	(revision 27505)
+++ head/editors/semi113-xemacs20/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi113-xemacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/semi113-xemacs21-mule/Makefile
===================================================================
--- head/editors/semi113-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/semi113-xemacs21-mule/Makefile	(revision 27506)
@@ -1,65 +1,64 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.9
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
 
 # xemacs package
 XEMACS_PKGNAME=	semi
 XEMACS_PKGVER=	1.18
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-ui-en.info info/mime-ui-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/semi113-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/editors/semi114-emacs20/Makefile
===================================================================
--- head/editors/semi114-emacs20/Makefile	(revision 27505)
+++ head/editors/semi114-emacs20/Makefile	(revision 27506)
@@ -1,233 +1,233 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.13.2
 SEMI_VER=	1.13.7
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/semi114-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/editors/wemi-emacs/Makefile
===================================================================
--- head/editors/wemi-emacs/Makefile	(revision 27505)
+++ head/editors/wemi-emacs/Makefile	(revision 27506)
@@ -1,234 +1,234 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.12.7
 WEMI_VER=	1.13.4
 # setupel filename
 WEMI_SETUPEL=	wemi-setupel.el
 # document install directory by install-doc target
 WEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
 WEMI_COOKIE=	wemi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${WEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE} WEMI_COOKIE=${WEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${WEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 	@${TOUCH} ${PREFIX}/share/semi/${WEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${WEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${WEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${WEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/wemi-emacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/editors/wemi-emacs-current/Makefile
===================================================================
--- head/editors/wemi-emacs-current/Makefile	(revision 27505)
+++ head/editors/wemi-emacs-current/Makefile	(revision 27506)
@@ -1,232 +1,232 @@
 # 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
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_VER=	1.13.2
 WEMI_VER=	1.13.7
 # setupel filename
 WEMI_SETUPEL=	wemi-setupel.el
 # document install directory by install-doc target
 WEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
 WEMI_COOKIE=	wemi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
 # target name for make build
 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")
 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} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${WEMI_SETUPEL}"
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE} WEMI_COOKIE=${WEMI_COOKIE}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .endif
 # depends on flim
 BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
 	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${WEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 MAKEINFO=		makeinfo --no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-copy
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} info-build-by-emacs
 .else
 	@${MAKE} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} mkdir-site-packages
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
 	@${MAKE} pkg-el-install
 .endif
 
 post-install:
 	@${MKDIR} -p ${PREFIX}/share/semi
 	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
 	@${TOUCH} ${PREFIX}/share/semi/${WEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} info-package-install
 	@${MAKE} manifest-install
 .else
 	@${MAKE} info-install
 .endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
 .endif
 
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .endif
 
 info-build-by-emacs:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 pkg-el-copy:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
 	fi)
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
 	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
 		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${WEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${WEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${WEMI_SETUPEL} \
 		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} -f ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>

Property changes on: head/editors/wemi-emacs-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/wemi-emacs20/Makefile
===================================================================
--- head/editors/wemi-emacs20/Makefile	(revision 27505)
+++ head/editors/wemi-emacs20/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # New ports collection makefile for:	wemi for emacs20
-# Version required:	1.13.4
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-emacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/wemi-emacs20-current/Makefile
===================================================================
--- head/editors/wemi-emacs20-current/Makefile	(revision 27505)
+++ head/editors/wemi-emacs20-current/Makefile	(revision 27506)
@@ -1,29 +1,28 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs has mule feature
 HAS_MULE=	YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-emacs20-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/editors/wemi-mule/Makefile
===================================================================
--- head/editors/wemi-mule/Makefile	(revision 27505)
+++ head/editors/wemi-mule/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # New ports collection makefile for:	wemi for mule
-# Version required:	1.13.4
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/wemi-mule-current/Makefile
===================================================================
--- head/editors/wemi-mule-current/Makefile	(revision 27505)
+++ head/editors/wemi-mule-current/Makefile	(revision 27506)
@@ -1,33 +1,32 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 # whether emacs has a *-common port
 HAS_COMMON_PORT=	YES
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-mule-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/editors/wemi-xemacs/Makefile
===================================================================
--- head/editors/wemi-xemacs/Makefile	(revision 27505)
+++ head/editors/wemi-xemacs/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	wemi for xemacs
-# Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-xemacs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/wemi-xemacs-current/Makefile
===================================================================
--- head/editors/wemi-xemacs-current/Makefile	(revision 27505)
+++ head/editors/wemi-xemacs-current/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs
 EMACS_VER=	19.16
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-19.16 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-xemacs-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/wemi-xemacs20/Makefile
===================================================================
--- head/editors/wemi-xemacs20/Makefile	(revision 27505)
+++ head/editors/wemi-xemacs20/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # New ports collection makefile for:	wemi for xemacs20
-# Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-xemacs20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/editors/wemi-xemacs20-current/Makefile
===================================================================
--- head/editors/wemi-xemacs20-current/Makefile	(revision 27505)
+++ head/editors/wemi-xemacs20-current/Makefile	(revision 27506)
@@ -1,27 +1,26 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs20
 EMACS_VER=	20.4
 EMACS_LIBDIR=		lib/${EMACS_NAME}
 # xemacs-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-xemacs20-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/wemi-xemacs21-mule/Makefile
===================================================================
--- head/editors/wemi-xemacs21-mule/Makefile	(revision 27505)
+++ head/editors/wemi-xemacs21-mule/Makefile	(revision 27506)
@@ -1,66 +1,65 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
 
 # xemacs package
 XEMACS_PKGNAME=		semi
 XEMACS_PKGNAME_ALT=	wemi
 XEMACS_PKGVER=  	1.13
 #XEMACS_PKGVER!=	grep version ${MASTERDIR}/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME_ALT}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-ui-en.info info/mime-ui-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 WEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-xemacs21-mule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/editors/wemi-xemacs21-mule-current/Makefile
===================================================================
--- head/editors/wemi-xemacs21-mule-current/Makefile	(revision 27505)
+++ head/editors/wemi-xemacs21-mule-current/Makefile	(revision 27506)
@@ -1,66 +1,65 @@
 # 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>
 #
 # $FreeBSD$
 #
 
 MAINTAINER=	shige@FreeBSD.org
 
 # This is a slave port.
 PORTCLASS=	slave
 
 MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
 EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
 
 # how to make and install
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAS_COMMON_PORT=	YES
 
 # whether emacs has mule feature
 HAS_MULE=		YES
 
 # whether building info files by emacs or makeinfo
 BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
 
 # xemacs package
 XEMACS_PKGNAME=		semi
 XEMACS_PKGNAME_ALT=	wemi
 XEMACS_PKGVER=		1.18
 #XEMACS_PKGVER!=	grep version ${MASTERDIR}/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME_ALT}-${XEMACS_PKGVER}-pkg.tar.gz
 XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
 			info/mime-ui-en.info info/mime-ui-ja.info \
 			man/${XEMACS_PKGNAME}
 
 # package documents
 WEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
 xemacs-package: install
 	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
 	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
 	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
 	)
 
 .include <${MASTERDIR}/Makefile>

Property changes on: head/editors/wemi-xemacs21-mule-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/editors/xenon/Makefile
===================================================================
--- head/editors/xenon/Makefile	(revision 27505)
+++ head/editors/xenon/Makefile	(revision 27506)
@@ -1,33 +1,33 @@
 # 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/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
 
 MAN1=		xe.1
 
 pre-patch:
 	@${CP} ${WRKSRC}/makefiles/Makefile.Linux ${WRKSRC}/makefiles/Makefile.FreeBSD
 
 do-configure:
 	@cd ${WRKSRC}; ${LN} -sf makefiles/Makefile.FreeBSD Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xe ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xe.1 ${PREFIX}/man/man1
 	@${MKDIR} ${PREFIX}/share/examples/xe
 	${INSTALL_DATA} ${WRKSRC}/xerc ${PREFIX}/share/examples/xe/sample.xerc
 
 .include <bsd.port.mk>

Property changes on: head/editors/xenon/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/xvile/Makefile
===================================================================
--- head/editors/xvile/Makefile	(revision 27505)
+++ head/editors/xvile/Makefile	(revision 27506)
@@ -1,58 +1,58 @@
 # 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
 
 USE_XLIB=	yes
 MAKEFILE=	makefile
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-screen=${SCREEN_TYPE} ${WITH_PERL}
 MAN1=		xvile.1
 
 pre-configure:
 .if ! defined(USE_MENUS)
 	@${ECHO_MSG} "To use xvile with menus, set the environment variable USE_MENUS"
 .endif
 .if ! defined(USE_PERL)
 	@${ECHO_MSG} "To use xvile with PERL, set the environment variable USE_PERL"
 .endif
 
 .if defined(USE_MENUS)
 SCREEN_TYPE=	Xaw
 .else
 SCREEN_TYPE=	x11
 .endif
 
 .if defined(USE_PERL)
 WITH_PERL=	--with-perl
 PLIST=		${PKGDIR}/PLIST.perl
 USE_PERL5=	yes
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@if ! [ -d ${PREFIX}/share/doc/vile ]; then ${MKDIR} ${PREFIX}/share/doc/vile; fi
 	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${PREFIX}/share/doc/vile
 .endif
 	@if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi
 	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros
 	${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros
 .if defined(USE_PERL)
 	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile
 .endif
 	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation."
 	@${ECHO_MSG} "Look in ${PREFIX}/share/vile/macros for macros."
 
 .include <bsd.port.mk>

Property changes on: head/editors/xvile/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.23
\ No newline at end of property
+1.24
\ No newline at end of property
Index: head/editors/yudit/Makefile
===================================================================
--- head/editors/yudit/Makefile	(revision 27505)
+++ head/editors/yudit/Makefile	(revision 27506)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	yudit
-# Version required:	1.3
 # Date created:		October 3, 1998
 # Whom:			rch@richard.eu.org
 #
 # $FreeBSD$
 #
 #
 #
 #
 
-DISTNAME=	yudit-1.5
+PORTNAME=	yudit
+PORTVERSION=	1.5
 CATEGORIES=	editors converters print
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR= apps/editors/X
 
 MAINTAINER=	rch@WriteMe.Com
 
 LIB_DEPENDS=	ttf.4:${PORTSDIR}/print/freetype
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 CONFIGURE_ENV=	LC_ALL=C
 GNU_CONFIGURE=	YES
 MAKE_ENV=	LC_ALL=C
 MAN1=		yudit.1 makeumap.1 stripumap.1 uniconv.1 uniprint.1
 USE_GMAKE=	YES
 
 post-install:
 	cd ${PREFIX}/bin/ && strip yudit stripumap uniconv uniprint
 
 .include <bsd.port.mk>

Property changes on: head/editors/yudit/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/textproc/coco/Makefile
===================================================================
--- head/textproc/coco/Makefile	(revision 27505)
+++ head/textproc/coco/Makefile	(revision 27506)
@@ -1,165 +1,166 @@
 # New ports collection makefile for:	files except executables for mule 2.3@19.34
 # Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $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/
 PATCHFILES=	mule-23-1934-alpha01.diff.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	taoka@FreeBSD.org
 
 .include <bsd.port.pre.mk>
 
 WRKDIRBASE!=	${ECHO} ${WRKDIRPREFIX}${.CURDIR} | sed s:/editors/mule-common$$::
 
 .for dir in 	chinese/mule-wnn4 \
 		editors/mule \
 		japanese/mule-canna+sj3+wnn4 \
 		japanese/mule-canna+sj3+wnn6 \
 		japanese/mule-canna+sj3 \
 		japanese/mule-canna+wnn4 \
 		japanese/mule-canna+wnn6 \
 		japanese/mule-canna \
 		japanese/mule-sj3+wnn4 \
 		japanese/mule-sj3+wnn6 \
 		japanese/mule-sj3 \
 		japanese/mule-wnn4 \
 		japanese/mule-wnn6 \
 		korean/mule-wnn4
 .if exists(${WRKDIRBASE}/${dir}/work/.install_done)
 WRKDIR=		${WRKDIRBASE}/${dir}/work
 .elif exists(${WRKDIRBASE}/${dir}/work/.build_done)
 WRKDIR?=	${WRKDIRBASE}/${dir}/work
 .endif
 .endfor
 WRKSRC= ${WRKDIR}/emacs-19.34
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/mule.sh
 
 .if !defined(WRKDIR)
 .if defined(PACKAGE_BUILDING)
 # XXX
 WRKDIR=	${WRKDIRBASE}/editors/mule/work
 pre-build:
 	@cd ${.CURDIR}/../mule; make
 .else
 BROKEN=		You should build install one of the other mule ports first
 .endif
 .endif
 
 INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
 PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${CONFIGURE_TARGET}
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
 CONFIGURE_ARGS=	--with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
 STRIP=
 MAN1=		coco.1 ctags.1 etags.1 m2ps.1 emacs.1 mule.1
 
 INSTALL_TARGET=	install-arch-indep
 
 COMP_ELC=	egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc
 ELC_DIR=	../lisp
 
 # ORIGINAL, MEW_ORG_PATCH and MEW_PATCH are used for debugging.
 #
 #   ORIGINAL: original mule 2.3 based on emacs 19.34
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${MKDIR} ${WRKSRC}/lisp/its
 	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
 .endif
 
 .if !defined(ORIGINAL)
 post-patch:
 .if !defined(MEW_ORG_PATCH)
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/patch-19.34
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/Mule-2.3-19.34.patch
 	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/extra.patch
 .if defined(MEW_PATCH)
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch-for_katayama
 .endif
 .else
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch
 .endif
 .if defined(MEW_PATCH) || defined(MEW_ORG_PATCH)
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/canna.el-19.34.patch
 	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/sj3-egg.el.patch
 .endif
 .endif
 
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.34.*
 
 post-build:
 # bytecompile elisps for Japanese input method
 	for file in ${COMP_ELC}; do \
 		target="$$target ${ELC_DIR}/$$file"; \
 	done; \
 	cd ${WRKSRC}/src; \
 	./temacs -batch -l mule-inst.el $$target
 
 post-install:
 # note that any2ps rcs-checkin are scripts
 .for file in b2m coco ctags emacsclient etags m2ps
 	strip ${PREFIX}/bin/${file}
 .endfor
 	if [ ! -f ${PREFIX}/share/mule/19.34/info/dir ]; then \
 	  ${MKDIR} ${PREFIX}/share/mule/19.34/info; \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/share/mule/19.34/info/dir; \
 	fi
 .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
 	if [ ! -f ${STARTUP_SCRIPT} ]; then \
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
 		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; \
 		${ECHO} '#${ECHO} -n " Mule"' >> ${STARTUP_SCRIPT}; \
 		${ECHO} 'if [ -d /var/run/emacs/lock ]; then' >> ${STARTUP_SCRIPT}; \
 		${ECHO} '     rm -f /var/run/emacs/lock/*' >> ${STARTUP_SCRIPT}; \
 		${ECHO} "else" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "     mkdir -p /var/run/emacs/lock" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "fi" >> ${STARTUP_SCRIPT} ; \
 		${ECHO} "${CHMOD} 1777 /var/run/emacs/lock${lockdir}" >> ${STARTUP_SCRIPT} ; \
 		${CHMOD} 755 ${STARTUP_SCRIPT} ;				\
 		${CHOWN} bin.bin ${STARTUP_SCRIPT};			\
 	fi
 
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.post.mk>

Property changes on: head/textproc/coco/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.45
\ No newline at end of property
+1.46
\ No newline at end of property