Convert to new option framework

3 files changed, 42 insertions, 37 deletions

diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index 7eb52e3acb9c..7014ab8c5fc8 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -30,33 +30,35 @@ CONFIGURE_ENV=	JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lcurses"
 CONFIGURE_ARGS=	--enable-x-locale=no
 ALL_TARGET=	${BINSTUFF} getmail
 MAN1=		jed.1 rgrep.1
-.if !defined(NOPORTDOCS)
-INFO=		jed
-.endif
 
 MAKE_JOBS_UNSAFE=  yes
 
 JED_ROOT=	${DATADIR}
 BINSTUFF=	jed rgrep
 
-OPTIONS=	CANNA	"Canna support"	on \
-		X11	"X11 support"	on
+OPTIONS_DEFINE=	DOCS X11 CANNA
+OPTIONS_DEFAULT= CANNA X11
+CANNA_DESC=	Canna support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_CANNA)
-CONFIGURE_ARGS+=	--with-canna=no
-.else
+.if ${PORT_OPTIONS:MDOCS}
+INFO=		jed
+.endif
+
+.if ${PORT_OPTIONS:MCANNA}
 CONFIGURE_ARGS+=	--with-canna=yes
 LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
+.else
+CONFIGURE_ARGS+=	--with-canna=no
 .endif
 
-.if defined(WITHOUT_X11)
-PLIST_SUB=	X11="@comment "
-.else
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xext xt
 BINSTUFF+=	xjed
 PLIST_SUB=	X11="bin/xjed"
+.else
+PLIST_SUB=	X11="@comment "
 .endif
 
 _OBJDIR=	${WRKSRC}/src/${ARCH}objs
