aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2000-04-13 16:34:11 +0800
committerknu <knu@FreeBSD.org>2000-04-13 16:34:11 +0800
commit6d83855189dd6358e1e808aa082eb143030a1138 (patch)
tree592d0f8367887605e07e8a8490731d9163720b83 /japanese
parent1d62bfcd9c854266dcbbcff96df51732877cd673 (diff)
downloadfreebsd-ports-gnome-6d83855189dd6358e1e808aa082eb143030a1138.tar.gz
freebsd-ports-gnome-6d83855189dd6358e1e808aa082eb143030a1138.tar.zst
freebsd-ports-gnome-6d83855189dd6358e1e808aa082eb143030a1138.zip
Update with the new PORT{NAME,VERSION}/PKGNAME{PRE,SUF}FIX variables.
Finally `japanese' category has been done.
Diffstat (limited to 'japanese')
-rw-r--r--japanese/vfghostscript/Makefile19
-rw-r--r--japanese/vfghostscript5/Makefile46
-rw-r--r--japanese/vfghostscript55/Makefile40
-rw-r--r--japanese/vflib/Makefile9
-rw-r--r--japanese/vftool/Makefile11
-rw-r--r--japanese/vfxdvi118/Makefile1
-rw-r--r--japanese/vfxdvi240/Makefile1
-rw-r--r--japanese/vfxdvi300/Makefile26
-rw-r--r--japanese/vfxdvi360/Makefile1
-rw-r--r--japanese/vfxdvi400/Makefile1
-rw-r--r--japanese/vfxdvi600/Makefile1
-rw-r--r--japanese/vje30-trial/Makefile9
-rw-r--r--japanese/vje30/Makefile8
-rw-r--r--japanese/w3/Makefile4
-rw-r--r--japanese/w3m-ssl/Makefile15
-rw-r--r--japanese/w3m/Makefile2
-rw-r--r--japanese/weblint97/Makefile6
-rw-r--r--japanese/wine/Makefile13
-rw-r--r--japanese/word/Makefile5
-rw-r--r--japanese/xdvik-vflib-pk118/Makefile3
-rw-r--r--japanese/xdvik-vflib-pk240/Makefile3
-rw-r--r--japanese/xdvik-vflib-pk300/Makefile3
-rw-r--r--japanese/xdvik-vflib-pk360/Makefile3
-rw-r--r--japanese/xdvik-vflib-pk400/Makefile3
-rw-r--r--japanese/xdvik-vflib-pk600/Makefile3
-rw-r--r--japanese/xdvik-vflib-pkall/Makefile3
-rw-r--r--japanese/xdvik-vflib/Makefile14
-rw-r--r--japanese/xdvik/Makefile14
-rw-r--r--japanese/xemacs21-canna+freewnn/Makefile1
-rw-r--r--japanese/xemacs21-canna+wnn6/Makefile1
-rw-r--r--japanese/xemacs21-canna/Makefile12
-rw-r--r--japanese/xemacs21-freewnn/Makefile1
-rw-r--r--japanese/xemacs21-sumo-canna+freewnn/Makefile4
-rw-r--r--japanese/xemacs21-sumo-canna+wnn6/Makefile4
-rw-r--r--japanese/xemacs21-sumo-canna/Makefile4
-rw-r--r--japanese/xemacs21-sumo-freewnn/Makefile4
-rw-r--r--japanese/xemacs21-sumo-wnn6/Makefile4
-rw-r--r--japanese/xemacs21-wnn6/Makefile1
-rw-r--r--japanese/xjman-3/Makefile5
-rw-r--r--japanese/xjman/Makefile5
-rw-r--r--japanese/xklock/Makefile8
-rw-r--r--japanese/xnetmaj/Makefile9
-rw-r--r--japanese/xshodo/Makefile6
-rw-r--r--japanese/xshodou/Makefile5
-rw-r--r--japanese/xv/Makefile2
-rw-r--r--japanese/xyagamo/Makefile4
-rw-r--r--japanese/yc.el/Makefile14
-rw-r--r--japanese/zipcodes/Makefile6
48 files changed, 167 insertions, 200 deletions
diff --git a/japanese/vfghostscript/Makefile b/japanese/vfghostscript/Makefile
index 5ae24191e4d8..112871c9bdec 100644
--- a/japanese/vfghostscript/Makefile
+++ b/japanese/vfghostscript/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Japanese ghostscript + vector font library
-# Version required: 2.6.2
# Date created: 14 May 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ghostscript2.6.2
-PKGNAME= ja-vfghostscript-2.6.2
+PORTNAME= vfghostscript
+PORTVERSION= 2.6.2
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.iis.u-tokyo.ac.jp/GNU/ \
@@ -15,19 +14,23 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/
MASTER_SITE_SUBDIR= ghostscript
-DISTFILES= ghostscript-2.6.2.tar.gz ghostscript-fonts-2.6.2.tar.gz \
- ghostscript-fonts-4.0.tar.gz gs261j10.tar.gz \
+DISTNAME= ghostscript-${PORTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ghostscript-fonts-${PORTVERSION}.tar.gz \
+ ghostscript-fonts-4.0.tar.gz \
+ gs261j10.tar.gz \
gs261d13.tar.gz \
gdevlips4-1.1.0.tar.gz \
- bjc600j-0.9.tar.gz gdevmjc-0.7.tar.gz
+ bjc600j-0.9.tar.gz \
+ gdevmjc-0.7.tar.gz
MAINTAINER= mita@jp.FreeBSD.org
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
NO_LATEST_LINK= yes
-WRKSRC= ${WRKDIR}/gs262
-EXTRACT_ONLY= ghostscript-2.6.2.tar.gz
+WRKSRC= ${WRKDIR}/gs${PORTVERSION:S/.//g}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAN1= gs.1
DOC_DIR=${PREFIX}/lib/ghostscript/doc
diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 1cd0a66d934d..b25db372c5b7 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Japanese Aladdin ghostscript + vector font library(FreeType)
-# Version required: 5.10
# Date created: 26 Aug 1997
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-5.10
-PKGNAME= ja-vfghostscript-5.10
+PORTNAME= vfghostscript
+PORTVERSION= 5.10
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/ \
ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
@@ -23,31 +22,32 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/ \
http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
http://www.necs.co.jp/~umi/ \
http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
- http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.10/ \
+ http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs${PORTVERSION}/ \
http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \
ftp://ftp.humblesoft.com/pub/
DISTFILES= ${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
+DISTNAME= ghostscript-${PORTVERSION}
MAINTAINER= mita@jp.FreeBSD.org
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
-EXTRACT_ONLY= ghostscript-5.10.tar.gz jpegsrc.v6a.tar.gz libpng-0.96.tgz
-WRKSRC= ${WRKDIR}/gs5.10
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} jpegsrc.v6a.tar.gz libpng-0.96.tgz
+WRKSRC= ${WRKDIR}/gs${PORTVERSION}
MAKEFILE= unix-gcc.mak
MAKE_FLAGS= prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
MAN1= gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1
CFLAGS+= -DA4
-GSINST_DIR= ${PREFIX}/share/ghostscript/5.10vflib
+GSINST_DIR= ${PREFIX}/share/ghostscript/${PORTVERSION}vflib
DOC_DIR= ${GSINST_DIR}/doc
PRINTER= ${WRKSRC}/jp-printers
-GS_SOURCES= ghostscript-5.10.tar.gz
+GS_SOURCES= ${DISTNAME}.tar.gz
GS_SOURCES+= jpegsrc.v6a.tar.gz
GS_SOURCES+= libpng-0.96.tgz
-GS_DRIVERS= gs5.10-vflib-1.2.tar.gz
-GS_DRIVERS+= gs5.10-jpdf-0.2.tar.gz
-GS_DRIVERS+= gs5.10-VFlibBM-PL2.diff.gz
+GS_DRIVERS= gs${PORTVERSION}-vflib-1.2.tar.gz
+GS_DRIVERS+= gs${PORTVERSION}-jpdf-0.2.tar.gz
+GS_DRIVERS+= gs${PORTVERSION}-VFlibBM-PL2.diff.gz
GS_DRIVERS+= gdevlips-2.3.2-510.tar.gz
GS_DRIVERS+= gdevmjc-0.8.tar.gz
GS_DRIVERS+= gdev10v.tar.gz
@@ -62,7 +62,7 @@ GS_DRIVERS+= epag-3.08.tar.gz
# downloading distfiles, do not change these when upgrading the port
# unless the files really change.
GS_FONTS_STD= ghostscript-fonts-std-5.50.tar.gz
-GS_FONTS_OTHER= ghostscript-fonts-other-5.10.tar.gz
+GS_FONTS_OTHER= ghostscript-fonts-other-${PORTVERSION}.tar.gz
pre-fetch:
.if !defined(PDFENCRYPT)
@@ -71,15 +71,15 @@ pre-fetch:
.endif
pre-patch:
- @(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.2.tar.gz )
- @(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.2.tar.gz )
+ @(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs${PORTVERSION}-vflib-1.2.tar.gz )
+ @(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs${PORTVERSION}-jpdf-0.2.tar.gz )
@(cd ${WRKDIR} ; \
- ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.2/gs5.10-vflib-1.2.diff \
+ ${PATCH} -p < ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/gs${PORTVERSION}-vflib-1.2.diff \
>/dev/null 2>&1)
@(cd ${WRKDIR} ; \
- ${PATCH} -p < ${WRKSRC}/gs5.10-jpdf-0.2/gs5.10-jpdf-0.2.diff \
+ ${PATCH} -p < ${WRKSRC}/gs${PORTVERSION}-jpdf-0.2/gs${PORTVERSION}-jpdf-0.2.diff \
>/dev/null 2>&1)
- @(cd ${WRKDIR} ; zcat ${DISTDIR}/gs5.10-VFlibBM-PL2.diff.gz | \
+ @(cd ${WRKDIR} ; zcat ${DISTDIR}/gs${PORTVERSION}-VFlibBM-PL2.diff.gz | \
${PATCH} -p >/dev/null 2>&1)
post-patch:
@@ -106,7 +106,7 @@ post-patch:
${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak ${WRKSRC}; \
${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak ${WRKSRC}; \
${CP} gdevrpdl-1.2-510/gdevrpdl.c gdevrpdl-1.2-510/gdevrpdl.mak ${WRKSRC}; \
- ${PATCH} -d gdevnpdl < ${PRINTER}/gdevnpdl/gdevnpdl.patch-gs5.10 ; \
+ ${PATCH} -d gdevnpdl < ${PRINTER}/gdevnpdl/gdevnpdl.patch-gs${PORTVERSION} ; \
${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
)
@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
@@ -137,11 +137,11 @@ post-install:
${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin
@strip ${PREFIX}/bin/gs
@( \
- ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README ${DOC_DIR}/README.gs5.10-vflib ; \
- ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
- ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
- ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
- ${CP} ${WRKSRC}/gs5.10-jpdf-0.2/README ${DOC_DIR}/README.gs5.10-jpdf ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/README ${DOC_DIR}/README.gs${PORTVERSION}-vflib ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/README.CID ${DOC_DIR}/README.CID.gs${PORTVERSION}-vflib ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-jpdf-0.2/README ${DOC_DIR}/README.gs${PORTVERSION}-jpdf ; \
${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
${CP} ${PRINTER}/gdevlips-2.3.2-510/Gdevlips.htm ${DOC_DIR} ; \
${CP} ${PRINTER}/gdevlips-2.3.2-510/gs_statd.dif ${DOC_DIR} ; \
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index fb9557b99e9d..fc7bc6973045 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: Japanese Aladdin ghostscript + vector font library(FreeType)
-# Version required: 5.50
# Date created: 26 Aug 1997
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ghostscript-5.50
-PKGNAME= ja-vfghostscript-5.50
+PORTNAME= vfghostscript
+PORTVERSION= 5.50
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
@@ -25,15 +24,16 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
ftp://ftp.humblesoft.com/pub/ \
http://www.necs.co.jp/~umi/ \
http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
- http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.50/
+ http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs${PORTVERSION}/
+DISTNAME= ghostscript-${PORTVERSION}
DISTFILES= ${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
MAINTAINER= mita@jp.FreeBSD.org
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
-EXTRACT_ONLY= ghostscript-5.50.tar.gz jpegsrc.v6b.tar.gz libpng-1.0.2.tar.gz
-WRKSRC= ${WRKDIR}/gs5.50
+EXTRACT_ONLY= ghostscript-${PORTVERSION}.tar.gz jpegsrc.v6b.tar.gz libpng-1.0.2.tar.gz
+WRKSRC= ${WRKDIR}/gs${PORTVERSION}
MAKEFILE= unix-gcc.mak
#MAKE_FLAGS= prefix=${PREFIX} CFLAGS="${CFLAGS}" -f
ALL_TARGET=
@@ -41,13 +41,13 @@ MAN1= gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1 ps2ps.1
USE_GMAKE= yes
CFLAGS+= -DA4
-GSINST_DIR= ${PREFIX}/share/ghostscript/5.50vflib
+GSINST_DIR= ${PREFIX}/share/ghostscript/${PORTVERSION}vflib
DOC_DIR= ${GSINST_DIR}/doc
PRINTER= ${WRKSRC}/jp-printers
-GS_SOURCES= ghostscript-5.50.tar.gz
+GS_SOURCES= ghostscript-${PORTVERSION}.tar.gz
GS_SOURCES+= jpegsrc.v6b.tar.gz
GS_SOURCES+= libpng-1.0.2.tar.gz
-GS_DRIVERS= gs5.50-vflib-1.0.tar.gz
+GS_DRIVERS= gs${PORTVERSION}-vflib-1.0.tar.gz
GS_DRIVERS+= gdevlips-2.3.2.tar.gz
GS_DRIVERS+= gdevmjc-0.8.tar.gz
GS_DRIVERS+= gdev10v.tar.gz
@@ -61,8 +61,8 @@ GS_DRIVERS+= gdevrpdl-1.2.tar.gz
# later version numbers pointing to them. To avoid unnecessarily
# downloading distfiles, do not change these when upgrading the port
# unless the files really change.
-GS_FONTS_STD= ghostscript-fonts-std-5.50.tar.gz
-GS_FONTS_OTHER= ghostscript-fonts-other-5.50.tar.gz
+GS_FONTS_STD= ghostscript-fonts-std-${PORTVERSION}.tar.gz
+GS_FONTS_OTHER= ghostscript-fonts-other-${PORTVERSION}.tar.gz
pre-fetch:
.if !defined(PDFENCRYPT)
@@ -72,10 +72,10 @@ pre-fetch:
pre-patch:
@(cd ${WRKSRC} ; \
- tar xzf ${DISTDIR}/gs5.50-vflib-1.0.tar.gz ;\
+ tar xzf ${DISTDIR}/gs${PORTVERSION}-vflib-1.0.tar.gz ;\
${MV} ../jpeg-6b jpeg ; \
${MV} ../libpng-1.0.2 libpng ; \
- ${PATCH} -s -p1 < ${WRKSRC}/gs5.50-vflib-1.0/gs5.50-vflib-1.0.diff \
+ ${PATCH} -s -p1 < ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/gs${PORTVERSION}-vflib-1.0.diff \
>/dev/null 2>&1)
post-patch:
@@ -99,8 +99,8 @@ post-patch:
${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h ${WRKSRC}; \
${CP} epag-3.08/gdevepag.c epag-3.08/gdevepag.mak ${WRKSRC}; \
${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
- ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-5.50 ${WRKSRC}; \
- ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-5.50 ${WRKSRC}; \
+ ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-${PORTVERSION} ${WRKSRC}; \
+ ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-${PORTVERSION} ${WRKSRC}; \
${CP} gdevrpdl-1.2/gdevrpdl.c gdevrpdl-1.2/gdevrpdl.mak ${WRKSRC}; \
)
@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
@@ -117,8 +117,8 @@ post-patch:
@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/contrib.mak
@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/contrib.mak
@${CAT} ${WRKSRC}/gdevmjc.mak >> ${WRKSRC}/contrib.mak
- @${CAT} ${WRKSRC}/gdevalps.mak-5.50 >> ${WRKSRC}/contrib.mak
- @${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak
+ @${CAT} ${WRKSRC}/gdevalps.mak-${PORTVERSION} >> ${WRKSRC}/contrib.mak
+ @${CAT} ${WRKSRC}/gdevmd2k.mak-${PORTVERSION} >> ${WRKSRC}/contrib.mak
post-build:
@(cd ${PRINTER}/epag-3.08 ; ${MAKE})
@@ -132,9 +132,9 @@ post-install:
${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin
@strip ${PREFIX}/bin/gs
@( \
- ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
- ${CP} ${WRKSRC}/gs5.50-vflib-1.0/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
- ${CP} ${WRKSRC}/gs5.50-vflib-1.0/OLD-DOC/gs261j11-doc/* ${DOC_DIR} ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
+ ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.0/OLD-DOC/gs261j11-doc/* ${DOC_DIR} ; \
${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
${CP} ${PRINTER}/gdevlips-2.3.2/Gdevlips.htm ${DOC_DIR} ; \
${CP} ${PRINTER}/gdevlips-2.3.2/gs_statd.dif ${DOC_DIR} ; \
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index e41ec4178abc..09efdd168ec6 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: vflib + FreeType
-# Version required: 2.24 Patchlevel 2
# Date created: 10 May 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= VFlib2-2.24.2
-PKGNAME= ja-vflib-2.24.2
+PORTNAME= vflib
+PORTVERSION= ${VFLIB_VERSION}
CATEGORIES= japanese print
MASTER_SITES= ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
-DISTFILES= VFlib2-2.24.2.tar.gz watanabe-vf.tar.Z
+DISTNAME= VFlib2-${PORTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ watanabe-vf.tar.Z
MAINTAINER= mita@jp.FreeBSD.org
diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile
index 6ddfc5b7074f..727b320dd2c2 100644
--- a/japanese/vftool/Makefile
+++ b/japanese/vftool/Makefile
@@ -1,26 +1,27 @@
# New ports collection makefile for: virtual fonts tools(n2a,a2n,a2bk,p2pn)
-# Version required: 1.2
# Date created: 12 September 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= vftool-1.2
-PKGNAME= ja-vftool-1.2
+PORTNAME= vftool
+PORTVERSION= 1.2
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/ \
ftp://bash.cc.keio.ac.jp/pub/TeX/ascii-ptex/ptex215/ \
ftp://ftp.iis.u-tokyo.ac.jp/TeX/NTT-JTeX/:old/ \
ftp://ftp.iis.u-tokyo.ac.jp/TeX/fonts/pk/ \
ftp://ftp.waseda.ac.jp/pub/tex/ascii-OLD/
-DISTFILES= vftool-1.2.tar.gz plib13-euc.tar.gz jtex-1.52.tar.gz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ plib13-euc.tar.gz \
+ jtex-1.52.tar.gz
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
BUILD_DEPENDS= ${AFMDIR}/GothicBBB-Medium-H:${PORTSDIR}/japanese/japaneseAFM
-EXTRACT_ONLY= vftool-1.2.tar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
ALL_TARGET= n2a a2n a2bk p2pn
SCRIPTS_ENV= MV=${MV} SED=${SED} AFMDIR=${AFMDIR} JFMDIR=${JFMDIR}
diff --git a/japanese/vfxdvi118/Makefile b/japanese/vfxdvi118/Makefile
index 1432f29f8e15..802bafc41b35 100644
--- a/japanese/vfxdvi118/Makefile
+++ b/japanese/vfxdvi118/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xdvi-17miyu + patches + vector font library
-# Version required: pl17
# Date created: 8 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
diff --git a/japanese/vfxdvi240/Makefile b/japanese/vfxdvi240/Makefile
index 97746a4b74a9..38099ac64f7b 100644
--- a/japanese/vfxdvi240/Makefile
+++ b/japanese/vfxdvi240/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xdvi-17miyu + patches + vector font library
-# Version required: pl17
# Date created: 8 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
diff --git a/japanese/vfxdvi300/Makefile b/japanese/vfxdvi300/Makefile
index edfa2777ef2c..9b4a71c2e2c9 100644
--- a/japanese/vfxdvi300/Makefile
+++ b/japanese/vfxdvi300/Makefile
@@ -1,21 +1,25 @@
# New ports collection makefile for: xdvi-17miyu + patches + vector font library
-# Version required: pl17
# Date created: 8 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xdvi-17
-PKGNAME= ja-vfxdvi${RESOLUTION}-17
+PORTNAME= vfxdvi
+PORTVERSION= 17
+PKGNAMESUFFIX= ${RESOLUTION}
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
ftp://ftp.hipecs.hokudai.ac.jp/pub/news-archive/fj.comp.texhax/volume95/Sep/ \
ftp://ftp.hipecs.hokudai.ac.jp/pub/news-archive/fj.comp.texhax/volume95/Oct/ \
ftp://ftp.hipecs.hokudai.ac.jp/pub/news-archive/fj.comp.texhax/volume95/Nov/
-DISTFILES= xdvi-17.tar.gz xdvi-17miyu.patch-beta6.gz \
+DISTNAME= xdvi-${PORTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ xdvi-${PORTVERSION}miyu.patch-beta6.gz \
xdvi18-okagawa-patch \
- 950923.02.Z 951007.02.Z 951109.04.Z
+ 950923.02.Z \
+ 951007.02.Z \
+ 951109.04.Z
MAINTAINER= mita@jp.FreeBSD.org
@@ -26,7 +30,7 @@ WRKSRC= ${WRKDIR}
DIST_SUBDIR= xdvi
USE_IMAKE= yes
XMKMF= xmkmf
-EXTRACT_ONLY= xdvi-17.tar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
.if !defined(RESOLUTION)
RESOLUTION= 300
@@ -48,15 +52,15 @@ pre-patch:
uudecode ${DISTDIR}/${DIST_SUBDIR}/xdvi18-okagawa-patch ; \
${GUNZIP_CMD} xdvi18.vflib.patch.gz ; \
${PATCH} < ${FILESDIR}/xdvi18.vflib.patch.of.patch >/dev/null 2>&1; \
- ${GUNZIP_CMD} xdvi-17+ptex.fixed.patch.gz ; \
- ${PATCH} < ${FILESDIR}/xdvi-17+ptex.fixed.patch.of.patch >/dev/null 2>&1; \
+ ${GUNZIP_CMD} xdvi-${PORTVERSION}+ptex.fixed.patch.gz ; \
+ ${PATCH} < ${FILESDIR}/xdvi-${PORTVERSION}+ptex.fixed.patch.of.patch >/dev/null 2>&1; \
${MKDIR} tmp; \
cd tmp; \
${PATCH} -f < ../xdvi18.vflib.patch >/dev/null 2>&1; \
cd .. ; \
- ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xdvi-17miyu.patch-beta6.gz | patch -d . >/dev/null 2>&1; \
- ${GZCAT} xdvi-pl17+markpage+toc+printdvi+paper.patch.gz | patch -d . >/dev/null 2>&1 ; \
- ${PATCH} -d . < xdvi-17+ptex.fixed.patch >/dev/null 2>&1; \
+ ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xdvi-${PORTVERSION}miyu.patch-beta6.gz | patch -d . >/dev/null 2>&1; \
+ ${GZCAT} xdvi-pl${PORTVERSION}+markpage+toc+printdvi+paper.patch.gz | patch -d . >/dev/null 2>&1 ; \
+ ${PATCH} -d . < xdvi-${PORTVERSION}+ptex.fixed.patch >/dev/null 2>&1; \
${CP} tmp/dnpzeit.c tmp/zeit.c . ; \
)
diff --git a/japanese/vfxdvi360/Makefile b/japanese/vfxdvi360/Makefile
index 7936e379d933..f1c80aad8cb4 100644
--- a/japanese/vfxdvi360/Makefile
+++ b/japanese/vfxdvi360/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xdvi-17miyu + patches + vector font library
-# Version required: pl17
# Date created: 8 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
diff --git a/japanese/vfxdvi400/Makefile b/japanese/vfxdvi400/Makefile
index e72a41ef629a..c9a8584a7fb8 100644
--- a/japanese/vfxdvi400/Makefile
+++ b/japanese/vfxdvi400/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xdvi-17miyu + patches + vector font library
-# Version required: pl17
# Date created: 8 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
diff --git a/japanese/vfxdvi600/Makefile b/japanese/vfxdvi600/Makefile
index 05977a5e87fc..80a5c6c28fe7 100644
--- a/japanese/vfxdvi600/Makefile
+++ b/japanese/vfxdvi600/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xdvi-17miyu + patches + vector font library
-# Version required: pl17
# Date created: 8 Nov 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile
index 28efc6e0bb93..0a9fcb33eec1 100644
--- a/japanese/vje30-trial/Makefile
+++ b/japanese/vje30-trial/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: VJE-Delta 3.0 Trial
-# Version required: 3.0 trial
# Date created: 14 January 2000
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
#
-DISTNAME= vje-delta-3.0t
-PKGNAME= ja-vje-trial-3.0
+PORTNAME= vje
+PORTVERSION= 3.0
+PKGNAMESUFFIX= -trial
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.vacs.co.jp/pub/unix/vje30/FreeBSD/ \
http://www.green.machida.ne.jp/vacs/unix/FreeBSD/
-EXTRACT_SUFX= -${DISTOBJFORMAT}.tgz
+EXTRACT_SUFX= .tgz
+DISTNAME= ${PORTNAME}-delta-${PORTVERSION}t-${DISTOBJFORMAT}
MAINTAINER= knu@idaemons.org
diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile
index 3848882c8333..1f9c67f177ba 100644
--- a/japanese/vje30/Makefile
+++ b/japanese/vje30/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: VJE-Delta 3.0
-# Version required: 3.0
# Date created: 29 January 2000
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
#
-DISTNAME= vje-delta-3.0
-PKGNAME= ja-vje-3.0
+PORTNAME= vje
+PORTVERSION= 3.0
CATEGORIES= japanese
MASTER_SITES= file:${MOUNT_PT}/freebsd/
-EXTRACT_SUFX= -${DISTOBJFORMAT}.tgz
+EXTRACT_SUFX= .tgz
+DISTNAME= ${PORTNAME}-delta-${PORTVERSION}-${DISTOBJFORMAT}
MAINTAINER= knu@idaemons.org
diff --git a/japanese/w3/Makefile b/japanese/w3/Makefile
index d9563e468fa1..cb2acb441afb 100644
--- a/japanese/w3/Makefile
+++ b/japanese/w3/Makefile
@@ -1,19 +1,17 @@
# New ports collection makefile for: w3 on Mule
-# Version required: 2.2.26
# Date created: 31 December 1996
# Whom: MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-w3-2.2.26
CATEGORIES= japanese www elisp
# Don't RUN_DEPENDS on mule because we don't know which version the
# user would want. We can't omit the BUILD_DEPENDS because it needs
# to byte-compile .el files.
BUILD_DEPENDS= mule:${PORTSDIR}/editors/mule
-RUN_DEPENDS=
+RUN_DEPENDS= # none
EMACSCMD= mule
ELISPDIR= ${PREFIX}/lib/mule/site-lisp
diff --git a/japanese/w3m-ssl/Makefile b/japanese/w3m-ssl/Makefile
index 100b4c2bf76e..c95ac1990fc3 100644
--- a/japanese/w3m-ssl/Makefile
+++ b/japanese/w3m-ssl/Makefile
@@ -1,19 +1,18 @@
# New ports collection makefile for: ja-w3m-ssl
-# Version required: 991028-2
# Date Created: 12 Oct 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
# $FreeBSD$
#
-PKGNAME= ja-w3m-ssl-${W3M_VER}
-CATEGORIES= japanese www ipv6
+PKGNAMESUFFIX= -ssl
+CATEGORIES= japanese www ipv6
-MASTERDIR= ${.CURDIR}/../../www/w3m
-PKGDIR= ${.CURDIR}/pkg
-PLIST= ${MASTERDIR}/pkg/PLIST.ja
+MASTERDIR= ${.CURDIR}/../../www/w3m
+PKGDIR= ${.CURDIR}/pkg
+PLIST= ${MASTERDIR}/pkg/PLIST.ja
-JAPANESE= Yes
-USE_OPENSSL= RSA
+JAPANESE= Yes
+USE_OPENSSL= RSA
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/w3m/Makefile b/japanese/w3m/Makefile
index 942b3bac3d1f..17d253b59a4d 100644
--- a/japanese/w3m/Makefile
+++ b/japanese/w3m/Makefile
@@ -1,12 +1,10 @@
# New ports collection makefile for: ja-w3m
-# Version required: 991028-2
# Date Created: 8 Oct 1999
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-PKGNAME= ja-w3m-${W3M_VER}
CATEGORIES= japanese www ipv6
MASTERDIR= ${.CURDIR}/../../www/w3m
diff --git a/japanese/weblint97/Makefile b/japanese/weblint97/Makefile
index 51acf8910745..745a800e8002 100644
--- a/japanese/weblint97/Makefile
+++ b/japanese/weblint97/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: weblint97
-# Version required: 0.12
# Date created: 27 Jun 1997
# Whom: Takayuki Ariga <a00821@cc.hc.keio.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= weblint-97-0.12
-PKGNAME= ja-weblint97-0.12
+PORTNAME= weblint97
+PORTVERSION= 0.12
CATEGORIES= japanese www
MASTER_SITES= http://www.sfc.keio.ac.jp/~mimasa/jweblint/ \
ftp://ftp.win.ne.jp/pub/network/www/weblint/ \
ftp://ftp.hipecs.hokudai.ac.jp/pub/network/WWW/contrib/
+DISTNAME= weblint-97-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/japanese/wine/Makefile b/japanese/wine/Makefile
index 661d9efbfe63..39ef304bb0ac 100644
--- a/japanese/wine/Makefile
+++ b/japanese/wine/Makefile
@@ -1,21 +1,22 @@
# New ports collection makefile for: ja-wine
-# Version required: 971130
# Date created: 14 Jan 1998
# Whom: Takashi Uozu <j1594016@ed.kagu.sut.ac.jp>
#
# $FreeBSD$
-DISTNAME= ja-Wine-990131
-PKGNAME= ja-wine-99.01.31
+PORTNAME= wine
+PORTVERSION= 99.01.31
CATEGORIES= japanese emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www1.mahoroba.ne.jp/~jkuchi/wine-jp/src/
MASTER_SITE_SUBDIR= ALPHA/wine/development
-DISTFILES= Wine-990131.tar.gz Wine990131-ja.tar.gz
+DISTNAME= ja-Wine-${PORTVERSION:S/.//g}
+DISTFILES= Wine-${PORTVERSION:S/.//g}.tar.gz \
+ Wine${PORTVERSION:S/.//g}-ja.tar.gz
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-WRKSRC= ${WRKDIR}/wine-990131
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g}
PATCH_STRIP= -p1
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-japanese --with-kinput
@@ -24,7 +25,7 @@ MAN1= wine.1
pre-patch:
@(cd ${WRKDIR}; \
- ${PATCH} ${PATCH_ARGS} < ${WRKDIR}/Wine990131-jp.Patch)
+ ${PATCH} ${PATCH_ARGS} < ${WRKDIR}/Wine${PORTVERSION:S/.//g}-jp.Patch)
pre-configure:
@${ECHO} "WINE_INI_GLOBAL \"${PREFIX}/etc/wine.conf\"" \
diff --git a/japanese/word/Makefile b/japanese/word/Makefile
index eb645496b16d..cdaf5ac1d9df 100644
--- a/japanese/word/Makefile
+++ b/japanese/word/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: word
-# Version required: 0.99.12
# Date created: 30 August 1999
# Whom: sada
#
# $FreeBSD$
#
-DISTNAME= word-0.99.12
-PKGNAME= ja-${DISTNAME}
+PORTNAME= word
+PORTVERSION= 0.99.12
CATEGORIES= japanese
MASTER_SITES= http://www.linet.gr.jp/~mituiwa/
diff --git a/japanese/xdvik-vflib-pk118/Makefile b/japanese/xdvik-vflib-pk118/Makefile
index e9c13b38ea1c..906b30d1f96e 100644
--- a/japanese/xdvik-vflib-pk118/Makefile
+++ b/japanese/xdvik-vflib-pk118/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15
-
RUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI}
FONTTYPE= pkfont
diff --git a/japanese/xdvik-vflib-pk240/Makefile b/japanese/xdvik-vflib-pk240/Makefile
index c96a69fddbee..9bce1be0ddbd 100644
--- a/japanese/xdvik-vflib-pk240/Makefile
+++ b/japanese/xdvik-vflib-pk240/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15
-
RUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI}
FONTTYPE= pkfont
diff --git a/japanese/xdvik-vflib-pk300/Makefile b/japanese/xdvik-vflib-pk300/Makefile
index 51cf492f8278..73138d40fb12 100644
--- a/japanese/xdvik-vflib-pk300/Makefile
+++ b/japanese/xdvik-vflib-pk300/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15
-
RUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI}
FONTTYPE= pkfont
diff --git a/japanese/xdvik-vflib-pk360/Makefile b/japanese/xdvik-vflib-pk360/Makefile
index 210aa0a1b7ea..29cd3ef60b2f 100644
--- a/japanese/xdvik-vflib-pk360/Makefile
+++ b/japanese/xdvik-vflib-pk360/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15
-
RUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI}
FONTTYPE= pkfont
diff --git a/japanese/xdvik-vflib-pk400/Makefile b/japanese/xdvik-vflib-pk400/Makefile
index 51b43b2099be..c656f6c63d18 100644
--- a/japanese/xdvik-vflib-pk400/Makefile
+++ b/japanese/xdvik-vflib-pk400/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15
-
RUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI}
FONTTYPE= pkfont
diff --git a/japanese/xdvik-vflib-pk600/Makefile b/japanese/xdvik-vflib-pk600/Makefile
index c6f2a1907f9e..2b73be29414c 100644
--- a/japanese/xdvik-vflib-pk600/Makefile
+++ b/japanese/xdvik-vflib-pk600/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15
-
RUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI}
FONTTYPE= pkfont
diff --git a/japanese/xdvik-vflib-pkall/Makefile b/japanese/xdvik-vflib-pkall/Makefile
index 28e17fe956f1..be1f16848cdb 100644
--- a/japanese/xdvik-vflib-pkall/Makefile
+++ b/japanese/xdvik-vflib-pkall/Makefile
@@ -1,13 +1,10 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-PKGNAME= ja-xdvik-vflib-${FONTTYPE}-22.15
-
FONTTYPE= pkall
BDPI= 300
SHRINK= 6
diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile
index 16b93e988166..fe79d1b0abaa 100644
--- a/japanese/xdvik-vflib/Makefile
+++ b/japanese/xdvik-vflib/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= xdvik-22.15
-PKGNAME?= ja-xdvik-vflib-22.15
+PORTNAME= xdvik-vflib
+PORTVERSION= 22.15
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
@@ -18,14 +17,14 @@ MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
${MASTER_SITE_LOCAL}
-#DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTNAME= xdvik-${PORTVERSION}
PATCH_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
ftp://komadori.planet.sci.kobe-u.ac.jp/pub/xdvi/ \
ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
${MASTER_SITE_LOCAL}
-PATCHFILES= xdvik-22.15-j1.03.patch.gz
+PATCHFILES= ${DISTNAME}-j1.03.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= inagaki@tg.rim.or.jp
@@ -111,6 +110,11 @@ MF_MODE= ${MAKETEX_MODE}
.else
MF_MODE= ${USEPK_MODE}
CONFIGURE_ARGS+=--without-mktexpk-default
+.if ${FONTTYPE} == pkall
+PKGNAMESUFFIX= -${FONTTYPE}
+.else
+PKGNAMESUFFIX= -pk${BDPI}
+.endif
.endif
.BEGIN:
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 16b93e988166..fe79d1b0abaa 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: xdvik + jp-patch
-# Version required: 22.15
# Date created: 15 Jun 1998
# Whom: Kentaro Inagaki <inagaki@tg.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= xdvik-22.15
-PKGNAME?= ja-xdvik-vflib-22.15
+PORTNAME= xdvik-vflib
+PORTVERSION= 22.15
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
@@ -18,14 +17,14 @@ MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
${MASTER_SITE_LOCAL}
-#DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTNAME= xdvik-${PORTVERSION}
PATCH_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
ftp://komadori.planet.sci.kobe-u.ac.jp/pub/xdvi/ \
ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
${MASTER_SITE_LOCAL}
-PATCHFILES= xdvik-22.15-j1.03.patch.gz
+PATCHFILES= ${DISTNAME}-j1.03.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= inagaki@tg.rim.or.jp
@@ -111,6 +110,11 @@ MF_MODE= ${MAKETEX_MODE}
.else
MF_MODE= ${USEPK_MODE}
CONFIGURE_ARGS+=--without-mktexpk-default
+.if ${FONTTYPE} == pkall
+PKGNAMESUFFIX= -${FONTTYPE}
+.else
+PKGNAMESUFFIX= -pk${BDPI}
+.endif
.endif
.BEGIN:
diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index 279526496edf..f916271fd24b 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: XEmacs with Canna and Wnn4
-# Version required: 21.1
# Date created: 5 Dec 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index a51ea92a52da..bd9953538aac 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: XEmacs with Canna and Wnn6
-# Version required: 21.1
# Date created: 5 Dec 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 339d99ab1291..867a6d037279 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: XEmacs for Japanese
-# Version required: 21.1
# Date created: 5 Dec 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
@@ -29,10 +28,9 @@ MAN1= xemacs-ja.1
DESCR= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/DESCR
XEMACS_MAJOR_VER?= 21
-LANGPREFIX= ja-
DESCR_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl
.if defined(CANNA) && defined(WNN4)
-PKGNAMEEXT= -canna+wnn4
+PKGNAMESUFFIX= -canna+wnn4
SITE_INCLUDES= ${X11BASE}/include
SITE_LIBRARIES= ${X11BASE}/lib
WITH_INPUT_METHOD= --with-canna --with-wnn --with-wnn6=no
@@ -40,25 +38,25 @@ LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna
BUILD_INPUT_METHOD= ${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn4 support
.elif defined(CANNA) && defined(WNN6)
-PKGNAMEEXT= -canna+wnn6
+PKGNAMESUFFIX= -canna+wnn6
WITH_INPUT_METHOD= --with-canna --with-wnn6
LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna
BUILD_INPUT_METHOD= ${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support
.elif defined(WNN4)
-PKGNAMEEXT= -wnn4
+PKGNAMESUFFIX= -wnn4
SITE_INCLUDES= ${X11BASE}/include
SITE_LIBRARIES= ${X11BASE}/lib
WITH_INPUT_METHOD= --with-wnn --with-canna=no --with-wnn6=no
BUILD_INPUT_METHOD= ${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn4 support
.elif defined(WNN6)
-PKGNAMEEXT= -wnn6
+PKGNAMESUFFIX= -wnn6
WITH_INPUT_METHOD= --with-wnn6 --with-canna=no
BUILD_INPUT_METHOD= ${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn6 support
.else
-PKGNAMEEXT= -canna
+PKGNAMESUFFIX= -canna
WITH_INPUT_METHOD= --with-canna --with-wnn=no --with-wnn6=no
LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Canna support
diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile
index ef93bf6c876e..83c6e31d55b7 100644
--- a/japanese/xemacs21-freewnn/Makefile
+++ b/japanese/xemacs21-freewnn/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: XEmacs with Wnn4
-# Version required: 21.1
# Date created: 25 January 1998
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/japanese/xemacs21-sumo-canna+freewnn/Makefile b/japanese/xemacs21-sumo-canna+freewnn/Makefile
index 333193fd9704..728e6352ddbc 100644
--- a/japanese/xemacs21-sumo-canna+freewnn/Makefile
+++ b/japanese/xemacs21-sumo-canna+freewnn/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
@@ -7,8 +6,7 @@
#
XEMACS_MAJOR_VER= 21
-LANGPREFIX= ja-
-NAMEEXT= -canna+wnn4
+PKGNAMESUFFIX= -canna+wnn4
MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
diff --git a/japanese/xemacs21-sumo-canna+wnn6/Makefile b/japanese/xemacs21-sumo-canna+wnn6/Makefile
index 120950c4e324..9ebdf5ccd426 100644
--- a/japanese/xemacs21-sumo-canna+wnn6/Makefile
+++ b/japanese/xemacs21-sumo-canna+wnn6/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
@@ -7,8 +6,7 @@
#
XEMACS_MAJOR_VER= 21
-LANGPREFIX= ja-
-NAMEEXT= -canna+wnn6
+PKGNAMESUFFIX= -canna+wnn6
MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
diff --git a/japanese/xemacs21-sumo-canna/Makefile b/japanese/xemacs21-sumo-canna/Makefile
index e93b15ef7faa..bce48d7b71e1 100644
--- a/japanese/xemacs21-sumo-canna/Makefile
+++ b/japanese/xemacs21-sumo-canna/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
@@ -7,8 +6,7 @@
#
XEMACS_MAJOR_VER= 21
-LANGPREFIX= ja-
-NAMEEXT= -canna
+PKGNAMESUFFIX= -canna
MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
diff --git a/japanese/xemacs21-sumo-freewnn/Makefile b/japanese/xemacs21-sumo-freewnn/Makefile
index 275a6eee19eb..84bc60ca8c77 100644
--- a/japanese/xemacs21-sumo-freewnn/Makefile
+++ b/japanese/xemacs21-sumo-freewnn/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
@@ -7,8 +6,7 @@
#
XEMACS_MAJOR_VER= 21
-LANGPREFIX= ja-
-NAMEEXT= -wnn4
+PKGNAMESUFFIX= -wnn4
MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
diff --git a/japanese/xemacs21-sumo-wnn6/Makefile b/japanese/xemacs21-sumo-wnn6/Makefile
index ebc8458ca562..4cf3590f3d60 100644
--- a/japanese/xemacs21-sumo-wnn6/Makefile
+++ b/japanese/xemacs21-sumo-wnn6/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Meta port of XEmacs mule with sumo package
-# Version required: 21.1
# Date created: 19 August 1999
# Whom: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
#
@@ -7,8 +6,7 @@
#
XEMACS_MAJOR_VER= 21
-LANGPREFIX= ja-
-NAMEEXT= -wnn6
+PKGNAMESUFFIX= -wnn6
MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index fc34580a579a..a4f915e16bc9 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: XEmacs with Wnn6
-# Version required: 21.1
# Date created: 25 January 1998
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/japanese/xjman-3/Makefile b/japanese/xjman-3/Makefile
index ee710514d832..f066addcd347 100644
--- a/japanese/xjman-3/Makefile
+++ b/japanese/xjman-3/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: X Japanese man documents
-# Version required: 0.4
# Date created: 24 Dec 1998
# Based on: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>'s
# japanese/man-doc
@@ -8,8 +7,8 @@
# $FreeBSD$
#
-DISTNAME= xjman-0.5
-PKGNAME= ja-${DISTNAME}
+PORTNAME= xjman
+PORTVERSION= 0.5
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
http://xjman.dsl.gr.jp/
diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile
index ee710514d832..f066addcd347 100644
--- a/japanese/xjman/Makefile
+++ b/japanese/xjman/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: X Japanese man documents
-# Version required: 0.4
# Date created: 24 Dec 1998
# Based on: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>'s
# japanese/man-doc
@@ -8,8 +7,8 @@
# $FreeBSD$
#
-DISTNAME= xjman-0.5
-PKGNAME= ja-${DISTNAME}
+PORTNAME= xjman
+PORTVERSION= 0.5
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
http://xjman.dsl.gr.jp/
diff --git a/japanese/xklock/Makefile b/japanese/xklock/Makefile
index 130d959867c8..4a97a096ba75 100644
--- a/japanese/xklock/Makefile
+++ b/japanese/xklock/Makefile
@@ -1,21 +1,21 @@
# New ports collection makefile for: xklock
-# Version required: 2.54
# Date created: 20 April 1997
# Whom: nkazushi@highway.or.jp
#
# $FreeBSD$
#
-DISTNAME= xklock-2.7
-PKGNAME= ja-xklock-2.7.1
+PORTNAME= xklock
+PORTVERSION= 2.7.1
CATEGORIES= japanese x11
MASTER_SITES= ftp://ftp.tk.mesh.ad.jp/pub/Linux/JE-sources/X/ \
ftp://ftp.biol.tsukuba.ac.jp/pub/X/clients/ \
ftp://ftp.kagoshima-u.ac.jp/pub1/PC/linux-j/JE-sources/X/ \
ftp://ftp.hitachi.co.jp/pub/linux/colias/pub/linux/JE-0.9.6/sources/X/
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= xklock-2.7+lx.diff.gz
+PATCHFILES= ${DISTNAME}+lx.diff.gz
PATCH_DIST_STRIP= -p1
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/japanese/xnetmaj/Makefile b/japanese/xnetmaj/Makefile
index 50ce6370634a..754a79a601f6 100644
--- a/japanese/xnetmaj/Makefile
+++ b/japanese/xnetmaj/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: xnetmaj
-# Version required: 2.0.7
# Date created: 20 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= netmaj
-PKGNAME= ja-xnetmaj-2.0.7
+PORTNAME= xnetmaj
+PORTVERSION= 2.0.7
CATEGORIES= japanese games
MASTER_SITES= http://www.sfc.wide.ad.jp/~kusune/netmaj/files/
-DISTFILES= netmaj-2.0.7.tar.gz netmaj-xui-2.0.7.tar.gz
+DISTNAME= netmaj
+DISTFILES= netmaj-${PORTVERSION}.tar.gz \
+ netmaj-xui-${PORTVERSION}.tar.gz
MAINTAINER= nakai@FreeBSD.org
diff --git a/japanese/xshodo/Makefile b/japanese/xshodo/Makefile
index ee3415ba6992..272377e9d5eb 100644
--- a/japanese/xshodo/Makefile
+++ b/japanese/xshodo/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xshodo
-# Version required: 2.0
# Date created: 11 October 1996
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xshodo2.0
-PKGNAME= ja-xshodo-2.0
+PORTNAME= xshodo
+PORTVERSION= 2.0
CATEGORIES= japanese
MASTER_SITES= ftp://cclub.tutcc.tut.ac.jp/pub/xwin/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/japanese/xshodou/Makefile b/japanese/xshodou/Makefile
index 8bbe6851caeb..da1b7ce8e2b1 100644
--- a/japanese/xshodou/Makefile
+++ b/japanese/xshodou/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: XShodou
-# Version required: 1.11
# Date created: 11 January 1999
# Whom: Sakai Hiroaki <sakai@miya.ee.kagu.sut.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xshodou-1.11
-PKGNAME= ja-${DISTNAME}
+PORTNAME= xshodou
+PORTVERSION= 1.11
CATEGORIES= japanese tk80
MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile
index 16c81828b979..5bfce5ee62e0 100644
--- a/japanese/xv/Makefile
+++ b/japanese/xv/Makefile
@@ -1,12 +1,10 @@
# New ports collection makefile for: ja-xv
-# Version required: 3.10a
# Date created: 07 Oct 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-PKGNAME= ja-xv-3.10a
CATEGORIES= japanese graphics
MAINTAINER= shige@FreeBSD.org
diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile
index c3ce7028dc4b..36685de9de38 100644
--- a/japanese/xyagamo/Makefile
+++ b/japanese/xyagamo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xyagamo
-# Version required: 0.1
# Date created: 5 Nov 1999
# Whom: Morita Shinya <shinmaru@dokidoki.ne.jp>
#
# $FreeBSD$
#
-DISTNAME= xyagamo-0.1b
+PORTNAME= xyagamo
+PORTVERSION= 0.1b
CATEGORIES= japanese games
MASTER_SITES= http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 6106bbc22632..fa5c933c2d4d 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: yc.el
-# Version required: 19991203
# Date created: 1999/12/05
# Whom: HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= yc.el
-PKGNAME?= ja-yc.el-19991203
+PORTNAME= yc.el
+PORTVERSION= 19991203
CATEGORIES= japanese elisp
MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/
EXTRACT_SUFX= .gz
+DISTNAME= ${PORTNAME}
MAINTAINER= honda@kashio.info.mie-u.ac.jp
@@ -24,14 +24,14 @@ XELISPDIR= ${PREFIX}/lib/xemacs/site-lisp
do-extract:
@${RM} -rf ${WRKDIR}
@${MKDIR} ${WRKDIR}
- @${CP} ${DISTDIR}/yc.el.gz ${WRKSRC}
- @(cd ${WRKSRC} ; ${GUNZIP_CMD} yc.el.gz)
+ @${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}
+ @(cd ${WRKSRC} ; ${GUNZIP_CMD} ${DISTNAME}${EXTRACT_SUFX})
do-install:
${MKDIR} ${ELISPDIR}
- ${INSTALL_DATA} ${WRKSRC}/yc.el ${ELISPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${ELISPDIR}
# for xemacs
${MKDIR} ${XELISPDIR}
- ${LN} -sf ${ELISPDIR}/yc.el ${XELISPDIR}
+ ${LN} -sf ${ELISPDIR}/${DISTNAME} ${XELISPDIR}
.include <bsd.port.mk>
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index a2376f26c9f8..7129bd4877e1 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: ja-zipcodes
-# Version required: 19980130
# Date created: 5 Nov 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-DISTNAME= ken_all
-PKGNAME= ja-zipcodes-19980130
+PORTNAME= zipcodes
+PORTVERSION= 19980130
CATEGORIES= japanese misc
MASTER_SITES= http://www.postal.mpt.go.jp/lzh/ \
http://freefall.freebsd.org/~itojun/distfiles/
EXTRACT_SUFX= .lzh
+DISTNAME= ken_all
MAINTAINER= itojun@itojun.org