From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 12 21:46:58 2010
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 D785E1065675;
	Fri, 12 Nov 2010 21:46:58 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ABAC88FC18;
	Fri, 12 Nov 2010 21:46:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oACLkwqp024477;
	Fri, 12 Nov 2010 21:46:58 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACLkwGS024474;
	Fri, 12 Nov 2010 21:46:58 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201011122146.oACLkwGS024474@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 12 Nov 2010 21:46:58 +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: r215205 - projects/jbuild/usr.bin/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: Fri, 12 Nov 2010 21:46:58 -0000

Author: obrien
Date: Fri Nov 12 21:46:58 2010
New Revision: 215205
URL: http://svn.freebsd.org/changeset/base/215205

Log:
  patch-gone-wild

Modified:
  projects/jbuild/usr.bin/jdirdep/Makefile.common
  projects/jbuild/usr.bin/jdirdep/jdirdep.c

Modified: projects/jbuild/usr.bin/jdirdep/Makefile.common
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/Makefile.common	Fri Nov 12 21:37:10 2010	(r215204)
+++ projects/jbuild/usr.bin/jdirdep/Makefile.common	Fri Nov 12 21:46:58 2010	(r215205)
@@ -5,19 +5,19 @@ SRCS += jdirdep.c
 CFLAGS += -I${.CURDIR}/../jdirdep -DJDIRDEP
 
 .if ${PROG} == "jdirdep"
-.if defined(USE_SQLITE3)
+. if defined(USE_SQLITE3)
 CFLAGS += -DUSE_SQLITE3 -pthread
 CFLAGS += -I/usr/local/include
 SRCS += jdirdep_sqlite3.c
 LDADD += /usr/local/lib/libsqlite3.a
-.elif defined(USE_MYSQL)
+. elif defined(USE_MYSQL)
 SRCS += jdirdep_mysql.c
 MYSQL_CFLAGS != mysql_config --cflags
 MYSQL_LIBS != mysql_config --libs
 CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS}
 LDADD += ${MYSQL_LIBS}
 LDADD += -static
-.else
-.endif
+. else
 SRCS += jdirdep_db_stub.c
+. endif
 .endif

Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/jdirdep.c	Fri Nov 12 21:37:10 2010	(r215204)
+++ projects/jbuild/usr.bin/jdirdep/jdirdep.c	Fri Nov 12 21:46:58 2010	(r215205)
@@ -38,6 +38,7 @@ struct march {
 	char *machine_arch;
 	TAILQ_ENTRY(march) link;
 };
+
 #ifdef NEED_INCMK
 struct incmk {
 	char *s;
@@ -45,6 +46,7 @@ struct incmk {
 	TAILQ_ENTRY(incmk) link;
 };
 #endif
+
 struct metas {
 	char *s;
 	TAILQ_ENTRY(metas) link;
@@ -1358,12 +1360,14 @@ main(int argc, char *argv[])
 		errx(1, "SUPMAC is missing from the environment");
 
 	jdirdep_supmac(p);
+
 #ifdef NEED_INCMK
 	if ((p = getenv("INCMK")) == NULL)
 		errx(1, "INCMK is missing from the environment");
 
 	jdirdep_incmk(p);
 #endif
+
 	/*
 	 * The current source relative directory is the bit after the
 	 * source top bit has been removed.