28 files changed, 44 insertions, 45 deletions

diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 88249b3494e7..e493c5fc1cce 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	plan
 PORTVERSION=	1.8.2
-CATEGORIES=	deskutils
+CATEGORIES+=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
 MASTER_SITE_SUBDIR=	applications
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index eae405159686..f2751d543e70 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-CATEGORIES?=	editors
+CATEGORIES+=	editors
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index eae405159686..f2751d543e70 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-CATEGORIES?=	editors
+CATEGORIES+=	editors
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index eae405159686..f2751d543e70 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-CATEGORIES?=	editors
+CATEGORIES+=	editors
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index e29f4c053da6..b953694795d1 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xv
 PORTVERSION=	3.10a
-CATEGORIES?=	graphics
+CATEGORIES+=	graphics
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/ \
 		ftp://ftp.airlab.cs.ritsumei.ac.jp/pub/X/xv-jp-extension/working/ \
 		http://people.FreeBSD.org/~shige/ports/xv/ \
diff --git a/japanese/ewipe/Makefile b/japanese/ewipe/Makefile
index e41d12d3952c..1e5e599249dc 100644
--- a/japanese/ewipe/Makefile
+++ b/japanese/ewipe/Makefile
@@ -5,6 +5,10 @@
 # $FreeBSD$
 #
 
+CATEGORIES=	japanese
+
+RUN_DEPENDS=	wish4.2jp:${PORTSDIR}/japanese/tk42
+
 MASTERDIR=	${.CURDIR}/../../misc/ewipe
 PATCHDIR=	${.CURDIR}/patches
 COMMENT=	${.CURDIR}/pkg/COMMENT
@@ -12,9 +16,3 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 KANJI=		yes
 
 .include "${MASTERDIR}/Makefile"
-
-CATEGORIES=	japanese misc tk42
-
-MAINTAINER=	itojun@itojun.org
-
-RUN_DEPENDS=	wish4.2jp:${PORTSDIR}/japanese/tk42
diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile
index 85298521d617..3752468008d9 100644
--- a/japanese/exmh2/Makefile
+++ b/japanese/exmh2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese mail tk80
+CATEGORIES=	japanese
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile
index 7bf94d15b280..dc2a514ee6ea 100644
--- a/japanese/gp/Makefile
+++ b/japanese/gp/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese print
+CATEGORIES=	japanese
 
 LANGUAGE=	Japanese
 
diff --git a/japanese/jpilot/Makefile b/japanese/jpilot/Makefile
index 3bd1debabb4b..02fe066c05a9 100644
--- a/japanese/jpilot/Makefile
+++ b/japanese/jpilot/Makefile
@@ -8,7 +8,7 @@
 MASTERDIR=	${.CURDIR}/../../palm/jpilot
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-CATEGORIES=	japanese palm comms
+CATEGORIES=	japanese
 
 MAINTAINER=	sumikawa@FreeBSD.org
 
diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile
index 2842f6bf9902..00155653cb76 100644
--- a/japanese/plan/Makefile
+++ b/japanese/plan/Makefile
@@ -8,6 +8,8 @@
 
 BROKEN=		"doesn't build properly from version 1.7.1"
 
+CATEGORIES=	japanese
+
 MAKE_ENV+=	JAPANESE=yes
 
 MASTERDIR=	${.CURDIR}/../../deskutils/plan
diff --git a/japanese/ppxp/Makefile b/japanese/ppxp/Makefile
index 2c86adcb3c2c..1cc75116a79c 100644
--- a/japanese/ppxp/Makefile
+++ b/japanese/ppxp/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+CATEGORIES=	japanese
+
 MASTERDIR=	${.CURDIR}/../../net/ppxp
 
 MAINTAINER=	sada@FreeBSD.org
diff --git a/japanese/ruby-tcltklib/Makefile b/japanese/ruby-tcltklib/Makefile
index 662f3ddc8076..952b21849bef 100644
--- a/japanese/ruby-tcltklib/Makefile
+++ b/japanese/ruby-tcltklib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese x11-toolkits
+CATEGORIES=	japanese
 
 MAINTAINER=	yasuf@big.or.jp
 
diff --git a/japanese/ruby-tk/Makefile b/japanese/ruby-tk/Makefile
index 662f3ddc8076..952b21849bef 100644
--- a/japanese/ruby-tk/Makefile
+++ b/japanese/ruby-tk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese x11-toolkits
+CATEGORIES=	japanese
 
 MAINTAINER=	yasuf@big.or.jp
 
diff --git a/japanese/ruby14-tcltklib/Makefile b/japanese/ruby14-tcltklib/Makefile
index 662f3ddc8076..952b21849bef 100644
--- a/japanese/ruby14-tcltklib/Makefile
+++ b/japanese/ruby14-tcltklib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese x11-toolkits
+CATEGORIES=	japanese
 
 MAINTAINER=	yasuf@big.or.jp
 
diff --git a/japanese/ruby14-tk/Makefile b/japanese/ruby14-tk/Makefile
index 662f3ddc8076..952b21849bef 100644
--- a/japanese/ruby14-tk/Makefile
+++ b/japanese/ruby14-tk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese x11-toolkits
+CATEGORIES=	japanese
 
 MAINTAINER=	yasuf@big.or.jp
 
