diff options
| author | kwm <kwm@FreeBSD.org> | 2013-03-19 18:40:22 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2013-03-19 18:40:22 +0800 |
| commit | 4f3e737e3339df65a7737d86948a5c8dacedae60 (patch) | |
| tree | 7a5f4c1c91d14d9fcab2b30589db732cde4a3725 /x11/gdm/Makefile | |
| parent | 38d22f91997e71dd03618ec2d16c51e19e000cd9 (diff) | |
| download | freebsd-ports-gnome-4f3e737e3339df65a7737d86948a5c8dacedae60.tar.gz freebsd-ports-gnome-4f3e737e3339df65a7737d86948a5c8dacedae60.tar.zst freebsd-ports-gnome-4f3e737e3339df65a7737d86948a5c8dacedae60.zip | |
Convert almost all gnome@ ports to OptionsNG, trim header, use USES=pathfix
instead of gnomehack and pet portlint.
Add conflicts with future gnome3 versions.
Reviewed by: miwi, bapt
Diffstat (limited to 'x11/gdm/Makefile')
| -rw-r--r-- | x11/gdm/Makefile | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index e5a702086f78..06c3b8a7fe1b 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: gdm2 -# Date created: 20 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $ -# +# $MCom: ports/x11/gdm/Makefile,v 1.192 2012/09/03 16:28:28 mezz Exp $ PORTNAME= gdm -PORTVERSION= 2.30.5 -PORTREVISION= 6 +PORTVERSION= 2.30.7 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,21 +14,23 @@ COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ - polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ +LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \ + polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ - upower-glib.1:${PORTSDIR}/sysutils/upower \ - xklavier.12:${PORTSDIR}/x11/libxklavier \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra + upower-glib:${PORTSDIR}/sysutils/upower \ + xklavier:${PORTSDIR}/x11/libxklavier \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ gnome-session:${PORTSDIR}/x11/gnome-session \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +CONFLICTS= gdm-3.[0-9]* + USERS= gdm GROUPS= gdm -USE_BZIP2= yes +USE_XZ= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_XORG= dmx dmxproto @@ -40,7 +38,8 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ +USES= pathfix +USE_GNOME= intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes @@ -58,19 +57,20 @@ PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var -OPTIONS= IPV6 "Enable IPv6 support" off \ - KEYRING "Enable GnomeKeyring/PAM integration" on +OPTIONS_DEFINE= IPV6 KEYRING +OPTIONS_DEFAULt=KEYRING +KEYRING_DESC= GnomeKeyring/PAM integration -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_KEYRING) -SUB_LIST+= PAM_KEYRING=\# -.else -LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +.if ${PORT_OPTIONS:MKEYRING} +LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring SUB_LIST+= PAM_KEYRING= +.else +SUB_LIST+= PAM_KEYRING=\# .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -106,4 +106,4 @@ post-install: | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> |