From 3f07fb0b8a815518642f786a28e28034a552da0a Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Apr 2014 13:22:14 +0000
Subject: [PATCH] Use options helpers

---
 deskutils/xpad/Makefile | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 0fd2f3ff9ae0..8c3746d05f1f 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -13,29 +13,24 @@ COMMENT=	Virtual note-pad system for your X11 desktop
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 CONFLICTS_INSTALL=	xpad-current-[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
 GNU_CONFIGURE=	yes
 
+NLS_USES=		gettext
+NLS_CPPFLAGS=		${CXXFLAGS} -I${LOCALBASE}/include
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
+NLS_CONFIGURE_ENABLE=	nls
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-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