diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index 04310d6ba31..15ebe503fa2 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -1,36 +1,45 @@ -# $OpenBSD: Makefile,v 1.2 2009/06/07 07:49:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2009/10/16 09:36:56 ajacoutot Exp $ + +BROKEN= WIP does not work yet COMMENT= Framework for defining and tracking users DISTNAME= ConsoleKit-0.3.0 -PKGNAME= ${DISTNAME:L}p0 +PKGNAME= ${DISTNAME:L}p1 + CATEGORIES= sysutils + EXTRACT_SUFX= .tar.bz2 SHARED_LIBS+= ck-connector 0.0 HOMEPAGE= http://freedesktop.org/wiki/Software/ConsoleKit +MANTAINER= Antoine Jacoutot + # GPLv2+ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -WANTLIB= c +WANTLIB += X11 Xau Xdmcp c dbus-1 dbus-glib-1 expat glib-2.0 gobject-2.0 +WANTLIB += gthread-2.0 kvm pcre pthread pthread-stubs xcb z -MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ +MASTER_SITES= ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ + +LIB_DEPENDS= polkit::sysutils/policykit MODULES= devel/gettext -AUTOCONF_VERSION= 2.61 -CONFIGURE_STYLE= autoconf -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --localstatedir=/var \ - --with-pid-file=/var/run/consolekit.pid \ - --with-authfw=bsdauth \ - --with-os-type=openbsd -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +AUTOCONF_VERSION= 2.61 +CONFIGURE_STYLE= autoconf +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --localstatedir=/var \ + --with-pid-file=/var/run/consolekit.pid \ + --with-authfw=bsdauth \ + --with-os-type=openbsd +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" USE_LIBTOOL= Yes USE_GMAKE= Yes diff --git a/sysutils/consolekit/patches/patch-configure_ac b/sysutils/consolekit/patches/patch-configure_ac index c11fd1d0779..d3da85f039c 100644 --- a/sysutils/consolekit/patches/patch-configure_ac +++ b/sysutils/consolekit/patches/patch-configure_ac @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure_ac,v 1.1.1.1 2009/06/07 02:55:19 robert Exp $ +$OpenBSD: patch-configure_ac,v 1.2 2009/10/16 09:36:56 ajacoutot Exp $ --- configure.ac.orig Sat May 30 23:09:15 2009 +++ configure.ac Sat May 30 23:10:16 2009 @@ -176,6 +176,14 @@ dnl -------------------------------------------------- @@ -36,6 +36,3 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2009/06/07 02:55:19 robert Exp $ echo " a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE" echo " ConsoleKit.conf to match your distro/site to avoid NASTY SECURITY HOLES." echo "" --fi -\ No newline at end of file -+fi diff --git a/sysutils/consolekit/patches/patch-src_ck-run-programs_c b/sysutils/consolekit/patches/patch-src_ck-run-programs_c index 4b40cb1840d..2b01905b093 100644 --- a/sysutils/consolekit/patches/patch-src_ck-run-programs_c +++ b/sysutils/consolekit/patches/patch-src_ck-run-programs_c @@ -1,4 +1,7 @@ -$OpenBSD: patch-src_ck-run-programs_c,v 1.1.1.1 2009/06/07 02:55:19 robert Exp $ +$OpenBSD: patch-src_ck-run-programs_c,v 1.2 2009/10/16 09:36:56 ajacoutot Exp $ + +https://bugs.freedesktop.org/show_bug.cgi?id=17893 + --- src/ck-run-programs.c.orig Sun May 31 19:37:54 2009 +++ src/ck-run-programs.c Sun May 31 19:38:07 2009 @@ -225,6 +225,7 @@ ck_run_programs (const char *dirpath, diff --git a/sysutils/consolekit/patches/patch-src_ck-session_c b/sysutils/consolekit/patches/patch-src_ck-session_c index 891bb0b40c1..d29475d9ea3 100644 --- a/sysutils/consolekit/patches/patch-src_ck-session_c +++ b/sysutils/consolekit/patches/patch-src_ck-session_c @@ -1,4 +1,7 @@ -$OpenBSD: patch-src_ck-session_c,v 1.1.1.1 2009/06/07 02:55:19 robert Exp $ +$OpenBSD: patch-src_ck-session_c,v 1.2 2009/10/16 09:36:56 ajacoutot Exp $ + +https://bugs.freedesktop.org/show_bug.cgi?id=18330 + --- src/ck-session.c.orig Sun May 31 19:37:12 2009 +++ src/ck-session.c Sun May 31 19:37:38 2009 @@ -1100,6 +1100,8 @@ ck_session_finalize (GObject *object) diff --git a/sysutils/consolekit/patches/patch-src_ck-sysdeps-openbsd_c b/sysutils/consolekit/patches/patch-src_ck-sysdeps-openbsd_c index 6fc34f56db3..94ddb2edfc9 100644 --- a/sysutils/consolekit/patches/patch-src_ck-sysdeps-openbsd_c +++ b/sysutils/consolekit/patches/patch-src_ck-sysdeps-openbsd_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_ck-sysdeps-openbsd_c,v 1.1.1.1 2009/06/07 02:55:19 robert Exp $ +$OpenBSD: patch-src_ck-sysdeps-openbsd_c,v 1.2 2009/10/16 09:36:56 ajacoutot Exp $ --- src/ck-sysdeps-openbsd.c.orig Sun May 31 04:10:36 2009 +++ src/ck-sysdeps-openbsd.c Sun May 31 19:24:53 2009 @@ -0,0 +1,412 @@ @@ -7,7 +7,7 @@ $OpenBSD: patch-src_ck-sysdeps-openbsd_c,v 1.1.1.1 2009/06/07 02:55:19 robert Ex + * Copyright (C) 2006 William Jon McCann + * Copyright (C) 2007 Joe Marcus Clarke + * Copyright (C) 2008 Jared D. McNeill -+ * Copyright (C) 2009 Jared D. McNeill ++ * Copyright (C) 2009 Robert Nagy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by