diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-07 00:09:58 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-07 00:09:58 +0800 |
| commit | 22ac137ba106297b5a5e33a59c9e33f5d7f01036 (patch) | |
| tree | 016ffc877ad80886e1963990713f653c362e1a2c /x11/gdm | |
| parent | afe6ebdf34fb4a51823a931978ce122f2033eada (diff) | |
| download | marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.gz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.zst marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.zip | |
Sync with ports, mostly OptionsNG conversion and some diff reductions.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18518 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 15 | ||||
| -rw-r--r-- | x11/gdm/files/gdm.pam.in | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 8da193150..283ab4bdc 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -31,13 +31,13 @@ USERS= gdm GROUPS= gdm USE_XZ= yes -USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_XORG= dmx dmxproto INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes +USES= gettext pathfix pkgconfig USE_GNOME= intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas @@ -56,19 +56,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.options.mk> -.if defined(WITHOUT_KEYRING) -SUB_LIST+= PAM_KEYRING=\# -.else +.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 diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in index 6d7b6436e..2274bb814 100644 --- a/x11/gdm/files/gdm.pam.in +++ b/x11/gdm/files/gdm.pam.in @@ -1,6 +1,6 @@ # -# $FreeBSD: ports/x11/gdm/files/gdm.pam.in,v 1.7 2010/07/25 19:35:05 kwm Exp $ -# $MCom$ +# $FreeBSD$ +# $MCom: ports/trunk/x11/gdm/files/gdm.pam.in 17268 2013-04-01 05:13:11Z marcus $ # # PAM configuration for the "gdm" service # |