svn commit: r330345 - in head/x11: libexo libxfce4menu libxfce4util xfce4-conf xfce4-conf/files
Olivier Duchateau
olivierd at FreeBSD.org
Mon Oct 14 19:42:28 UTC 2013
Author: olivierd
Date: Mon Oct 14 19:42:26 2013
New Revision: 330345
URL: http://svnweb.freebsd.org/changeset/ports/330345
Log:
- Support STAGEDIR
- Convert to new LIB_DEPENDS format (x11/libxfce4menu, x11/xfce4-conf)
- Switch to USES= gmake (x11/libxfce4menu)
- Update Perl dependencies versions (x11/xfce4-conf)
- Add patch, to use new GLib 2.32 mutex API (x11/xfce4-conf)
Reviewed by: Perl (az@, bapt@, and mat@)
Added:
head/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c (contents, props changed)
Modified:
head/x11/libexo/Makefile
head/x11/libexo/pkg-plist
head/x11/libxfce4menu/Makefile
head/x11/libxfce4util/Makefile
head/x11/libxfce4util/pkg-descr (contents, props changed)
head/x11/xfce4-conf/Makefile
head/x11/xfce4-conf/pkg-plist (contents, props changed)
Modified: head/x11/libexo/Makefile
==============================================================================
--- head/x11/libexo/Makefile Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/libexo/Makefile Mon Oct 14 19:42:26 2013 (r330345)
@@ -30,9 +30,6 @@ USES= desktop-file-utils gmake pathfix
OPTIONS_DEFINE= DOCS NLS
-MAN1= exo-csource.1 exo-open.1
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
Modified: head/x11/libexo/pkg-plist
==============================================================================
--- head/x11/libexo/pkg-plist Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/libexo/pkg-plist Mon Oct 14 19:42:26 2013 (r330345)
@@ -33,6 +33,8 @@ lib/libexo-1.so.1
lib/xfce4/exo-1/exo-compose-mail-1
lib/xfce4/exo-1/exo-helper-1
libdata/pkgconfig/exo-1.pc
+man/man1/exo-csource.1.gz
+man/man1/exo-open.1.gz
share/applications/exo-file-manager.desktop
share/applications/exo-mail-reader.desktop
share/applications/exo-preferred-applications.desktop
Modified: head/x11/libxfce4menu/Makefile
==============================================================================
--- head/x11/libxfce4menu/Makefile Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/libxfce4menu/Makefile Mon Oct 14 19:42:26 2013 (r330345)
@@ -14,19 +14,17 @@ COMMENT= Widgets library for the Xfce de
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GMAKE= yes
USE_GNOME= glib20 gtk20 intltool intlhack
USE_LDCONFIG= yes
USE_XFCE= configenv libutil xfconf
INSTALLS_ICONS= yes
-USES= pathfix pkgconfig
+USES= pathfix pkgconfig gmake
CONFIGURE_ARGS= --with-vendor-info=FreeBSD
OPTIONS_DEFINE= DOCS NLS NOTIFY GLADE
OPTIONS_DEFAULT= NOTIFY
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
@@ -47,14 +45,14 @@ PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+= startup-notification-1:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
CONFIGURE_ARGS+=--enable-startup-notification
.else
CONFIGURE_ARGS+=--disable-startup-notification
.endif
.if ${PORT_OPTIONS:MGLADE}
-LIB_DEPENDS+= gladeui-1:${PORTSDIR}/devel/glade3
+LIB_DEPENDS+= libgladeui-1.so:${PORTSDIR}/devel/glade3
CONFIGURE_ARGS+=--enable-gladeui
.else
CONFIGURE_ARGS+=--disable-gladeui
Modified: head/x11/libxfce4util/Makefile
==============================================================================
--- head/x11/libxfce4util/Makefile Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/libxfce4util/Makefile Mon Oct 14 19:42:26 2013 (r330345)
@@ -20,7 +20,6 @@ USES= gmake pathfix perl5 pkgconfig
OPTIONS_DEFINE= NLS DOCS
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
Modified: head/x11/libxfce4util/pkg-descr
==============================================================================
--- head/x11/libxfce4util/pkg-descr Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/libxfce4util/pkg-descr Mon Oct 14 19:42:26 2013 (r330345)
@@ -1,3 +1,3 @@
Xfce 4 library providing basic utilities.
-WWW: http://www.xfce.org/projects
+WWW: http://www.xfce.org/
Modified: head/x11/xfce4-conf/Makefile
==============================================================================
--- head/x11/xfce4-conf/Makefile Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/xfce4-conf/Makefile Mon Oct 14 19:42:26 2013 (r330345)
@@ -13,7 +13,7 @@ MAINTAINER= xfce at FreeBSD.org
COMMENT= D-Bus-based configuration storage system
BUILD_DEPENDS= p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
USE_BZIP2= yes
@@ -26,9 +26,6 @@ USES= gmake pathfix pkgconfig perl5
OPTIONS_DEFINE= DOCS PERL NLS
-MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VER}
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
@@ -40,11 +37,11 @@ PLIST_SUB+= APIDOCS="@comment "
.endif
.if ${PORT_OPTIONS:MPERL}
-MAN3= Xfce4::Xfconf.3
-BUILD_DEPENDS+= p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
- p5-ExtUtils-PkgConfig>=1.12:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
- p5-Glib2>=1.200:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS+= p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+ p5-ExtUtils-PkgConfig>=1.15:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
+ p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2
RUN_DEPENDS+= ${BUILD_DEPENDS}
+USE_PERL5+= run
CONFIGURE_ARGS+=--enable-perl-bindings
PLIST_SUB+= PERLBIND=""
.else
@@ -61,4 +58,8 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
+post-install:
+.if ${PORT_OPTIONS:MPERL}
+ @${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
+.endif
.include <bsd.port.mk>
Added: head/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c Mon Oct 14 19:42:26 2013 (r330345)
@@ -0,0 +1,221 @@
+--- ./xfconf/xfconf-cache.c.orig 2012-04-28 19:51:47.000000000 +0000
++++ ./xfconf/xfconf-cache.c 2013-03-08 20:38:01.000000000 +0000
+@@ -47,10 +47,16 @@
+
+ #define ALIGN_VAL(val, align) ( ((val) + ((align) -1)) & ~((align) - 1) )
+
+-static void xfconf_cache_mutex_lock(GStaticMutex *mtx) __attribute__((noinline));
+-static void xfconf_cache_mutex_lock(GStaticMutex *mtx) { g_static_mutex_lock(mtx); }
+-static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) __attribute__((noinline));
+-static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) { g_static_mutex_unlock(mtx); }
++
++
++#if GLIB_CHECK_VERSION (2, 32, 0)
++#define xfconf_cache_mutex_lock(cache) g_mutex_lock (&(cache)->cache_lock)
++#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock (&(cache)->cache_lock)
++#else
++#define xfconf_cache_mutex_lock(cache) g_mutex_lock ((cache)->cache_lock)
++#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock ((cache)->cache_lock)
++#endif
++
+
+
+ /**************** XfconfCacheItem ****************/
+@@ -210,7 +216,11 @@
+ GHashTable *pending_calls;
+ GHashTable *old_properties;
+
+- GStaticMutex cache_lock;
++#if GLIB_CHECK_VERSION (2, 32, 0)
++ GMutex cache_lock;
++#else
++ GMutex *cache_lock;
++#endif
+ };
+
+ typedef struct _XfconfCacheClass
+@@ -347,7 +357,11 @@
+ cache->old_properties = g_hash_table_new_full(g_str_hash, g_str_equal,
+ NULL, NULL);
+
+- g_static_mutex_init(&cache->cache_lock);
++#if GLIB_CHECK_VERSION (2, 32, 0)
++ g_mutex_init (&cache->cache_lock);
++#else
++ cache->cache_lock = g_mutex_new ();
++#endif
+ }
+
+ static void
+@@ -433,7 +447,9 @@
+ g_tree_destroy(cache->properties);
+ g_hash_table_destroy(cache->old_properties);
+
+- g_static_mutex_free(&cache->cache_lock);
++#if !GLIB_CHECK_VERSION (2, 32, 0)
++ g_mutex_free (cache->cache_lock);
++#endif
+
+ G_OBJECT_CLASS(xfconf_cache_parent_class)->finalize(obj);
+ }
+@@ -508,7 +524,7 @@
+ if(!cache->pending_calls)
+ return;
+
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+
+ old_item = g_hash_table_lookup(cache->pending_calls, call);
+ if(G_UNLIKELY(!old_item)) {
+@@ -547,12 +563,12 @@
+ }
+
+ /* we need to drop the lock when running the signal handlers */
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ g_signal_emit(G_OBJECT(cache), signals[SIG_PROPERTY_CHANGED],
+ g_quark_from_string(old_item->property),
+ cache->channel_name, old_item->property,
+ item ? item->value : &empty_val);
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+ }
+
+ /* we handled the call, so set it to %NULL */
+@@ -561,7 +577,7 @@
+ if(old_item)
+ xfconf_cache_old_item_free(old_item);
+ out:
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ }
+
+
+@@ -576,7 +592,7 @@
+ XfconfCacheOldItem *old_item;
+ GError *error = NULL;
+
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+
+ old_item = g_hash_table_lookup(cache->pending_calls, call);
+ if(G_UNLIKELY(!old_item)) {
+@@ -594,7 +610,7 @@
+ if(old_item)
+ g_hash_table_remove(cache->pending_calls, old_item->call);
+
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ }
+ #endif
+
+@@ -634,7 +650,7 @@
+
+ g_return_val_if_fail(g_tree_nnodes(cache->properties) == 0, FALSE);
+
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+
+ if(xfconf_client_get_all_properties(proxy, cache->channel_name,
+ property_base ? property_base : "/",
+@@ -647,7 +663,7 @@
+ } else
+ g_propagate_error(error, tmp_error);
+
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+
+ return ret;
+ }
+@@ -710,9 +726,9 @@
+ g_return_val_if_fail(XFCONF_IS_CACHE(cache) && property
+ && (!error || !*error), FALSE);
+
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+ ret = xfconf_cache_lookup_locked(cache, property, value, error);
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+
+ return ret;
+ }
+@@ -727,7 +743,7 @@
+ XfconfCacheItem *item = NULL;
+ XfconfCacheOldItem *old_item = NULL;
+
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+
+ item = g_tree_lookup(cache->properties, property);
+ if(!item) {
+@@ -756,7 +772,7 @@
+ {
+ /* this is bad... */
+ g_propagate_error(error, tmp_error);
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ return FALSE;
+ }
+
+@@ -771,7 +787,7 @@
+ if(item) {
+ /* if the value isn't changing, there's no reason to continue */
+ if(_xfconf_gvalue_is_equal(item->value, value)) {
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ return TRUE;
+ }
+ }
+@@ -814,7 +830,7 @@
+ g_tree_insert(cache->properties, g_strdup(property), item);
+ }
+
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+
+ g_signal_emit(G_OBJECT(cache), signals[SIG_PROPERTY_CHANGED], 0,
+ cache->channel_name, property, value);
+@@ -855,7 +871,7 @@
+ XfconfCacheOldItem *old_item = NULL;
+ #endif
+
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+
+ #if 0
+ /* it's not really feasible here to look up all the old/new values
+@@ -919,7 +935,7 @@
+ }
+ #endif
+
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+
+ return ret;
+ }
+@@ -929,10 +945,10 @@
+ xfconf_cache_set_max_entries(XfconfCache *cache,
+ gint max_entries)
+ {
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+ cache->max_entries = max_entries;
+ /* TODO: check tree for eviction */
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ }
+
+ gint
+@@ -945,10 +961,10 @@
+ xfconf_cache_set_max_age(XfconfCache *cache,
+ gint max_age)
+ {
+- xfconf_cache_mutex_lock(&cache->cache_lock);
++ xfconf_cache_mutex_lock(cache);
+ cache->max_age = max_age;
+ /* TODO: check tree for eviction */
+- xfconf_cache_mutex_unlock(&cache->cache_lock);
++ xfconf_cache_mutex_unlock(cache);
+ }
+
+ gint
Modified: head/x11/xfce4-conf/pkg-plist
==============================================================================
--- head/x11/xfce4-conf/pkg-plist Mon Oct 14 19:18:17 2013 (r330344)
+++ head/x11/xfce4-conf/pkg-plist Mon Oct 14 19:42:26 2013 (r330345)
@@ -72,7 +72,7 @@ share/dbus-1/services/org.xfce.Xfconf.se
%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo
-%%PERLBIND%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
+%%PERLBIND%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz
%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.bs
%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/.packlist
More information about the svn-ports-all
mailing list