Index: head/databases/arangodb33/Makefile
===================================================================
--- head/databases/arangodb33/Makefile	(revision 472081)
+++ head/databases/arangodb33/Makefile	(revision 472082)
@@ -1,43 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	arangodb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.7
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	33
 
-MAINTAINER=	dev@dudu.ro	
+MAINTAINER=	dev@dudu.ro
 COMMENT=	ArangoDB is a distributed NoSQL database with multiple data models
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only builds on amd64: https://github.com/arangodb/arangodb/issues/2334"
 BROKEN_FreeBSD_10=	libc++ is too old
 
 CONFLICTS_INSTALL=	arangodb32
 CONFLICTS_BUILD=	v8
 
 USES=		cmake:outsource,noninja compiler gmake python:2.7 ssl  # ninja: error: loading 'build.ninja': No such file or directory
 USE_GITHUB=	yes
 
 CMAKE_OFF=	USE_JEMALLOC
 CMAKE_ON=	USE_BACKTRACE
 CMAKE_ARGS=	-DBASE_LD_FLAGS:STRING="-L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/x64.release/obj.target/src -L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/x64.release/obj.target/third_party/icu -L${LOCALBASE}/lib -L/usr/lib"
 
 USERS=		arangodb
 GROUPS=		arangodb
 USE_RC_SUBR=	arangod
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.endif
 
 post-install:
 .for section in 1 8
 	@${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/man/man${section}
 .endfor
 	@${REINPLACE_CMD} -e 's|/usr/local/var/lib/arangodb3|/var/db/arangodb|g' ${STAGEDIR}${PREFIX}/etc/arangodb/*.conf
 	@${REINPLACE_CMD} -e 's|/usr/local/var/log/arangodb3|/var/log/arangodb|g' ${STAGEDIR}${PREFIX}/etc/arangodb/arangod.conf
 	@${FIND} ${STAGEDIR}${PREFIX}/etc/arangodb/ -type f -name *.conf -exec ${MV} {} {}.sample \;
 	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} share/man var/lib/arangodb var/lib/arangodb-apps var/lib var/log/arangodb var/log var
 
 .include <bsd.port.mk>
Index: head/databases/arangodb33/files/arangod.in
===================================================================
--- head/databases/arangodb33/files/arangod.in	(revision 472081)
+++ head/databases/arangodb33/files/arangod.in	(revision 472082)
@@ -1,85 +1,86 @@
 #!/bin/sh
 
 # PROVIDE: arangod
 # REQUIRE: NETWORK ldconfig
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # arangod_enable (bool): Set to "NO" by default.
 #                        Set it to "YES" to enable arangod.
-# arangod_limits (bool): Set to "NO" by default.
-#                        Set it to yes to run `limits -e -U arangodb`
-#                        just before arangod starts.
+%%LEGACY_LIMITS%%# arangod_limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U arangodb`
+%%LEGACY_LIMITS%%#                        just before arangod starts.
 # arangod_dbpath (str):  Default to "/var/db/arangodb"
 #                        Base database directory.
 # arangod_logpath (str): Default to "/var/log/arangodb"
-#                        Base logging directory 
+#                        Base logging directory
 # arangod_apppath (str): Default to "/var/db/arangodb-apps"
 #                        Base apps directory
 # arangod_flags (str):   Custom additional arguments to be passed to arangod.
 #                        Default to "".
 # arangod_config (str):	 Default to "%%PREFIX%%/etc/arangodb/arangod.conf"
 #                        Path to config file
 #
 
 . /etc/rc.subr
 
 name="arangod"
 rcvar=arangod_enable
 
 load_rc_config $name
 
 : ${arangod_enable="NO"}
-: ${arangod_limits="NO"}
+%%LEGACY_LIMITS%%: ${arangod_limits="NO"}
 : ${arangod_dbpath="/var/db/arangodb"}
 : ${arangod_logpath="/var/log/arangodb"}
 : ${arangod_apppath="/var/db/arangodb-apps"}
 : ${arangod_flags=""}
 : ${arangod_user="arangodb"}
 : ${arangod_group="arangodb"}
 : ${arangod_config="%%PREFIX%%/etc/arangodb/arangod.conf"}
 
 pidfile="${arangod_dbpath}/arangod.lock"
 command=%%PREFIX%%/sbin/${name}
 command_args="--configuration $arangod_config --database.directory $arangod_dbpath --log.output ${arangod_logpath}/arangod.log --javascript.app-path ${arangod_apppath} --daemon --pid-file ${pidfile} >/dev/null 2>/dev/null"
 start_precmd="${name}_prestart"
 
 arangod_create_dbpath()
 {
         mkdir ${arangod_dbpath} >/dev/null 2>/dev/null
         [ $? -eq 0 ] && chown -R ${arangod_user}:${arangod_group} ${arangod_dbpath}
 }
 
 arangod_create_logpath()
 {
         mkdir ${arangod_logpath} >/dev/null 2>/dev/null
         [ $? -eq 0 ] && chown -R ${arangod_user}:${arangod_group} ${arangod_logpath}
 }
 
 arangod_create_apppath()
 {
         mkdir ${arangod_apppath} >/dev/null 2>/dev/null
         [ $? -eq 0 ] && chown -R ${arangod_user}:${arangod_group} ${arangod_apppath}
 }
 
 arangod_prestart()
 {
         if [ ! -d ${arangod_dbpath} ]; then
                 arangod_create_dbpath || return 1
         fi
         if [ ! -d ${arangod_logpath} ]; then
                 arangod_create_logpath || return 1
         fi
         if [ ! -d ${arangod_apppath} ]; then
                 arangod_create_apppath || return 1
         fi
-        if checkyesno arangod_limits; then
-                eval `/usr/bin/limits -e -U ${arangod_user}` 2>/dev/null
-        else
-                return 0
-        fi
+%%LEGACY_LIMITS%%        if checkyesno arangod_limits; then
+%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${arangod_user}` 2>/dev/null
+%%LEGACY_LIMITS%%        else
+%%LEGACY_LIMITS%%                return 0
+%%LEGACY_LIMITS%%        fi
+%%MODERN_LIMITS%%        return 0
 }
 
 run_rc_command "$1"