Page MenuHomeFreeBSD
Files F147469074

D12643.id33919.diff
No OneTemporary
Actions

D12643.id33919.diff
View Options

Index: head/CHANGES
===================================================================
--- head/CHANGES
+++ head/CHANGES
@@ -10,6 +10,12 @@
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
Index: head/Mk/Uses/gnome.mk
===================================================================
--- head/Mk/Uses/gnome.mk
+++ head/Mk/Uses/gnome.mk
@@ -477,70 +477,6 @@
# 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}
@@ -627,15 +563,6 @@
. if defined(GCONF_SCHEMAS)
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)
Index: head/Mk/bsd.sanity.mk
===================================================================
--- head/Mk/bsd.sanity.mk
+++ head/Mk/bsd.sanity.mk
@@ -179,7 +179,7 @@
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_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})
Index: head/audio/xmixer/Makefile
===================================================================
--- head/audio/xmixer/Makefile
+++ head/audio/xmixer/Makefile
@@ -12,7 +12,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-WANT_GNOME= yes
GNU_CONFIGURE= yes
ALL_TARGET= ${PROGRAMS}
Index: head/audio/xmms-faad/Makefile
===================================================================
--- head/audio/xmms-faad/Makefile
+++ head/audio/xmms-faad/Makefile
@@ -21,7 +21,6 @@
USE_GNOME= gtk12
USES= pkgconfig tar:bzip2
-WANT_GNOME= yes
EXTRA_CFLAGS= `xmms-config --cflags`
EXTRA_LDFLAGS= `xmms-config --libs`
Index: head/audio/xmp/Makefile
===================================================================
--- head/audio/xmp/Makefile
+++ head/audio/xmp/Makefile
@@ -16,7 +16,6 @@
LIB_DEPENDS= libxmp.so:audio/libxmp
USES= gmake localbase:ldflags pkgconfig
-WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
Index: head/comms/cqrlog/Makefile
===================================================================
--- head/comms/cqrlog/Makefile
+++ head/comms/cqrlog/Makefile
@@ -25,7 +25,6 @@
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
Index: head/databases/sqlrelay/Makefile
===================================================================
--- head/databases/sqlrelay/Makefile
+++ head/databases/sqlrelay/Makefile
@@ -16,7 +16,6 @@
libkrb5.so:security/krb5 \
libcurl.so:ftp/curl
-WANT_GNOME= yes
USES= gmake libtool pathfix python readline
PATHFIX_MAKEFILEIN= Makefile
CPPFLAGS+= -I${LOCALBASE}/include
Index: head/deskutils/planner/Makefile
===================================================================
--- head/deskutils/planner/Makefile
+++ head/deskutils/planner/Makefile
@@ -16,7 +16,6 @@
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
Index: head/devel/distcc/Makefile
===================================================================
--- head/devel/distcc/Makefile
+++ head/devel/distcc/Makefile
@@ -20,7 +20,6 @@
USE_GITHUB= yes
GH_ACCOUNT= distcc
GH_TAGNAME= 9a09372
-WANT_GNOME= yes
GROUPS= distcc
USERS= distcc
Index: head/devel/mono-addins/Makefile
===================================================================
--- head/devel/mono-addins/Makefile
+++ head/devel/mono-addins/Makefile
@@ -16,7 +16,6 @@
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
Index: head/devel/pwlib/Makefile
===================================================================
--- head/devel/pwlib/Makefile
+++ head/devel/pwlib/Makefile
@@ -25,7 +25,6 @@
USES= bison gmake ssl
USE_GCC= any
USE_AUTOTOOLS= autoconf
-WANT_GNOME= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
Index: head/editors/libreoffice/Makefile
===================================================================
--- head/editors/libreoffice/Makefile
+++ head/editors/libreoffice/Makefile
@@ -103,7 +103,6 @@
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
Index: head/emulators/visualboyadvance-m/Makefile
===================================================================
--- head/emulators/visualboyadvance-m/Makefile
+++ head/emulators/visualboyadvance-m/Makefile
@@ -35,7 +35,6 @@
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
Index: head/java/classpath/Makefile
===================================================================
--- head/java/classpath/Makefile
+++ head/java/classpath/Makefile
@@ -24,7 +24,6 @@
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
Index: head/java/icedtea-web/Makefile
===================================================================
--- head/java/icedtea-web/Makefile
+++ head/java/icedtea-web/Makefile
@@ -28,8 +28,6 @@
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"
Index: head/misc/magicpoint/Makefile
===================================================================
--- head/misc/magicpoint/Makefile
+++ head/misc/magicpoint/Makefile
@@ -21,7 +21,6 @@
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}
Index: head/multimedia/gpodder/Makefile
===================================================================
--- head/multimedia/gpodder/Makefile
+++ head/multimedia/gpodder/Makefile
@@ -38,7 +38,6 @@
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
Index: head/multimedia/mplayer/Makefile.common
===================================================================
--- head/multimedia/mplayer/Makefile.common
+++ head/multimedia/mplayer/Makefile.common
@@ -50,8 +50,6 @@
--disable-real \
--yasm=''
-WANT_GNOME= yes
-
common-post-patch:
@${REINPLACE_CMD} \
-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
Index: head/multimedia/transcode/Makefile
===================================================================
--- head/multimedia/transcode/Makefile
+++ head/multimedia/transcode/Makefile
@@ -16,7 +16,6 @@
USE_LDCONFIG= yes
USES= gmake libtool pkgconfig tar:bzip2
-WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-oss
CPPFLAGS+= -I${LOCALBASE}/include
Index: head/net-im/libpurple/Makefile
===================================================================
--- head/net-im/libpurple/Makefile
+++ head/net-im/libpurple/Makefile
@@ -28,12 +28,10 @@
# 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 @@
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
Index: head/net-im/pidgin/Makefile
===================================================================
--- head/net-im/pidgin/Makefile
+++ head/net-im/pidgin/Makefile
@@ -24,7 +24,6 @@
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gtk20 intltool
USE_XORG= xscrnsaver sm
-WANT_GNOME= yes
CONFIGURE_ARGS= --disable-consoleui \
--disable-nm \
--enable-screensaver \
Index: head/net/unison-devel/Makefile
===================================================================
--- head/net/unison-devel/Makefile
+++ head/net/unison-devel/Makefile
@@ -23,7 +23,6 @@
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
-WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS= unison-[0-9]* unison-nox11-[0-9]*
Index: head/net/unison/Makefile
===================================================================
--- head/net/unison/Makefile
+++ head/net/unison/Makefile
@@ -20,7 +20,6 @@
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
Index: head/net/unison232/Makefile
===================================================================
--- head/net/unison232/Makefile
+++ head/net/unison232/Makefile
@@ -21,7 +21,6 @@
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
-WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
MAKE_JOBS_UNSAFE= yes
Index: head/net/unison240/Makefile
===================================================================
--- head/net/unison240/Makefile
+++ head/net/unison240/Makefile
@@ -20,7 +20,6 @@
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
-WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
MAKE_JOBS_UNSAFE= yes
Index: head/net/yate/Makefile
===================================================================
--- head/net/yate/Makefile
+++ head/net/yate/Makefile
@@ -26,7 +26,6 @@
share/scripts/route.php \
share/scripts/voicemail.php
USE_LDCONFIG= yes
-WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-fdsize \
Index: head/print/ghostscript7-base/Makefile
===================================================================
--- head/print/ghostscript7-base/Makefile
+++ head/print/ghostscript7-base/Makefile
@@ -30,7 +30,6 @@
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
Index: head/sysutils/cdrdao/Makefile
===================================================================
--- head/sysutils/cdrdao/Makefile
+++ head/sysutils/cdrdao/Makefile
@@ -37,7 +37,6 @@
.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
Index: head/sysutils/gkrellm2/Makefile
===================================================================
--- head/sysutils/gkrellm2/Makefile
+++ head/sysutils/gkrellm2/Makefile
@@ -15,7 +15,6 @@
USES= gmake pkgconfig tar:bzip2
USE_RC_SUBR= gkrellmd
-WANT_GNOME= yes
OPTIONS_DEFINE= DOCS CLIENT NLS NTLM OPENSSL
OPTIONS_DEFAULT= CLIENT NTLM OPENSSL
Index: head/sysutils/thefish/Makefile
===================================================================
--- head/sysutils/thefish/Makefile
+++ head/sysutils/thefish/Makefile
@@ -12,7 +12,6 @@
LICENSE= BSD2CLAUSE
USES= pkgconfig tar:xz
-WANT_GNOME= yes
OPTIONS_SINGLE= X11
OPTIONS_SINGLE_X11= GTK2
Index: head/sysutils/xcdroast/Makefile
===================================================================
--- head/sysutils/xcdroast/Makefile
+++ head/sysutils/xcdroast/Makefile
@@ -22,7 +22,6 @@
USES= gettext gmake iconv pkgconfig
GNU_CONFIGURE= yes
-WANT_GNOME= yes
CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \
GLIB_CONFIG="${GLIB_CONFIG}"
Index: head/textproc/uim/Makefile
===================================================================
--- head/textproc/uim/Makefile
+++ head/textproc/uim/Makefile
@@ -16,7 +16,6 @@
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
Index: head/www/linux-opera/Makefile
===================================================================
--- head/www/linux-opera/Makefile
+++ head/www/linux-opera/Makefile
@@ -24,7 +24,6 @@
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
Index: head/www/nginx-devel/Makefile
===================================================================
--- head/www/nginx-devel/Makefile
+++ head/www/nginx-devel/Makefile
@@ -236,8 +236,6 @@
XSS_DESC= 3rd party xss module
VIDEO_DESC= Video module support
-WANT_GNOME= yes
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}
Index: head/www/nginx/Makefile
===================================================================
--- head/www/nginx/Makefile
+++ head/www/nginx/Makefile
@@ -246,8 +246,6 @@
XSS_DESC= 3rd party xss module
VIDEO_DESC= Video module support
-WANT_GNOME= yes
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}
Index: head/x11-fm/doublecmd/Makefile
===================================================================
--- head/x11-fm/doublecmd/Makefile
+++ head/x11-fm/doublecmd/Makefile
@@ -26,7 +26,6 @@
fcl-xml iconvenc pasjpeg rtl-extra x11
USE_XORG= x11
DOS2UNIX_FILES= src/dmhelpmanager.pas
-WANT_GNOME= yes
PLIST= ${WRKDIR}/pkg-plist
Index: head/x11-themes/gnome-icons-jini/Makefile
===================================================================
--- head/x11-themes/gnome-icons-jini/Makefile
+++ head/x11-themes/gnome-icons-jini/Makefile
@@ -12,7 +12,6 @@
NO_BUILD= yes
WRKSRC= ${WRKDIR}
-WANT_GNOME= yes
INSTALLS_ICONS= yes
post-extract:
Index: head/x11-themes/gnome-icons/bsd.gnome-icons.mk
===================================================================
--- head/x11-themes/gnome-icons/bsd.gnome-icons.mk
+++ head/x11-themes/gnome-icons/bsd.gnome-icons.mk
@@ -9,7 +9,6 @@
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
Index: head/x11/eaglemode/Makefile
===================================================================
--- head/x11/eaglemode/Makefile
+++ head/x11/eaglemode/Makefile
@@ -20,7 +20,6 @@
USE_PERL5= build
USE_XORG= x11 xext xxf86vm
SUB_FILES= eaglemode.sh
-WANT_GNOME= yes
BUILD_ARGS= continue=no
Index: head/x11/metisse/Makefile
===================================================================
--- head/x11/metisse/Makefile
+++ head/x11/metisse/Makefile
@@ -44,7 +44,6 @@
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
Index: head/x11/xvattr/Makefile
===================================================================
--- head/x11/xvattr/Makefile
+++ head/x11/xvattr/Makefile
@@ -12,7 +12,6 @@
COMMENT= Getting and setting Xv attributes
USE_XORG= x11 xv
-WANT_GNOME= yes
USES= pkgconfig
PLIST_FILES= bin/${PORTNAME} bin/g${PORTNAME} \

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 6:24 AM (15 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29569503
Default Alt Text
D12643.id33919.diff (17 KB)

Event Timeline