From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 29 13:03:46 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTP id 27151446;
 Mon, 29 Jul 2013 13:03:46 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
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 14774251B;
 Mon, 29 Jul 2013 13:03:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6TD3jSK087416;
 Mon, 29 Jul 2013 13:03:45 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6TD3jth087415;
 Mon, 29 Jul 2013 13:03:45 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307291303.r6TD3jth087415@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 29 Jul 2013 13:03:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323885 - head/devel/cppi
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jul 2013 13:03:46 -0000

Author: danfe
Date: Mon Jul 29 13:03:45 2013
New Revision: 323885
URL: http://svnweb.freebsd.org/changeset/ports/323885

Log:
  - Unbreak parallel (-jX) builds (have to use GNU make)
  - Generally cleanup and modernize the port while here
  
  Reported by:	pointyhat-west

Modified:
  head/devel/cppi/Makefile

Modified: head/devel/cppi/Makefile
==============================================================================
--- head/devel/cppi/Makefile	Mon Jul 29 12:40:06 2013	(r323884)
+++ head/devel/cppi/Makefile	Mon Jul 29 13:03:45 2013	(r323885)
@@ -3,28 +3,23 @@
 PORTNAME=	cppi
 PORTVERSION=	1.18
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	A tool to indent the C preprocessor directives
+COMMENT=	Tool to indent the C preprocessor directives
 
 USE_XZ=		yes
-USES=		gettext charsetfix
+USES=		charsetfix gmake	# gmake is needed for -jX builds
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		cppi.1
+MAN1=		${PORTNAME}.1
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CONFIGURE_OFF=	--disable-nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:(libdir)/lib:(libdir):' ${WRKSRC}/Makefile.in