Remove WANT_GNOME and HAVE_GNOME.

Approved by:	bapt kwm
Sponsored by:	Absolight
Differential Revision:	  https://reviews.freebsd.org/D12643
This commit is contained in:
Mathieu Arnold 2017-10-12 15:57:51 +00:00
parent 68dce24019
commit 4da13b8f8e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=451901
42 changed files with 9 additions and 119 deletions

View File

@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20171012:
AUTHOR: mat@FreeBSD.org
Remove WANT_GNOME and HAVE_GNOME, they were in disuse, and made useless by
options.
20171011:
AUTHOR: bapt@FreeBSD.org

View File

@ -477,70 +477,6 @@ USE_GNOME+= gtk-update-icon-cache
# End component definition section
# This section defines tests for optional software. These work off four
# types of variables: WANT_GNOME, WITH_GNOME, HAVE_GNOME and USE_GNOME.
# The logic of this is that a port can WANT support for a package; a user
# specifies if they want ports compiled WITH certain features; this section
# tests if we HAVE these features; and the port is then free to USE them.
# The logic of this section is like this:
#
# .if defined(WANT_GNOME) && !defined(WITHOUT_GNOME)
# .for foo in ALL_GNOME_COMPONENTS
# .if defined(WITH_GNOME)
# HAVE_GNOME += foo
# .elif (foo installed)
# HAVE_GNOME += foo
# .else
# Print option message
# .endif
# .endfor
# .endif
#
# Although it appears a little more convoluted in the tests.
# Ports can make use of this like so:
#
# WANT_GNOME= yes
#
# .include <bsd.port.pre.mk>
#
# .if ${HAVE_GNOME:Mfoo}!=""
# ... Do some things ...
# USE_GNOME= foo
# .else
# ... Do some other things ...
# .endif
# We also check each component to see if it has a desktop requirement. If
# it does, and its requirement disagrees with the user's chosen desktop,
# do not add the component to the HAVE_GNOME list.
_USE_GNOME_SAVED:=${USE_GNOME}
HAVE_GNOME?=
.if (defined(WANT_GNOME) && !defined(WITHOUT_GNOME))
. for component in ${_USE_GNOME_ALL}
. if exists(${${component}_DETECT})
HAVE_GNOME+= ${component}
. elif defined(WITH_GNOME)
. if ${WITH_GNOME}=="yes" || ${WITH_GNOME:M${component}}!="" \
|| ${WITH_GNOME}=="1"
HAVE_GNOME+= ${component}
. endif
. endif
. endfor
.elif defined(WITHOUT_GNOME)
. if ${WITHOUT_GNOME}!="yes" && ${WITHOUT_GNOME}!="1"
. for component in ${_USE_GNOME_ALL}
. if ${WITHOUT_GNOME:M${component}}==""
. if exists(${${component}_DETECT})
HAVE_GNOME+= ${component}
. endif
. endif
. endfor
. endif
.endif
.if defined(USE_GNOME)
# First of all expand all USE_GNOME_IMPL recursively
. for component in ${_USE_GNOME_ALL}
@ -629,15 +565,6 @@ MAKE_ENV+= GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
. endif
.endif
.if defined(WANT_GNOME)
USE_GNOME?=
. if ${_USE_GNOME_SAVED}==${USE_GNOME}
PLIST_SUB+= GNOME:="@comment " NOGNOME:=""
. else
PLIST_SUB+= GNOME:="" NOGNOME:="@comment "
. endif
.endif
.if defined(USE_GNOME_SUBR)
GNOME_SUBR= ${LOCALBASE}/etc/gnome.subr
RUN_DEPENDS+= ${GNOME_SUBR}:sysutils/gnome_subr

View File

