From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 11 20:04:41 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 9CC73FE4;
 Sat, 11 Jan 2014 20:04:41 +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 6ED441E25;
 Sat, 11 Jan 2014 20:04:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BK4fhY023425;
 Sat, 11 Jan 2014 20:04:41 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BK4fX4023423;
 Sat, 11 Jan 2014 20:04:41 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201401112004.s0BK4fX4023423@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sat, 11 Jan 2014 20:04:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339448 - head/textproc/diffutils
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: Sat, 11 Jan 2014 20:04:41 -0000

Author: johans
Date: Sat Jan 11 20:04:40 2014
New Revision: 339448
URL: http://svnweb.freebsd.org/changeset/ports/339448

Log:
  Enable stage support + minor cleanups

Modified:
  head/textproc/diffutils/Makefile
  head/textproc/diffutils/pkg-plist

Modified: head/textproc/diffutils/Makefile
==============================================================================
--- head/textproc/diffutils/Makefile	Sat Jan 11 20:03:46 2014	(r339447)
+++ head/textproc/diffutils/Makefile	Sat Jan 11 20:04:40 2014	(r339448)
@@ -4,35 +4,27 @@
 PORTNAME=	diffutils
 PORTVERSION=	3.3
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	diffutils
+MASTER_SITES=	GNU
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The GNU diff utilities
 
-LIB_DEPENDS=	sigsegv:${PORTSDIR}/devel/libsigsegv
+LIB_DEPENDS=	libsigsegv.so:${PORTSDIR}/devel/libsigsegv
 
 USES=		charsetfix
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=nls
+
 INFO=		diffutils
-MAN1=		gcmp.1 gdiff.1 gdiff3.1 gsdiff.1
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/^mkdir/s:@mkdir_p@:${MKDIR}:' \
 		${WRKSRC}/po/Makefile.in.in
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 .include <bsd.port.mk>

Modified: head/textproc/diffutils/pkg-plist
==============================================================================
--- head/textproc/diffutils/pkg-plist	Sat Jan 11 20:03:46 2014	(r339447)
+++ head/textproc/diffutils/pkg-plist	Sat Jan 11 20:04:40 2014	(r339448)
@@ -2,6 +2,10 @@ bin/gcmp
 bin/gdiff
 bin/gdiff3
 bin/gsdiff
+man/man1/gcmp.1.gz
+man/man1/gdiff.1.gz
+man/man1/gdiff3.1.gz
+man/man1/gsdiff.1.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/diffutils.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/diffutils.mo
 %%NLS%%share/locale/da/LC_MESSAGES/diffutils.mo