From owner-svn-ports-all@FreeBSD.ORG Mon Mar 25 13:59:20 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2883767A; Mon, 25 Mar 2013 13:59:20 +0000 (UTC) (envelope-from makc@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 1A4DDFD0; Mon, 25 Mar 2013 13:59:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2PDxJM4035713; Mon, 25 Mar 2013 13:59:19 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2PDxIXf035701; Mon, 25 Mar 2013 13:59:18 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201303251359.r2PDxIXf035701@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 25 Mar 2013 13:59:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315222 - in head: devel/qdevelop games/warmux graphics/xaos math/qtiplot multimedia/minitube print/hplip textproc/qstardict 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: Mon, 25 Mar 2013 13:59:20 -0000 Author: makc Date: Mon Mar 25 13:59:18 2013 New Revision: 315222 URL: http://svnweb.freebsd.org/changeset/ports/315222 Log: - Add global options (DOCS, NLS, etc) to the OPTIONS_DEFINE if it's already defined - Remove OPTIONS_DEFINE, if it contains only global options Modified: head/devel/qdevelop/Makefile head/games/warmux/Makefile head/graphics/xaos/Makefile head/math/qtiplot/Makefile head/multimedia/minitube/Makefile head/print/hplip/Makefile head/textproc/qstardict/Makefile Modified: head/devel/qdevelop/Makefile ============================================================================== --- head/devel/qdevelop/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/devel/qdevelop/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -30,7 +30,7 @@ DESKTOP_ENTRIES= "QDevelop" \ "Development;IDE;Qt;" \ "false" -OPTIONS_DEFINE= TOOLS +OPTIONS_DEFINE= TOOLS DOCS NLS OPTIONS_DEFAULT= ${OPTIONS_DEFINE} TOOLS_DESC= Install Qt4 dev. tools (qmake, moc, etc.) Modified: head/games/warmux/Makefile ============================================================================== --- head/games/warmux/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/games/warmux/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -30,7 +30,7 @@ USE_DOS2UNIX= fixed_class.h MANCOMPRESSED= no MAN6= warmux.6 -OPTIONS_DEFINE= FRIBIDI SERVER +OPTIONS_DEFINE= FRIBIDI SERVER NLS FRIBIDI_DESC= Enable bi-directional unicode support SERVER_DESC= Enable dedicated server Modified: head/graphics/xaos/Makefile ============================================================================== --- head/graphics/xaos/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/graphics/xaos/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -16,7 +16,7 @@ USE_XORG= x11 xext GNU_CONFIGURE= yes USE_GMAKE= yes -OPTIONS_DEFINE= GTK2 PTHREAD +OPTIONS_DEFINE= GTK2 PTHREAD NLS GTK2_DESC= GTK+ User Interface (experimental) PTHREAD_DESC= Enable SMP support (experimental) Modified: head/math/qtiplot/Makefile ============================================================================== --- head/math/qtiplot/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/math/qtiplot/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -33,7 +33,7 @@ DESKTOP_ENTRIES="QtiPlot" "Data analysis "${DATADIR}/qtiplot.png" \ "qtiplot" "" false -OPTIONS_DEFINE= DOCS PYTHON +OPTIONS_DEFINE= DOCS PYTHON NLS OPTIONS_DEFAULT= ${OPTIONS_DEFINE} DOCS_DESC= Install the QtiPlot Handbook Modified: head/multimedia/minitube/Makefile ============================================================================== --- head/multimedia/minitube/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/multimedia/minitube/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -22,8 +22,6 @@ LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 STRIP_FILES= bin/minitube -OPTIONS_DEFINE= NLS - .include .if ${PORT_OPTIONS:MNLS} Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/print/hplip/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -73,7 +73,7 @@ FILES4FIX= Makefile.in \ ui/setupform.py \ ui4/devmgr5.py -OPTIONS_DEFINE= QT FAX SNMP SCAN XSANE +OPTIONS_DEFINE= QT FAX SNMP SCAN XSANE DOCS OPTIONS_DEFAULT= QT QT_DESC= Graphical User Interface (Qt4) Modified: head/textproc/qstardict/Makefile ============================================================================== --- head/textproc/qstardict/Makefile Mon Mar 25 13:47:31 2013 (r315221) +++ head/textproc/qstardict/Makefile Mon Mar 25 13:59:18 2013 (r315222) @@ -20,7 +20,7 @@ USE_DOS2UNIX= qstardict.pri DICPATH= ${LOCALBASE}/share/stardict/dic -OPTIONS_DEFINE= DBUS +OPTIONS_DEFINE= DBUS DOCS NLS OPTIONS_DEFAULT= ${OPTIONS_DEFINE} .include