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/gdm3 | |
parent | afe6ebdf34fb4a51823a931978ce122f2033eada (diff) | |
download | marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.gz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.bz2 marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.lz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.xz 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/gdm3')
-rw-r--r-- | x11/gdm3/Makefile | 21 | ||||
-rw-r--r-- | x11/gdm3/pkg-plist | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index c7aeb320a..67c9491be 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -39,7 +39,6 @@ GROUPS= gdm LATEST_LINK= gdm3 USE_XZ= yes -USES= gettext pathfix pkgconfig USE_LDCONFIG= yes USE_XORG= dmx dmxproto INSTALLS_OMF= yes @@ -47,9 +46,10 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes +USES= gettext pathfix pkgconfig USE_GNOME= intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 dconf -GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml GNU_CONFIGURE= yes +GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ --with-at-spi-registryd-directory=${LOCALBASE}/libexec \ --enable-authentication-scheme=pam \ @@ -68,23 +68,24 @@ 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(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.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 diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist index b049933e1..007f29246 100644 --- a/x11/gdm3/pkg-plist +++ b/x11/gdm3/pkg-plist @@ -342,3 +342,5 @@ share/pixmaps/nohost.png @dirrmtry share/locale/as @dirrmtry share/locale/an/LC_MESSAGES @dirrmtry share/locale/an +@exec dconf update +@unexec dconf update |