From owner-svn-src-projects@FreeBSD.ORG  Tue Jul 14 02:50:29 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5ADDB106564A;
	Tue, 14 Jul 2009 02:50:29 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4980D8FC15;
	Tue, 14 Jul 2009 02:50:29 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6E2oTaH042722;
	Tue, 14 Jul 2009 02:50:29 GMT (envelope-from jb@svn.freebsd.org)
Received: (from jb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6E2oT6B042718;
	Tue, 14 Jul 2009 02:50:29 GMT (envelope-from jb@svn.freebsd.org)
Message-Id: <200907140250.n6E2oT6B042718@svn.freebsd.org>
From: John Birrell <jb@FreeBSD.org>
Date: Tue, 14 Jul 2009 02:50:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195672 - in projects/jbuild/usr.bin: jbuild/port
	jdirdep
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jul 2009 02:50:29 -0000

Author: jb
Date: Tue Jul 14 02:50:29 2009
New Revision: 195672
URL: http://svn.freebsd.org/changeset/base/195672

Log:
  - Don't ignore dependencies when bsd.dirdep.mk is included.
  - Declare the shell to jcommit.
  - Bump the port number.

Modified:
  projects/jbuild/usr.bin/jbuild/port/Makefile
  projects/jbuild/usr.bin/jdirdep/jcommit
  projects/jbuild/usr.bin/jdirdep/jdirdep.c

Modified: projects/jbuild/usr.bin/jbuild/port/Makefile
==============================================================================
--- projects/jbuild/usr.bin/jbuild/port/Makefile	Tue Jul 14 02:19:09 2009	(r195671)
+++ projects/jbuild/usr.bin/jbuild/port/Makefile	Tue Jul 14 02:50:29 2009	(r195672)
@@ -5,7 +5,7 @@
 
 PORTNAME=      jbuild
 PORTDIRNAME=	${PORTNAME}
-PORTVERSION=   12
+PORTVERSION=   13
 CATEGORIES=    devel
 
 MAINTAINER=    rodrigc@FreeBSD.org

Modified: projects/jbuild/usr.bin/jdirdep/jcommit
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/jcommit	Tue Jul 14 02:19:09 2009	(r195671)
+++ projects/jbuild/usr.bin/jdirdep/jcommit	Tue Jul 14 02:50:29 2009	(r195672)
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #

Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/jdirdep.c	Tue Jul 14 02:19:09 2009	(r195671)
+++ projects/jbuild/usr.bin/jdirdep/jdirdep.c	Tue Jul 14 02:50:29 2009	(r195672)
@@ -708,12 +708,6 @@ do_dirdep(const char *srctop, const char
 		/* Whack the trailing newline. */
 		bufr[strlen(bufr) - 1] = '\0';
 
-		if (bufr[0] != '#' && strstr(bufr, "<bsd.dirdep.mk>") != NULL) {
-			f_dirdep = 0;
-			f_rewrite = 0;
-			break;
-		}
-
 		if (bufr[0] != '#' && strstr(bufr, "<bsd.subdir.mk>") != NULL) {
 			f_dirdep = 0;
 			f_rewrite = 0;