summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-02-15 23:06:49 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-02-15 23:06:49 +0800
commitc8996248cedb4e05a43c6558eeb3abf38086441d (patch)
tree220735bf8b41c39acc28fca4ff41603d920ddfe6 /devel
parent50c9cbf6f0ec0e407010ebabe7315a923f689389 (diff)
downloadmarcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.tar
marcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.tar.gz
marcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.tar.bz2
marcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.tar.lz
marcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.tar.xz
marcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.tar.zst
marcuscom-ports-c8996248cedb4e05a43c6558eeb3abf38086441d.zip
Add Portscout macro, port to OptionsNG. This exposes X11 option dialog.
While here replace PTHREAD_LIBS with -pthread. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17204 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
-rw-r--r--devel/dbus/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index c8364b295..201521b47 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -1,6 +1,6 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/devel/dbus/Makefile,v 1.56 2012/08/16 14:28:17 kwm Exp $
+# $MCom: ports/devel/dbus/Makefile,v 1.57 2012/11/07 10:01:28 kwm Exp $
PORTNAME= dbus
PORTVERSION= 1.6.8
@@ -12,6 +12,8 @@ COMMENT= A message bus system for inter-application communication
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
+PORTSCOUT= limitw:1,even
+
USE_GNOME= gnomehack libxml2 ltverhack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
@@ -23,9 +25,8 @@ CONFIGURE_ARGS=--localstatedir=/var \
--with-session-socket-dir=/tmp \
--disable-doxygen-docs \
--disable-xml-docs
-CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
USE_RC_SUBR= dbus
USE_GNOME_SUBR= yes
@@ -38,7 +39,12 @@ PLIST_SUB= VERSION="1.0"
MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
-.if !defined(WITHOUT_X11)
+OPTIONS_DEFINE= X11
+OPTIONS_DEFAULT=X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
USE_XORG= ice sm x11
.else
CONFIGURE_ARGS+=--without-x