svn commit: r350111 - head/deskutils/xpad-current

[Baptiste Daroussin]

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