diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-04 02:44:57 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-04 02:44:57 +0800 |
| commit | 64271989d0808e017bf6d18d7fc2152b3508c4d6 (patch) | |
| tree | dac04a2ebef045e0cebe10beebf595e5742571ad /devel/dbus/Makefile | |
| parent | b529f5c1046129d644ab9e47a7d02b58e32e0832 (diff) | |
| download | marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.tar marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.tar.gz marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.tar.bz2 marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.tar.lz marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.tar.xz marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.tar.zst marcuscom-ports-64271989d0808e017bf6d18d7fc2152b3508c4d6.zip | |
Update to 1.4.10.
Specify full path to the dbus-uuidgen binary. [1]
This fixes generating /var/db/dbus/machine-id on boot,
when /usr/local/bin isn't in PATH yet.
Remove DBUS_SLAVE I can't find anywhere where it is used.
we don't need pre.mk/post.mk.
Submitted by: Michal Varga <varga.michal@gmail.com> [1]
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16024 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/dbus/Makefile')
| -rw-r--r-- | devel/dbus/Makefile | 16 |
1 files changed, 5 insertions, 11 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> |