Date: Mon, 15 Oct 2012 17:06:02 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305925 - in head: devel/py-gdata graphics/electrix x11/keybinder Message-ID: <201210151706.q9FH62b1033874@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Mon Oct 15 17:06:01 2012 New Revision: 305925 URL: http://svn.freebsd.org/changeset/ports/305925 Log: - Convert to OptionsNG While here - Update maintainer address - Trim Makefile headers Approved by: rene, miwi (mentors) Feature safe: yes Modified: head/devel/py-gdata/Makefile (contents, props changed) head/graphics/electrix/Makefile (contents, props changed) head/x11/keybinder/Makefile (contents, props changed) Modified: head/devel/py-gdata/Makefile ============================================================================== --- head/devel/py-gdata/Makefile Mon Oct 15 16:52:11 2012 (r305924) +++ head/devel/py-gdata/Makefile Mon Oct 15 17:06:01 2012 (r305925) @@ -1,7 +1,4 @@ -# New ports collection makefile for: py-gdata -# Date created: Mar. 28, 2007 -# Whom: Li-Wen Hsu <lwhsu@lwhsu.org> -# +# Created by: Li-Wen Hsu <lwhsu@lwhsu.org> # $FreeBSD$ # @@ -11,7 +8,7 @@ CATEGORIES= devel python MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= duchateau.olivier@gmail.com +MAINTAINER= olivierd@FreeBSD.org COMMENT= GData Python Client Library LICENSE= AL2 @@ -20,10 +17,14 @@ PROJECTHOST= gdata-python-client USE_PYTHON= -2.7 USE_PYDISTUTILS= yes +OPTIONS_DEFINE= GMPY M2CRYPTO PYCRYPTO + # optional modules (see src/gdata/tlslite/utils/cryptomath.py) -OPTIONS= M2CRYPTO "Add cryptography and SSL toolkit for Python" off \ - PYCRYPTO "Add cryptography toolkit for Python" off \ - GMPY "Add multiprecision arithmetic for Python" off +GMPY_DESC= Multiprecision arithmetic +M2CRYPTO_DESC= Cryptography and SSL toolkit +PYCRYPTO_DESC= Cryptography toolkit + +OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} @@ -38,18 +39,18 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- ${FILESDIR}/extra-patch-src_gdata_tlslite_utils-jython_compat.py .endif -.if defined(WITH_M2CRYPTO) +.if ${PORT_OPTIONS:MM2CRYPTO} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:${PORTSDIR}/security/py-m2crypto .endif -.if defined(WITH_PYCRYPTO) +.if ${PORT_OPTIONS:MPYCRYPTO} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto .endif -.if defined(WITH_GMPY) +.if ${PORT_OPTIONS:MGMPY} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gmpy.so:${PORTSDIR}/math/py-gmpy .endif -.if !defined(NOPORTEXAMPLES) post-install: +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR}/ ${CP} -R ${WRKSRC}/samples/ ${EXAMPLESDIR}/ .endif Modified: head/graphics/electrix/Makefile ============================================================================== --- head/graphics/electrix/Makefile Mon Oct 15 16:52:11 2012 (r305924) +++ head/graphics/electrix/Makefile Mon Oct 15 17:06:01 2012 (r305925) @@ -1,7 +1,3 @@ -# New ports collection makefile for: eLectrix -# Date created: 2011-03-10 -# Whom: Olivier Duchateau <duchateau.olivier@gmail.com> -# # $FreeBSD$ # @@ -11,31 +7,32 @@ PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME:L}/${PORTVERSION} -MAINTAINER= duchateau.olivier@gmail.com +MAINTAINER= olivierd@FreeBSD.org COMMENT= An application to view PDF files LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - poppler-glib.8:${PORTSDIR}/graphics/poppler-glib +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + poppler-glib:${PORTSDIR}/graphics/poppler-glib USE_BZIP2= yes -USE_GNOME= gtk20 desktopfileutils intltool intlhack pkgconfig +USE_GNOME= gtk20 desktopfileutils intltool intlhack USE_PYTHON= yes USE_GETTEXT= yes +USE_PKGCONFIG= build -CFLAGS= "-I${LOCALBASE}/include" -LFLAGS= "-L${LOCALBASE}/lib" CONFIGURE_ARGS= --prefix=${PREFIX} -OPTIONS= PS "Enable PostScript support" off +OPTIONS_DEFINE= PS + +PS_DESC= PostScript support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_PS) -LIB_DEPENDS+= spectre.1:${PORTSDIR}/print/libspectre +.if ${PORT_OPTIONS:MPS} +LIB_DEPENDS+= spectre:${PORTSDIR}/print/libspectre .else CONFIGURE_ARGS+= --disable-ps .endif @@ -53,4 +50,4 @@ do-install: post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/x11/keybinder/Makefile ============================================================================== --- head/x11/keybinder/Makefile Mon Oct 15 16:52:11 2012 (r305924) +++ head/x11/keybinder/Makefile Mon Oct 15 17:06:01 2012 (r305925) @@ -1,7 +1,3 @@ -# New ports collection makefile for: keybinder -# Date created: 2011-02-21 -# Whom: Olivier Duchateau <duchateau.olivier@gmail.com> -# # $FreeBSD$ # @@ -11,24 +7,28 @@ PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://kaizer.se/publicfiles/${PORTNAME}/ -MAINTAINER= duchateau.olivier@gmail.com +MAINTAINER= olivierd@FreeBSD.org COMMENT= Library for registering keyboard shortcuts LICENSE= GPLv2 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 pkgconfig +USE_GNOME= gnomehack gtk20 +USE_PKGCONFIG= build USE_LDCONFIG= yes PORTEXAMPLES= * -OPTIONS= PYTHON "Install Python bindings" on \ - LUA "Install Lua bindings" off +OPTIONS_DEFINE= PYTHON LUA +OPTIONS_DEFAULT= PYTHON + +# Override LUA description +LUA_DESC= Lua bindings .include <bsd.port.options.mk> -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes USE_GNOME+= pygtk2 pygobject PLIST_SUB+= PYTHON="" @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --disable-python PLIST_SUB+= PYTHON="@comment " .endif -.if defined(WITH_LUA) +.if ${PORT_OPTIONS:MLUA} USE_LUA= 5.1+ CONFIGURE_ARGS+= --with-lua-includes=${LUA_INCDIR} PLIST_SUB+= LUA=""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210151706.q9FH62b1033874>