Date: Wed, 1 May 2013 18:06:30 +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: r317036 - in head/net-im: amsn centericq centerim centerim-devel Message-ID: <201305011806.r41I6Vbt049790@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Wed May 1 18:06:30 2013 New Revision: 317036 URL: http://svnweb.freebsd.org/changeset/ports/317036 Log: - adoption of USES and optionsNG Approved by: portmgr (bapt@) Modified: head/net-im/amsn/Makefile head/net-im/centericq/Makefile head/net-im/centerim-devel/Makefile head/net-im/centerim/Makefile Modified: head/net-im/amsn/Makefile ============================================================================== --- head/net-im/amsn/Makefile Wed May 1 17:29:24 2013 (r317035) +++ head/net-im/amsn/Makefile Wed May 1 18:06:30 2013 (r317036) @@ -1,9 +1,5 @@ -# New ports collection makefile for: amsn -# Date created: 01 Feb 2003 -# Whom: Andreas Klemm <andreas@FreeBSD.org> -# +# Created by: Andreas Klemm <andreas@FreeBSD.org> # $FreeBSD$ -# PORTNAME= amsn PORTVERSION= 0.98.9 @@ -30,7 +26,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= x11 -USE_GETTEXT= yes +USES= gettext WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/net-im/centericq/Makefile ============================================================================== --- head/net-im/centericq/Makefile Wed May 1 17:29:24 2013 (r317035) +++ head/net-im/centericq/Makefile Wed May 1 18:06:30 2013 (r317036) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: centericq -# Date created: 25 December 1999 -# Whom: Chris Piazza <cpiazza@FreeBSD.org> -# +# Created by: Chris Piazza <cpiazza@FreeBSD.org> # $FreeBSD$ -# PORTNAME= centericq PORTVERSION= 4.21.0 @@ -25,93 +20,95 @@ CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lstdc++ CONFIGURE_ARGS= --with-openssl --disable-konst -OPTIONS= NLS "Native Language Support" on \ - MULTIBYTE "Multibyte Support" off \ - FRIBIDI "Fribidi Support" off \ - MSN "Support for MSN Protocol" off \ - YAHOO "Support for Yahoo! Messenger Protocol" off \ - AIM "Support for AOL's Instant Messenger Protocol" off \ - IRC "Support for IRC Protocol" off \ - JABBER "Support for Jabber Protocol" off \ - GPGME "Support for PGP encrypted Jabber messages" on \ - RSS "Support for RSS" off \ - LJ "Support for LiveJournal" off \ - GG "Support for Gadu-Gadu Protocol" off +OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG +FRIBIDI_DESC= Fribidi Support +MSN_DESC= MSN Protocol +YAHOO_DESC= Yahoo! Messenger Protocol +AIM_DESC= AOL's Instant Messenger Protocol +IRC_DESC= IRC Protocol +GPGME_DESC= PGP encrypted Jabber messages +RSS_DESC= RSS Support +LJ_DESC= LiveJournal Support +GG_DESC= Gadu-Gadu Protocol Support + +OPTIONS_DEFAULT= GPGME MAN1= cicqconv.1 cicqsync.1 PORTDOCS= FAQ README -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx -.endif +.include <bsd.port.options.mk> .if ${ARCH} == "amd64" # Don't use optimization since it sefgaults in some cases otherwise. CFLAGS:= ${CFLAGS:C/-O[0123456789]*/-O0/} .endif -.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(WITH_MULTIBYTE) +.if ${PORT_OPTIONS:MMULTIBYTE} CONFIGURE_ARGS+= --enable-locales-fix .endif -.if defined(WITH_FRIBIDI) +.if ${PORT_OPTIONS:MFRIBIDI} LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+= --with-fribidi .endif -.if !defined(WITH_MSN) -CONFIGURE_ARGS+= --disable-msn -.else +.if ${PORT_OPTIONS:MMSN} LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl +.else +CONFIGURE_ARGS+= --disable-msn .endif -.if !defined(WITH_YAHOO) +.if ! ${PORT_OPTIONS:MYAHOO} CONFIGURE_ARGS+= --disable-yahoo .endif -.if !defined(WITH_AIM) +.if ! ${PORT_OPTIONS:MAIM} CONFIGURE_ARGS+= --disable-aim .endif -.if !defined(WITH_IRC) +.if ! ${PORT_OPTIONS:MIRC} CONFIGURE_ARGS+= --disable-irc .endif -.if !defined(WITH_JABBER) +.if ! ${PORT_OPTIONS:MJABBER} CONFIGURE_ARGS+= --disable-jabber -.else -.if !defined(WITH_GPGME) -CONFIGURE_ARGS+= --without-gpgme -.else +.endif + +.if ${PORT_OPTIONS:MGPGME} LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE} -.endif +.else +CONFIGURE_ARGS+= --without-gpgme .endif -.if !defined(WITH_RSS) +.if ! ${PORT_OPTIONS:MRSS} CONFIGURE_ARGS+= --disable-rss .endif -.if !defined(WITH_LJ) +.if ! ${PORT_OPTIONS:MLJ} CONFIGURE_ARGS+= --disable-lj .endif -.if !defined(WITH_GG) -CONFIGURE_ARGS+= --disable-gg -.else +.if ${PORT_OPTIONS:MGG} LIB_DEPENDS+= gadu.3:${PORTSDIR}/polish/ekg LIBGADU= -lgadu +.else +CONFIGURE_ARGS+= --disable-gg +.endif + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} > 900007 +BROKEN= fails to build with new utmpx .endif post-patch: @@ -129,7 +126,7 @@ post-patch: -e 's|libgadu-0.1||' \ -e 's|-llibgadu|${LIBGADU}|' -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) Modified: head/net-im/centerim-devel/Makefile ============================================================================== --- head/net-im/centerim-devel/Makefile Wed May 1 17:29:24 2013 (r317035) +++ head/net-im/centerim-devel/Makefile Wed May 1 18:06:30 2013 (r317036) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: centerim -# Date created: 2006-03-14 -# Whom: Frank Altpeter <frank@altpeter.de> -# +# Created by: Frank Altpeter <frank@altpeter.de> # $FreeBSD$ -# PORTNAME= centerim PORTVERSION= 4.22.10.11 @@ -14,7 +9,7 @@ MASTER_SITES= http://www.centerim.org/do PKGNAMESUFFIX= -devel MAINTAINER= frank@altpeter.de -COMMENT= A text mode menu- and window-driven IM interface +COMMENT= Text mode menu- and window-driven IM interface LICENSE= GPLv2 @@ -29,64 +24,64 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ssl --with-openssl CONFLICTS= centericq-[0-9]* centerim-[0-9]* -OPTIONS= NLS "Native Language Support" on \ - MULTIBYTE "Multibyte Support" on \ - FRIBIDI "Fribidi Support" on \ - MSN "Support for MSN Protocol" on \ - YAHOO "Support for Yahoo! Messenger Protocol" on \ - AIM "Support for AOL's Instant Messenger Protocol" on \ - IRC "Support for IRC Protocol" on \ - JABBER "Support for Jabber Protocol" on \ - GPGME "Support for PGP encrypted Jabber messages" on \ - RSS "Support for RSS" on \ - LJ "Support for LiveJournal" on \ - GG "Support for Gadu-Gadu Protocol" on +OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG +FRIBIDI_DESC= Fribidi Support +MSN_DESC= MSN Protocol +YAHOO_DESC= Yahoo! Messenger Protocol +AIM_DESC= AOL's Instant Messenger Protocol +IRC_DESC= IRC Protocol +GPGME_DESC= PGP encrypted Jabber messages +RSS_DESC= RSS Support +LJ_DESC= LiveJournal Support +GG_DESC= Gadu-Gadu Protocol Support + +OPTIONS_DEFAULT= MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG MAN1= cimconv.1 centerim.1 PORTDOCS= FAQ README -.include <bsd.port.pre.mk> +.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(WITH_MULTIBYTE) +.if ${PORT_OPTIONS:MMULTIBYTE} CONFIGURE_ARGS+= --enable-locales-fix .endif -.if defined(WITH_FRIBIDI) +.if ${PORT_OPTIONS:MFRIBIDI} LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+= --with-fribidi .endif -.if !defined(WITH_MSN) +.if ! ${PORT_OPTIONS:MMSN} CONFIGURE_ARGS+= --disable-msn .endif -.if !defined(WITH_YAHOO) +.if ! ${PORT_OPTIONS:MYAHOO} CONFIGURE_ARGS+= --disable-yahoo .endif -.if !defined(WITH_AIM) +.if ! ${PORT_OPTIONS:MAIM} CONFIGURE_ARGS+= --disable-aim .endif -.if !defined(WITH_IRC) +.if ! ${PORT_OPTIONS:MIRC} CONFIGURE_ARGS+= --disable-irc .endif -.if !defined(WITH_JABBER) +.if ! ${PORT_OPTIONS:MJABBER} CONFIGURE_ARGS+= --disable-jabber .else .endif -.if !defined(WITH_GPGME) +.if ! ${PORT_OPTIONS:MGPGME} CONFIGURE_ARGS+= --without-gpgme .else LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme @@ -94,15 +89,15 @@ LIB_DEPENDS+= gpgme.19:${PORTSDIR}/secu CONFIGURE_ARGS+= --with-ssl .endif -.if !defined(WITH_RSS) +.if ! ${PORT_OPTIONS:MRSS} CONFIGURE_ARGS+= --disable-rss .endif -.if !defined(WITH_LJ) +.if ! ${PORT_OPTIONS:MLJ} CONFIGURE_ARGS+= --disable-lj .endif -.if !defined(WITH_GG) +.if ! ${PORT_OPTIONS:MGG} CONFIGURE_ARGS+= --disable-gg .else LIB_DEPENDS+= gadu.3:${PORTSDIR}/polish/ekg @@ -113,10 +108,10 @@ post-patch: @${REINPLACE_CMD} -e 's|/var/run/screen|/tmp/screens|' \ ${WRKSRC}/src/icqconf.cc -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-im/centerim/Makefile ============================================================================== --- head/net-im/centerim/Makefile Wed May 1 17:29:24 2013 (r317035) +++ head/net-im/centerim/Makefile Wed May 1 18:06:30 2013 (r317036) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: centerim -# Date created: 2006-03-14 -# Whom: Frank Altpeter <frank@altpeter.de> -# +# Created by: Frank Altpeter <frank@altpeter.de> # $FreeBSD$ -# PORTNAME= centerim PORTVERSION= 4.22.10 @@ -13,7 +8,7 @@ MASTER_SITES= http://www.centerim.org/do ftp://ftp.centerim.org/releases/ MAINTAINER= frank@altpeter.de -COMMENT= A text mode menu- and window-driven IM interface +COMMENT= Text mode menu- and window-driven IM interface LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl @@ -27,80 +22,78 @@ CONFIGURE_ARGS= --with-ssl --with-openss WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]* -OPTIONS= NLS "Native Language Support" on \ - MULTIBYTE "Multibyte Support" off \ - FRIBIDI "Fribidi Support" off \ - MSN "Support for MSN Protocol" off \ - YAHOO "Support for Yahoo! Messenger Protocol" off \ - AIM "Support for AOL's Instant Messenger Protocol" off \ - IRC "Support for IRC Protocol" off \ - JABBER "Support for Jabber Protocol" off \ - GPGME "Support for PGP encrypted Jabber messages" off \ - RSS "Support for RSS" off \ - LJ "Support for LiveJournal" off \ - GG "Support for Gadu-Gadu Protocol" off +OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG +FRIBIDI_DESC= Fribidi Support +MSN_DESC= MSN Protocol +YAHOO_DESC= Yahoo! Messenger Protocol +AIM_DESC= AOL's Instant Messenger Protocol +IRC_DESC= IRC Protocol +GPGME_DESC= PGP encrypted Jabber messages +RSS_DESC= RSS Support +LJ_DESC= LiveJournal Support +GG_DESC= Gadu-Gadu Protocol Support MAN1= cimconv.1 centerim.1 PORTDOCS= FAQ README -.include <bsd.port.pre.mk> +.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(WITH_MULTIBYTE) +.if ${PORT_OPTIONS:MMULTIBYTE} CONFIGURE_ARGS+= --enable-locales-fix .endif -.if defined(WITH_FRIBIDI) +.if ${PORT_OPTIONS:MFRIBIDI} LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+= --with-fribidi .endif -.if !defined(WITH_MSN) +.if ! ${PORT_OPTIONS:MMSN} CONFIGURE_ARGS+= --disable-msn .endif -.if !defined(WITH_YAHOO) +.if ! ${PORT_OPTIONS:MYAHOO} CONFIGURE_ARGS+= --disable-yahoo .endif -.if !defined(WITH_AIM) +.if ! ${PORT_OPTIONS:MAIM} CONFIGURE_ARGS+= --disable-aim .endif -.if !defined(WITH_IRC) +.if ! ${PORT_OPTIONS:MIRC} CONFIGURE_ARGS+= --disable-irc .endif -.if !defined(WITH_JABBER) +.if ! ${PORT_OPTIONS:MJABBER} CONFIGURE_ARGS+= --disable-jabber .else .endif -.if !defined(WITH_GPGME) -CONFIGURE_ARGS+= --without-gpgme -.else +.if ${PORT_OPTIONS:MGPGME} LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme #CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE} CONFIGURE_ARGS+= --with-ssl +.else +CONFIGURE_ARGS+= --without-gpgme .endif -.if !defined(WITH_RSS) +.if ! ${PORT_OPTIONS:MRSS} CONFIGURE_ARGS+= --disable-rss .endif -.if !defined(WITH_LJ) +.if ! ${PORT_OPTIONS:MLJ} CONFIGURE_ARGS+= --disable-lj .endif -.if !defined(WITH_GG) +.if ! ${PORT_OPTIONS:MGG} CONFIGURE_ARGS+= --disable-gg .else LIB_DEPENDS+= gadu.3:${PORTSDIR}/polish/ekg @@ -111,10 +104,10 @@ post-patch: @${REINPLACE_CMD} -e '1 s|/usr/bin/python|/usr/bin/env python|' \ ${WRKSRC}/misc/CenterIMLog2HTML.py -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305011806.r41I6Vbt049790>