Index: Makefile
===================================================================
--- Makefile	(revision 522479)
+++ Makefile	(working copy)
@@ -27,17 +27,14 @@
 OPTIONS_SUB=		yes
 
 ICONV_CONFIGURE_USES=	iconv
-ICONV_CONFIGURE_ON=	--with-libiconv-prefix=${LOCALBASE}
-ICONV_CONFIGURE_OFF=	--without-libiconv-prefix
+ICONV_CONFIGURE_WITH=	libiconv-prefix=${LOCALBASE}
 
 LIBSIGSEGV_LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
-LIBSIGSEGV_CONFIGURE_ON=	--with-libsigsegv-prefix=${LOCALBASE}
-LIBSIGSEGV_CONFIGURE_OFF=	--without-libsigsegv-prefix
+LIBSIGSEGV_CONFIGURE_WITH=	libsigsegv-prefix=${LOCALBASE}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
-NLS_CONFIGURE_OFF=	--without-libintl-prefix
+NLS_CONFIGURE_WITH=	libintl-prefix=${LOCALBASE}
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_USES=		pkgconfig