[Midnightbsd-cvs] mports [20402] trunk/Mk/extensions/gnome.mk: sync up gnome extension with the fact that gnome 2 is long gone
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 3 00:52:10 EDT 2015
Revision: 20402
http://svnweb.midnightbsd.org/mports/?rev=20402
Author: laffer1
Date: 2015-10-03 00:52:10 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
sync up gnome extension with the fact that gnome 2 is long gone
Modified Paths:
--------------
trunk/Mk/extensions/gnome.mk
Modified: trunk/Mk/extensions/gnome.mk
===================================================================
--- trunk/Mk/extensions/gnome.mk 2015-10-03 04:51:36 UTC (rev 20401)
+++ trunk/Mk/extensions/gnome.mk 2015-10-03 04:52:10 UTC (rev 20402)
@@ -43,10 +43,11 @@
# file and add apropriate @exec/@unexec directives for
# each .omf file found to track OMF registration database.
#
-# INSTALLS_ICONS - If your port installs Freedesktop-style icons to
+# INSTALLS_ICONS - If a GTK+ port installs Freedesktop-style icons to
# ${LOCALBASE}/share/icons, then you should use this
-# macro. If the icons are not cached, they will not be
-# displayed.
+# macro. Using this macro ensures that icons are cached
+# and will display correctly. This macro isn't needed
+# for QT based applications, which use a different method.
#
# non-version specific components
@@ -72,7 +73,7 @@
# GNOME 3 components
_USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
- gnomemenus3 gtk30 gtkhtml4 gtksourceview3 libgda5 \
+ gnomemenus3 gsound gtk30 gtkhtml4 gtksourceview3 libgda5 \
libgda5-ui libwnck3 metacity nautilus3 py3gobject3 \
pygobject3 vte3
@@ -122,6 +123,12 @@
glibmm_LIB_DEPENDS= libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
glibmm_USE_GNOME_IMPL= libsigc++20 glib20
+gsound_DETECT= ${LOCALBASE}/libdata/pkgconfig/gsound.pc
+gsound_BUILD_DEPENDS= gsound-play:${PORTSDIR}/audio/gsound
+gsound_LIB_DEPENDS= libgsound.so:${PORTSDIR}/audio/gsound
+gsound_RUN_DEPENDS= gsound-play:${PORTSDIR}/audio/gsound
+gsound_USE_GNOME_IMPL= glib20
+
gtkmm20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc
gtkmm20_LIB_DEPENDS= libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20
gtkmm20_USE_GNOME_IMPL= libsigc++12 gtk20
@@ -197,7 +204,9 @@
atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc
atk_USE_GNOME_IMPL= glib20
+dconf_BUILD_DEPENDS= dconf:${PORTSDIR}/devel/dconf
dconf_LIB_DEPENDS= libdconf.so:${PORTSDIR}/devel/dconf
+dconf_RUN_DEPENDS= dconf:${PORTSDIR}/devel/dconf
dconf_DETECT= ${LOCALBASE}/libdata/pkgconfig/dconf.pc
dconf_USE_GNOME_IMPL= glib20
@@ -220,12 +229,12 @@
gtk20_LIB_DEPENDS= libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
gtk20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc
-gtk20_USE_GNOME_IMPL= intltool atk pango
+gtk20_USE_GNOME_IMPL= atk pango
GTK2_VERSION= 2.10.0
gtk30_LIB_DEPENDS= libgtk-3.so:${PORTSDIR}/x11-toolkits/gtk30
gtk30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-3.0.pc
-gtk30_USE_GNOME_IMPL= intltool atk pango
+gtk30_USE_GNOME_IMPL= atk pango
GTK3_VERSION= 3.0.0
linc_LIB_DEPENDS= liblinc.so:${PORTSDIR}/net/linc
@@ -336,11 +345,9 @@
nautilus3_LIB_DEPENDS= libnautilus-extension.so:${PORTSDIR}/x11-fm/nautilus
nautilus3_DETECT= ${LOCALBASE}/share/gir-1.0/Nautilus-3.0.gir
nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2
-nautilus3_GNOME_DESKTOP_VERSION=3
metacity_LIB_DEPENDS= libmetacity-private.so:${PORTSDIR}/x11-wm/metacity
metacity_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc
-metacity_GNOME_DESKTOP_VERSION=3
gal2_LIB_DEPENDS= libgal-2.4.so:${PORTSDIR}/x11-toolkits/gal2
gal2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc
@@ -350,7 +357,6 @@
gnomecontrolcenter3_BUILD_DEPENDS= ${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center
gnomecontrolcenter3_RUN_DEPENDS= ${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center
gnomecontrolcenter3_USE_GNOME_IMPL= gnomedesktop3
-gnomecontrolcenter3_GNOME_DESKTOP_VERSION=3
libgda4_LIB_DEPENDS= libgda-4.0.so:${PORTSDIR}/databases/libgda4
libgda4_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-4.0.pc
@@ -436,13 +442,11 @@
evolutiondataserver3_LIB_DEPENDS= libedataserver-1.2.so:${PORTSDIR}/databases/evolution-data-server
evolutiondataserver3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libedataserverui-3.0.pc
evolutiondataserver3_USE_GNOME_IMPL= libxml2 gtk30
-evolutiondataserver3_GNOME_DESKTOP_VERSION=3
gnomemenus3_BUILD_DEPENDS= gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus
gnomemenus3_RUN_DEPENDS= gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus
gnomemenus3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu-3.0.pc
gnomemenus3_USE_GNOME_IMPL= glib20
-gnomemenus3_GNOME_DESKTOP_VERSION=3
gnomedocutils_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc
gnomedocutils_BUILD_DEPENDS= ${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
@@ -519,32 +523,14 @@
# ... Do some other things ...
# .endif
-# If the user has not defined GNOME_DESKTOP_VERSION, let's try to prevent
-# users from shooting themselves in the foot. We will try to make an
-# intelligent choice on the user's behalf.
-.if exists(${gnomepanel3_DETECT})
-GNOME_DESKTOP_VERSION?= 3
-.elif exists(${gnomepanel_DETECT})
-GNOME_DESKTOP_VERSION?= 2
-.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}
-_USE_GNOME_DESKTOP=yes
HAVE_GNOME?=
.if (defined(WANT_GNOME) && !defined(WITHOUT_GNOME))
. for component in ${_USE_GNOME_ALL}
-. if defined(GNOME_DESKTOP_VERSION) && \
- defined(${component}_GNOME_DESKTOP_VERSION)
-. if ${GNOME_DESKTOP_VERSION}==${${component}_GNOME_DESKTOP_VERSION}
-HAVE_GNOME+= ${component}
-. else
-_USE_GNOME_DESKTOP=no
-. endif
-. else
. if exists(${${component}_DETECT})
HAVE_GNOME+= ${component}
. elif defined(WITH_GNOME)
@@ -553,7 +539,6 @@
HAVE_GNOME+= ${component}
. endif
. endif
-. endif
. endfor
.elif defined(WITHOUT_GNOME)
. if ${WITHOUT_GNOME}!="yes" && ${WITHOUT_GNOME}!="1"
@@ -591,14 +576,6 @@
# and if the user's chosen desktop is not of the same version, mark the
# port as IGNORE.
. for component in ${USE_GNOME:C/^([^:]+).*/\1/}
-. if defined(GNOME_DESKTOP_VERSION) && \
- defined(${component}_GNOME_DESKTOP_VERSION)
-. if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION}
-IGNORE= cannot install: ${PORTNAME} wants to use the GNOME
-IGNORE+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use
-IGNORE+=the GNOME ${GNOME_DESKTOP_VERSION} desktop
-. endif
-. endif
. if ${_USE_GNOME_ALL:M${component}}==""
IGNORE= cannot install: Unknown component ${component}
. endif
@@ -615,6 +592,14 @@
USE_CSTD= gnu89
.endif
+.if defined(_USE_GNOME) && empty(_USE_GNOME:Mglib20:u) && defined(GLIB_SCHEMAS)
+IGNORE= GLIB_SCHEMAS is set, but needs USE_GNOME=glib20 to work
+.endif
+
+.if defined(_USE_GNOME) && empty(_USE_GNOME:Mgconf2:u) && defined(GCONF_SCHEMAS)
+IGNORE= GCONF_SCHEMAS is set, but needs USE_GNOME=gconf2 to work
+.endif
+
# Then traverse through all components, check which of them
# exist in ${_USE_GNOME} and set variables accordingly
.ifdef _USE_GNOME
@@ -680,13 +665,6 @@
PLIST_SUB+= GNOME:="@comment " NOGNOME:=""
. else
PLIST_SUB+= GNOME:="" NOGNOME:="@comment "
-. if defined(GNOME_DESKTOP_VERSION)
-. if ${_USE_GNOME_DESKTOP}=="yes"
-PLIST_SUB+= GNOMEDESKTOP:="" NOGNOMEDESKTOP:="@comment "
-. else
-PLIST_SUB+= GNOMEDESKTOP:="@comment " NOGNOMEDESKTOP:=""
-. endif
-. endif
. endif
.endif
@@ -696,22 +674,10 @@
SUB_LIST+= GNOME_SUBR=${GNOME_SUBR}
.endif
-.if ${MAINTAINER}=="gnome at MidnightBSD.org"
-CONFIGURE_FAIL_MESSAGE= "Report the build failure to the GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", and (b) the output of the failed make command. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`)."
-.endif
-
.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \
|| defined(GLIB_SCHEMAS)
-pre-install: gnome-pre-install
post-install: gnome-post-install
-gnome-pre-install:
-.if defined(GCONF_SCHEMAS)
- @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/
-.else
- @${DO_NADA}
-.endif
-
gnome-post-install:
. if defined(GCONF_SCHEMAS)
@for i in ${GCONF_SCHEMAS}; do \
More information about the Midnightbsd-cvs
mailing list