svn commit: r195672 - in projects/jbuild/usr.bin: jbuild/port jdirdep

[John Birrell]

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 at 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;