ports/169548: [PATCH]: Update databases/mongodb

[Wesley Shields]

>Number:         169548
>Category:       ports
>Synopsis:       [PATCH]: Update databases/mongodb
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 29 17:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD syn.csh.rit.edu 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #7: Tue Jun 12 15:48:26 EDT 2012 root at syn.csh.rit.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
databases/mongodb is out of date. I've attached a patch which updates
the port and converts it to use the new options support.

I am CC'ing the maintainer on this.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/mongodb/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile	22 Mar 2012 08:03:06 -0000	1.26
+++ Makefile	29 Jun 2012 17:28:16 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mongodb
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.6
 CATEGORIES=	databases net
 MASTER_SITES=	http://downloads.mongodb.org/src/
 DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
@@ -23,8 +23,9 @@
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
 
-OPTIONS=	DEVEL "Install development files (library and headers)" off \
-		V8 "Use v8 instead of spider monkey for javascript" off
+OPTIONS_DEFINE=	DEVEL V8
+DEVEL_DESC=	Install development files (library and headers)
+V8_DESC=	Use v8 instead of spider monkey for javascript
 
 USE_SCONS=	yes
 SCONS_TARGET=	all
@@ -35,16 +36,16 @@
 
 USE_RC_SUBR=	mongod
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEVEL)
+.if ${PORT_OPTIONS:MDEVEL}
 SCONS_ARGS+=	--full
 PLIST_SUB+=	DEVEL=""
 .else
 PLIST_SUB+=	DEVEL="@comment "
 .endif
 
-.if defined(WITH_V8)
+.if ${PORT_OPTIONS:MV8}
 SCONS_ARGS+=	--usev8
 LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8
 .else
@@ -57,4 +58,4 @@
 		${TOUCH} ${PREFIX}/etc/mongodb.conf ; \
 	fi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/databases/mongodb/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	22 Mar 2012 08:03:06 -0000	1.21
+++ distinfo	29 Jun 2012 13:51:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r2.0.4.tar.gz) = 65296df2777778f49a72513483d048f271339683c89d676b80e76687496a38f9
-SIZE (mongodb-src-r2.0.4.tar.gz) = 2966431
+SHA256 (mongodb-src-r2.0.6.tar.gz) = a972725a7dc3d079f8070d3631956141a7fe2f422d350e6cd3288c9e19fa314e
+SIZE (mongodb-src-r2.0.6.tar.gz) = 2973489
Index: files/patch-SConstruct
===================================================================
RCS file: /home/ncvs/ports/databases/mongodb/files/patch-SConstruct,v
retrieving revision 1.5
diff -u -r1.5 patch-SConstruct
--- files/patch-SConstruct	22 Mar 2012 08:03:06 -0000	1.5
+++ files/patch-SConstruct	29 Jun 2012 14:34:12 -0000
@@ -1,18 +1,6 @@
---- SConstruct.orig	2012-03-21 22:02:02.000000000 +0100
-+++ SConstruct	2012-03-21 23:21:09.000000000 +0100
-@@ -714,7 +714,10 @@
- 
-     #make scons colorgcc friendly
-     env['ENV']['HOME'] = os.environ['HOME']
--    env['ENV']['TERM'] = os.environ['TERM']
-+    try:
-+        env['ENV']['TERM'] = os.environ['TERM']
-+    except KeyError:
-+        env['ENV']['TERM'] = 'dumb'
- 
-     if linux and has_option( "sharedclient" ):
-         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
-@@ -797,8 +800,9 @@
+--- ./SConstruct.orig	2012-06-29 09:53:07.000000000 -0400
++++ ./SConstruct	2012-06-29 10:34:03.000000000 -0400
+@@ -800,8 +800,9 @@
      options_topass["nix"] = nix
      
      if has_option( "use-system-" + shortName ) or has_option( "use-system-all" ):
@@ -24,7 +12,7 @@
      else:
          myModule.configure( env , fileLists , options_topass )
  
-@@ -1458,7 +1462,7 @@
+@@ -1461,7 +1462,7 @@
      fullInstallName = installDir + "/bin/" + name
  
      allBinaries += [ name ]
>Release-Note:
>Audit-Trail:
>Unformatted: