summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-08-19 19:15:15 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-08-19 19:15:15 +0800
commitc97f26efbc90f987a9a234458a3717e3255f8ec6 (patch)
tree2a5c17efba0f886836c69744e901570668db8167
parent6e0e6a09fcea9db92887c8931dece9803986b548 (diff)
downloadmarcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.tar
marcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.tar.gz
marcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.tar.bz2
marcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.tar.lz
marcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.tar.xz
marcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.tar.zst
marcuscom-ports-c97f26efbc90f987a9a234458a3717e3255f8ec6.zip
Fix plist. Misc minor cleanups.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16122 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/dbus/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index dedfc5a77..6d9813ff5 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/dbus/Makefile,v 1.48 2011/06/03 18:44:56 kwm Exp $
+# $MCom: ports/devel/dbus/Makefile,v 1.49 2011/08/14 09:36:49 kwm Exp $
#
PORTNAME= dbus
-PORTVERSION?= 1.4.14
-PORTREVISION?= 0
+PORTVERSION= 1.4.14
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -17,7 +17,7 @@ COMMENT= A message bus system for inter-application communication
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_GNOME?= gnomehack libxml2 ltverhack
+USE_GNOME= gnomehack libxml2 ltverhack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=--localstatedir=/var \
--with-session-socket-dir=/var/tmp \
--disable-doxygen-docs \
--disable-xml-docs
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -55,6 +55,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
${WRKSRC}/dbus/Makefile.in \
${WRKSRC}/tools/Makefile.in
+ @${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s|test||g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|THREAD_LIBS -lrt|THREAD_LIBS|g ; \
s|dummy man2html|dummy man2html_disable|g' \
${WRKSRC}/configure