[Midnightbsd-cvs] mports [15617] U trunk/lang/ruby18: new options

[laffer1 at midnightbsd.org]

Revision: 15617
          http://svnweb.midnightbsd.org/mports/?rev=15617
Author:   laffer1
Date:     2013-11-23 13:28:24 -0500 (Sat, 23 Nov 2013)
Log Message:
-----------
new options

Modified Paths:
--------------
    trunk/lang/ruby18/Makefile
    trunk/lang/ruby18/pkg-descr

Property Changed:
----------------
    trunk/lang/ruby18/distinfo
    trunk/lang/ruby18/pkg-descr
    trunk/lang/ruby18/pkg-message
    trunk/lang/ruby18/pkg-plist

Modified: trunk/lang/ruby18/Makefile
===================================================================
--- trunk/lang/ruby18/Makefile	2013-11-23 05:21:15 UTC (rev 15616)
+++ trunk/lang/ruby18/Makefile	2013-11-23 18:28:24 UTC (rev 15617)
@@ -12,6 +12,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT?=	An object-oriented interpreted scripting language
+
 LICENSE=	gpl2
 
 FAKE_OPTS=	trueprefix
@@ -18,11 +19,12 @@
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
-CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} --enable-shared
-CONFIGURE_ENV=	CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
+CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} --enable-shared --enable-frame-address
+CONFIGURE_ENV=	CFLAGS="-fwrapv -I${OPENSSLINC} ${CFLAGS}" \
 		LDFLAGS="-L${OPENSSLLIB} ${LDFLAGS}" \
 		LIBS="-L${OPENSSLLIB} ${LDFLAGS}" \
 		CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
+USE_CSTD=	gnu89
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	aclocal autoconf
@@ -38,9 +40,11 @@
 RUBY_NO_RUN_DEPENDS=	yes
 _RUBY_SYSLIBDIR=	${PREFIX}/lib
 
-OPTIONS=	ONIGURUMA "Build with oniguruma regular expressions lib" off \
-		RDOC "Build and install Rdoc indexes" on \
-		DEBUG "Compile-in debug info" off
+OPTIONS_DEFINE=	ONIGURUMA RDOC DEBUG
+ONIGURUMA_DESC=	Build with oniguruma regular expressions lib
+RDOC_DESC=	Build and install Rdoc indexes
+DEBUG_DESC=	Compile-in debug info
+OPTIONS_DEFAULT=	RDOC
 
 .include <bsd.mport.options.mk>
 
@@ -71,8 +75,7 @@
 CONFIGURE_ARGS+=--enable-pthread
 .endif
 
-.if defined(WITH_ONIGURUMA)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+oniguruma
+.if ${PORT_OPTIONS:MONIGURUMA}
 BUILD_DEPENDS+=	${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch
 ONIGURUMA_PORTDIR=${PORTSDIR}/devel/oniguruma
 ONIGURUMA_WRKSRC=`cd ${ONIGURUMA_PORTDIR}; ${MAKE} -V WRKSRC`
@@ -84,7 +87,7 @@
 #
 # Disable doc generation if requested or docs disabled at all
 #
-.if !defined(WITHOUT_RDOC) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MRDOC} && ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--enable-install-doc
 .else
 CONFIGURE_ARGS+=	--disable-install-doc
@@ -96,6 +99,7 @@
 MLINKS=		${RUBY_NAME}.1 ruby.1
 PLIST_SUB+=	IF_DEFAULT=""
 .else
+PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
@@ -143,7 +147,7 @@
 .endfor
 
 pre-configure:
-.if defined(WITH_ONIGURUMA)
+.if ${PORT_OPTIONS:MONIGURUMA}
 	cd ${ONIGURUMA_WRKSRC}; ./configure; \
 		${MAKE} -f Makefile ${RUBY_RELVERSION:S/.//g} \
 		RUBYDIR="${WRKSRC}"
@@ -151,7 +155,7 @@
 	${TOUCH} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-configure:
-.if defined(WITH_ONIGURUMA)
+.if ${PORT_OPTIONS:MONIGURUMA}
 	cd ${WRKSRC}/ && ${PATCH} -p0 < ${PATCHDIR}/extrapatch-oniguruma-reggnu.c
 .endif
 
@@ -201,7 +205,7 @@
 . endfor
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
 	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${RUBY_EXAMPLESDIR}/,}
 	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${RUBY_DOCDIR}/,}

Index: trunk/lang/ruby18/distinfo
===================================================================
--- trunk/lang/ruby18/distinfo	2013-11-23 05:21:15 UTC (rev 15616)
+++ trunk/lang/ruby18/distinfo	2013-11-23 18:28:24 UTC (rev 15617)

Property changes on: trunk/lang/ruby18/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.7
\ No newline at end of property
Modified: trunk/lang/ruby18/pkg-descr
===================================================================
--- trunk/lang/ruby18/pkg-descr	2013-11-23 05:21:15 UTC (rev 15616)
+++ trunk/lang/ruby18/pkg-descr	2013-11-23 18:28:24 UTC (rev 15617)
@@ -16,5 +16,4 @@
   + Highly Portable(works on many UNIX machines, and on DOS,
     Windows, Mac, BeOS etc.)
 
-Author:	Matsumoto "matz" Yukihiro <matz at zetabits.com>
-WWW:	http://www.ruby-lang.org/en/
+WWW: http://www.ruby-lang.org/en/


Property changes on: trunk/lang/ruby18/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/lang/ruby18/pkg-message
===================================================================
--- trunk/lang/ruby18/pkg-message	2013-11-23 05:21:15 UTC (rev 15616)
+++ trunk/lang/ruby18/pkg-message	2013-11-23 18:28:24 UTC (rev 15617)

Property changes on: trunk/lang/ruby18/pkg-message
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/lang/ruby18/pkg-plist
===================================================================
--- trunk/lang/ruby18/pkg-plist	2013-11-23 05:21:15 UTC (rev 15616)
+++ trunk/lang/ruby18/pkg-plist	2013-11-23 18:28:24 UTC (rev 15617)

Property changes on: trunk/lang/ruby18/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property