From owner-svn-ports-all@FreeBSD.ORG  Wed Jan 15 11:49:43 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTPS id D173DFD4;
 Wed, 15 Jan 2014 11:49:43 +0000 (UTC)
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 BD6291A29;
 Wed, 15 Jan 2014 11:49:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FBnhCJ009273;
 Wed, 15 Jan 2014 11:49:43 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FBnh83009272;
 Wed, 15 Jan 2014 11:49:43 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201401151149.s0FBnh83009272@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Wed, 15 Jan 2014 11:49:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339774 - head/devel/distcc
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.17
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: Wed, 15 Jan 2014 11:49:43 -0000

Author: marino
Date: Wed Jan 15 11:49:43 2014
New Revision: 339774
URL: http://svnweb.freebsd.org/changeset/ports/339774
QAT: https://qat.redports.org/buildarchive/r339774/

Log:
  devel/distcc: Fix mistake made during optionsNG conversion
  
  Not only is it not necessary to include both bsd.port.pre.mk and
  bsd.port.options.mk, it actually causes problems like double inclusion
  when other ".include" keywords are encountered.  While here, convert
  USE_GMAKE too, both under the "Just fix it" blanket.

Modified:
  head/devel/distcc/Makefile

Modified: head/devel/distcc/Makefile
==============================================================================
--- head/devel/distcc/Makefile	Wed Jan 15 11:41:06 2014	(r339773)
+++ head/devel/distcc/Makefile	Wed Jan 15 11:49:43 2014	(r339774)
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gprof --disable-Werror
 WANT_GNOME=	yes
@@ -36,7 +36,6 @@ COMPILER_LINKS=	Create symlinks to distc
 OPTIONS_DEFAULT=	COMPILER_LINKS
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAVAHI}
@@ -116,4 +115,4 @@ post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>