Index: branches/2015Q1/sysutils/lsof/Makefile
===================================================================
--- branches/2015Q1/sysutils/lsof/Makefile	(revision 378248)
+++ branches/2015Q1/sysutils/lsof/Makefile	(revision 378249)
@@ -1,80 +1,80 @@
 # Created by: David O'Brien <obrien@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lsof
 DISTVERSION=	4.89B
 PORTEPOCH=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \
 		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
 		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
 		http://www.lerctr.org/lsof/ \
 		ftp://ftp.ayamura.org/pub/lsof/ \
 		ftp://ftp.ayamura.org/pub/lsof/NEW/ \
 		ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \
 		ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/NEW/ \
 		ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \
 		ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/NEW/ \
 		ftp://ftp.sunet.se/pub/unix/admin/lsof/  \
 		ftp://ftp.sunet.se/pub/unix/admin/lsof/NEW/ \
 		ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/  \
 		ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/NEW/ \
 		ftp://ftp.tau.ac.il/pub/unix/admin/
 DISTNAME=	${PORTNAME}_${DISTVERSION}${DISTNAME_SUFFIX}
 
 MAINTAINER=	ler@lerctr.org
 COMMENT=	Lists information about open files (similar to fstat(1))
 
 #Please leave the below line in for the next clean up.
 FIXUP_RELEASE=	YES
 .if defined(FIXUP_RELEASE)
 DISTNAME_SUFFIX=.freebsd
 .else
 SRCBALL_NAME=	${DISTNAME:S/_W$//}_src
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
 .endif
 
 HAS_CONFIGURE=	yes
 
 USES=		shebangfix tar:bzip2
 SHEBANG_FILES=	scripts/sort_res.perl5
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "arm"
-BROKEN=		Does not compile on arm
+.if !empty(ARCH:Marm*) && ((${OSVERSION} < 1001505) || (${OSVERSION} > 1100000 && ${OSVERSION} < 1100052))
+BROKEN=	Not supported on ARM platform below release 10.1 or a more recent current
 .endif
 
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
 CONFIGURE_ENV=	LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys"
 
 CFLAGS+=	-DNEEDS_BOOL_TYPEDEF
 
 .if !exists(${SRC_BASE}/sys/kern/kern_lockf.c)
 IGNORE=		requires kernel sources
 .endif
 
 .if !defined(FIXUP_RELEASE)
 post-extract:
 	@( cd ${WRKDIR}/${DISTNAME} ; \
 	EXPMD5=`${SED} -n 's/^[[:blank:]]*\(MD5*=*\)/\1/p' README.${DISTNAME}` ; \
 	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
 	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
 		${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
 		${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
 		exit 1 ; \
 	fi ; \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \
 	)
 	@( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 )
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lsof ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/lsof
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/share/lsof
 	@${CHMOD} 0444 ${STAGEDIR}${PREFIX}/share/lsof/00*
 
 .include <bsd.port.post.mk>
Index: branches/2015Q1/sysutils/lsof/files/patch-Configure
===================================================================
--- branches/2015Q1/sysutils/lsof/files/patch-Configure	(nonexistent)
+++ branches/2015Q1/sysutils/lsof/files/patch-Configure	(revision 378249)
@@ -0,0 +1,11 @@
+--- Configure.orig	2014-12-19 19:55:04.000000000 +0100
++++ Configure	2015-02-01 12:45:30.783557202 +0100
+@@ -1642,7 +1642,7 @@
+     then
+       FREEBSD_MAKE_CONF="/etc/make.conf"
+     fi	# }
+-    if test -r $FREEBSD_MAKE_CONF	# {
++    if test $FREEBSD_MAKE_CONF	# {
+     then
+       LSOF_TMP1=`echo "all:\n.include <bsd.prog.mk>" | $LSOF_MAKE -f- -VCFLAGS`
+       LSOF_TMP=1

Property changes on: branches/2015Q1/sysutils/lsof/files/patch-Configure
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q1
===================================================================
--- branches/2015Q1	(revision 378248)
+++ branches/2015Q1	(revision 378249)

Property changes on: branches/2015Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r378245