8 files changed, 85 insertions, 112 deletions

diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 20e25cc892d8..675fae71394c 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -34,9 +34,8 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if defined(USE_INSTALLED_JISYO) && ${USE_INSTALLED_JISYO} == YES || \
-    exists(${LOCALBASE}/share/skk/${SKKJISYO}) && \
-    (!defined(USE_INSTALLED_JISYO) || ${USE_INSTALLED_JISYO} != NO)
+.if defined(WITH_JISYO) || (exists(${LOCALBASE}/share/skk/${SKKJISYO}) \
+    && !defined(WITHOUT_JISYO))
 pre-build::
 	@${CP} ${LOCALBASE}/share/skk/${SKKJISYO} ${WRKSRC}
 .else
@@ -45,9 +44,8 @@ pre-build::
 	@${CP} ${PORTSDIR}/japanese/skk-jisyo/work/*/jisyo/${SKKJISYO} ${WRKSRC}
 .endif
 
-.if defined(USE_INSTALLED_CDB) && ${USE_INSTALLED_CDB} == YES || \
-    exists(${LOCALBASE}/lib/libcdb.a) && exists(${LOCALBASE}/bin/cdbmake) && \
-    (!defined(USE_INSTALLED_CDB) || ${USE_INSTALLED_CDB} != NO)
+.if defined(WITH_CDB) || (exists(${LOCALBASE}/lib/libcdb.a) && \
+    exists(${LOCALBASE}/bin/cdbmake) && !defined(WITHOUT_CDB))
 pre-build::
 	@${CP} ${LOCALBASE}/lib/libcdb.a ${LOCALBASE}/bin/cdbmake ${WRKSRC}
 	@(cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh)
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index 7cbd4bae266a..a0610ca523fe 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -25,7 +25,7 @@ JP_VERSION=	067
 DIST_SUBDIR=	jed
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lxpg4 -lcurses"
-CONFIGURE_ARGS=	--enable-x-locale=no --with-canna="${WITH_CANNA}"
+CONFIGURE_ARGS=	--enable-x-locale=no
 ALL_TARGET=	${BINSTUFF} getmail
 MAN1=		jed.1 rgrep.1
 
@@ -34,10 +34,10 @@ BINSTUFF=	jed rgrep
 
 .include <bsd.port.pre.mk>
 
-.if defined(NO_CANNA)
-WITH_CANNA=	no
+.if defined(WITHOUT_CANNA)
+CONFIGURE_ARGS+= --with-canna=no
 .else
-WITH_CANNA=	yes
+CONFIGURE_ARGS+= --with-canna=yes
 LIBDEP_CANNA=	canna.1:${PORTSDIR}/japanese/Canna
 .endif
 
@@ -46,11 +46,11 @@ LIBDEP_CANNA=	canna.1:${PORTSDIR}/japanese/Canna
 XJED_BROKEN=	yes
 .endif
 
-.if defined(NO_X11)
-NO_XJED=	yes
+.if defined(WITHOUT_X11)
+WITHOUT_XJED=	yes
 .endif
 
-.if defined(NO_XJED)
+.if defined(WITHOUT_XJED) || defined(XJED_BROKEN)
 PLIST_SUB=	XJED_ENTRY="@comment xjed is not installed"
 .else
 USE_XLIB=	yes
@@ -64,14 +64,14 @@ _INFODIR=	${WRKSRC}/info
 _LIBDIR=	${WRKSRC}/lib
 
 pre-fetch:
-.if !defined(NO_CANNA)
-	@${ECHO_MSG} "To build this port without Canna, define \"NO_CANNA\"."
+.if !defined(WITHOUT_CANNA)
+	@${ECHO_MSG} "To build this port without Canna, define \"WITHOUT_CANNA\"."
 .endif
-.if !defined(NO_XJED)
+.if !defined(WITHOUT_XJED)
 .if defined(XJED_BROKEN)
 	@${ECHO_MSG} "Sorry, I will not build xjed since it is broken on 3.x-STABLE for the present."
 .else
-	@${ECHO_MSG} "To build this port without xjed, define \"NO_XJED\"."
+	@${ECHO_MSG} "To build this port without xjed, define \"WITHOUT_XJED\"."
 .endif
 .endif
 
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index ecf568af4f2a..7e1c43594030 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -36,27 +36,22 @@ DOCDIR=		${PREFIX}/share/doc/kterm
 
 .if !defined(PACKAGE_BUILDING)
 
-.if defined(USE_XAW3DLIB) && defined(USE_NEXTAWLIB)
-.if (${USE_XAW3DLIB} == "YES") && (${USE_NEXTAWLIB} == "YES")
+.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB)
 .BEGIN:
-	@${ECHO} "Error: \$${USE_XAW3DLIB} and \$${USE_NEXTAWLIB} cannot be specified simultaneously!"
+	@${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!"
 	@${FALSE}
-.endif
-.elif defined(USE_XAW3DLIB)
-.if (${USE_XAW3DLIB} == "YES")
+.elif defined(WITH_XAW3DLIB)
 LIB_DEPENDS+=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 post-patch:
 	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-Xaw3d
-.endif
-.elif defined(USE_NEXTAWLIB)
-.if (${USE_NEXTAWLIB} == "YES")
+.elif defined(WITH_NEXTAWLIB)
 LIB_DEPENDS+=	neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw
 post-patch:
 	@${ECHO_MSG}  "===>  Applying neXtaw scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-neXtaw
 .endif
-.endif
+
 .endif
 
 post-install:
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index cbc65266bcd9..7bbfd9951abb 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -43,27 +43,22 @@ post-extract:
 
 .if !defined(PACKAGE_BUILDING)
 
-.if defined(USE_XAW3DLIB) && defined(USE_NEXTAWLIB)
-.if (${USE_XAW3DLIB} == "YES") && (${USE_NEXTAWLIB} == "YES")
+.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB)
 .BEGIN:
-	@${ECHO} "Error: \$${USE_XAW3DLIB} and \$${USE_NEXTAWLIB} cannot be specified simultaneously!"
+	@${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!"
 	@${FALSE}
-.endif
-.elif defined(USE_XAW3DLIB)
-.if (${USE_XAW3DLIB} == "YES")
+.elif defined(WITH_XAW3DLIB)
 LIB_DEPENDS+=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 post-patch:
 	@${ECHO_MSG}  "===>  Applying Xaw3d scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-Xaw3d
-.endif
-.elif defined(USE_NEXTAWLIB)
-.if (${USE_NEXTAWLIB} == "YES")
+.elif defined(WITH_NEXTAWLIB)
 LIB_DEPENDS+=	neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw
 post-patch:
 	@${ECHO_MSG}  "===>  Applying neXtaw scrollbar patch"
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-neXtaw
 .endif
-.endif
+
 .endif
 
 do-install:
diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile
index 45d3d1f21c71..b3314a344f57 100644
--- a/japanese/latex2html/Makefile
+++ b/japanese/latex2html/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 # Default image format is GIF.
-# If you prefer PNG to GIF, define USE_PNG (`make -DUSE_PNG`).
+# If you prefer PNG to GIF, define WITH_PNG (`make -DWITH_PNG`).
 
 PORTNAME=	latex2html
 PORTVERSION=	${VERSION}j${JP_VERSION}
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${PREFIX}/bin/latex:${PORTSDIR}/print/latex \
 		${PREFIX}/bin/gs:${PORTSDIR}/print/ghostscript5 \
 		${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm
 
-.ifdef USE_PNG
+.ifdef WITH_PNG
 RUN_DEPENDS +=	${X11BASE}/bin/pnmtopng:${PORTSDIR}/graphics/pnmtopng
 .endif
 
@@ -55,7 +55,7 @@ post-patch:
 			"s|LATEX2HTMLDIR\s*=.*;|LATEX2HTMLDIR='${L2HDIR}';|; s|^use lib.*;|use lib '${L2HDIR}';|;" \
 			${WRKDIR}/$$file; \
 	done
-.ifdef USE_PNG
+.ifdef WITH_PNG
 	@${PERL} -pi -e "s|IMAGE_TYPE=.*;|IMAGE_TYPE='png';|" \
 		${WRKDIR}/jlatex2html.config
 .endif
diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index 8f044d6373d7..b6d64f7cee1b 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -18,28 +18,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PLISTS=
 
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
-# postgresql with tcl support by typing: make USE_TCL=yes
-.if defined(USE_TCL)
+# postgresql with tcl support by typing: make WITH_TCL=yes
+.if defined(WITH_TCL)
 TCL_INCDIR=	${PREFIX}/include/tcl8.0jp
 TK_INCDIR=	${PREFIX}/include/tk8.0jp
 MAKE_ENV=	USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR}
-WITH_TCL=	--with-tcl
-WITH_TK=	--with-tk
-WITH_TCLCONFIG=	--with-tclconfig=${PREFIX}/lib/tcl8.0jp
-WITH_TKCONFIG=	--with-tkconfig=${PREFIX}/lib/tk8.0jp
+CONFIGURE_ARGS= --with-tcl --with-tk \
+		--with-tclconfig=${PREFIX}/lib/tcl8.0jp \
+		--with-tkconfig=${PREFIX}/lib/tk8.0jp
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
 		tk80jp.1:${PORTSDIR}/japanese/tk80
 PLISTS+=	PLIST.tcl
 .endif
 .if defined(MULTIBYTE)
-WITH_MB=	--with-mb=${MULTIBYTE}
+CONFIGURE_ARGS+= --with-mb=${MULTIBYTE}
 .endif
-.if defined(USE_PERL)
-WITH_PERL=      --with-perl
+.if defined(WITH_PERL)
+CONFIGURE_ARGS+= --with-perl
 PLISTS+=	PLIST.pl
 .endif
-.if defined(USE_ODBC)
-WITH_ODBC=      --with-odbc
+.if defined(WITH_ODBC)
+CONFIGURE_ARGS+= --with-odbc
 PLISTS+=	PLIST.odbc
 .endif
 
@@ -48,13 +47,10 @@ NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
+CONFIGURE_ARGS+= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		${WITH_TCL} ${WITH_TCLCONFIG} \
-		${WITH_TK} ${WITH_TKCONFIG} \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
-		--with-libraries=${PREFIX}/lib \
-		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
+		--with-libraries=${PREFIX}/lib
 
 INSTALL_TARGET= install install-man
 
@@ -89,14 +85,14 @@ PGSQL_UID=	pgsql
 PGSQL_GID=	pgsql
 
 pre-fetch:
-.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE)
+.if !defined(WITH_TCL) & !defined(WITH_PERL) & !defined(WITH_ODBC) & !defined(MULTIBYTE)
 
 	@${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:"
 	@${ECHO_MSG} "    make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}"
-	@${ECHO_MSG} "          USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes"
+	@${ECHO_MSG} "          WITH_TCL=yes, WITH_PERL=yes, WITH_ODBC=yes"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
-	@${ECHO_MSG} "		make USE_TCL=yes"
+	@${ECHO_MSG} "		make WITH_TCL=yes"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
@@ -115,15 +111,14 @@ post-build:
 .for i in ${PLISTS} PLIST
 	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
 .endfor
-.if defined(USE_TCL)
+.if defined(WITH_TCL)
 	${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST
 .endif
-.if defined(USE_ODBC)
+.if defined(WITH_ODBC)
 	${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST
-	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
-.else
-	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
 .endif
+	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}
diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile
index 8f044d6373d7..b6d64f7cee1b 100644
--- a/japanese/postgresql/Makefile
+++ b/japanese/postgresql/Makefile
@@ -18,28 +18,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PLISTS=
 
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
-# postgresql with tcl support by typing: make USE_TCL=yes
-.if defined(USE_TCL)
+# postgresql with tcl support by typing: make WITH_TCL=yes
+.if defined(WITH_TCL)
 TCL_INCDIR=	${PREFIX}/include/tcl8.0jp
 TK_INCDIR=	${PREFIX}/include/tk8.0jp
 MAKE_ENV=	USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR}
-WITH_TCL=	--with-tcl
-WITH_TK=	--with-tk
-WITH_TCLCONFIG=	--with-tclconfig=${PREFIX}/lib/tcl8.0jp
-WITH_TKCONFIG=	--with-tkconfig=${PREFIX}/lib/tk8.0jp
+CONFIGURE_ARGS= --with-tcl --with-tk \
+		--with-tclconfig=${PREFIX}/lib/tcl8.0jp \
+		--with-tkconfig=${PREFIX}/lib/tk8.0jp
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
 		tk80jp.1:${PORTSDIR}/japanese/tk80
 PLISTS+=	PLIST.tcl
 .endif
 .if defined(MULTIBYTE)
-WITH_MB=	--with-mb=${MULTIBYTE}
+CONFIGURE_ARGS+= --with-mb=${MULTIBYTE}
 .endif
-.if defined(USE_PERL)
-WITH_PERL=      --with-perl
+.if defined(WITH_PERL)
+CONFIGURE_ARGS+= --with-perl
 PLISTS+=	PLIST.pl
 .endif
-.if defined(USE_ODBC)
-WITH_ODBC=      --with-odbc
+.if defined(WITH_ODBC)
+CONFIGURE_ARGS+= --with-odbc
 PLISTS+=	PLIST.odbc
 .endif
 
@@ -48,13 +47,10 @@ NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
+CONFIGURE_ARGS+= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		${WITH_TCL} ${WITH_TCLCONFIG} \
-		${WITH_TK} ${WITH_TKCONFIG} \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
-		--with-libraries=${PREFIX}/lib \
-		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
+		--with-libraries=${PREFIX}/lib
 
 INSTALL_TARGET= install install-man
 
@@ -89,14 +85,14 @@ PGSQL_UID=	pgsql
 PGSQL_GID=	pgsql
 
 pre-fetch:
-.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE)
+.if !defined(WITH_TCL) & !defined(WITH_PERL) & !defined(WITH_ODBC) & !defined(MULTIBYTE)
 
 	@${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:"
 	@${ECHO_MSG} "    make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}"
-	@${ECHO_MSG} "          USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes"
+	@${ECHO_MSG} "          WITH_TCL=yes, WITH_PERL=yes, WITH_ODBC=yes"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
-	@${ECHO_MSG} "		make USE_TCL=yes"
+	@${ECHO_MSG} "		make WITH_TCL=yes"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
@@ -115,15 +111,14 @@ post-build:
 .for i in ${PLISTS} PLIST
 	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
 .endfor
-.if defined(USE_TCL)
+.if defined(WITH_TCL)
 	${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST
 .endif
-.if defined(USE_ODBC)
+.if defined(WITH_ODBC)
 	${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST
-	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
-.else
-	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
 .endif
+	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}
diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile
index 8f044d6373d7..b6d64f7cee1b 100644
--- a/japanese/postgresql7/Makefile
+++ b/japanese/postgresql7/Makefile
@@ -18,28 +18,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PLISTS=
 
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
-# postgresql with tcl support by typing: make USE_TCL=yes
-.if defined(USE_TCL)
+# postgresql with tcl support by typing: make WITH_TCL=yes
+.if defined(WITH_TCL)
 TCL_INCDIR=	${PREFIX}/include/tcl8.0jp
 TK_INCDIR=	${PREFIX}/include/tk8.0jp
 MAKE_ENV=	USE_TCL=true USE_TK=true TCL_INCDIR=${TCL_INCDIR}
-WITH_TCL=	--with-tcl
-WITH_TK=	--with-tk
-WITH_TCLCONFIG=	--with-tclconfig=${PREFIX}/lib/tcl8.0jp
-WITH_TKCONFIG=	--with-tkconfig=${PREFIX}/lib/tk8.0jp
+CONFIGURE_ARGS= --with-tcl --with-tk \
+		--with-tclconfig=${PREFIX}/lib/tcl8.0jp \
+		--with-tkconfig=${PREFIX}/lib/tk8.0jp
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80 \
 		tk80jp.1:${PORTSDIR}/japanese/tk80
 PLISTS+=	PLIST.tcl
 .endif
 .if defined(MULTIBYTE)
-WITH_MB=	--with-mb=${MULTIBYTE}
+CONFIGURE_ARGS+= --with-mb=${MULTIBYTE}
 .endif
-.if defined(USE_PERL)
-WITH_PERL=      --with-perl
+.if defined(WITH_PERL)
+CONFIGURE_ARGS+= --with-perl
 PLISTS+=	PLIST.pl
 .endif
-.if defined(USE_ODBC)
-WITH_ODBC=      --with-odbc
+.if defined(WITH_ODBC)
+CONFIGURE_ARGS+= --with-odbc
 PLISTS+=	PLIST.odbc
 .endif
 
@@ -48,13 +47,10 @@ NO_PACKAGE=	"Requires ${PGSQL_UID} uid"
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS= --prefix=${PREFIX}/${INSTALL_DIR} \
+CONFIGURE_ARGS+= --prefix=${PREFIX}/${INSTALL_DIR} \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
-		${WITH_TCL} ${WITH_TCLCONFIG} \
-		${WITH_TK} ${WITH_TKCONFIG} \
 		--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" \
-		--with-libraries=${PREFIX}/lib \
-		${WITH_MB} ${WITH_PERL} ${WITH_ODBC}
+		--with-libraries=${PREFIX}/lib
 
 INSTALL_TARGET= install install-man
 
@@ -89,14 +85,14 @@ PGSQL_UID=	pgsql
 PGSQL_GID=	pgsql
 
 pre-fetch:
-.if !defined(USE_TCL) & !defined(USE_PERL) & !defined(USE_ODBC) & !defined(MULTIBYTE)
+.if !defined(WITH_TCL) & !defined(WITH_PERL) & !defined(WITH_ODBC) & !defined(MULTIBYTE)
 
 	@${ECHO_MSG} "To build the \"MULTIBYTE PostgreSQL\", type:"
 	@${ECHO_MSG} "    make MULTIBYTE={EUC_JP,EUC_CN,EUC_KR,EUC_TW,UNICODE,MULE_INTERNAL,LATIN1-5}"
-	@${ECHO_MSG} "          USE_TCL=yes, USE_PERL=yes, USE_ODBC=yes"
+	@${ECHO_MSG} "          WITH_TCL=yes, WITH_PERL=yes, WITH_ODBC=yes"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
-	@${ECHO_MSG} "		make USE_TCL=yes"
+	@${ECHO_MSG} "		make WITH_TCL=yes"
 .else
 	@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
 .endif
@@ -115,15 +111,14 @@ post-build:
 .for i in ${PLISTS} PLIST
 	${CAT} ${PKGDIR}/${i} >> ${WRKDIR}/PLIST
 .endfor
-.if defined(USE_TCL)
+.if defined(WITH_TCL)
 	${CAT} ${PKGDIR}/PLIST.tcl.dirrm >> ${WRKDIR}/PLIST
 .endif
-.if defined(USE_ODBC)
+.if defined(WITH_ODBC)
 	${CAT} ${PKGDIR}/PLIST.odbc.dirrm >> ${WRKDIR}/PLIST
-	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
-.else
-	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
 .endif
+	${CAT} ${PKGDIR}/PLIST.dirrm >> ${WRKDIR}/PLIST
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	${RM} -rf ${PREFIX}/${INSTALL_DIR}