From owner-svn-ports-all@FreeBSD.ORG Sun Dec 16 20:59:36 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CB3A8246; Sun, 16 Dec 2012 20:59:36 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A5EAE8FC12; Sun, 16 Dec 2012 20:59:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGKxaxh049568; Sun, 16 Dec 2012 20:59:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGKxa54049564; Sun, 16 Dec 2012 20:59:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212162059.qBGKxa54049564@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 16 Dec 2012 20:59:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309043 - in head: audio/vagalume net-mgmt/nefu X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Dec 2012 20:59:36 -0000 Author: bapt Date: Sun Dec 16 20:59:35 2012 New Revision: 309043 URL: http://svnweb.freebsd.org/changeset/ports/309043 Log: Convert to new options framework, While here trim headers and fix pkgconfig dependency Approved by: decke (maintainer) Modified: head/audio/vagalume/Makefile head/net-mgmt/nefu/Makefile Modified: head/audio/vagalume/Makefile ============================================================================== --- head/audio/vagalume/Makefile Sun Dec 16 20:22:15 2012 (r309042) +++ head/audio/vagalume/Makefile Sun Dec 16 20:59:35 2012 (r309043) @@ -1,9 +1,5 @@ -# New ports collection makefile for: vagalume -# Date created: 2008-06-14 -# Whom: Bernhard Fröhlich -# +# Created by: Bernhard Fröhlich # $FreeBSD$ -# PORTNAME= vagalume PORTVERSION= 0.8.5 @@ -21,18 +17,20 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/l GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_GSTREAMER= good mad gconf INSTALLS_ICONS= yes MAN1= vagalume.1 -OPTIONS= DBUS "Build with DBUS support" on \ - TRAY "Build with tray icon and libnotify support" on +OPTIONS_DEFINE= DBUS TRAY NLS GCONF +OPTIONS_DEFAULT= DBUS TRAY +TRAY_DESC= Tray icon and libnotify support -.include +.include -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -41,7 +39,7 @@ PLIST_SUB+= NLS="" PLIST_SUB+= NLS="@comment " .endif -.if !defined(WITHOUT_DBUS) +.if ${PORT_OPTIONS:MDBUS} CONFIGURE_ARGS+=--enable-dbus --enable-im-status LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib PLIST_SUB+= DBUS="" @@ -51,7 +49,7 @@ CONFIGURE_ARGS+=--disable-dbus --disable PLIST_SUB+= DBUS="@comment " .endif -.if !defined(WITHOUT_TRAY) +.if ${PORT_OPTIONS:MTRAY} CONFIGURE_ARGS+=--enable-tray-icon BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify @@ -59,7 +57,7 @@ LIB_DEPENDS+= notify.4:${PORTSDIR}/devel CONFIGURE_ARGS+=--disable-tray-icon .endif -.if defined(WITH_GNOME) +.if ${PORT_OPTIONS:MGCONF} USE_GNOME+= gconf2 CONFIGURE_ARGS+=--enable-gconf .endif @@ -67,9 +65,9 @@ CONFIGURE_ARGS+=--enable-gconf post-patch: @${REINPLACE_CMD} -e 's|serviceentrydir = @serviceentrydir@|serviceentrydir = ${PREFIX}/share/dbus-1/services|' \ ${WRKSRC}/Makefile.in -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|SUBDIRS = src po|SUBDIRS = src|' \ ${WRKSRC}/Makefile.in .endif -.include +.include Modified: head/net-mgmt/nefu/Makefile ============================================================================== --- head/net-mgmt/nefu/Makefile Sun Dec 16 20:22:15 2012 (r309042) +++ head/net-mgmt/nefu/Makefile Sun Dec 16 20:59:35 2012 (r309043) @@ -1,9 +1,5 @@ -# New ports collection makefile for: nefu -# Date created: 17.10.2003 -# Whom: Kirill Ponomarew -# +# Created by: Kirill Ponomarew # $FreeBSD$ -# PORTNAME= nefu PORTVERSION= 1.5 @@ -32,24 +28,24 @@ USERS= nefu GROUPS= nefu USE_OPENSSL= yes -OPTIONS= LDAP "Enable OpenLDAP support" off \ - HTML "Enable HTML support" off +OPTIONS_DEFINE= LDAP HTML +HTML_DESC= HTML support MAN1= nefu.1 MAN4= nefu.conf.4 DBDIR= /var/db/nefu PLIST_FILES= bin/nefu -.include +.include -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --without-ldap .endif -.if defined(WITH_HTML) +.if ${PORT_OPTIONS:MHTML} CONFIGURE_ARGS+=--with-html=${WWWDIR} PLIST_FILES+= "@unexec rm -rf "%D/%%WWWDIR%%" 2> /dev/null || true" .else @@ -72,11 +68,11 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/nefu.conf.4 ${PREFIX}/man/man4 post-install: -.if defined(WITH_HTML) +.if ${PORT_OPTIONS:MHTML} ${MKDIR} ${WWWDIR} ${CHOWN} -R ${USERS}:${GROUPS} ${WWWDIR} .endif ${MKDIR} ${DBDIR} ${CHOWN} -R ${USERS}:${GROUPS} ${DBDIR} -.include +.include