@ -179,7 +179,7 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD USE_PHPEXT \
USE_ZENDEXT USE_PHP_BUILD USE_BDB PLIST_DIRSTRY USE_RCORDER \
USE_OPENSSL
USE_OPENSSL WANT_GNOME
SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS \
USE_MYSQL WANT_MYSQL_VER \
USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \
@ -239,6 +239,7 @@ WANT_PHP_MOD_ALT= USES=php:mod
WANT_PHP_WEB_ALT= USES=php:web
WANT_PHP_EMB_ALT= USES=php:embed
USE_RCORDER_ALT= USE_RC_SUBR=${USE_RCORDER}
WANT_GNOME_ALT= USES=gnome
.for a in ${SANITY_DEPRECATED}
.if defined(${a})

View File

@ -12,7 +12,6 @@ COMMENT= Audio mixer (gtk and Xlib) for X11R6
WRKSRC= ${WRKDIR}/${PORTNAME}
WANT_GNOME= yes
GNU_CONFIGURE= yes
ALL_TARGET= ${PROGRAMS}

View File

@ -21,7 +21,6 @@ WRKSRC_SUBDIR= plugins/xmms/src
USE_GNOME= gtk12
USES= pkgconfig tar:bzip2
WANT_GNOME= yes
EXTRA_CFLAGS= `xmms-config --cflags`
EXTRA_LDFLAGS= `xmms-config --libs`

View File

@ -16,7 +16,6 @@ LICENSE= GPLv2
LIB_DEPENDS= libxmp.so:audio/libxmp
USES= gmake localbase:ldflags pkgconfig
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc

View File

@ -25,7 +25,6 @@ SHEBANG_FILES= tools/cqrlog-apparmor-fix \
USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-net fcl-web \
fcl-registry rtl-extra fcl-xml mysql numlib openssl pasjpeg x11
WANT_GNOME= yes
ALL_TARGET= ${PORTNAME}
LAZARUS_VER= 1.6.4

View File

@ -16,7 +16,6 @@ LIB_DEPENDS= librudiments.so:devel/rudiments \
libkrb5.so:security/krb5 \
libcurl.so:ftp/curl
WANT_GNOME= yes
USES= gmake libtool pathfix python readline
PATHFIX_MAKEFILEIN= Makefile
CPPFLAGS+= -I${LOCALBASE}/include

View File

@ -16,7 +16,6 @@ USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
shared-mime-info tar:xz
USE_GNOME= gnomeprefix intlhack libgnomeui libgnomeprintui \
libgsf
WANT_GNOME= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip

View File

@ -20,7 +20,6 @@ USES= autoreconf alias gmake libtool pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= distcc
GH_TAGNAME= 9a09372
WANT_GNOME= yes
GROUPS= distcc
USERS= distcc

View File

@ -16,7 +16,6 @@ GH_ACCOUNT= mono
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_MCS=${LOCALBASE}/bin/mcs
USES= autoreconf gmake mono pkgconfig
WANT_GNOME= yes
OPTIONS_DEFINE= GTK2 GTK3
OPTIONS_DEFAULT=GTK2

View File

@ -25,7 +25,6 @@ WRKSRC= ${WRKDIR}/ptlib_v${PORTVERSION:S/./_/g}
USES= bison gmake ssl
USE_GCC= any
USE_AUTOTOOLS= autoconf
WANT_GNOME= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes

View File

@ -103,7 +103,6 @@ USE_QT4= # empty but required
USE_XORG= xaw xrandr
USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \
perl5 pkgconfig python shared-mime-info tar:xz
WANT_GNOME= yes
OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
TEST WEBDAV

View File

@ -35,7 +35,6 @@ DEBUGGER_DESC= Enable the debugger
ASMCORE_DESC= Enable x86 ASM CPU cores (i386 only)
ASMSCALERS_DESC= Enable x86 ASM graphic filters (i386 only)
WANT_GNOME= yes
DOS2UNIX_REGEX= .*\.(c|cpp|h|ypp)
USE_XORG= x11 xext
USE_GL= gl glu

View File

@ -24,7 +24,6 @@ USES= gmake iconv libtool perl5 pkgconfig
USE_LDCONFIG= yes
USE_PERL5= build
USE_XORG= x11 ice xtst xaw xproto xext
WANT_GNOME= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib

