4 files changed, 29 insertions, 25 deletions

diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index ff31c99dd67c..01fb4f6bc063 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -19,37 +19,39 @@ NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 REINPLACE_ARGS=	-i ""
 
-OPTIONS=	WQY		"WenQuanYi Bitmap Song Font"		on \
-		FIREFLYTTF	"Firefly TrueType Font"			off \
-		FCITX		"GBK Chinese XIM server"		off \
-		SCIM 		"Smart Common Input Method platform"	on \
-		MINICHINPUT 	"A tiny version of Chinput"		off \
-		RELAXCONF	"A set of utilities for FreeBSD LiveCD"	on
+OPTIONS_DEFINE=	WQY FIREFLYTTF FCITX SCIM MINICHINPUT RELAXCONF
+OPTIONS_DEFAULT=	WQY SCIM RELAXCONF
+WQY_DESC=		WenQuanYi Bitmap Song Font
+FIREFLYTTF_DESC=	Firefly TrueType Font
+FCITX_DESC=		GBK Chinese XIM server
+SCIM_DESC=		Smart Common Input Method platform
+MINICHINPUT_DESC=	A tiny version of Chinput
+RELAXCONF_DESC=		A set of utilities for FreeBSD LiveCD
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_WQY)
+.if ${PORT_OPTIONS:MWQY}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy
 .endif
 
-.if defined(WITH_FIREFLYTTF)
+.if ${PORT_OPTIONS:MFIREFLYTTF}
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf
 .endif
 
-.if defined(WITH_FCITX)
+.if ${PORT_OPTIONS:MFCITX}
 RUN_DEPENDS+=	fcitx:${PORTSDIR}/chinese/fcitx
 .endif
 
-.if !defined(WITHOUT_SCIM)
+.if ${PORT_OPTIONS:MSCIM}
 RUN_DEPENDS+=	${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables
 RUN_DEPENDS+=	${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin
 .endif
 
-.if defined(WITH_MINICHINPUT)
+.if ${PORT_OPTIONS:MMINICHINPUT}
 RUN_DEPENDS+=	chinput:${PORTSDIR}/chinese/miniChinput
 .endif
 
-.if !defined(WITHOUT_RELAXCONF)
+.if ${PORT_OPTIONS:MRELAXCONF}
 RUN_DEPENDS+=	relaxconf:${PORTSDIR}/sysutils/relaxconf
 .endif
 
diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
index c5108075b643..a7babae564a0 100644
--- a/chinese/fireflyttf/Makefile
+++ b/chinese/fireflyttf/Makefile
@@ -20,40 +20,41 @@ CONFLICTS=	zh-opendesktop-fonts-*
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
-OPTIONS=	LGJ_FONT "Patch for Taiwan horn" on
+OPTIONS_DEFINE=	LGJ_FONT X11
+OPTIONS_DEFAULT=	LGJ_FONT X11
+LGJ_FONT_DESC=	Patch for Taiwan horn
 
 TTF=		fireflysung.ttf
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_LGJ_FONT)
-.else
+.if ${PORT_OPTIONS:MLGJ_FONT}
 PKGNAMESUFFIX+=	-LGJ
 MASTER_SITES=	http://edt1023.sayya.org/fonts/
 DISTNAME=	fireflysung-1.3.0p1
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	X11=""
 .else
 PLIST_SUB+=	X11="@comment "
 .endif
 
 post-extract:
-.if defined(WITHOUT_LGJ_FONT)
-	@${DO_NADA}
-.else
+.if ${PORT_OPTIONS:MLGJ_FONT}
 	@${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \
 		fireflysung-1.3.0p1/fireflysung.ttf
 	@${MV} ${WRKSRC}/fireflysung-1.3.0p1/fireflysung.ttf  ${WRKSRC}
 	@${RM} -rf ${WRKSRC}/fireflysung-1.3.0p1
+.else
+	${DO_NADA}
 .endif
 
 do-install:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR}
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR}
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf
 .endif
 
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 38d496623244..85730a5c100f 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -18,11 +18,11 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 
-OPTIONS=	NLS	"Build with Native Language Support"	on
+OPTIONS_DEFINE=	NLS
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 6bec8a322a09..62c655c2bace 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -34,7 +34,8 @@ SUB_FILES=	pkg-message
 MAN1=		zhcon.1
 PORTDOCS=	*
 
-OPTIONS=	BIG5	"Use Big5 by default (Taiwan, Hong Kong, Macau)" off
+OPTIONS_DEFINE=	BIG5 DOCS
+BIG5_DESC=	Use Big5 by default (Taiwan, Hong Kong, Macau)
 
 .include <bsd.port.options.mk>
 
@@ -49,13 +50,13 @@ post-patch:
 		${WRKSRC}/src/zhcon.conf
 	@${REINPLACE_CMD} -e 's,$$enable_debug = ,x&x,' \
 		${WRKSRC}/configure
-.if defined(WITH_BIG5)
+.if ${PORT_OPTIONS:MBIG5}
 	@${REINPLACE_CMD} -e '/defaultencode =/s,gb2312,big5,' \
 		${WRKSRC}/src/zhcon.conf
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/README.html ${WRKSRC}/doc/bpsf.txt \
 		${WRKSRC}/doc/poem.* ${WRKSRC}/ChangeLog ${WRKSRC}/NEWS \