From owner-svn-ports-all@FreeBSD.ORG  Fri Apr  4 13:19:56 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 40D20A95;
 Fri,  4 Apr 2014 13:19:56 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CD8CCFE;
 Fri,  4 Apr 2014 13:19:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34DJuX4096550;
 Fri, 4 Apr 2014 13:19:56 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34DJu07096549;
 Fri, 4 Apr 2014 13:19:56 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404041319.s34DJu07096549@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Apr 2014 13:19:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350111 - head/deskutils/xpad-current
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: Fri, 04 Apr 2014 13:19:56 -0000

Author: bapt
Date: Fri Apr  4 13:19:55 2014
New Revision: 350111
URL: http://svnweb.freebsd.org/changeset/ports/350111
QAT: https://qat.redports.org/buildarchive/r350111/

Log:
  Use options helpers

Modified:
  head/deskutils/xpad-current/Makefile

Modified: head/deskutils/xpad-current/Makefile
==============================================================================
--- head/deskutils/xpad-current/Makefile	Fri Apr  4 13:18:09 2014	(r350110)
+++ head/deskutils/xpad-current/Makefile	Fri Apr  4 13:19:55 2014	(r350111)
@@ -14,29 +14,23 @@ COMMENT=	Virtual note-pad system for you
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 CONFLICTS_INSTALL=	xpad-[0-9]*
-USE_BZIP2=	yes
 USE_XORG=	x11 sm
 USE_GNOME=	gtk20 gnomehier intltool
-USES=	pkgconfig gmake
+USES=	pkgconfig gmake tar:bzip2
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.options.mk>
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-#code currently doesn't properly handle --disable-nls (in next upstream milestone)
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
-post-patch-script:
+post-patch:
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's|SUBDIRS = autopackage doc src images po|SUBDIRS = autopackage doc src images|' \
 		${WRKSRC}/Makefile.in