svn commit: r316994 - in head: x11-fm/thunar-vfs x11-toolkits/Xaw3d

[Jason Helfman]

Author: jgh
Date: Wed May  1 07:20:26 2013
New Revision: 316994
URL: http://svnweb.freebsd.org/changeset/ports/316994

Log:
  - conversion to USES framework for gettext
  
  Approved by:	portmgr (bapt@)

Modified:
  head/x11-fm/thunar-vfs/Makefile
  head/x11-toolkits/Xaw3d/Makefile

Modified: head/x11-fm/thunar-vfs/Makefile
==============================================================================
--- head/x11-fm/thunar-vfs/Makefile	Wed May  1 07:18:20 2013	(r316993)
+++ head/x11-fm/thunar-vfs/Makefile	Wed May  1 07:20:26 2013	(r316994)
@@ -22,10 +22,10 @@ USE_AUTOTOOLS=	libtool
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack
+USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libutil libexo
 USE_XORG=	x11
-USES=		pkgconfig
+USES=		pkgconfig pathfix
 
 CONFIGURE_ARGS=	--disable-debug
 
@@ -35,10 +35,10 @@ OPTIONS_DEFAULT=	NLS HAL DBUS STARTUP AP
 APIDOCS_DESC=	Install api documentation
 STARTUP_DESC=	Enable startup notification support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
@@ -86,4 +86,4 @@ PLIST_SUB+=	APIDOCS="@comment "
 post-patch:
 		@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-toolkits/Xaw3d/Makefile
==============================================================================
--- head/x11-toolkits/Xaw3d/Makefile	Wed May  1 07:18:20 2013	(r316993)
+++ head/x11-toolkits/Xaw3d/Makefile	Wed May  1 07:20:26 2013	(r316994)
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.visi.com/users/h
 		ftp.slackware.com/pub/slackware/slackware_source/x/xaw3d/
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A 3-D Athena Widget set that looks like Motif
+COMMENT=	3-D Athena Widget set that looks like Motif
 
 LICENSE=	MIT
 
@@ -23,10 +23,10 @@ SUB_FILES=	pkg-message
 XAWVER=		8
 SUB_LIST=	XAWVER="${XAWVER}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
@@ -35,7 +35,7 @@ PLIST_SUB+=	NLS="@comment "
 post-extract:
 	${MKDIR} ${WRKSRC}/X11/Xaw3d
 	cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \
 		-e '/#ifdef XawI18nDefines/s//#if 0/' \
 		${WRKSRC}/Imakefile
@@ -49,10 +49,10 @@ post-configure:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DOCSDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>