svn commit: r440100 - in head: audio/pulseaudio devel/glib20

[Tijl Coosemans]

Author: tijl
Date: Thu May  4 12:08:12 2017
New Revision: 440100
URL: https://svnweb.freebsd.org/changeset/ports/440100

Log:
  r431187 moved machine-id to the upstream default location.  Remove patching
  of the path in audio/pulseaudio and devel/glib20.
  
  PR:		218983, 218984

Modified:
  head/audio/pulseaudio/Makefile
  head/devel/glib20/Makefile

Modified: head/audio/pulseaudio/Makefile
==============================================================================
--- head/audio/pulseaudio/Makefile	Thu May  4 11:09:50 2017	(r440099)
+++ head/audio/pulseaudio/Makefile	Thu May  4 12:08:12 2017	(r440100)
@@ -6,7 +6,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -102,7 +102,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/src/daemon/default.pa.in
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
-		-e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
 		${WRKSRC}/configure
 
 post-install:

Modified: head/devel/glib20/Makefile
==============================================================================
--- head/devel/glib20/Makefile	Thu May  4 11:09:50 2017	(r440099)
+++ head/devel/glib20/Makefile	Thu May  4 12:08:12 2017	(r440100)
@@ -3,7 +3,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.50.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -93,9 +93,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \
 			${WRKSRC}/glib/gutils.c
-	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
-		${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \
-		${WRKSRC}/po/*.po
 	@${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \
 		s|-Werror|| ; \
 		s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure