svn commit: r319863 - in head/math: rkward rkward-kde4

[Baptiste Daroussin]

Author: bapt
Date: Tue Jun  4 14:26:02 2013
New Revision: 319863
URL: http://svnweb.freebsd.org/changeset/ports/319863

Log:
  WITHOUT_NLS -> PORT_OPTIONS:MNLS
  NOPORTDOCS -> PORT_OPTIONS:MDOCS

Modified:
  head/math/rkward-kde4/Makefile
  head/math/rkward/Makefile

Modified: head/math/rkward-kde4/Makefile
==============================================================================
--- head/math/rkward-kde4/Makefile	Tue Jun  4 14:17:16 2013	(r319862)
+++ head/math/rkward-kde4/Makefile	Tue Jun  4 14:26:02 2013	(r319863)
@@ -32,13 +32,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/rkward
 MAN1=		rkward.1
 
-.if defined(WITHOUT_NLS)
-NLS=		"@comment "
-.else
-NLS=		""
-.endif
-PLIST_SUB+=	NLS=${NLS}
-
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
 .endif
@@ -49,6 +42,13 @@ OPTIONS_DEFAULT=RECDEP
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNLS}
+NLS=		""
+.else
+NLS=		"@comment "
+.endif
+PLIST_SUB+=	NLS=${NLS}
+
 .if ${PORT_OPTIONS:MRECDEP}
 LR_MOD_DIR=	${LOCALBASE}/lib/R/library
 RUN_DEPENDS+=	${LR_MOD_DIR}/R2HTML/INDEX:${PORTSDIR}/textproc/R-cran-R2HTML	\
@@ -62,7 +62,7 @@ RUN_DEPENDS+=	${LR_MOD_DIR}/R2HTML/INDEX
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'	\
 		${WRKSRC}/rkward/rbackend/rkfrontendtransmitter.cpp
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(doc)|#ADD_SUBDIRECTORY(doc)|'	\
 		${WRKSRC}/CMakeLists.txt
 .else
@@ -70,7 +70,7 @@ pre-configure:
 	${REINPLACE_CMD} -e 's,V4.1-Based Variant V1.0,V4.2-Based Variant V1.1,g' \
 		${WRKSRC}/doc/rkward/index.docbook
 .endif
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(po)|#ADD_SUBDIRECTORY(po)|'	\
 		${WRKSRC}/CMakeLists.txt
 .endif

Modified: head/math/rkward/Makefile
==============================================================================
--- head/math/rkward/Makefile	Tue Jun  4 14:17:16 2013	(r319862)
+++ head/math/rkward/Makefile	Tue Jun  4 14:26:02 2013	(r319863)
@@ -30,10 +30,12 @@ FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -pr
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/rkward
 
-.if defined(WITHOUT_NLS)
-NLS=		"@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 NLS=		""
+.else
+NLS=		"@comment "
 .endif
 PLIST_SUB+=	NLS=${NLS}
 
@@ -45,11 +47,11 @@ pre-configure:
 		${PHP2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|-lgfortran|-L${FORTRANLIBDIR2} -lgfortran|'	\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|rkward po doc|rkward po|'	\
 		${WRKSRC}/Makefile.in
 .endif
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e 's|SUBDIRS = rkward po|SUBDIRS = rkward|'	\
 		${WRKSRC}/Makefile.in
 .endif