diff --git a/japanese/tgif2tex/Makefile b/japanese/tgif2tex/Makefile
index 9a8d2b8e2aff..3f6e0d7a99cf 100644
--- a/japanese/tgif2tex/Makefile
+++ b/japanese/tgif2tex/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese print
+CATEGORIES=	japanese
 
 RUN_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 867a6d037279..1d4f7844c765 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -21,7 +21,7 @@
 #	LIB_INPUT_METHOD  : LIB_DEPENDS list of Input Methods
 #	BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
 
-CATEGORIES=	japanese editors
+CATEGORIES=	japanese
 
 MANLANG=	ja
 MAN1=		xemacs-ja.1
diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile
index 5bfce5ee62e0..d14e357b7cb6 100644
--- a/japanese/xv/Makefile
+++ b/japanese/xv/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	japanese graphics
+CATEGORIES=	japanese
 
 MAINTAINER=	shige@FreeBSD.org
 
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index f43db79c8861..5759e2301192 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	rubytk
-PORTVERSION?=	1.4.3
-CATEGORIES?=	x11-toolkits
+PORTNAME=	rubytk
+PORTVERSION=	${VERSION}
+CATEGORIES+=	x11-toolkits
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
diff --git a/lang/ruby14-tcltklib/Makefile b/lang/ruby14-tcltklib/Makefile
index f43db79c8861..5759e2301192 100644
--- a/lang/ruby14-tcltklib/Makefile
+++ b/lang/ruby14-tcltklib/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	rubytk
-PORTVERSION?=	1.4.3
-CATEGORIES?=	x11-toolkits
+PORTNAME=	rubytk
+PORTVERSION=	${VERSION}
+CATEGORIES+=	x11-toolkits
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index ac6994e636d1..c7c18df3f9e8 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-# "?=" lines are for sharing this Makefile with japanese/exmh2.
+# "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2.
 PORTNAME=	exmh
 PORTVERSION=	2.1.1
-CATEGORIES?=	mail tk82
+CATEGORIES+=	mail tk82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/exmh/
 
 MAINTAINER?=	markm@FreeBSD.org
@@ -33,7 +33,7 @@ RUN_DEPENDS+=	repl:${PORTSDIR}/japanese/mh
 RUN_DEPENDS+=	repl:${PORTSDIR}/mail/mh
 .else
 RUN_DEPENDS+=	repl:${PORTSDIR}/mail/nmh
-SCRIPT_ENV+=	USE_NMH=YES
+SCRIPTS_ENV+=	USE_NMH=YES
 .endif
 .endif
 
diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index e86b08b9efcb..847b441f9f72 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	ewipe
 PORTVERSION=	1.1.0
-CATEGORIES=	misc tk42
+CATEGORIES+=	misc tk42
 MASTER_SITES=	http://www.jnet-jp.to/~sekisita/ewipe/ \
 		http://freefall.freebsd.org/~itojun/distfiles/
 
-MAINTAINER=	itojun@itojun.org
+MAINTAINER?=	itojun@itojun.org
 
 #RUN_DEPENDS=	wish4.2:${PORTSDIR}/x11-toolkits/tk42
 
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index 6ef4e8935cb6..6648da36afbf 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -9,10 +9,7 @@
 
 PORTNAME=	ppxp
 PORTVERSION=	0.99120923
-CATEGORIES=	net tk82
-.if defined(USE_TCLJP)
-CATEGORIES+=	japanese
-.endif
+CATEGORIES+=	net tk82
 MASTER_SITES=	http://www.dsl.gr.jp/~manabe/PPxP/packages/	\
 		http://www.linet.gr.jp/~manabe/PPxP/packages/	\
 		http://www.dsl.ics.tut.ac.jp/~manabe/PPxP/packages/
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 7db1bf66d947..2e004d6fa0ae 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jpilot
 PORTVERSION=	0.98.1
-CATEGORIES?=	palm comms
+CATEGORIES+=	palm comms
 MASTER_SITES=	http://jpilot.linuxave.net/
 
 MAINTAINER?=	varju@webct.com
diff --git a/print/gp/Makefile b/print/gp/Makefile
index 874a9a6dc908..9658a1205f6c 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gp
 PORTVERSION=	2.5.p2
-CATEGORIES?=	print tk42
+CATEGORIES+=	print tk42
 MASTER_SITES=	http://www.itbrain.co.jp/~ueda/GP/
 DISTNAME=	GP-2.5p2	
 
diff --git a/print/tgif2tex/Makefile b/print/tgif2tex/Makefile
index f2aebaf5a1c2..c90ae9222a9a 100644
--- a/print/tgif2tex/Makefile
+++ b/print/tgif2tex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tgif2tex
 PORTVERSION=	1.46
-CATEGORIES=	print
+CATEGORIES+=	print
 MASTER_SITES=	http://camphor.elcom.nitech.ac.jp/~nakano/tgif2tex/
 DISTNAME=	${PORTNAME}
 
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index f43db79c8861..5759e2301192 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	rubytk
-PORTVERSION?=	1.4.3
-CATEGORIES?=	x11-toolkits
+PORTNAME=	rubytk
+PORTVERSION=	${VERSION}
+CATEGORIES+=	x11-toolkits
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index f43db79c8861..5759e2301192 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	rubytk
-PORTVERSION?=	1.4.3
-CATEGORIES?=	x11-toolkits
+PORTNAME=	rubytk
+PORTVERSION=	${VERSION}
+CATEGORIES+=	x11-toolkits
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \