svn commit: r318883 - in head/net-im: ejabberd iserverd jabber-pyaim jggtrans naim py-xmpppy-yahoo sim-im-devel skype skype-devel tkabber-devel
Jason Helfman
jgh at FreeBSD.org
Thu May 23 16:10:46 UTC 2013
Author: jgh
Date: Thu May 23 16:10:43 2013
New Revision: 318883
URL: http://svnweb.freebsd.org/changeset/ports/318883
Log:
- adoption of optionsNG framework
Approved by: portmgr (bapt)
Modified:
head/net-im/ejabberd/Makefile
head/net-im/iserverd/Makefile
head/net-im/jabber-pyaim/Makefile
head/net-im/jggtrans/Makefile
head/net-im/naim/Makefile
head/net-im/py-xmpppy-yahoo/Makefile
head/net-im/sim-im-devel/Makefile
head/net-im/skype-devel/Makefile
head/net-im/skype/Makefile
head/net-im/tkabber-devel/Makefile
Modified: head/net-im/ejabberd/Makefile
==============================================================================
--- head/net-im/ejabberd/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/ejabberd/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,9 +1,5 @@
-## New ports collection makefile for: ejabberd
-# Date created: 03 July 2004
-# Whom: Alexander Timoshenko <gonzo at univ.kiev.ua>
-#
+# Created by: Alexander Timoshenko <gonzo at univ.kiev.ua>
# $FreeBSD$
-#
PORTNAME= ejabberd
PORTVERSION= 2.1.11
@@ -30,8 +26,7 @@ USES= iconv
USE_RC_SUBR= ${PORTNAME}
NOPRECIOUSMAKEVARS= yes
-OPTIONS= ODBC "Enable ODBC support" off \
- PAM "Enable setuid PAM auth support" off
+OPTIONS_DEFINE= ODBC PAM
MAKE_ENV= PORTVERSION=${PORTVERSION}
CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE}
@@ -49,21 +44,21 @@ USE_OPENSSL= yes
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
CONFIGURE_ARGS+=--enable-odbc
PLIST_SUB+= ODBC=""
.else
PLIST_SUB+= ODBC="@comment "
.endif
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
CONFIGURE_ARGS+=--enable-pam
PLIST_SUB+= PAM=""
.else
PLIST_SUB+= PAM="@comment "
.endif
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
MAKE_ARGS+= NOPORTDOCS=${NOPORTDOCS}
.endif
@@ -75,7 +70,7 @@ post-install:
@${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
@${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
${CHMOD} 4750 ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam
${CHOWN} root:ejabberd ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam
${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${PREFIX}/etc/pam.d/ejabberd
Modified: head/net-im/iserverd/Makefile
==============================================================================
--- head/net-im/iserverd/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/iserverd/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: iserverd
-# Date created: Sun Jun 10 17:51:00 GMT 2007
-# Whom: Denis Rakhmangulov <danfocus at gmail.com>
-#
+# Created by: Denis Rakhmangulov <danfocus at gmail.com>
# $FreeBSD$
-#
PORTNAME= iserverd
PORTVERSION= 2.5.5
@@ -18,8 +14,10 @@ USE_PGSQL= YES
GNU_CONFIGURE= YES
USE_RC_SUBR= iserverd
-OPTIONS= KQUEUE "Use kqueue(2) instead of poll(2)" on \
- DEBUG "Enable debugging symbols" off
+OPTIONS_DEFINE= KQUEUE DEBUG
+KQUEUE_DESC= kqueue(2) instead of poll(2)
+
+OPTIONS_DEFAULT= KQUEUE
CONFIGURE_ARGS= --with-pgsql=${LOCALBASE} \
--with-bindir=${PREFIX}/bin \
@@ -33,7 +31,7 @@ MAN1= db_convert.1
MAN5= iserv.conf.5 v3_proto.conf.5 v5_proto.conf.5
MAN8= iserverd.8
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} >= 700042
.if ${ARCH} == "sparc64"
@@ -41,10 +39,10 @@ BROKEN= Does not compile with GCC 4.2
.endif
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
-.if defined(WITH_KQUEUE)
+.if ${PORT_OPTIONS:MKQUEUE}
CONFIGURE_ARGS+=--with-kqueue
.endif
@@ -61,4 +59,4 @@ post-install:
@${CHOWN} -R iserv /var/log/iserverd
@${CHOWN} -R iserv /var/run/iserverd
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/jabber-pyaim/Makefile
==============================================================================
--- head/net-im/jabber-pyaim/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/jabber-pyaim/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,15 +1,11 @@
-# New ports collection makefile for: Jabber Python AIM Transport
-# Date created: 2006-06-06
-# Whom: Derek Kulinski <takeda at takeda.tk>
-#
+# Created by: Derek Kulinski <takeda at takeda.tk>
# $FreeBSD$
-#
PORTNAME= pyaim
PORTVERSION= 0.8a
PORTREVISION= 1
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= jabber-
PKGNAMESUFFIX= -transport
DISTNAME= ${PORTNAME}-t-${PORTVERSION}
@@ -20,8 +16,9 @@ COMMENT= Python AIM-Transport for Jabber
PROJECTHOST= pyaimt
-OPTIONS= EJABBERD "Use transport with ejabberd" off \
- TWISTED1 "Use old py-twisted 1.x" off
+OPTIONS_DEFINE= EJABBERD TWISTED1
+EJABBERD_DESC= transport with ejabberd
+TWISTED1_DESC= old py-twisted 1.x
NO_BUILD= yes
USE_PYTHON= yes
@@ -34,9 +31,10 @@ INST_DIR= ${PREFIX}/lib/jabber/${PORTNAM
PORTDOCS= COPYING README NEWS AUTHORS INSTALL
+.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
-.if defined(WITH_EJABBERD)
+.if ${PORT_OPTIONS:MEJABBERD}
JABBER_USER?= ejabberd
SUB_LIST+= JABBER_REQUIRE=ejabberd
.else
@@ -44,7 +42,7 @@ JABBER_USER?= jabber
SUB_LIST+= JABBER_REQUIRE=jabberd
.endif
-.if defined(WITH_TWISTED1)
+.if ${PORT_OPTIONS:MTWISTED1}
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted
.else
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore \
@@ -75,7 +73,7 @@ do-install:
${MKDIR} ${EXAMPLESDIR}/etc
${INSTALL_DATA} ${WRKSRC}/config_example.xml ${EXAMPLESDIR}/etc/jabber-pyaim.xml
@[ -f ${PREFIX}/etc/jabber-pyaim.xml ] || ${CP} -v ${EXAMPLESDIR}/etc/jabber-pyaim.xml ${PREFIX}/etc/jabber-pyaim.xml
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for portdoc in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${portdoc} ${DOCSDIR}/
Modified: head/net-im/jggtrans/Makefile
==============================================================================
--- head/net-im/jggtrans/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/jggtrans/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -25,16 +25,16 @@ CFLAGS+= -I${LOCALBASE}/include
USE_RC_SUBR= jggtrans
-OPTIONS= NODEBUG "Turn off debugging code" off \
- EJABBERD "Use transport with ejabberd" off
+OPTIONS_DEFINE= DEBUG EJABBERD
+EJABBERD_DESC= transport with ejabberd
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_NODEBUG)
+.if ! ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --disable-debug
.endif
-.if defined(WITH_EJABBERD)
+.if ${PORT_OPTIONS:MEJABBERD}
JABBER_USER?= ejabberd
SUB_LIST+= JABBER_REQUIRE=ejabberd
.else
@@ -49,4 +49,4 @@ post-install:
@${CP} -n ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml || ${TRUE}
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/naim/Makefile
==============================================================================
--- head/net-im/naim/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/naim/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: naim
-# Date created: 02 March 1999
-# Whom: mharo at area51.fremont.ca.us
-#
+# Created by: mharo at area51.fremont.ca.us
# $FreeBSD$
-#
PORTNAME= naim
PORTVERSION= 0.11.8.3.2
@@ -20,19 +16,20 @@ MAN1= naim.1
MLINKS= naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1
PORTDOCS= FAQ README commands.txt keyboard.txt
-OPTIONS= DETACH "Enable 'detach' feature (requires misc/screen)" off
+OPTIONS_DEFINE= DETACH
+DETACH_DESC= Activate 'detach' feature (requires misc/screen)
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
CONFIGURE_ARGS+= --with-pkgdocdir=${DOCSDIR}
.else
CONFIGURE_ARGS+= --without-pkgdocdir
.endif
-.if defined(WITH_DETACH)
+.if ${PORT_OPTIONS:MDETACH}
RUN_DEPENDS= screen:${PORTSDIR}/sysutils/screen
CONFIGURE_ARGS+= --enable-detach
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/py-xmpppy-yahoo/Makefile
==============================================================================
--- head/net-im/py-xmpppy-yahoo/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/py-xmpppy-yahoo/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,9 +1,5 @@
-# Ports collection makefile for: xmpppy-yahoo
-# Date created: Thu Jul 26
-# Whom: Michael Nottebrock <lofi at FreeBSD.org>
-#
+# Created by: Michael Nottebrock <lofi at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= yahoo
PORTVERSION= 0.3.20070314
@@ -17,7 +13,8 @@ DISTNAME= yahoo-transport-${PORTVERSION}
MAINTAINER= wenheping at gmail.com
COMMENT= Yahoo! transport for Jabber
-OPTIONS= EJABBERD "Use transport with ejabberd" off
+OPTIONS_DEFINE= EJABBERD
+EJABBERD_DESC= transport with ejabberd
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
@@ -37,9 +34,9 @@ SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} BIND
USE_RC_SUBR= ${UNIQUENAME:S/-/_/}
DDIR= ${PYTHON_SITELIBDIR}/xmpp/yahoo
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_EJABBERD)
+.if ${PORT_OPTIONS:MEJABBERD}
JABBER_USER?= ejabberd
SUB_LIST+= JABBER_REQUIRE=ejabberd
.else
@@ -81,4 +78,4 @@ post-install:
@${ECHO_CMD} "****************************************************"
@${ECHO_CMD}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/sim-im-devel/Makefile
==============================================================================
--- head/net-im/sim-im-devel/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/sim-im-devel/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,7 +1,4 @@
-# New Ports Collection Makefile for: sim-im-devel
-# Date created: 18 Apr 2006
-# Whom: Alexey V. Panfilov <sim-im at lehis.ru>
-#
+# Created by: Alexey V. Panfilov <sim-im at lehis.ru>
# $FreeBSD$
PORTNAME= sim-im-devel
@@ -31,31 +28,32 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-OPTIONS= KDE "Enable KDE support" off \
- DEBUG "Enable debug" on
+OPTIONS_DEFINE= KDE3 DEBUG
+OPTIONS_DEFAULT= DEBUG
+.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
post-patch:
-.if !defined(WITH_KDE)
+.if ! ${PORT_OPTIONS:MKDE3}
@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
${CONFIGURE_WRKSRC}/configure
.endif
-.if !defined(WITHOUT_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.endif
-.if !defined(WITH_KDE)
-CONFIGURE_ARGS+=--disable-kde --enable-mt
-LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell
-PLIST_SUB+= KDE="@comment " \
- SPELL=""
-.else
+.if ${PORT_OPTIONS:MKDE3}
USE_KDELIBS_VER=3
PLIST_SUB+= KDE="" \
SPELL="@comment "
.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.else
+CONFIGURE_ARGS+=--disable-kde --enable-mt
+LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell
+PLIST_SUB+= KDE="@comment " \
+ SPELL=""
.endif
.include <bsd.port.post.mk>
Modified: head/net-im/skype-devel/Makefile
==============================================================================
--- head/net-im/skype-devel/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/skype-devel/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: skype-devel
-# Date created: Jun 21. 2004
-# Whom: netchild at FreeBSD.org
-#
+# Created by: netchild at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= skype
PORTVERSION= 2.2.0.35
@@ -18,8 +14,11 @@ COMMENT= P2P VoIP software, development
CONFLICTS= skype-[0-9]*
-OPTIONS= VIDEO "[broken] Video sending support via multimedia/webcamd" on \
- NVIDIA_GL "Use libGL provided by NVidia binary drivers" off
+OPTIONS_DEFINE= VIDEO NVIDIA_GL
+VIDEO_DESC=[broken] Video support
+NVIDIA_GL_DESC= libGL provided by NVidia binary drivers
+
+OPTIONS_DEFAULT= VIDEO
CONFLICTS= skype-1* skype-2.0* skype-2.1*
@@ -38,16 +37,17 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR}
SUB_FILES= skype.sh
SUB_LIST+= SKYPEDIR=${SKYPEDIR}
+.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
-.ifdef WITH_NVIDIA_GL
+.if ${PORT_OPTIONS:MNVIDIA_GL}
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
USE_LINUX_APPS+=xorglibs
.else
USE_LINUX_APPS+=dri
.endif
-.ifdef WITH_VIDEO
+.if ${PORT_OPTIONS:MVIDEO}
. include "${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod/Makefile.sub"
RUN_DEPENDS+= webcamd>0:${PORTSDIR}/multimedia/webcamd
USE_LINUX_APPS+=libv4l
@@ -93,7 +93,7 @@ do-install:
@${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype
@${CHMOD} a+rx ${PREFIX}/bin/skype
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${INSTALL} -d ${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
Modified: head/net-im/skype/Makefile
==============================================================================
--- head/net-im/skype/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/skype/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,12 +1,5 @@
-# New ports collection makefile for: skype
-# Date created: Jun 21. 2004
-# Whom: netchild at FreeBSD.org
-#
-# Maintainers: Ion-Mihai Tetcu <itetcu at FreeBSD.org>
-# Martin Wilke <miwi at FreeBSD.org>
-#
+# Created by: netchild at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= skype
PORTVERSION= 2.1.0.81
@@ -20,8 +13,11 @@ MAINTAINER= itetcu at FreeBSD.org
COMMENT= P2P VoIP software
CONFLICTS= skype-devel-[0-9]*
-OPTIONS= VIDEO "Video sending support via multimedia/webcamd" on \
- NVIDIA_GL "Use libGL provided by NVidia binary drivers" off
+
+OPTIONS_DEFINE= VIDEO NVIDIA_GL
+NVIDIA_GL_DESC= libGL provided by NVidia binary drivers
+
+OPTIONS_DEFAULT= VIDEO
NO_BUILD= yes
@@ -38,16 +34,17 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR}
SUB_FILES= skype.sh
SUB_LIST+= SKYPEDIR=${SKYPEDIR}
+.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
-.ifdef WITH_NVIDIA_GL
+.if ${PORT_OPTIONS:MNVIDIA_GL}
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
USE_LINUX_APPS+=xorglibs
.else
USE_LINUX_APPS+=dri
.endif
-.ifdef WITH_VIDEO
+.if ${PORT_OPTIONS:MVIDEO}
. include "${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod/Makefile.sub"
RUN_DEPENDS+= webcamd>0:${PORTSDIR}/multimedia/webcamd
USE_LINUX_APPS+=libv4l
@@ -92,7 +89,7 @@ do-install:
# The wrapper for main program
@${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${INSTALL} -d ${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
Modified: head/net-im/tkabber-devel/Makefile
==============================================================================
--- head/net-im/tkabber-devel/Makefile Thu May 23 16:05:47 2013 (r318882)
+++ head/net-im/tkabber-devel/Makefile Thu May 23 16:10:43 2013 (r318883)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tkabber-devel
-# Date created: 09 July 2005
-# Whom: Denis Shaposhnikov <dsh at vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh at vlink.ru>
# $FreeBSD$
-#
PORTNAME= tkabber
PORTVERSION= 0.11.1.a.20100207
@@ -38,7 +34,9 @@ DESKTOP_ENTRIES= "${PORTNAME}" \
SUBDIRS= emoticons ifacetk mclistbox msgs pixmaps plugins sounds \
tclxmpp trans
-OPTIONS= ZLIB "with zlib support" off
+OPTIONS_DEFINE= ZLIB
+
+.include <bsd.port.options.mk>
do-install:
${ECHO} -e "#!/bin/sh\nexec ${WISH} ${DATADIR}/tkabber.tcl \
@@ -57,7 +55,7 @@ do-install:
${MKDIR} ${EXAMPLESDIR}
(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
. for i in AUTHORS COPYING ChangeLog README
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -65,10 +63,8 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
LIB_DEPENDS+= ztcl[0-9]:${PORTSDIR}/devel/ztcl
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-all
mailing list