svn commit: r339774 - head/devel/distcc

[John Marino]

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>