diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/dbus/Makefile | 16 | ||||
| -rw-r--r-- | devel/dbus/distinfo | 4 | ||||
| -rw-r--r-- | devel/dbus/files/dbus.in | 2 | ||||
| -rw-r--r-- | devel/dbus/files/patch-bus_Makefile.in | 20 |
4 files changed, 8 insertions, 34 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index e5322b4e9..9850562cf 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/dbus/Makefile,v 1.46 2011/03/06 22:39:38 kwm Exp $ +# $MCom: ports/devel/dbus/Makefile,v 1.47 2011/04/30 20:43:15 mezz Exp $ # PORTNAME= dbus -PORTVERSION?= 1.4.6 +PORTVERSION?= 1.4.10 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ @@ -28,11 +28,10 @@ CONFIGURE_ARGS=--localstatedir=/var \ --with-session-socket-dir=/var/tmp \ --disable-doxygen-docs \ --disable-xml-docs -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.if !defined(DBUS_SLAVE) USE_RC_SUBR= dbus USE_GNOME_SUBR= yes @@ -49,9 +48,6 @@ USE_XORG= x11 .else CONFIGURE_ARGS+=--without-x .endif -.endif - -.include <bsd.port.pre.mk> post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ @@ -63,12 +59,10 @@ post-patch: s|dummy man2html|dummy man2html_disable|g' \ ${WRKSRC}/configure -.if !defined(DBUS_SLAVE) post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${MKDIR} ${PREFIX}/share/dbus-1/interfaces -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 4740679b7..1b9ff153b 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,2 +1,2 @@ -SHA256 (dbus-1.4.6.tar.gz) = 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567 -SIZE (dbus-1.4.6.tar.gz) = 1835214 +SHA256 (dbus-1.4.10.tar.gz) = fcb4b41121525d485da32b5c988e1b31cab109c74d72c5abf05ae2a5b7db9517 +SIZE (dbus-1.4.10.tar.gz) = 1862554 diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in index c012378e0..1a5a669ee 100644 --- a/devel/dbus/files/dbus.in +++ b/devel/dbus/files/dbus.in @@ -31,7 +31,7 @@ dbus_prestart() mkdir -p /var/db/dbus fi if [ ! -f /var/db/dbus/machine-id ]; then - dbus-uuidgen > /var/db/dbus/machine-id + %%PREFIX%%/bin/dbus-uuidgen > /var/db/dbus/machine-id fi mkdir -p $(dirname $pidfile) diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in deleted file mode 100644 index b55c5dc79..000000000 --- a/devel/dbus/files/patch-bus_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- bus/Makefile.in.orig 2008-01-22 14:45:58.000000000 -0500 -+++ bus/Makefile.in 2008-01-22 15:24:26.000000000 -0500 -@@ -412,7 +412,7 @@ target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - configdir = $(sysconfdir)/dbus-1 --INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ -+INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION - -@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \ - $(DBUS_BUS_LIBS) \ - $(top_builddir)/dbus/libdbus-convenience.la - --dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ -+dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ - LAUNCH_HELPER_SOURCES = \ - $(XML_SOURCES) \ - config-parser-common.c \ |