2 files changed, 28 insertions, 28 deletions

diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index cd1b5b6c29f4..4b71430b5b86 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -27,13 +27,15 @@ CONFIGURE_ARGS=	--disable-dependency-tracking --disable-lua-extension
 
 PROJECTHOST=	ibus
 
-OPTIONS=	ANDROID_DB	"Build Android DB" on \
-			OPENPHRASE_DB	"Build Open Phrase DB" off \
-			OPENCC	"Use opencc" off
+OPTIONS_DEFINE=	ANDROID_DB OPENPHRASE_DB OPENCC NLS
+OPTIONS_DEFAULT=	ANDROID_DB
+ANDROID_DB_DESC=	Build Android DB
+OPENPHRASE_DB_DESC=	Build Open Phrase DB
+OPENCC_DESC=		Use opencc
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ANDROID_DB)
+.if ${PORT_OPTIONS:MANDROID_DB}
 CONFIGURE_ARGS+=	--enable-db-android
 PLIST_SUB+=	ANDROID_DB=""
 .else
@@ -44,7 +46,7 @@ PLIST_SUB+=	ANDROID_DB="@comment "
 OPENPHRASE_DBVER=	1.2.99
 OPENPHRASE_DBFILE=	pinyin-database-${OPENPHRASE_DBVER}.tar.bz2
 
-.if defined(WITH_OPENPHRASE_DB)
+.if ${PORT_OPTIONS:MOPENPHRASE_DB}
 CONFIGURE_ARGS+=	--enable-db-open-phrase
 DISTFILES+=	${OPENPHRASE_DBFILE}
 PLIST_SUB+=	OPENPHRASE_DB=""
@@ -53,14 +55,14 @@ CONFIGURE_ARGS+=	--disable-db-open-phrase
 PLIST_SUB+=	OPENPHRASE_DB="@comment "
 .endif
 
-.if defined(WITH_OPENCC)
+.if ${PORT_OPTIONS:MOPENCC}
 CONFIGURE_ARGS+=	--enable-opencc
 LIB_DEPENDS+=		opencc.1:${PORTSDIR}/chinese/opencc
 .else
 CONFIGURE_ARGS+=	--disable-opencc
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -69,11 +71,11 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-extract:
-.if defined(WITH_OPENPHRASE_DB)
+.if ${PORT_OPTIONS:MOPENPHRASE_DB}
 	@${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index b218b60798a1..978eab85484b 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	oxim
-# Date created:				Mar 19 2006
-# Whom:					Rong-En Fan <rafan@infor.org>
-#
+# Created by: Rong-En Fan <rafan@infor.org>
 # $FreeBSD$
-#
 
 PORTNAME=	oxim
 PORTVERSION=	1.2.2
@@ -17,9 +13,11 @@ COMMENT=	Open X Input Method server
 
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf
 
-OPTIONS=	GTK2 "Enable GTK2 input method module" On \
-		CHEWING "Enable Chewing input module" On \
-		UNICODE "Enable Unicode input module" On
+OPTIONS_DEFINE=	GTK2 CHEWING UNICODE
+OPTIONS_DEFAULT=	GTK2 CHEWING UNICODE
+GTK2_DESC=	 GTK2 input method module
+CHEWING_DESC=	 Chewing input module
+UNICODE_DESC=	 Unicode input module
 
 USE_ICONV=	yes
 USE_XORG=	x11 xft xpm xtst
@@ -38,18 +36,18 @@ CONFIGURE_ARGS+=--disable-qt-immodule
 
 MAN1=		oxim.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GTK2)
-CONFIGURE_ARGS+=	--disable-gtk-immodule
-PLIST_SUB+=	GTK2="@comment "
-.else
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk-immodule
 PLIST_SUB+=	GTK2=""
+.else
+CONFIGURE_ARGS+=	--disable-gtk-immodule
+PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if !defined(WITHOUT_CHEWING)
+.if ${PORT_OPTIONS:MCHEWING}
 # make sure we have the required libchewing
 BUILD_DEPENDS+=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
 RUN_DEPENDS+=	zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing
@@ -62,7 +60,7 @@ CONFIGURE_ARGS+=	--disable-chewing-module
 PLIST_SUB+=	CHEWING="@comment "
 .endif
 
-.if !defined(WITHOUT_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
 CONFIGURE_ARGS+=	--enable-unicode-module
 PLIST_SUB+=	UNICODE=""
 .else
@@ -71,7 +69,7 @@ PLIST_SUB+=	UNICODE="@comment "
 .endif
 
 # TODO WITHOUT_NLS knob
-#.if !defined(WITHOUT_NLS)
+#.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 LDFLAGS+=	-lintl
 PLIST_SUB+=	NLS=""
@@ -85,10 +83,10 @@ post-patch:
 			${WRKSRC}/src/gtk-immodule/gtkintl.h
 
 post-install:
-.if !defined(WITHOUT_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 	@gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
 .endif
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>