@@ -90,7 +92,7 @@ do-install:
 	${INSTALL_DATA} ${_LIBDIR}/colors/* ${JED_ROOT}/lib/colors/
 	${INSTALL_DATA} ${_LIBDIR}/tm/* ${JED_ROOT}/lib/tm/
 	cd ${_DOCDIR} && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_DATA} ${_INFODIR}/jed.info ${PREFIX}/info/
 	${INSTALL_DATA} ${_INFODIR}/jed.1in ${PREFIX}/info/jed.info-1
 	${INSTALL_DATA} ${_INFODIR}/jed.2in ${PREFIX}/info/jed.info-2
@@ -102,4 +104,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index a80eaf213b51..efe3ccf06d06 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -32,12 +32,13 @@ MAKE_ARGS=	FEPOPT='${FEPOPT}' \
 
 MAN1=		jvim3.1
 
-OPTIONS=	X11	"X11 support"				on \
-		CANNA	"Canna support (via ONEW library)"	on \
-		DIRECT_CANNA	"Canna support (direct)"	off \
-		FREEWNN	"FreeWnn support (via ONEW library)"	on \
-		WNN6	"Wnn6 support"				off \
-		WNN7	"Wnn7 support"				off
+OPTIONS_DEFINE=	X11 CANNA DIRECT_CANNA WNN6 WNN7 FREEWNN 
+OPTIONS_DEFAULT=	CANNA FREEWNN X11
+CANNA_DESC=	Canna support (via ONEW library)
+DIRECT_CANNA_DESC=	Canna support (direct)
+FREEWNN_DESC=	FreeWnn support (via ONEW library)
+WNN6_DESC=	Wnn6 support
+WNN7_DESC=	Wnn7 support
 
 PORTDOCS=	cygwin.txt differen.doc fepctrl.doc readme.doc \
 		termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j
@@ -46,9 +47,9 @@ PORTDOCS=	cygwin.txt differen.doc fepctrl.doc readme.doc \
 MACHINE=	-DBSD_UNIX -DUSE_LOCALE
 LIBS=		-ltermlib -L${PREFIX}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 MACHINE+=	-DUSE_X11
 CC+=		-I${LOCALBASE}/include
@@ -56,17 +57,17 @@ LIBS+=		-L${LOCALBASE}/lib -lX11
 .endif
 
 #  Direct connection to Canna
-.if !defined(WITHOUT_DIRECT_CANNA)
+.if ${PORT_OPTIONS:MDIRECT_CANNA}
 INPUT_METHOD+=	direct_canna
 LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/canna-lib
 FEPOPT+=	-DJP_DEF=\"EEE\" -DCANNA -DFEPCTRL
 FEPLIBS=	-lcanna
 FEPOBJS=	fepcanna.o
 JVIM3RC=	"set fepctrl"
-.else # !WITHOUT_DIRECT_CANNA
+.else
 
 # Connection by using ONEW library
-.if !defined(WITHOUT_CANNA)
+.if ${PORT_OPTIONS:MCANNA}
 INPUT_METHOD+=	canna
 LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/canna-lib
 FEPLIBS+=	-L${LOCALBASE}/lib -lonew-canna -lcanna
@@ -75,7 +76,7 @@ FEPOBJS=	feponew.o
 JVIM3RC=	"set fepctrl onewredraw"
 .endif
 
-.if !defined(WITHOUT_FREEWNN)
+.if ${PORT_OPTIONS:MFREEWNN}
 LIB_DEPENDS+=	jd.0:${PORTSDIR}/japanese/FreeWnn-lib
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew-freewnn.a:${PORTSDIR}/japanese/onew
 FEPLIBS+=	-L${LOCALBASE}/lib -lonew-freewnn -ljd -lcrypt
@@ -84,7 +85,7 @@ FEPOBJS=	feponew.o
 JVIM3RC=	"set fepctrl onewredraw"
 .endif
 
-.if !defined(WITHOUT_WNN6)
+.if ${PORT_OPTIONS:MWNN6}
 LIB_DEPENDS+=	jd.0:${PORTSDIR}/japanese/FreeWnn-lib
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew-wnn6.a:${PORTSDIR}/japanese/onew
 FEPLIBS+=	-L${LOCALBASE}/lib -lonew-wnn6 -ljd -lcrypt
@@ -93,7 +94,7 @@ FEPOBJS=	feponew.o
 JVIM3RC=	"set fepctrl onewredraw"
 .endif
 
-.if !defined(WITHOUT_WNN7)
+.if ${PORT_OPTIONS:MWNN7}
 LIB_DEPENDS+=	jd.0:${PORTSDIR}/japanese/FreeWnn-lib
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libonew-wnn7.a:${PORTSDIR}/japanese/onew
 FEPLIBS+=	-L${LOCALBASE}/lib -lonew-wnn7 -ljd -lcrypt
@@ -101,7 +102,7 @@ FEPOPT+=	-DJP_DEF=\"EEE\" -DONEW -DFEPCTRL
 FEPOBJS=	feponew.o
 JVIM3RC=	"set fepctrl onewredraw"
 .endif
-.endif # !WITHOUT_DIRECT_CANNA
+.endif
 
 post-build:
 	${CP} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j
@@ -114,9 +115,9 @@ post-install:
 .if !exists(${PREFIX}/etc/jvim3rc)
 	${INSTALL_DATA} ${PREFIX}/etc/jvim3rc.dist ${PREFIX}/etc/jvim3rc
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/skk-tools/Makefile b/japanese/skk-tools/Makefile
index 87336a42d080..904c414cd9f0 100644
--- a/japanese/skk-tools/Makefile
+++ b/japanese/skk-tools/Makefile
@@ -18,7 +18,9 @@ COMMENT=	Jisyo-tools for the SKK Japanese-input software
 
 LICENSE=	GPLv2
 
-OPTIONS=	EXPR2 "Build skkdic-expr2 (needs glib-2.x)" on
+OPTIONS_DEFINE=	EXPR2
+OPTIONS_DEFAULT=	EXPR2
+EXPR2_DESC=	Build skkdic-expr2 (needs glib-2.x)
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -30,19 +32,19 @@ PLIST_FILES=	bin/skkdic-count bin/skkdic-expr bin/skkdic-sort
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_EXPR2)
-CONFIGURE_ARGS=	--without-skkdic-expr2
-.else
+.if ${PORT_OPTIONS:MEXPR2}
 USE_GNOME=	glib20
 PORTDOCS+=	README.skkdic-expr2
 PLIST_FILES+=	bin/skkdic-expr2
+.else
+CONFIGURE_ARGS=	--without-skkdic-expr2
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/READMEs/README.C ${DOCSDIR}/README.skktools
-.if !defined(WITHOUT_EXPR2)
+.if ${PORT_OPTIONS:MEXPR2}
 	${INSTALL_DATA} ${WRKSRC}/READMEs/README.skkdic-expr2 ${DOCSDIR}
 .endif
 .endif