dbus-dfbsd: Update wip/dbus-dfbsd to pkgsrc current
This commit is contained in:
David Shao
parent
f270c44863
commit
854f0cd445
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.104 2016/12/12 13:57:44 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.109 2017/08/14 20:38:10 wiz Exp $
|
||||
|
||||
DISTNAME= dbus-1.10.14
|
||||
DISTNAME= dbus-1.10.22
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
|
||||
|
||||
|
|
@ -20,10 +20,7 @@ USE_LIBTOOL= YES
|
|||
|
||||
PKGCONFIG_OVERRIDE= dbus-1.pc.in
|
||||
|
||||
BUILD_DEFS+= VARBASE PKG SYSCONFBASE DBUS_USER DBUS_GROUP DBUS_SYSTEM_PID_FILE
|
||||
|
||||
OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
|
||||
SPECIAL_PERMS+= libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4511
|
||||
BUILD_DEFS+= VARBASE PKG_SYSCONFBASE DBUS_USER DBUS_GROUP DBUS_SYSTEM_PID_FILE
|
||||
|
||||
SMF_METHODS= dbus
|
||||
SMF_NAME= dbus
|
||||
|
|
@ -57,6 +54,11 @@ CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER}
|
|||
CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q}
|
||||
CONFIGURE_ARGS+= --with-system-pid-file=${VARBASE}/run/dbus/${DBUS_SYSTEM_PID_FILE}
|
||||
|
||||
SUBST_CLASSES+= docbook
|
||||
SUBST_STAGE.docbook= pre-configure
|
||||
SUBST_FILES.docbook= doc/*.xml*
|
||||
SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g'
|
||||
|
||||
PTHREAD_AUTO_VARS= yes
|
||||
|
||||
.if ${OPSYS} == "Linux"
|
||||
|
|
@ -64,6 +66,8 @@ PLIST.linux= yes
|
|||
.else
|
||||
CONFIGURE_ARGS+= --disable-abstract-sockets
|
||||
CONFIGURE_ARGS+= --disable-selinux
|
||||
CONFIGURE_ARGS+= --disable-apparmor
|
||||
CONFIGURE_ARGS+= --disable-systemd
|
||||
.endif
|
||||
|
||||
PLIST_VARS+= linux launchd
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
Copy port to sysutils/dbus, do not install from wip.
|
||||
|
||||
FreeBSD and DragonFly changes discussed in
|
||||
pkg/50075 (Making dbus actually work on FreeBSD, DragonFly, and
|
||||
probably more)
|
||||
implemented.
|
||||
|
|
@ -1,11 +1,13 @@
|
|||
$NetBSD: distinfo,v 1.77 2016/12/12 13:57:44 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.83 2017/08/14 20:38:10 wiz Exp $
|
||||
|
||||
SHA1 (dbus-1.10.14.tar.gz) = ea9efcf5439b53c3bdcabf8efba838c783c3639d
|
||||
RMD160 (dbus-1.10.14.tar.gz) = 1d7143cb689a8d23faa964cda7b8d4b9d5badbde
|
||||
SHA512 (dbus-1.10.14.tar.gz) = 87eda0117ee5fd47952f37a227cc017acdaa174a28e59ecd0c9f2501ffd5d56d015865d472dd9a922d8a52184662bfebff86279eb7431d19583958dd9e4dae26
|
||||
Size (dbus-1.10.14.tar.gz) = 1985828 bytes
|
||||
SHA1 (dbus-1.10.22.tar.gz) = 9d4e93475fb95498cc105af68c88eb51f3062e6d
|
||||
RMD160 (dbus-1.10.22.tar.gz) = 64615bd0f1947166dbe64ee1de92af1b6fd3256c
|
||||
SHA512 (dbus-1.10.22.tar.gz) = c5c0040717ecef66b788c5bcda94463c079502b5004639b3c1e93bb92b4de5d9be8b3fe43e18843f1d9e50411f742ba8a869375b57d479882f8aee46b613c545
|
||||
Size (dbus-1.10.22.tar.gz) = 1989350 bytes
|
||||
SHA1 (patch-ak) = ebb0c291297577a9cff246e7bc71412bf6157254
|
||||
SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194
|
||||
SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
|
||||
SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4
|
||||
SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 3dfc60eba7ab9d5a29d2a842ce0baa1b109df716
|
||||
SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
|
||||
SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
name="dbus"
|
||||
rcvar="@DBUS_RCVAR@"
|
||||
command="@PREFIX@/bin/dbus-daemon"
|
||||
command_args="--system"
|
||||
command_args="--system --fork"
|
||||
pidfile="@VARBASE@/run/dbus/@DBUS_SYSTEM_PID_FILE_SH@"
|
||||
start_precmd="dbus_prestart"
|
||||
stop_postcmd="dbus_poststop"
|
||||
|
|
@ -25,8 +25,8 @@ dbus_prestart() {
|
|||
if @TEST@ ! -d $dir; then
|
||||
@MKDIR@ $dir
|
||||
# On other systems /var/run/dbus root:wheel works fine
|
||||
# @CHMOD@ 0755 $dir
|
||||
# @CHOWN@ @DBUS_USER_SH@:@DBUS_GROUP_SH@ $dir
|
||||
@CHMOD@ 0755 $dir
|
||||
@CHOWN@ @DBUS_VAR_RUN_USER_SH@:@DBUS_VAR_RUN_GROUP_SH@ $dir
|
||||
elif @TEST@ -f $pidfile; then
|
||||
@RM@ -f $pidfile
|
||||
fi
|
||||
|
|
@ -35,6 +35,7 @@ dbus_prestart() {
|
|||
|
||||
dbus_poststop() {
|
||||
@RM@ -f $pidfile
|
||||
[ ! -d $dbdir ] || @RMDIR@ $dbdir
|
||||
}
|
||||
|
||||
load_rc_config $name
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: options.mk,v 1.10 2016/02/26 10:24:12 jperkin Exp $
|
||||
# $NetBSD: options.mk,v 1.11 2017/03/14 15:34:56 wiz Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.dbus
|
||||
PKG_SUPPORTED_OPTIONS+= debug x11 enable-in-rcvar
|
||||
PKG_SUPPORTED_OPTIONS+= debug x11 enable-in-rcvar nonroot
|
||||
PKG_SUGGESTED_OPTIONS= x11
|
||||
|
||||
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
|
||||
|
|
@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --with-x
|
|||
BUILDLINK_DEPMETHOD.libXt= build
|
||||
. include "../../x11/libXt/buildlink3.mk"
|
||||
.else
|
||||
CONFIGURE_ARGS= --without-x
|
||||
CONFIGURE_ARGS+= --without-x
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mlaunchd)
|
||||
|
|
@ -55,11 +55,22 @@ CONFIGURE_ARGS+= --with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents
|
|||
CONFIGURE_ARGS+= --disable-launchd
|
||||
.endif
|
||||
|
||||
|
||||
.if !empty(PKG_OPTIONS:Menable-in-rcvar)
|
||||
DBUS_RCVAR= dbus_enable
|
||||
.else
|
||||
DBUS_RCVAR= dbus
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mnonroot)
|
||||
OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
|
||||
SPECIAL_PERMS+= libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4511
|
||||
FILES_SUBST+= DBUS_VAR_RUN_USER_SH=${DBUS_USER}
|
||||
FILES_SUBST+= DBUS_VAR_RUN_GROUP_SH=${DBUS_GROUP}
|
||||
.else
|
||||
OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
|
||||
SPECIAL_PERMS+= libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4750
|
||||
FILES_SUBST+= DBUS_VAR_RUN_USER_SH=${REAL_ROOT_USER}
|
||||
FILES_SUBST+= DBUS_VAR_RUN_GROUP_SH=${REAL_ROOT_GROUP}
|
||||
.endif
|
||||
|
||||
FILES_SUBST+= DBUS_RCVAR=${DBUS_RCVAR}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-configure,v 1.5 2017/05/23 15:12:57 jperkin Exp $
|
||||
|
||||
Don't blanket define _XOPEN_SOURCE on SunOS, patch where required instead.
|
||||
|
||||
--- configure.orig 2017-04-05 15:25:13.000000000 +0000
|
||||
+++ configure
|
||||
@@ -23169,7 +23169,7 @@ case $host_os in
|
||||
# ... this opt-in to get sockaddr_in6 and sockaddr_storage...
|
||||
CFLAGS="$CFLAGS -D__EXTENSIONS__"
|
||||
# ... and this opt-in to get file descriptor passing support
|
||||
- CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
|
||||
+ #CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.5 2017/05/24 08:06:28 jperkin Exp $
|
||||
|
||||
Support _XOPEN_SOURCE requirements on SunOS with different compiler defaults.
|
||||
|
||||
--- dbus/dbus-sysdeps-unix.c.orig 2017-02-16 13:46:23.000000000 +0000
|
||||
+++ dbus/dbus-sysdeps-unix.c
|
||||
@@ -24,6 +24,14 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#ifdef __sun
|
||||
+# if __STDC_VERSION__ - 0 < 199901L
|
||||
+#define _XOPEN_SOURCE 500
|
||||
+# else
|
||||
+#define _XOPEN_SOURCE 600
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
#include "dbus-internals.h"
|
||||
#include "dbus-sysdeps.h"
|
||||
#include "dbus-sysdeps-unix.h"
|
||||
Loading…
Reference in New Issue