summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-08-28 04:13:55 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-08-28 04:13:55 +0800
commita7aa15dc53a7ec0b44c7f249a1e013958f2e52ed (patch)
tree4452fbb3a0d9338d6d740c86b470e5602ed6f8b2 /x11
parent0b4328a867e6e59bcde24a25aff4abec71566232 (diff)
downloadmarcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.tar
marcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.tar.gz
marcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.tar.bz2
marcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.tar.lz
marcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.tar.xz
marcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.tar.zst
marcuscom-ports-a7aa15dc53a7ec0b44c7f249a1e013958f2e52ed.zip
Sync with FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9468 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f96d2ba87..87ec94d5b 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.73 2007/08/15 20:30:07 marcus Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.74 2007/08/18 16:08:20 marcus Exp $
#
PORTNAME= gdm
@@ -33,7 +33,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-console-kit=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
@@ -46,7 +45,8 @@ GNOME_LOCALSTATEDIR= /var
MAN1= gdm.1
OPTIONS= IPV6 "Enable IPv6 support" on \
- LOG_LIMIT "Limit ~/.xsession-errors size" on
+ LOG_LIMIT "Limit ~/.xsession-errors size" on \
+ CONSOLEKIT "Enable ConsoleKit support" off
.include <bsd.port.pre.mk>
@@ -66,6 +66,13 @@ CONFIGURE_ARGS+= --disable-ipv6
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c
.endif
+.if defined(WITH_CONSOLEKIT)
+CONFIGURE_ARGS+=--with-console-kit=yes
+LIB_DEPENDS+= ck-connector.0:${PORTSDIR}/sysutils/consolekit
+.else
+CONFIGURE_ARGS+=--with-console-kit=no
+.endif
+
post-patch:
.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
( ${OSVERSION} < 503101 )
@@ -88,8 +95,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \
${PREFIX}/etc/gdm/custom.conf.default
@${MKDIR} ${PREFIX}/etc/gdm/Sessions
-# @${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
-# ${PREFIX}/share/gdm/icons/hicolor
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}