[Midnightbsd-cvs] mports [17539] dbus 1.8.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 27 08:18:27 EDT 2014


Revision: 17539
          http://svnweb.midnightbsd.org/mports/?rev=17539
Author:   laffer1
Date:     2014-09-27 08:18:26 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
dbus 1.8.8

Modified Paths:
--------------
    trunk/devel/dbus/Makefile
    trunk/devel/dbus/distinfo
    trunk/devel/dbus/files/dbus.in
    trunk/devel/dbus/files/patch-doc_Makefile.in
    trunk/devel/dbus/pkg-plist

Property Changed:
----------------
    trunk/devel/dbus/files/dbus.in
    trunk/devel/dbus/files/patch-bus__session.conf.in
    trunk/devel/dbus/files/patch-bus__system.conf.in
    trunk/devel/dbus/files/patch-dbus-1.pc.in
    trunk/devel/dbus/files/patch-dbus_Makefile.in
    trunk/devel/dbus/files/patch-dbus_dbus-connection.c
    trunk/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
    trunk/devel/dbus/files/patch-doc_Makefile.in

Modified: trunk/devel/dbus/Makefile
===================================================================
--- trunk/devel/dbus/Makefile	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/Makefile	2014-09-27 12:18:26 UTC (rev 17539)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	dbus
-PORTVERSION=	1.6.18
+PORTVERSION=	1.8.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -10,10 +10,10 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-USE_GNOME=	libxml2 ltverhack
-USES=		gmake pathfix
+USE_GNOME=
+USES=		gmake libtool:keepla pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--localstatedir=/var \
@@ -21,10 +21,10 @@
 		--with-system-pid-file=/var/run/dbus/dbus.pid \
 		--with-system-socket=/var/run/dbus/system_bus_socket \
 		--with-session-socket-dir=/tmp \
-		--disable-doxygen-docs \
-		--disable-xml-docs
+		--disable-doxygen-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
@@ -32,28 +32,23 @@
 USERS=		messagebus
 GROUPS=		messagebus
 
-PLIST_SUB=	VERSION="1.0"
+PLIST_SUB=	VERSION="1.0" GROUPS=${GROUPS}
 
-MAN1=		dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
-		dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
-
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	MANPAGES X11
+OPTIONS_DEFAULT=MANPAGES X11
 X11_DESC=	Support X11 Desktop Environments
 
-.include <bsd.mport.options.mk>
+MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_CONFIGURE_ENABLE=	xml-docs
+X11_USE=		xorg=ice,sm,x11
+X11_CONFIGURE_WITH=	x
 
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	ice sm x11
-.else
-CONFIGURE_ARGS+=--without-x
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/dbus/dbus-sysdeps-unix.c
 	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
-		${WRKSRC}/doc/dbus-uuidgen.1 \
+		${WRKSRC}/doc/dbus-uuidgen.1.xml.in \
 		${WRKSRC}/dbus/Makefile.in \
 		${WRKSRC}/tools/Makefile.in
 	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s|test||g' ${WRKSRC}/Makefile.in

Modified: trunk/devel/dbus/distinfo
===================================================================
--- trunk/devel/dbus/distinfo	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/distinfo	2014-09-27 12:18:26 UTC (rev 17539)
@@ -1,2 +1,2 @@
-SHA256 (dbus-1.6.18.tar.gz) = 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd
-SIZE (dbus-1.6.18.tar.gz) = 1916553
+SHA256 (dbus-1.8.8.tar.gz) = dfab263649a979d0fff64a30cac374891a8e9940350e41f3bbd7679af32bd1fd
+SIZE (dbus-1.8.8.tar.gz) = 1864881

Modified: trunk/devel/dbus/files/dbus.in
===================================================================
--- trunk/devel/dbus/files/dbus.in	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/dbus.in	2014-09-27 12:18:26 UTC (rev 17539)
@@ -30,9 +30,7 @@
     if [ ! -d /var/db/dbus ]; then
         mkdir -p /var/db/dbus
     fi
-    if [ ! -f /var/db/dbus/machine-id ]; then
-        %%PREFIX%%/bin/dbus-uuidgen > /var/db/dbus/machine-id
-    fi
+    %%PREFIX%%/bin/dbus-uuidgen --ensure
 
     mkdir -p $(dirname $pidfile)
 }


