Date: Tue, 30 Apr 2013 16:26:32 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316948 - in head/net: linphone-base ndisc6 tsclient wireshark Message-ID: <201304301626.r3UGQW1H004982@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Tue Apr 30 16:26:32 2013 New Revision: 316948 URL: http://svnweb.freebsd.org/changeset/ports/316948 Log: - conversion of USE_GETTEXT to USES framework Approved by: portmgr (bapt@) Modified: head/net/linphone-base/Makefile head/net/ndisc6/Makefile head/net/tsclient/Makefile head/net/wireshark/Makefile Modified: head/net/linphone-base/Makefile ============================================================================== --- head/net/linphone-base/Makefile Tue Apr 30 16:19:24 2013 (r316947) +++ head/net/linphone-base/Makefile Tue Apr 30 16:26:32 2013 (r316948) @@ -1,9 +1,5 @@ -# New ports collection makefile for: linphone -# Date created: 30 December 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# PORTNAME= linphone PORTVERSION= 3.2.1 @@ -21,7 +17,8 @@ LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm CONFLICTS= ortp-[0-9]* -USE_GNOME= glib20 gnomehack intlhack pkgconfig +USE_GNOME= glib20 intlhack +USES= pathfix pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure @@ -34,18 +31,14 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include <bsd.port.pre.mk> - -.if ${ARCH} == "powerpc" -BROKEN= Does not compile on powerpc -.endif +.include <bsd.port.options.mk> -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" .endif .if defined(LINPHONE_GUI) @@ -63,6 +56,12 @@ MAN1= linphonec.1 linphonecsh.1 sipomat SUBDIRS= po oRTP mediastreamer2 coreapi console .endif +.include <bsd.port.pre.mk> + +.if ${ARCH} == "powerpc" +BROKEN= Does not compile on powerpc +.endif + post-patch: @${REINPLACE_CMD} -e 's|sounds/linphone|linphone/sounds|g' \ ${WRKSRC}/configure Modified: head/net/ndisc6/Makefile ============================================================================== --- head/net/ndisc6/Makefile Tue Apr 30 16:19:24 2013 (r316947) +++ head/net/ndisc6/Makefile Tue Apr 30 16:26:32 2013 (r316948) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ndisc6 -# Date created: 12 July 2006 -# Whom: rdenis@simphalempin.com -# +# Created by: rdenis@simphalempin.com # $FreeBSD$ -# PORTNAME= ndisc6 PORTVERSION= 1.0.2 @@ -21,14 +17,14 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-suid-install -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} >= 803000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rdnssd-rdnssd.h .endif -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes +.if ${PORT_OPTIONS:MNLS} +USES+= gettext .else CONFIGURE_ARGS+=--disable-nls .endif @@ -45,11 +41,11 @@ USE_RC_SUBR= rdnssd PORTDOCS= AUTHORS NEWS README post-install: -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/tsclient/Makefile ============================================================================== --- head/net/tsclient/Makefile Tue Apr 30 16:19:24 2013 (r316947) +++ head/net/tsclient/Makefile Tue Apr 30 16:26:32 2013 (r316948) @@ -8,14 +8,14 @@ CATEGORIES= net gnome MASTER_SITES= SF MAINTAINER= ports@thepentagon.org -COMMENT= A GNOME 2 frontend for rdesktop and vncviewer +COMMENT= GNOME 2 frontend for rdesktop and vncviewer RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop USE_AUTOTOOLS= libtool USE_GNOME= gtk20 USE_GMAKE= yes -USE_GETTEXT= yes +USES= gettext GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` @@ -24,7 +24,7 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= tsclient.1 PORTDOCS= COPYING NEWS README -OPTIONS_DEFINE= GNOME TIGHTVNC XNEST DOCS +OPTIONS_DEFINE= GNOME TIGHTVNC XNEST DOCS OPTIONS_DEFAULT= GNOME TIGHTVNC_DESC= vncviewer support XNEST_DESC= X via Xnest support @@ -32,8 +32,8 @@ XNEST_DESC= X via Xnest support .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGNOME} -USES= pathfix -USE_GNOME+= gnomeprefix gnomepanel libgnomeui +USES+= pathfix +USE_GNOME+= gnomeprefix gnomepanel libgnomeui .else CONFIGURE_ARGS+= --disable-gnome .endif Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Tue Apr 30 16:19:24 2013 (r316947) +++ head/net/wireshark/Makefile Tue Apr 30 16:26:32 2013 (r316948) @@ -15,14 +15,13 @@ MASTER_SITES= http://www.wireshark.org/d DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org -COMMENT?= A powerful network analyzer/capture tool +COMMENT?= Powerful network analyzer/capture tool DATADIR_NAME= wireshark USE_PERL5_BUILD=yes USE_PYTHON_BUILD=yes -USE_GETTEXT= yes -USES= iconv +USES= iconv gettext USE_BZIP2= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304301626.r3UGQW1H004982>