svn commit: r313767 - in head/devel/dbus: . files

[Koop Mast]

Author: kwm
Date: Sat Mar  9 22:36:49 2013
New Revision: 313767
URL: http://svnweb.freebsd.org/changeset/ports/313767

Log:
  Update to 1.6.8.
  Update Makefile header, port to OptionsNG and pet portlint.
  Add portscout macro

Deleted:
  head/devel/dbus/files/patch-dbus_dbus-protocol.h
Modified:
  head/devel/dbus/Makefile
  head/devel/dbus/distinfo
  head/devel/dbus/files/patch-dbus-1.pc.in
  head/devel/dbus/pkg-deinstall
  head/devel/dbus/pkg-plist

Modified: head/devel/dbus/Makefile
==============================================================================
--- head/devel/dbus/Makefile	Sat Mar  9 22:22:52 2013	(r313766)
+++ head/devel/dbus/Makefile	Sat Mar  9 22:36:49 2013	(r313767)
@@ -1,21 +1,18 @@
-# New ports collection makefile for:   D-BUS
-# Date Created:			22 June 2004
-# Whom:				Joe Marcus Clarke <marcus at FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/dbus/Makefile,v 1.51 2011/08/30 08:13:48 kwm Exp $
-#
+#   $MCom: ports/devel/dbus/Makefile,v 1.58 2013/02/15 15:06:49 kwm Exp $
 
 PORTNAME=	dbus
-PORTVERSION=	1.4.14
-PORTREVISION=	4
+PORTVERSION=	1.6.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	A message bus system for inter-application communication
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+
+PORTSCOUT=	limitw:1,even
 
 USE_GNOME=	gnomehack libxml2 ltverhack
 USE_GMAKE=	yes
@@ -42,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

Modified: head/devel/dbus/distinfo
==============================================================================
--- head/devel/dbus/distinfo	Sat Mar  9 22:22:52 2013	(r313766)
+++ head/devel/dbus/distinfo	Sat Mar  9 22:36:49 2013	(r313767)
@@ -1,2 +1,2 @@
-SHA256 (dbus-1.4.14.tar.gz) = 47f27efc29aa9d1cc64b74e374204084d6fd53191e70dd584b604181059e5877
-SIZE (dbus-1.4.14.tar.gz) = 1880298
+SHA256 (dbus-1.6.8.tar.gz) = fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac
+SIZE (dbus-1.6.8.tar.gz) = 1929630

Modified: head/devel/dbus/files/patch-dbus-1.pc.in
==============================================================================
--- head/devel/dbus/files/patch-dbus-1.pc.in	Sat Mar  9 22:22:52 2013	(r313766)
+++ head/devel/dbus/files/patch-dbus-1.pc.in	Sat Mar  9 22:36:49 2013	(r313767)
@@ -1,8 +1,8 @@
---- dbus-1.pc.in.orig	2010-08-31 21:44:19.000000000 +0000
-+++ dbus-1.pc.in	2010-09-18 17:52:00.000000000 +0000
-@@ -13,4 +13,4 @@ Name: dbus
- Description: Free desktop message bus
+--- dbus-1.pc.in.orig	2012-06-05 13:17:45.000000000 +0200
++++ dbus-1.pc.in	2012-06-18 00:26:56.000000000 +0200
+@@ -14,4 +14,4 @@
  Version: @VERSION@
- Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@
+ Libs: -L${libdir} -ldbus-1
+ Libs.private: @LIBDBUS_LIBS@
 -Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
 +Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include

Modified: head/devel/dbus/pkg-deinstall
==============================================================================
--- head/devel/dbus/pkg-deinstall	Sat Mar  9 22:22:52 2013	(r313766)
+++ head/devel/dbus/pkg-deinstall	Sat Mar  9 22:36:49 2013	(r313767)
@@ -9,7 +9,7 @@ DEINSTALL)
 	echo "To really remove the dbus port, please remove the following"
 	echo "directories and the content manualy:"
 	echo ""
-	echo "/var/run/dbus /var/db/dbus"
+	echo "/var/run/dbus and /var/db/dbus"
 	echo ""
 	;;
 esac

Modified: head/devel/dbus/pkg-plist
==============================================================================
--- head/devel/dbus/pkg-plist	Sat Mar  9 22:22:52 2013	(r313766)
+++ head/devel/dbus/pkg-plist	Sat Mar  9 22:36:49 2013	(r313767)
@@ -19,6 +19,7 @@ include/dbus-%%VERSION%%/dbus/dbus-proto
 include/dbus-%%VERSION%%/dbus/dbus-server.h
 include/dbus-%%VERSION%%/dbus/dbus-shared.h
 include/dbus-%%VERSION%%/dbus/dbus-signature.h
+include/dbus-%%VERSION%%/dbus/dbus-syntax.h
 include/dbus-%%VERSION%%/dbus/dbus-threads.h
 include/dbus-%%VERSION%%/dbus/dbus-types.h
 include/dbus-%%VERSION%%/dbus/dbus.h