From owner-svn-ports-head@FreeBSD.ORG Thu Dec 13 08:54:04 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 458875AF; Thu, 13 Dec 2012 08:54:04 +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 2A2B48FC13; Thu, 13 Dec 2012 08:54:04 +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 qBD8s4DW091877; Thu, 13 Dec 2012 08:54:04 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBD8s4w2091876; Thu, 13 Dec 2012 08:54:04 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212130854.qBD8s4w2091876@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 13 Dec 2012 08:54:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308836 - head/net-p2p/gtk-gnutella X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 08:54:04 -0000 Author: bapt Date: Thu Dec 13 08:54:03 2012 New Revision: 308836 URL: http://svnweb.freebsd.org/changeset/ports/308836 Log: Convert to new option framework rename TLS to GNUTLS Modified: head/net-p2p/gtk-gnutella/Makefile Modified: head/net-p2p/gtk-gnutella/Makefile ============================================================================== --- head/net-p2p/gtk-gnutella/Makefile Thu Dec 13 08:31:08 2012 (r308835) +++ head/net-p2p/gtk-gnutella/Makefile Thu Dec 13 08:54:03 2012 (r308836) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gtk-gnutella -# Date created: 19 May, 2000 -# Whom: rbt@zort.on.ca -# +# Created by: rbt@zort.on.ca # $FreeBSD$ -# # # A quick note on configurable make symbols: @@ -68,31 +64,25 @@ ONLY_FOR_ARCHS= i386 amd64 MAN1= gtk-gnutella.1 -OPTIONS= X11 "Build with GUI" on \ - GTK2 "Build with GTK2 frontend" on \ - TLS "Enable GNU TLS encryption support" on \ - NLS "Enable national language support" on \ - IPV6 "Enable IPv6 support" on \ - DBUS "Enable D-BUS IPC support" off \ - SQLITE "Enable SQLite support" off \ - DEBUG "Build with debugging symbols" off \ - PORTABILITY "Use the PATH variable at run-time" off +OPTIONS_DEFINE= X11 GTK2 GNUTLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY +OPTIONS_DEFAULT= X11 GTK2 GNUTLS +PORTABILITY_DESC= Use the PATH variable at run-time -.include +.include .if !defined(INTERACTIVE_CONFIGURE) CONFIGURE_ARGS+= -ders .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= -D optimize=-g -D official=false .else CONFIGURE_ARGS+= -D official=true .endif -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= -D gtkversion=2 USE_GNOME+= gtk20 .else @@ -103,19 +93,17 @@ USE_GNOME+= gtk12 CONFIGURE_ARGS+= -D d_headless .endif -.if defined(WITH_PORTABILITY) +.if ${PORT_OPTIONS:MPORTABILITY} CONFIGURE_ARGS+= -D d_portable .endif -.if defined(WITH_TLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= -U d_gnutls .endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= -U d_nls -.else +.if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= -D d_nls USE_GETTEXT= yes PLIST_FILES= share/locale/de/LC_MESSAGES/gtk-gnutella.mo \ @@ -130,34 +118,36 @@ PLIST_FILES= share/locale/de/LC_MESSAGE share/locale/tr/LC_MESSAGES/gtk-gnutella.mo \ share/locale/uk/LC_MESSAGES/gtk-gnutella.mo \ share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo +.else +CONFIGURE_ARGS+= -U d_nls .endif -.if defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPB6} CONFIGURE_ARGS+= -D ipv6=false .endif -.if defined(WITH_DBUS) +.if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= dbus:${PORTSDIR}/devel/dbus .else CONFIGURE_ARGS+= -D dbus=false .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= yes .else CONFIGURE_ARGS+= -U d_sqlite .endif -.if ${ARCH} == "i386" +.if ${ARCH} == i386 PLIST_SUB+= I386="" .else PLIST_SUB+= I386="@comment " .endif -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 PLIST_SUB+= AMD64="" .else PLIST_SUB+= AMD64="@comment " .endif -.include +.include