diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-10-08 10:23:48 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-10-08 10:23:48 +0000 |
| commit | 7acef1cd7a4173168980125b140340c62b38c8d6 (patch) | |
| tree | 8e913f3c1574a206914a5852d584d77c40e8b447 /japanese | |
| parent | Remove extra "pkg/". (diff) | |
Change PKGDIR from pkg/ to . Also fix places where ${PKGDIR} is
spelled out (many of which are ${PKGDIR}/MESSAGE -> ${PKGMESSAGE} type
fixes that shouldn't have been necessary) and the string "/pkg/"
appear.
Diffstat (limited to 'japanese')
139 files changed, 164 insertions, 164 deletions
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 16ef7810a4dd..7c3b8dbfef2e 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -60,6 +60,6 @@ post-install: ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ fi - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index 91b3e8dede4e..14fea615a163 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -8,6 +8,6 @@ PKGNAMESUFFIX= -server MASTERDIR= ${.CURDIR}/../FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile index 145fa8ff10c4..40756bebf125 100644 --- a/japanese/Wnn6/Makefile +++ b/japanese/Wnn6/Makefile @@ -82,12 +82,12 @@ post-extract: @/sbin/umount ${MOUNT_PT} pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: @cd ${WRKSRC}/usr; tar cf - OMRONWnn6 | (cd ${PREFIX}; tar xvpf -) post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile index fb55eeb366c3..de63d5d68f2a 100644 --- a/japanese/alias-fonts/Makefile +++ b/japanese/alias-fonts/Makefile @@ -30,6 +30,6 @@ NO_BUILD= yes do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - /usr/bin/perl ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + /usr/bin/perl ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile index 5aa141aab734..9d080c6c8a1e 100644 --- a/japanese/another-htmllint/Makefile +++ b/japanese/another-htmllint/Makefile @@ -38,6 +38,6 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${RULE} ${DIR}/rule post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 16ef7810a4dd..7c3b8dbfef2e 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -60,6 +60,6 @@ post-install: ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ fi - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 16ef7810a4dd..7c3b8dbfef2e 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -60,6 +60,6 @@ post-install: ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ fi - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile index 1fc0d3769ec5..a4c092e93422 100644 --- a/japanese/cdrom2/Makefile +++ b/japanese/cdrom2/Makefile @@ -29,7 +29,7 @@ post-install: .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/cdrom2 .endfor - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.mk> diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile index 8b31ad3e56d6..ee22adefa328 100644 --- a/japanese/dserver/Makefile +++ b/japanese/dserver/Makefile @@ -35,6 +35,6 @@ post-install: @${SED} s!PREFIX_DIR!${PREFIX}!g ${WRKSRC}/deinstall.sh.template \ > ${PREFIX}/lib/dserver/deinstall.sh @${INSTALL_DATA} ${FILESDIR}/README.FreeBSD-setup.euc ${PREFIX}/lib/dserver/doc/ - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .include <bsd.port.mk> diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile index 178988328285..d02177c719a3 100644 --- a/japanese/dvi2ps/Makefile +++ b/japanese/dvi2ps/Makefile @@ -40,6 +40,6 @@ post-install: ${INSTALL_SCRIPT} tools/psstrip ${PREFIX}/bin ;\ ${INSTALL_SCRIPT} tools/MakePK ${PREFIX}/bin ;\ ) - @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SH} ${PKGREQ} ${PKGNAME} INSTALL .include <bsd.port.mk> diff --git a/japanese/dvipsk-vflib/Makefile b/japanese/dvipsk-vflib/Makefile index 7bd3df296b2e..00901af44627 100644 --- a/japanese/dvipsk-vflib/Makefile +++ b/japanese/dvipsk-vflib/Makefile @@ -88,6 +88,6 @@ post-install: done @${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile index 99a390d35b22..c04be457984a 100644 --- a/japanese/dvipsk/Makefile +++ b/japanese/dvipsk/Makefile @@ -82,6 +82,6 @@ post-install: done @${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile index f48f153fe5b6..2e9316a470fe 100644 --- a/japanese/elisa10x8/Makefile +++ b/japanese/elisa10x8/Makefile @@ -34,7 +34,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index 4ea6289f350b..01e0f5040f7b 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -40,7 +40,7 @@ do-build: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @${MKDIR} ${INSTALLDIR} ${DOCDIR} diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile index 92111fa0d9b1..c0f6d837dc2d 100644 --- a/japanese/elvis/Makefile +++ b/japanese/elvis/Makefile @@ -31,7 +31,7 @@ do-configure: post-install: @${MKDIR} ${PREFIX}/share/doc/ja-elvis ${INSTALL_DATA} ${WRKSRC}/README.j18 ${PREFIX}/share/doc/ja-elvis - @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SH} ${PKGREQ} ${PKGNAME} INSTALL @if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${FILESDIR}/ja-elvis.sh ${STARTUP_SCRIPT};\ diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile index 3752468008d9..a6bb4c16e601 100644 --- a/japanese/exmh2/Makefile +++ b/japanese/exmh2/Makefile @@ -12,8 +12,8 @@ MAINTAINER= ports@FreeBSD.org JAPANESE_EXMH= yes MASTERDIR= ${.CURDIR}/../../mail/exmh2 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work .include "${MASTERDIR}/Makefile" diff --git a/japanese/gn-gnspool/Makefile b/japanese/gn-gnspool/Makefile index 02d4855d0ca6..ed10047c4d8b 100644 --- a/japanese/gn-gnspool/Makefile +++ b/japanese/gn-gnspool/Makefile @@ -43,6 +43,6 @@ post-install: .endif @${MKDIR} ${PREFIX}/share/examples/gn-gnspool @${CP} ${FILESDIR}/_gnrc ${PREFIX}/share/examples/gn-gnspool - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile index dc2a514ee6ea..a4a36befb96c 100644 --- a/japanese/gp/Makefile +++ b/japanese/gp/Makefile @@ -10,6 +10,6 @@ CATEGORIES= japanese LANGUAGE= Japanese MASTERDIR= ${.CURDIR}/../../print/gp -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index a3882a5845a4..d38f1da16f3c 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -106,6 +106,6 @@ do-install: .endif post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/jpilot/Makefile b/japanese/jpilot/Makefile index 02fe066c05a9..6c8d279695b4 100644 --- a/japanese/jpilot/Makefile +++ b/japanese/jpilot/Makefile @@ -6,7 +6,7 @@ # MASTERDIR= ${.CURDIR}/../../palm/jpilot -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment CATEGORIES= japanese diff --git a/japanese/jtex209-ascii/Makefile b/japanese/jtex209-ascii/Makefile index b5332e8cc96e..b4a6440c9a6e 100644 --- a/japanese/jtex209-ascii/Makefile +++ b/japanese/jtex209-ascii/Makefile @@ -10,6 +10,6 @@ BATCH_TEX= ASCII MANUAL_PACKAGE_BUILD= incompatible with other versions of jtex-* MASTERDIR= ${.CURDIR}/../jtex209-both/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jtex209-ntt/Makefile b/japanese/jtex209-ntt/Makefile index adf2569a0d64..a6569a38ce76 100644 --- a/japanese/jtex209-ntt/Makefile +++ b/japanese/jtex209-ntt/Makefile @@ -10,6 +10,6 @@ BATCH_TEX= NTT MANUAL_PACKAGE_BUILD= incompatible with other versions of jtex-* MASTERDIR= ${.CURDIR}/../jtex209-both/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile index 5f57766b1026..a4d4a5dab751 100644 --- a/japanese/jvim-canna+freewnn/Makefile +++ b/japanese/jvim-canna+freewnn/Makefile @@ -10,6 +10,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+wnn6/Makefile b/japanese/jvim-canna+wnn6/Makefile index 165c7e5e4912..310b3a8cb447 100644 --- a/japanese/jvim-canna+wnn6/Makefile +++ b/japanese/jvim-canna+wnn6/Makefile @@ -10,6 +10,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile index 165c7e5e4912..310b3a8cb447 100644 --- a/japanese/jvim-canna+wnn7/Makefile +++ b/japanese/jvim-canna+wnn7/Makefile @@ -10,6 +10,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna/Makefile b/japanese/jvim-canna/Makefile index 1fb81f682902..c14537105db1 100644 --- a/japanese/jvim-canna/Makefile +++ b/japanese/jvim-canna/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -canna CANNA= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile index a799e2d48eb4..5b6def445750 100644 --- a/japanese/jvim-freewnn/Makefile +++ b/japanese/jvim-freewnn/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -freewnn FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-wnn6/Makefile b/japanese/jvim-wnn6/Makefile index b61c433057be..c351b2e8d27b 100644 --- a/japanese/jvim-wnn6/Makefile +++ b/japanese/jvim-wnn6/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -wnn6 WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-wnn7/Makefile b/japanese/jvim-wnn7/Makefile index b61c433057be..c351b2e8d27b 100644 --- a/japanese/jvim-wnn7/Makefile +++ b/japanese/jvim-wnn7/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -wnn6 WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile index 7318a13f4e54..639aeb32c223 100644 --- a/japanese/jvim3-canna+freewnn/Makefile +++ b/japanese/jvim3-canna+freewnn/Makefile @@ -9,6 +9,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile index 41ee6eaad019..3088260ab82f 100644 --- a/japanese/jvim3-canna+wnn6/Makefile +++ b/japanese/jvim3-canna+wnn6/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile index 41ee6eaad019..3088260ab82f 100644 --- a/japanese/jvim3-canna+wnn7/Makefile +++ b/japanese/jvim3-canna+wnn7/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile index 9f3ec47dc983..84678da9f79c 100644 --- a/japanese/jvim3-canna/Makefile +++ b/japanese/jvim3-canna/Makefile @@ -8,6 +8,6 @@ CANNA= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile index 4d1a73ef6beb..4dc35cf67046 100644 --- a/japanese/jvim3-direct_canna/Makefile +++ b/japanese/jvim3-direct_canna/Makefile @@ -8,6 +8,6 @@ DIRECT_CANNA= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile index fbe0bec7b257..9d29c12073cc 100644 --- a/japanese/jvim3-freewnn/Makefile +++ b/japanese/jvim3-freewnn/Makefile @@ -8,6 +8,6 @@ FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile index 4347bf16810e..cbacb366dff3 100644 --- a/japanese/jvim3-wnn6/Makefile +++ b/japanese/jvim3-wnn6/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile index 4347bf16810e..cbacb366dff3 100644 --- a/japanese/jvim3-wnn7/Makefile +++ b/japanese/jvim3-wnn7/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index d5d9892146ae..417dc4808927 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -28,7 +28,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index e11d2d0b2ba4..eaa426bb1d80 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -37,7 +37,7 @@ post-extract: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile index b9d88626ea39..a6be93e74e1a 100644 --- a/japanese/kanji18/Makefile +++ b/japanese/kanji18/Makefile @@ -58,7 +58,7 @@ do-build: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.pcf.gz ${PREFIX}/lib/X11/fonts/local/ diff --git a/japanese/kanji26/Makefile b/japanese/kanji26/Makefile index 665dc62c6208..49da61a57a9a 100644 --- a/japanese/kanji26/Makefile +++ b/japanese/kanji26/Makefile @@ -10,7 +10,7 @@ DISTFILES?= 793.gz 794.gz 795.gz 796.gz 797.gz 798.gz 799.gz \ 800.gz 802.gz 816.gz 817.gz 818.gz 819.gz 820.gz 821.gz FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} MASTERDIR= ${.CURDIR}/../kanji18 README_FILE?= 793.gz RESIZESED_FILE?= 26to24.sed diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index 3ff2c6292739..7a46e8a1f8cb 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -29,7 +29,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile index 6586f84ecae0..478d39e4a97a 100644 --- a/japanese/kinput2-canna+freewnn+sj3/Makefile +++ b/japanese/kinput2-canna+freewnn+sj3/Makefile @@ -10,6 +10,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile index f4d91b9944cb..112596697d74 100644 --- a/japanese/kinput2-canna+freewnn/Makefile +++ b/japanese/kinput2-canna+freewnn/Makefile @@ -9,6 +9,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile index 97f33a72ec20..b0cedcde9944 100644 --- a/japanese/kinput2-canna+sj3+wnn6/Makefile +++ b/japanese/kinput2-canna+sj3+wnn6/Makefile @@ -10,6 +10,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile index 97f33a72ec20..b0cedcde9944 100644 --- a/japanese/kinput2-canna+sj3+wnn7/Makefile +++ b/japanese/kinput2-canna+sj3+wnn7/Makefile @@ -10,6 +10,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile index 2d39683aa9dc..64b6c2308b00 100644 --- a/japanese/kinput2-canna+sj3/Makefile +++ b/japanese/kinput2-canna+sj3/Makefile @@ -9,6 +9,6 @@ CANNA= yes SJ3= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile index 9409f5ece462..83fa48e6d38f 100644 --- a/japanese/kinput2-canna+wnn6/Makefile +++ b/japanese/kinput2-canna+wnn6/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile index 9409f5ece462..83fa48e6d38f 100644 --- a/japanese/kinput2-canna+wnn7/Makefile +++ b/japanese/kinput2-canna+wnn7/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile index 47eec3219abb..df1f90f9899d 100644 --- a/japanese/kinput2-canna/Makefile +++ b/japanese/kinput2-canna/Makefile @@ -8,6 +8,6 @@ CANNA= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile index 69c608505f69..fa81460d69dc 100644 --- a/japanese/kinput2-freewnn+sj3/Makefile +++ b/japanese/kinput2-freewnn+sj3/Makefile @@ -9,6 +9,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile index a9fdd38ab4df..e06705e38597 100644 --- a/japanese/kinput2-freewnn/Makefile +++ b/japanese/kinput2-freewnn/Makefile @@ -72,8 +72,8 @@ do-configure: post-install: # For FreeWnn or Wnn6 - @if [ -e ${PKGDIR}/MESSAGE ]; then \ - ${CAT} ${PKGDIR}/MESSAGE; \ + @if [ -e ${PKGMESSAGE} ]; then \ + ${CAT} ${PKGMESSAGE}; \ fi .include <bsd.port.mk> diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile index 0619283a3650..beef5feb502c 100644 --- a/japanese/kinput2-sj3+wnn6/Makefile +++ b/japanese/kinput2-sj3+wnn6/Makefile @@ -9,6 +9,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile index 0619283a3650..beef5feb502c 100644 --- a/japanese/kinput2-sj3+wnn7/Makefile +++ b/japanese/kinput2-sj3+wnn7/Makefile @@ -9,6 +9,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile index e0c7d9df5e5d..a995c1d51643 100644 --- a/japanese/kinput2-sj3/Makefile +++ b/japanese/kinput2-sj3/Makefile @@ -8,6 +8,6 @@ SJ3= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile index 1b83328003bf..e6c8263d21b7 100644 --- a/japanese/kinput2-wnn6/Makefile +++ b/japanese/kinput2-wnn6/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile index 1b83328003bf..e6c8263d21b7 100644 --- a/japanese/kinput2-wnn7/Makefile +++ b/japanese/kinput2-wnn7/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index a9fdd38ab4df..e06705e38597 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -72,8 +72,8 @@ do-configure: post-install: # For FreeWnn or Wnn6 - @if [ -e ${PKGDIR}/MESSAGE ]; then \ - ${CAT} ${PKGDIR}/MESSAGE; \ + @if [ -e ${PKGMESSAGE} ]; then \ + ${CAT} ${PKGMESSAGE}; \ fi .include <bsd.port.mk> diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index 02163b34643b..dfebfaca9748 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -81,6 +81,6 @@ post-install: @${INSTALL_DATA} ${FILESDIR}/dot.termcap ${DOCDIR} @${INSTALL_DATA} ${FILESDIR}/kterm16c.doc ${DOCDIR} .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile index 5901dbf9d1b3..72ac343f9781 100644 --- a/japanese/lookup-emacs21/Makefile +++ b/japanese/lookup-emacs21/Makefile @@ -16,8 +16,8 @@ MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS+= eblook:${PORTSDIR}/japanese/eblook FILESDIR= ${.CURDIR}/../lookup-mule/files -PKGDIR= ${.CURDIR}/../lookup-mule/pkg -PLIST= ${.CURDIR}/pkg/PLIST +PKGDIR= ${.CURDIR}/../lookup-mule +PLIST= ${.CURDIR}/pkg-plist EMACS_PORT_NAME?= mule .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/lookup-mule/Makefile b/japanese/lookup-mule/Makefile index 5901dbf9d1b3..72ac343f9781 100644 --- a/japanese/lookup-mule/Makefile +++ b/japanese/lookup-mule/Makefile @@ -16,8 +16,8 @@ MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS+= eblook:${PORTSDIR}/japanese/eblook FILESDIR= ${.CURDIR}/../lookup-mule/files -PKGDIR= ${.CURDIR}/../lookup-mule/pkg -PLIST= ${.CURDIR}/pkg/PLIST +PKGDIR= ${.CURDIR}/../lookup-mule +PLIST= ${.CURDIR}/pkg-plist EMACS_PORT_NAME?= mule .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index 5901dbf9d1b3..72ac343f9781 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -16,8 +16,8 @@ MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS+= eblook:${PORTSDIR}/japanese/eblook FILESDIR= ${.CURDIR}/../lookup-mule/files -PKGDIR= ${.CURDIR}/../lookup-mule/pkg -PLIST= ${.CURDIR}/pkg/PLIST +PKGDIR= ${.CURDIR}/../lookup-mule +PLIST= ${.CURDIR}/pkg-plist EMACS_PORT_NAME?= mule .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile index 2983fb5bbb60..762b793cb968 100644 --- a/japanese/magicpoint/Makefile +++ b/japanese/magicpoint/Makefile @@ -6,7 +6,7 @@ # MASTERDIR= ${.CURDIR}/../../misc/magicpoint -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile index 5a6d55d09062..a2675b8de025 100644 --- a/japanese/man-doc/Makefile +++ b/japanese/man-doc/Makefile @@ -64,6 +64,6 @@ pre-install: .endfor post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/man/Makefile b/japanese/man/Makefile index 17717432f732..78d84160cd9d 100644 --- a/japanese/man/Makefile +++ b/japanese/man/Makefile @@ -27,6 +27,6 @@ MANCOMPRESSED= yes pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .include <bsd.port.mk> diff --git a/japanese/mhonarc/Makefile b/japanese/mhonarc/Makefile index b0c367cc0d2c..7209cf60da28 100644 --- a/japanese/mhonarc/Makefile +++ b/japanese/mhonarc/Makefile @@ -39,6 +39,6 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/mhonarc.rc.sample ${PREFIX}/share/examples/MHonArc/ post-install: - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/mnews-gnspool/Makefile b/japanese/mnews-gnspool/Makefile index 9aeea4c0a0e7..222f9a651060 100644 --- a/japanese/mnews-gnspool/Makefile +++ b/japanese/mnews-gnspool/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -gnspool RUN_DEPENDS= gnspool:${PORTSDIR}/japanese/gn-gnspool MASTERDIR= ${.CURDIR}/../mnews -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment GNSPOOL= 1 diff --git a/japanese/mnews-im/Makefile b/japanese/mnews-im/Makefile index ab2aba0be6ab..55b60f251e32 100644 --- a/japanese/mnews-im/Makefile +++ b/japanese/mnews-im/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -im RUN_DEPENDS= imput:${PORTSDIR}/mail/im MASTERDIR= ${.CURDIR}/../mnews -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment GNSPOOL= 0 IMPUT= 1 diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile index 84f3d9cae21b..100ee184a5f8 100644 --- a/japanese/mule-canna+freewnn+sj3/Makefile +++ b/japanese/mule-canna+freewnn+sj3/Makefile @@ -13,6 +13,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile index 9c5a74502eb8..d371cf24ceb9 100644 --- a/japanese/mule-canna+freewnn/Makefile +++ b/japanese/mule-canna+freewnn/Makefile @@ -12,6 +12,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile index 9a584c65c4c4..8620e654f287 100644 --- a/japanese/mule-canna+sj3+wnn6/Makefile +++ b/japanese/mule-canna+sj3+wnn6/Makefile @@ -13,6 +13,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile index 9a584c65c4c4..8620e654f287 100644 --- a/japanese/mule-canna+sj3+wnn7/Makefile +++ b/japanese/mule-canna+sj3+wnn7/Makefile @@ -13,6 +13,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile index 7f72d3fd501e..0a21dae9ce4a 100644 --- a/japanese/mule-canna+sj3/Makefile +++ b/japanese/mule-canna+sj3/Makefile @@ -12,6 +12,6 @@ CANNA= yes SJ3= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile index f78195fde45d..225171354406 100644 --- a/japanese/mule-canna+wnn6/Makefile +++ b/japanese/mule-canna+wnn6/Makefile @@ -12,6 +12,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile index f78195fde45d..225171354406 100644 --- a/japanese/mule-canna+wnn7/Makefile +++ b/japanese/mule-canna+wnn7/Makefile @@ -12,6 +12,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile index a5edfd61b0cb..bb2bd1a26b43 100644 --- a/japanese/mule-canna/Makefile +++ b/japanese/mule-canna/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese CANNA= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile index 0fa3618a444a..3f5a75f0bf72 100644 --- a/japanese/mule-freewnn+sj3/Makefile +++ b/japanese/mule-freewnn+sj3/Makefile @@ -12,6 +12,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile index 97d2cf26a060..1b84f2697442 100644 --- a/japanese/mule-freewnn/Makefile +++ b/japanese/mule-freewnn/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile index 0233ed71d206..95fa0a2d81c3 100644 --- a/japanese/mule-sj3+wnn6/Makefile +++ b/japanese/mule-sj3+wnn6/Makefile @@ -12,6 +12,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile index 0233ed71d206..95fa0a2d81c3 100644 --- a/japanese/mule-sj3+wnn7/Makefile +++ b/japanese/mule-sj3+wnn7/Makefile @@ -12,6 +12,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile index 5be8f36cda5c..04988366f0e1 100644 --- a/japanese/mule-sj3/Makefile +++ b/japanese/mule-sj3/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese SJ3= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile index bba36ac6392c..98c1d7c63b16 100644 --- a/japanese/mule-wnn6/Makefile +++ b/japanese/mule-wnn6/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile index bba36ac6392c..98c1d7c63b16 100644 --- a/japanese/mule-wnn7/Makefile +++ b/japanese/mule-wnn7/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile index ae4480016fe5..cf65002302a8 100644 --- a/japanese/nethack/Makefile +++ b/japanese/nethack/Makefile @@ -55,6 +55,6 @@ post-install: ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf .endfor - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile index ae4480016fe5..cf65002302a8 100644 --- a/japanese/nethack32/Makefile +++ b/japanese/nethack32/Makefile @@ -55,6 +55,6 @@ post-install: ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf .endfor - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile index ae4480016fe5..cf65002302a8 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -55,6 +55,6 @@ post-install: ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf .endfor - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/netscape-fonts/Makefile b/japanese/netscape-fonts/Makefile index fb55eeb366c3..de63d5d68f2a 100644 --- a/japanese/netscape-fonts/Makefile +++ b/japanese/netscape-fonts/Makefile @@ -30,6 +30,6 @@ NO_BUILD= yes do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - /usr/bin/perl ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + /usr/bin/perl ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/netscape3.language/Makefile b/japanese/netscape3.language/Makefile index 19bdf08f6182..6927af642283 100644 --- a/japanese/netscape3.language/Makefile +++ b/japanese/netscape3.language/Makefile @@ -67,7 +67,7 @@ post-install: ${MKDIR} ${DOCDIR} ${INSTALL_DATA} ${FILESDIR}/setup.doc ${DOCDIR} .endif - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile index 4482ec09df5e..a64f29e1d40d 100644 --- a/japanese/nvi-euc-jp/Makefile +++ b/japanese/nvi-euc-jp/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -eucjp MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile index 3dc83934dac5..44d8efd86cd2 100644 --- a/japanese/nvi-iso-2022-jp/Makefile +++ b/japanese/nvi-iso-2022-jp/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -iso2022jp MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile index a24c2011903e..8fad785c7705 100644 --- a/japanese/nvi-sjis/Makefile +++ b/japanese/nvi-sjis/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -sjis MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile index 91bb4c259794..20d3ceb54785 100644 --- a/japanese/okphone/Makefile +++ b/japanese/okphone/Makefile @@ -26,6 +26,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/okphone .endfor .endif - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile index 9ae32ac0fdd4..15322c59ca46 100644 --- a/japanese/onew-canna+freewnn/Makefile +++ b/japanese/onew-canna+freewnn/Makefile @@ -9,6 +9,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile index 9b1afeaed3f9..a27515142150 100644 --- a/japanese/onew-canna+wnn6/Makefile +++ b/japanese/onew-canna+wnn6/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile index 9b1afeaed3f9..a27515142150 100644 --- a/japanese/onew-canna+wnn7/Makefile +++ b/japanese/onew-canna+wnn7/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile index 74ac138eff77..68f0d027e909 100644 --- a/japanese/onew-canna/Makefile +++ b/japanese/onew-canna/Makefile @@ -8,6 +8,6 @@ CANNA= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile index b97f6a9bc6e1..1e07108d66c8 100644 --- a/japanese/onew-wnn6/Makefile +++ b/japanese/onew-wnn6/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile index b97f6a9bc6e1..1e07108d66c8 100644 --- a/japanese/onew-wnn7/Makefile +++ b/japanese/onew-wnn7/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile index a1b1d95f02b4..bcf2a353d391 100644 --- a/japanese/perl5/Makefile +++ b/japanese/perl5/Makefile @@ -129,6 +129,6 @@ post-install: @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/suidperl @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/jsuidperl @${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/pgp.language/Makefile b/japanese/pgp.language/Makefile index c3d5fbf7e022..4fa6b36422cf 100644 --- a/japanese/pgp.language/Makefile +++ b/japanese/pgp.language/Makefile @@ -44,6 +44,6 @@ do-install: ${SH} ${SCRIPTDIR}/pgp.config.l10n.sh \ ${PGPLIB} ${PGP_LANG} ${PGP_CHARSET} -pgp > /dev/null 2>&1 # update .idx file - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/pips760/Makefile b/japanese/pips760/Makefile index 51d9fbb06f5e..f51cb61eac7b 100644 --- a/japanese/pips760/Makefile +++ b/japanese/pips760/Makefile @@ -2,13 +2,13 @@ # Date created: 2000.08.04 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips760/Attic/Makefile,v 1.1.1.1 2000-09-01 16:31:58 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips760/Attic/Makefile,v 1.2 2000-10-08 10:21:15 asami Exp $ # CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 760 do-install: # empty diff --git a/japanese/pips770/Makefile b/japanese/pips770/Makefile index d03e7550e35f..d8072e876200 100644 --- a/japanese/pips770/Makefile +++ b/japanese/pips770/Makefile @@ -2,13 +2,13 @@ # Date created: 00/04/21 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips770/Attic/Makefile,v 1.1.1.1 2000-09-01 16:30:47 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips770/Attic/Makefile,v 1.2 2000-10-08 10:21:16 asami Exp $ # CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 770 do-install: # empty diff --git a/japanese/pips820_3300/Makefile b/japanese/pips820_3300/Makefile index 7553bc22e1e2..5e054c29a26f 100644 --- a/japanese/pips820_3300/Makefile +++ b/japanese/pips820_3300/Makefile @@ -2,13 +2,13 @@ # Date created: 00/04/21 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips820_3300/Attic/Makefile,v 1.1.1.1 2000-09-01 16:29:44 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips820_3300/Attic/Makefile,v 1.2 2000-10-08 10:21:17 asami Exp $ # CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 820_3300 do-install: # empty diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile index 00155653cb76..d74516835f7e 100644 --- a/japanese/plan/Makefile +++ b/japanese/plan/Makefile @@ -22,4 +22,4 @@ PLIST= ${WRKDIR}/PLIST pre-install: ${ECHO} "share/doc/plan/plan_calSJ.ps" > ${PLIST} - ${CAT} ${PKGDIR}/PLIST >> ${PLIST} + ${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile index 12cbb98193c1..e6f4c60fabc4 100644 --- a/japanese/postgresql/Makefile +++ b/japanese/postgresql/Makefile @@ -129,7 +129,7 @@ pre-install: @ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \ PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \ PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \ ${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \ diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile index 1ea53fb4b93c..1f172a9321cb 100644 --- a/japanese/ptex-base/Makefile +++ b/japanese/ptex-base/Makefile @@ -44,9 +44,9 @@ do-configure: pre-install: .if defined(BATCH) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL BATCH + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL BATCH .else - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .endif @${TAR} --exclude 'texmf/tex/latex/base/*' --exclude 'texmf/dvips/*' \ -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile index 1ea53fb4b93c..1f172a9321cb 100644 --- a/japanese/ptex-common/Makefile +++ b/japanese/ptex-common/Makefile @@ -44,9 +44,9 @@ do-configure: pre-install: .if defined(BATCH) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL BATCH + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL BATCH .else - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .endif @${TAR} --exclude 'texmf/tex/latex/base/*' --exclude 'texmf/dvips/*' \ -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz diff --git a/japanese/ruby-man/Makefile b/japanese/ruby-man/Makefile index feec4735a782..056b9c14f71e 100644 --- a/japanese/ruby-man/Makefile +++ b/japanese/ruby-man/Makefile @@ -12,7 +12,7 @@ CATEGORIES= japanese MAINTAINER= knu@FreeBSD.org FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} LANGSUFFIX= -jp diff --git a/japanese/ruby-slang/Makefile b/japanese/ruby-slang/Makefile index 83d7c18c1ac9..e08a39073b37 100644 --- a/japanese/ruby-slang/Makefile +++ b/japanese/ruby-slang/Makefile @@ -11,7 +11,7 @@ CATEGORIES= japanese MAINTAINER= knu@FreeBSD.org -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment WITH_JAPANESE= yes diff --git a/japanese/ruby-usersguide/Makefile b/japanese/ruby-usersguide/Makefile index 0cf41e2b5f8b..e1ea9d1b3be9 100644 --- a/japanese/ruby-usersguide/Makefile +++ b/japanese/ruby-usersguide/Makefile @@ -18,7 +18,7 @@ MAINTAINER= knu@FreeBSD.org VERSION= 980206 FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} LANGSUFFIX= -jp diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile index a15b4f975ed9..c8917609e086 100644 --- a/japanese/sj3-lib/Makefile +++ b/japanese/sj3-lib/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT}; \ fi ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile index a15b4f975ed9..c8917609e086 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT}; \ fi ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/sj3/Makefile b/japanese/sj3/Makefile index a15b4f975ed9..c8917609e086 100644 --- a/japanese/sj3/Makefile +++ b/japanese/sj3/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT}; \ fi ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/tcsh-nls-asuka/Makefile b/japanese/tcsh-nls-asuka/Makefile index ceb4ad99c76f..c9577f2eee0a 100644 --- a/japanese/tcsh-nls-asuka/Makefile +++ b/japanese/tcsh-nls-asuka/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= asuka MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-ayanami/Makefile b/japanese/tcsh-nls-ayanami/Makefile index b00cbb4224a2..d719c33cacdc 100644 --- a/japanese/tcsh-nls-ayanami/Makefile +++ b/japanese/tcsh-nls-ayanami/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= ayanami MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-koshiki/Makefile b/japanese/tcsh-nls-koshiki/Makefile index 345423b09894..c2e95baa3418 100644 --- a/japanese/tcsh-nls-koshiki/Makefile +++ b/japanese/tcsh-nls-koshiki/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= koshiki MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-merril/Makefile b/japanese/tcsh-nls-merril/Makefile index 8c99e6f3ab08..35f6720d81a7 100644 --- a/japanese/tcsh-nls-merril/Makefile +++ b/japanese/tcsh-nls-merril/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= merril MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-miyakonjo/Makefile b/japanese/tcsh-nls-miyakonjo/Makefile index ecef524b18e8..558cb3306a40 100644 --- a/japanese/tcsh-nls-miyakonjo/Makefile +++ b/japanese/tcsh-nls-miyakonjo/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= miyakonjo MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-multi/Makefile b/japanese/tcsh-nls-multi/Makefile index 6d1de93b4144..7b94979d42cc 100644 --- a/japanese/tcsh-nls-multi/Makefile +++ b/japanese/tcsh-nls-multi/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= multi MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-rishu/Makefile b/japanese/tcsh-nls-rishu/Makefile index d78ed2a3eb6c..152ddd68a561 100644 --- a/japanese/tcsh-nls-rishu/Makefile +++ b/japanese/tcsh-nls-rishu/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= rishu MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-roomi/Makefile b/japanese/tcsh-nls-roomi/Makefile index 02ee70db83cc..a271f96c5996 100644 --- a/japanese/tcsh-nls-roomi/Makefile +++ b/japanese/tcsh-nls-roomi/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= roomi MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-ruri2/Makefile b/japanese/tcsh-nls-ruri2/Makefile index 7f7751221190..e315b5df554d 100644 --- a/japanese/tcsh-nls-ruri2/Makefile +++ b/japanese/tcsh-nls-ruri2/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= ruri2 MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile index 69dd1c793951..5f29c780aa46 100644 --- a/japanese/tcsh/Makefile +++ b/japanese/tcsh/Makefile @@ -37,6 +37,6 @@ post-install: @${ECHO} "updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/tgif2tex/Makefile b/japanese/tgif2tex/Makefile index 202d78bfe245..bcdc12831148 100644 --- a/japanese/tgif2tex/Makefile +++ b/japanese/tgif2tex/Makefile @@ -10,7 +10,7 @@ CATEGORIES= japanese RUN_DEPENDS= nkf:${PORTSDIR}/japanese/nkf MASTERDIR= ${.CURDIR}/../../print/tgif2tex -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} PORTSDOCDIR= ${PREFIX}/share/doc/ja-tgif2tex DOCSRC= Makefile \ example.obj \ diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile index d30b39e7d26f..d3f0a07761aa 100644 --- a/japanese/tk80/Makefile +++ b/japanese/tk80/Makefile @@ -57,7 +57,7 @@ post-install: ${LN} -sf libtk80jp.so.1.5 ${PREFIX}/lib/libtk80jp.so ${RANLIB} ${PREFIX}/lib/libtk80jp.so .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} test: cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile index 4f84efab9aef..1532e3ee2eac 100644 --- a/japanese/truetypefonts/Makefile +++ b/japanese/truetypefonts/Makefile @@ -37,6 +37,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/watanabe-mincho.ttf ${FONTDIR} ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${FONTDIR}/fonts.dir.truetype ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias.truetype - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile index ee46b866e00f..8ab44c1bb98e 100644 --- a/japanese/vje30-trial/Makefile +++ b/japanese/vje30-trial/Makefile @@ -64,6 +64,6 @@ do-install: @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index 06a62fd39fde..c22076de92e6 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -104,6 +104,6 @@ do-install: @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/w3/Makefile b/japanese/w3/Makefile index 400514332df0..b1f6e18a605a 100644 --- a/japanese/w3/Makefile +++ b/japanese/w3/Makefile @@ -17,6 +17,6 @@ EMACSCMD= mule ELISPDIR= ${PREFIX}/lib/mule/site-lisp MASTERDIR= ${.CURDIR}/../../www/w3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/w3m-ssl/Makefile b/japanese/w3m-ssl/Makefile index 2a1f310c6d51..40ad6087b42c 100644 --- a/japanese/w3m-ssl/Makefile +++ b/japanese/w3m-ssl/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= -ssl CATEGORIES= japanese MASTERDIR= ${.CURDIR}/../../www/w3m -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist.ja JAPANESE= Yes diff --git a/japanese/w3m/Makefile b/japanese/w3m/Makefile index be9f844e87b2..63340f26d84d 100644 --- a/japanese/w3m/Makefile +++ b/japanese/w3m/Makefile @@ -8,7 +8,7 @@ CATEGORIES= japanese MASTERDIR= ${.CURDIR}/../../www/w3m -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist.ja JAPANESE= Yes diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile index 825c6860ab16..bea2f942ea81 100644 --- a/japanese/xemacs21-canna+freewnn/Makefile +++ b/japanese/xemacs21-canna+freewnn/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 CANNA= yes diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile index d5a3ae72375c..5fd7df668062 100644 --- a/japanese/xemacs21-canna+wnn6/Makefile +++ b/japanese/xemacs21-canna+wnn6/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 CANNA= yes diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile index 07e8740f5ff3..5a2a91aaa6de 100644 --- a/japanese/xemacs21-canna/Makefile +++ b/japanese/xemacs21-canna/Makefile @@ -24,8 +24,8 @@ CATEGORIES= japanese MANLANG= ja MAN1= xemacs-ja.1 -COMMENT?= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/COMMENT -DESCR= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/DESCR +COMMENT?= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-comment +DESCR= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-descr XEMACS_MAJOR_VER?= 21 DESCR_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile index 20d0221ed99d..1356f7612552 100644 --- a/japanese/xemacs21-freewnn/Makefile +++ b/japanese/xemacs21-freewnn/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 FREEWNN= yes diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile index 821a7368040d..a6b804a7a6df 100644 --- a/japanese/xemacs21-wnn6/Makefile +++ b/japanese/xemacs21-wnn6/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 WNN6= yes diff --git a/japanese/xjman-3/Makefile b/japanese/xjman-3/Makefile index f066addcd347..0bdeee0e8c71 100644 --- a/japanese/xjman-3/Makefile +++ b/japanese/xjman-3/Makefile @@ -60,6 +60,6 @@ post-install: .for i in COPYRIGHT COPYRIGHT.XJDP @${INSTALL_DATA} ${FILESDIR}/$i ${PREFIX}/share/doc/xjman/ .endfor - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile index f066addcd347..0bdeee0e8c71 100644 --- a/japanese/xjman/Makefile +++ b/japanese/xjman/Makefile @@ -60,6 +60,6 @@ post-install: .for i in COPYRIGHT COPYRIGHT.XJDP @${INSTALL_DATA} ${FILESDIR}/$i ${PREFIX}/share/doc/xjman/ .endfor - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile index d14e357b7cb6..d861ee659d55 100644 --- a/japanese/xv/Makefile +++ b/japanese/xv/Makefile @@ -10,7 +10,7 @@ CATEGORIES= japanese MAINTAINER= shige@FreeBSD.org MASTERDIR= ${.CURDIR}/../../graphics/xv -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} MAKE_ENV= LOCALE_EXTENSION=-DTV_L10N |