From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 24 12:32:34 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 29C3D449;
 Sat, 24 Aug 2013 12:32:34 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 174C02C24;
 Sat, 24 Aug 2013 12:32:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OCWXr2075366;
 Sat, 24 Aug 2013 12:32:33 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7OCWX8e075363;
 Sat, 24 Aug 2013 12:32:33 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201308241232.r7OCWX8e075363@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 24 Aug 2013 12:32:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r325295 - in head/misc/xless: . 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Aug 2013 12:32:34 -0000

Author: danfe
Date: Sat Aug 24 12:32:33 2013
New Revision: 325295
URL: http://svnweb.freebsd.org/changeset/ports/325295

Log:
  - Fix parallel (-jX) builds by using NamedMakeSubdirs() macro instead of
    MakeSubdirs(); doing so allows imake to generate non-racy dependencies
  - Ensure that MAKE has correct value; cleanup the COMMENT while I'm here

Modified:
  head/misc/xless/Makefile
  head/misc/xless/files/patch-aa

Modified: head/misc/xless/Makefile
==============================================================================
--- head/misc/xless/Makefile	Sat Aug 24 12:04:22 2013	(r325294)
+++ head/misc/xless/Makefile	Sat Aug 24 12:32:33 2013	(r325295)
@@ -10,11 +10,12 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	X11 viewer for text files.  Useful as an add-on tool for other apps
+COMMENT=	X11-based viewer for text files
 
-MAKE_JOBS_UNSAFE=	yes
 USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
+MAKE_ARGS=	MAKE="${MAKE_CMD}"
+
 MAN1=		xless.1
 MANCOMPRESSED=	yes
 

Modified: head/misc/xless/files/patch-aa
==============================================================================
--- head/misc/xless/files/patch-aa	Sat Aug 24 12:04:22 2013	(r325294)
+++ head/misc/xless/files/patch-aa	Sat Aug 24 12:32:33 2013	(r325295)
@@ -10,3 +10,12 @@
  
  
             SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \
+@@ -24,7 +25,7 @@ LOCAL_LIBRARIES = -Lregexp -lregexp XawC
+ #define PassCDebugFlags
+ #endif
+ 
+-MakeSubdirs($(SUBDIRS))
++NamedMakeSubdirs(./regexp/libregexp.a,$(SUBDIRS))
+ ComplexProgramTarget(xless)
+ 
+ InstallNonExec(xless.help, $(LIBDIR))