Property changes on: trunk/devel/dbus/files/dbus.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.9
\ No newline at end of property
Index: trunk/devel/dbus/files/patch-bus__session.conf.in
===================================================================
--- trunk/devel/dbus/files/patch-bus__session.conf.in	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-bus__session.conf.in	2014-09-27 12:18:26 UTC (rev 17539)

Property changes on: trunk/devel/dbus/files/patch-bus__session.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/dbus/files/patch-bus__system.conf.in
===================================================================
--- trunk/devel/dbus/files/patch-bus__system.conf.in	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-bus__system.conf.in	2014-09-27 12:18:26 UTC (rev 17539)

Property changes on: trunk/devel/dbus/files/patch-bus__system.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/dbus/files/patch-dbus-1.pc.in
===================================================================
--- trunk/devel/dbus/files/patch-dbus-1.pc.in	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-dbus-1.pc.in	2014-09-27 12:18:26 UTC (rev 17539)

Property changes on: trunk/devel/dbus/files/patch-dbus-1.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/devel/dbus/files/patch-dbus_Makefile.in
===================================================================
--- trunk/devel/dbus/files/patch-dbus_Makefile.in	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-dbus_Makefile.in	2014-09-27 12:18:26 UTC (rev 17539)

Property changes on: trunk/devel/dbus/files/patch-dbus_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/dbus/files/patch-dbus_dbus-connection.c
===================================================================
--- trunk/devel/dbus/files/patch-dbus_dbus-connection.c	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-dbus_dbus-connection.c	2014-09-27 12:18:26 UTC (rev 17539)

Property changes on: trunk/devel/dbus/files/patch-dbus_dbus-connection.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
===================================================================
--- trunk/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c	2014-09-27 12:18:26 UTC (rev 17539)

Property changes on: trunk/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/devel/dbus/files/patch-doc_Makefile.in
===================================================================
--- trunk/devel/dbus/files/patch-doc_Makefile.in	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/files/patch-doc_Makefile.in	2014-09-27 12:18:26 UTC (rev 17539)
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	2011-08-14 11:28:23.000000000 +0200
-+++ doc/Makefile.in	2011-08-14 11:28:47.000000000 +0200
-@@ -604,8 +604,8 @@ info: info-am
+--- doc/Makefile.in.orig	2014-09-27 08:10:07.000000000 -0400
++++ doc/Makefile.in	2014-09-27 08:14:35.000000000 -0400
+@@ -688,8 +688,8 @@
  
  info-am:
  
@@ -11,3 +11,16 @@
  
  install-dvi: install-dvi-am
  
+@@ -758,10 +758,10 @@
+ 
+ 
+ @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
+- at DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) html-nochunks $<
++ at DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) --skip-validation html-nochunks $<
+ 
+ @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
+- at DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) man $<
++ at DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) --skip-validation man $<
+ 
+ @DBUS_DOXYGEN_DOCS_ENABLED_TRUE at all-local:: doxygen.stamp
+ 


Property changes on: trunk/devel/dbus/files/patch-doc_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/dbus/pkg-plist
===================================================================
--- trunk/devel/dbus/pkg-plist	2014-09-27 11:56:00 UTC (rev 17538)
+++ trunk/devel/dbus/pkg-plist	2014-09-27 12:18:26 UTC (rev 17539)
@@ -2,6 +2,7 @@
 bin/dbus-daemon
 bin/dbus-launch
 bin/dbus-monitor
+bin/dbus-run-session
 bin/dbus-send
 bin/dbus-uuidgen
 etc/dbus-1/session.conf
@@ -27,9 +28,16 @@
 lib/libdbus-1.a
 lib/libdbus-1.la
 lib/libdbus-1.so
-lib/libdbus-1.so.3
+lib/libdbus-1.so.11
 libdata/pkgconfig/dbus-1.pc
 libexec/dbus-daemon-launch-helper
+%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
+%%MANPAGES%%man/man1/dbus-daemon.1.gz
+%%MANPAGES%%man/man1/dbus-launch.1.gz
+%%MANPAGES%%man/man1/dbus-monitor.1.gz
+%%MANPAGES%%man/man1/dbus-run-session.1.gz
+%%MANPAGES%%man/man1/dbus-send.1.gz
+%%MANPAGES%%man/man1/dbus-uuidgen.1.gz
 @exec mkdir -p %D/etc/dbus-1/system.d
 @exec mkdir -p %D/share/dbus-1/interfaces
 @exec mkdir -p %D/share/dbus-1/services



More information about the Midnightbsd-cvs mailing list