svn commit: r359987 - head/lang/spidermonkey185

[Baptiste Daroussin]

Author: bapt
Date: Tue Jul  1 12:39:10 2014
New Revision: 359987
URL: http://svnweb.freebsd.org/changeset/ports/359987
QAT: https://qat.redports.org/buildarchive/r359987/

Log:
  Fix build with readline from ports
  While here use options helpers
  Remove useless inclusion of pre.mk/post.mk

Modified:
  head/lang/spidermonkey185/Makefile

Modified: head/lang/spidermonkey185/Makefile
==============================================================================
--- head/lang/spidermonkey185/Makefile	Tue Jul  1 12:38:09 2014	(r359986)
+++ head/lang/spidermonkey185/Makefile	Tue Jul  1 12:39:10 2014	(r359987)
@@ -49,62 +49,19 @@ THREADSAFE_DESC=	Enable multiple thread 
 TRACEJIT_DESC=		Enable tracing JIT support
 UTF8_DESC=		Treat strings as UTF8 instead of ISO-8859-1
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug \
-			--enable-debug-symbols
-.else
-CONFIGURE_ARGS+=	--disable-debug
-.endif
-
-.if ${PORT_OPTIONS:MGCZEAL}
-CONFIGURE_ARGS+=	--enable-gczeal
-.else
-CONFIGURE_ARGS+=	--disable-gczeal
-.endif
-
-.if ${PORT_OPTIONS:MJEMALLOC}
-CONFIGURE_ARGS+=	--enable-jemalloc
-.else
-CONFIGURE_ARGS+=	--disable-jemalloc
-.endif
-
-.if ${PORT_OPTIONS:MMETHODJIT}
-CONFIGURE_ARGS+=	--enable-methodjit
-.else
-CONFIGURE_ARGS+=	--disable-methodjit
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZE}
-CONFIGURE_ARGS+=	--enable-optimize
-.else
-CONFIGURE_ARGS+=	--disable-optimize
-.endif
-
-.if ${PORT_OPTIONS:MREADLINE}
-CONFIGURE_ARGS+=	--enable-readline
-.else
-CONFIGURE_ARGS+=	--disable-readline
-.endif
-
-.if ${PORT_OPTIONS:MTHREADSAFE}
-CONFIGURE_ARGS+=	--enable-threadsafe
-.else
-CONFIGURE_ARGS+=	--disable-threadsafe
-.endif
-
-.if ${PORT_OPTIONS:MTRACEJIT}
-CONFIGURE_ARGS+=	--enable-tracejit
-.else
-CONFIGURE_ARGS+=	--disable-tracejit
-.endif
+DEBUG_CONFIGURE_ENABLE=	debug
+DEBUG_CONFIGURE_ON=	--enable-debug-sumbols
+GCZEAL_CONFIGURE_ENABLE=	gczeal
+JEMALLOC_CONFIGURE_ENABLE=	jemalloc
+METHODJIT_CONFIGURE_ENABLE=	methodjit
+OPTIMIZE_CONFIGURE_ENABLE=	optimize
+READLINE_CONFIGURE_ENABLE=	readline
+READLINE_USES=	readline
+THREADSAFE_CONFIGURE_ENABLE=	threadsafe
+TRACEJIT_CONFIGURE_ENABLE=	tracejit
+UTF8_CFLAGS=			-DJS_C_STRINGS_ARE_UTF8
 
-.if ${PORT_OPTIONS:MUTF8}
-CFLAGS+=		-DJS_C_STRINGS_ARE_UTF8
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
@@ -169,4 +126,4 @@ post-install:
 	${LN} -sf libmozjs185.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libmozjs185.so.1.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs185.so.1.0.0
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>