svn commit: r551332 - in head/devel/dbus: . files
Mateusz Piotrowski
0mp at FreeBSD.org
Sat Oct 3 17:11:57 UTC 2020
Author: 0mp
Date: Sat Oct 3 17:11:56 2020
New Revision: 551332
URL: https://svnweb.freebsd.org/changeset/ports/551332
Log:
devel/dbus: Fix honoring LOCALBASE
Bits we were replacing in dbus/dbus-sysdeps-unix.c were moved to
dbus/dbus-sysdeps-util-unix.c. Make the patch more robust by first using
a patch and then REINPLACE_CMD.
Approved by: portmgr blanket
Modified:
head/devel/dbus/Makefile
head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
Modified: head/devel/dbus/Makefile
==============================================================================
--- head/devel/dbus/Makefile Sat Oct 3 17:02:18 2020 (r551331)
+++ head/devel/dbus/Makefile Sat Oct 3 17:11:56 2020 (r551332)
@@ -3,7 +3,7 @@
PORTNAME= dbus
DISTVERSION= 1.12.20
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -52,8 +52,8 @@ X11_USE= XORG=ice,sm,x11
X11_CONFIGURE_WITH= x
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- ${WRKSRC}/dbus/dbus-sysdeps-unix.c
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/dbus/dbus-sysdeps-util-unix.c
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
Modified: head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
==============================================================================
--- head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c Sat Oct 3 17:02:18 2020 (r551331)
+++ head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c Sat Oct 3 17:11:56 2020 (r551332)
@@ -8,3 +8,39 @@
#include <sys/stat.h>
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
+@@ -1367,7 +1368,7 @@ out:
+ * On UNIX this should be the standard xdg freedesktop.org data directories:
+ *
+ * XDG_DATA_HOME=${XDG_DATA_HOME-$HOME/.local/share}
+- * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
++ * XDG_DATA_DIRS=${XDG_DATA_DIRS-%%LOCALBASE%%/share:/usr/share}
+ *
+ * and
+ *
+@@ -1424,7 +1425,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir
+ }
+ else
+ {
+- if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
++ if (!_dbus_string_append (&servicedir_path, "%%LOCALBASE%%/share:/usr/share:"))
+ goto oom;
+ }
+
+@@ -1457,7 +1458,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir
+ *
+ * On UNIX this should be the standard xdg freedesktop.org data directories:
+ *
+- * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
++ * XDG_DATA_DIRS=${XDG_DATA_DIRS-%%LOCALBASE%%/share:/usr/share}
+ *
+ * and
+ *
+@@ -1482,7 +1483,7 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs
+ * be available.
+ */
+ static const char standard_search_path[] =
+- "/usr/local/share:"
++ "%%LOCALBASE%%/share:"
+ "/usr/share:"
+ DBUS_DATADIR ":"
+ "/lib";
More information about the svn-ports-all
mailing list