View File

@ -28,8 +28,6 @@ USE_XORG= x11
USES= desktop-file-utils gmake perl5 pkgconfig shebangfix
SHEBANG_FILES= jrunscript.in launcher/launchers.in
WANT_GNOME= yes
CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"
CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"
CONFIGURE_ARGS+= --with-jre-home="${JAVA_HOME}/jre"

View File

@ -21,7 +21,6 @@ MAKE_JOBS_UNSAFE= yes
USES= imake:env perl5 pkgconfig
USE_PERL5= run
USE_XORG= x11 xext xmu xt sm ice xi xtst
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-vflib --enable-locale
CONFIGURE_ENV= mgp_cv_path_perl=${PERL}

View File

@ -38,7 +38,6 @@ MAKEFILE= makefile
NO_ARCH= yes
USES= gettext gmake python:-2.7 shebangfix
SHEBANG_FILES= src/gpodder/*.py share/gpodder/examples/*.py share/gpodder/extensions/*.py
WANT_GNOME= yes
INSTALLS_ICONS= yes
PLIST_SUB+= PORTVERSION=${PORTVERSION}
PORTDOCS= PKG-INFO README

View File

@ -50,8 +50,6 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-real \
--yasm=''
WANT_GNOME= yes
common-post-patch:
@${REINPLACE_CMD} \
-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \

View File

@ -16,7 +16,6 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
USE_LDCONFIG= yes
USES= gmake libtool pkgconfig tar:bzip2
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-oss
CPPFLAGS+= -I${LOCALBASE}/include

View File

@ -28,12 +28,10 @@ INSTALL_TARGET= install-strip
# set these macros themselves.
USES+= iconv python shebangfix
USE_LDCONFIG= yes
WANT_GNOME= yes
SHEBANG_FILES= libpurple/purple-remote \
libpurple/purple-url-handler
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
WITH_GNOME= yes
.endif
@ -126,7 +124,7 @@ USE_GNOME+= gconf2
GCONF_SCHEMAS= purple.schemas
.endif
#.if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!=""
#.if defined(WITH_GTKUI)
#USE_GNOME+= evolutiondataserver
#PLIST_SUB+= EVO=""
#CONFIGURE_ARGS+= --enable-gevolution

View File

@ -24,7 +24,6 @@ USES= python:build
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gtk20 intltool
USE_XORG= xscrnsaver sm
WANT_GNOME= yes
CONFIGURE_ARGS= --disable-consoleui \
--disable-nm \
--enable-screensaver \

View File

@ -23,7 +23,6 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS= unison-[0-9]* unison-nox11-[0-9]*

View File

@ -20,7 +20,6 @@ USES= gmake localbase
USE_OCAML= yes
WRKSRC= ${WRKDIR}/src
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]*
MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
MAKE_JOBS_UNSAFE= yes

View File

@ -21,7 +21,6 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
MAKE_JOBS_UNSAFE= yes

View File

@ -20,7 +20,6 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
MAKE_JOBS_UNSAFE= yes

View File

@ -26,7 +26,6 @@ SHEBANG_FILES= share/scripts/banbrutes.php \
share/scripts/route.php \
share/scripts/voicemail.php
USE_LDCONFIG= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-fdsize \

View File

@ -30,7 +30,6 @@ CONFLICTS_INSTALL= \
USES= autoreconf gmake jpeg shebangfix tar:bzip2
USE_LDCONFIG= yes
SHEBANG_FILES= lib/fixmswrd.pl
WANT_GNOME= yes
# normazile WRKSRC so things like cups-pstoraster may work
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKE_JOBS_UNSAFE= yes

View File

@ -37,7 +37,6 @@ TOC2MP3_DESC= Build with toc2mp3 (requires audio/lame)
.if ${PORTNAME} == "gcdmaster"
USES+= pkgconfig shared-mime-info
WANT_GNOME= yes
GCONF_SCHEMAS= gcdmaster.schemas
LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \
libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26

View File

@ -15,7 +15,6 @@ LICENSE= GPLv3
USES= gmake pkgconfig tar:bzip2
USE_RC_SUBR= gkrellmd
WANT_GNOME= yes
OPTIONS_DEFINE= DOCS CLIENT NLS NTLM OPENSSL
OPTIONS_DEFAULT= CLIENT NTLM OPENSSL

View File

@ -12,7 +12,6 @@ COMMENT= Gtk+/ncurses rc.conf editor/management tool
LICENSE= BSD2CLAUSE
USES= pkgconfig tar:xz
WANT_GNOME= yes
OPTIONS_SINGLE= X11
OPTIONS_SINGLE_X11= GTK2

View File

@ -22,7 +22,6 @@ BUILD_DEPENDS= cdrecord:sysutils/cdrtools
USES= gettext gmake iconv pkgconfig
GNU_CONFIGURE= yes
WANT_GNOME= yes
CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \
GLIB_CONFIG="${GLIB_CONFIG}"

View File

@ -16,7 +16,6 @@ COMMENT?= Input method library
BROKEN_aarch64= Fails to build: The collector has not been ported to this machine/OS combination
USE_LDCONFIG= yes
WANT_GNOME= yes
USE_GNOME+= glib20 intltool
USES+= gettext gmake iconv libedit libtool pathfix pkgconfig perl5 tar:bzip2
USE_PERL5= build

View File

@ -24,7 +24,6 @@ RUN_DEPENDS= update-mime-database:misc/shared-mime-info
USES= desktop-file-utils linux shared-mime-info tar:xz
USE_LINUX= gtk2 sqlite3 xorglibs
ONLY_FOR_ARCHS= i386 amd64
WANT_GNOME= yes
INSTALLS_ICONS= yes
NO_BUILD= yes

View File

@ -236,8 +236,6 @@ X11_DESC= graphics/ImageMagick[-nox11] dependency
XSS_DESC= 3rd party xss module
VIDEO_DESC= Video module support
WANT_GNOME= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}

View File

@ -246,8 +246,6 @@ X11_DESC= graphics/ImageMagick[-nox11] dependency
XSS_DESC= 3rd party xss module
VIDEO_DESC= Video module support
WANT_GNOME= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}

View File

@ -26,7 +26,6 @@ USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \
fcl-xml iconvenc pasjpeg rtl-extra x11
USE_XORG= x11
DOS2UNIX_FILES= src/dmhelpmanager.pas
WANT_GNOME= yes
PLIST= ${WRKDIR}/pkg-plist

View File

@ -12,7 +12,6 @@ COMMENT= Jini Icons for Gnome
NO_BUILD= yes
WRKSRC= ${WRKDIR}
WANT_GNOME= yes
INSTALLS_ICONS= yes
post-extract:

View File

@ -9,7 +9,6 @@ NO_ARCH= yes
REASON= Themes may contain artwork not done by the author. \
Keep FreeBSD safe if theme author violated copyrights.
WANT_GNOME= yes
INSTALLS_ICONS= yes
do-install: icon-do-install

View File

@ -20,7 +20,6 @@ USES= compiler:features jpeg perl5 pkgconfig shebangfix tar:bzip2
USE_PERL5= build
USE_XORG= x11 xext xxf86vm
SUB_FILES= eaglemode.sh
WANT_GNOME= yes
BUILD_ARGS= continue=no

View File

@ -44,7 +44,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/share/fonts
USE_LDCONFIG= yes
USE_XORG= xcursor xft xinerama xpm xrender xt xtst
WANT_GNOME= yes
MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}"
INSTALL_TARGET= install-strip

View File

@ -12,7 +12,6 @@ MAINTAINER= cy@FreeBSD.org
COMMENT= Getting and setting Xv attributes
USE_XORG= x11 xv
WANT_GNOME= yes
USES= pkgconfig
PLIST_FILES= bin/${PORTNAME} bin/g${PORTNAME} \