From owner-svn-ports-all@FreeBSD.ORG  Tue Feb 12 02:24:37 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E3DC2EC3;
 Tue, 12 Feb 2013 02:24:37 +0000 (UTC) (envelope-from mi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D4A37D04;
 Tue, 12 Feb 2013 02:24:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1C2ObPB042320;
 Tue, 12 Feb 2013 02:24:37 GMT (envelope-from mi@svn.freebsd.org)
Received: (from mi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1C2Ob7Q042318;
 Tue, 12 Feb 2013 02:24:37 GMT (envelope-from mi@svn.freebsd.org)
Message-Id: <201302120224.r1C2Ob7Q042318@svn.freebsd.org>
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Tue, 12 Feb 2013 02:24:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312086 - in head/devel/qmake: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Feb 2013 02:24:38 -0000

Author: mi
Date: Tue Feb 12 02:24:36 2013
New Revision: 312086
URL: http://svnweb.freebsd.org/changeset/ports/312086

Log:
  Change NOMAN to NO_MAN:
  
  PR:		ports/176041
  Submitted by:	Gavin Atkinson
  
  Also, change to use the MAKE_JOBS_SAFE knob from the old-fashioned
  adding of -j to make's command-line.

Modified:
  head/devel/qmake/Makefile
  head/devel/qmake/files/Makefile.bsd

Modified: head/devel/qmake/Makefile
==============================================================================
--- head/devel/qmake/Makefile	Tue Feb 12 00:57:47 2013	(r312085)
+++ head/devel/qmake/Makefile	Tue Feb 12 02:24:36 2013	(r312086)
@@ -19,7 +19,7 @@ COMMENT=	The build utility of the Qt pro
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
+MAKE_JOBS_SAFE=	yes
 PLIST_SUB+=	_PREFIX="${PREFIX}"
 MAKE_ENV+=	FILESDIR="${FILESDIR}"
 

Modified: head/devel/qmake/files/Makefile.bsd
==============================================================================
--- head/devel/qmake/files/Makefile.bsd	Tue Feb 12 00:57:47 2013	(r312085)
+++ head/devel/qmake/files/Makefile.bsd	Tue Feb 12 02:24:36 2013	(r312086)
@@ -5,7 +5,7 @@ _OBJS!=	${MAKE} -f Makefile.unix -V OBJS
 # next to -DHAVE_CONFIG_CPP below: 
 #_OBJS:=	${_OBJS:S/qconfig.o//}
 SRCS:=	${_OBJS:.o=.cpp}
-NOMAN=	true	# qmake.1 anyone?
+NO_MAN=	true	# qmake.1 anyone?
 
 .PATH:	${.CURDIR} ${.CURDIR:H}/src/tools
 CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++