diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-02 04:55:17 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-02 04:55:17 +0800 |
commit | b7b43b2b273dadf921594f1e9ee0de87384ecb40 (patch) | |
tree | cee731afbd267ba6bea3e2f1ed478ba50fe06cfd /x11/gdm3 | |
parent | 8d831d3752a3c90095ee2281234282ea71597ed5 (diff) | |
download | marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.tar marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.tar.gz marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.tar.bz2 marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.tar.lz marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.tar.xz marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.tar.zst marcuscom-ports-b7b43b2b273dadf921594f1e9ee0de87384ecb40.zip |
Update to 3.4.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16850 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm3')
-rw-r--r-- | x11/gdm3/Makefile | 23 | ||||
-rw-r--r-- | x11/gdm3/distinfo | 4 | ||||
-rw-r--r-- | x11/gdm3/files/patch-data_gconf.path | 9 | ||||
-rw-r--r-- | x11/gdm3/pkg-plist | 54 |
4 files changed, 41 insertions, 49 deletions
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index 83c2214ba..e7dfe86c9 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm3/Makefile,v 1.17 2012/01/26 00:35:47 ahze Exp $ +# $MCom: ports/x11/gdm3/Makefile,v 1.18 2012/01/26 13:14:13 kwm Exp $ # PORTNAME= gdm -PORTVERSION= 3.2.1.1 -PORTREVISION= 2 +PORTVERSION= 3.4.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -46,18 +45,19 @@ USE_XZ= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_XORG= dmx dmxproto +INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 dconf \ - gnomeprefix gnomepanel3 -GCONF_SCHEMAS= gdm-simple-greeter.schemas +USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ --with-at-spi-registryd-directory=${LOCALBASE}/libexec \ - --enable-authentication-scheme=pam + --enable-authentication-scheme=pam \ + --with-console-kit \ + --with-systemd=no CPPFLAGS= -I${LOCALBASE}/include -DHAS_SA_LEN LDFLAGS= -L${LOCALBASE}/lib CONFIGLIBS= -lm -lexecinfo @@ -98,10 +98,7 @@ post-patch: ${WRKSRC}/data/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/daemon/gdm-session-worker.c \ - ${WRKSRC}/data/gconf.path - @${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \ - ${WRKSRC}/data/session-setup.entries + ${WRKSRC}/daemon/gdm-session-worker.c @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \ -e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \ @@ -117,10 +114,6 @@ post-patch: ${WRKSRC}/data/applications/orca-screen-reader.desktop post-install: - ${INSTALL_DATA} ${WRKSRC}/data/gconf.path \ - ${PREFIX}/share/gdm/gconf.path - ${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \ - ${PREFIX}/share/gdm/session-setup.entries .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/gdm3/distinfo b/x11/gdm3/distinfo index 09999d6ad..c08503482 100644 --- a/x11/gdm3/distinfo +++ b/x11/gdm3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gdm-3.2.1.1.tar.xz) = 85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd -SIZE (gnome3/gdm-3.2.1.1.tar.xz) = 1632116 +SHA256 (gnome3/gdm-3.4.1.tar.xz) = 6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665 +SIZE (gnome3/gdm-3.4.1.tar.xz) = 1615612 diff --git a/x11/gdm3/files/patch-data_gconf.path b/x11/gdm3/files/patch-data_gconf.path deleted file mode 100644 index 2efdb3cc9..000000000 --- a/x11/gdm3/files/patch-data_gconf.path +++ /dev/null @@ -1,9 +0,0 @@ ---- data/gconf.path.orig 2008-12-26 17:04:03.000000000 -0500 -+++ data/gconf.path 2008-12-26 17:04:13.000000000 -0500 -@@ -1,5 +1,5 @@ - # treat system-wide settings as mandatory --xml:readonly:/etc/gconf/gconf.xml.system -+xml:readonly:%%LOCALBASE%%/etc/gconf/gconf.xml.system - - # override some settings - # we treat settings in this location as diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist index a8a4c76af..96bb86271 100644 --- a/x11/gdm3/pkg-plist +++ b/x11/gdm3/pkg-plist @@ -1,7 +1,6 @@ bin/gdm-screenshot bin/gdmflexiserver etc/dbus-1/system.d/gdm.conf -etc/dconf/db/gdm etc/dconf/db/gdm.d/00-upstream-settings etc/dconf/db/gdm.d/locks/00-upstream-settings-locks etc/dconf/profile/gdm @@ -52,31 +51,33 @@ libexec/gdm-smartcard-worker libexec/gdm-xdmcp-chooser-slave sbin/gdm sbin/gdm-binary -%%DATADIR%%/gconf.path %%DATADIR%%/gdb-cmd %%DATADIR%%/gdm-greeter-login-window.ui %%DATADIR%%/gdm.schemas -share/gdm/greeter/applications/gdm-simple-greeter.desktop -share/gdm/greeter/applications/gnome-mag.desktop -share/gdm/greeter/applications/gnome-shell.desktop -share/gdm/greeter/applications/gok.desktop -share/gdm/greeter/applications/mime-dummy-handler.desktop -share/gdm/greeter/applications/mimeapps.list -share/gdm/greeter/applications/orca-screen-reader.desktop +%%DATADIR%%/greeter/applications/gdm-simple-greeter.desktop +%%DATADIR%%/greeter/applications/gnome-mag.desktop +%%DATADIR%%/greeter/applications/gnome-shell.desktop +%%DATADIR%%/greeter/applications/gok.desktop +%%DATADIR%%/greeter/applications/mime-dummy-handler.desktop +%%DATADIR%%/greeter/applications/mimeapps.list +%%DATADIR%%/greeter/applications/orca-screen-reader.desktop %%DATADIR%%/locale.alias -%%DATADIR%%/session-setup.entries -share/gdm/simple-greeter/extensions/fingerprint/page.ui -share/gdm/simple-greeter/extensions/password/page.ui -share/gdm/simple-greeter/extensions/smartcard/page.ui -share/gdm/simple-greeter/extensions/unified/page.ui +%%DATADIR%%/simple-greeter/extensions/fingerprint/page.ui +%%DATADIR%%/simple-greeter/extensions/password/page.ui +%%DATADIR%%/simple-greeter/extensions/smartcard/page.ui +%%DATADIR%%/simple-greeter/extensions/unified/page.ui share/gir-1.0/GdmGreeter-1.0.gir +share/gnome-session/sessions/gdm-fallback.session +share/gnome-session/sessions/gdm-shell.session share/gnome/help/gdm/C/gdm.xml share/gnome/help/gdm/C/legal.xml +share/gnome/help/gdm/ca/gdm.xml share/gnome/help/gdm/de/gdm.xml share/gnome/help/gdm/el/gdm.xml share/gnome/help/gdm/en_GB/gdm.xml share/gnome/help/gdm/es/gdm.xml share/gnome/help/gdm/fr/gdm.xml +share/gnome/help/gdm/gl/gdm.xml share/gnome/help/gdm/id/gdm.xml share/gnome/help/gdm/it/gdm.xml share/gnome/help/gdm/ko/gdm.xml @@ -84,10 +85,9 @@ share/gnome/help/gdm/oc/gdm.xml share/gnome/help/gdm/ru/gdm.xml share/gnome/help/gdm/sl/gdm.xml share/gnome/help/gdm/sv/gdm.xml +share/gnome/help/gdm/te/gdm.xml share/gnome/help/gdm/uk/gdm.xml share/gnome/help/gdm/zh_CN/gdm.xml -share/gnome-session/sessions/gdm-fallback.session -share/gnome-session/sessions/gdm-shell.session share/icons/hicolor/16x16/apps/gdm-fingerprint.png share/icons/hicolor/16x16/apps/gdm-smartcard.png share/icons/hicolor/16x16/apps/gdm-xnest.png @@ -118,9 +118,9 @@ share/locale/da/LC_MESSAGES/gdm.mo share/locale/de/LC_MESSAGES/gdm.mo share/locale/dz/LC_MESSAGES/gdm.mo share/locale/el/LC_MESSAGES/gdm.mo +share/locale/en@shaw/LC_MESSAGES/gdm.mo share/locale/en_CA/LC_MESSAGES/gdm.mo share/locale/en_GB/LC_MESSAGES/gdm.mo -share/locale/en@shaw/LC_MESSAGES/gdm.mo share/locale/eo/LC_MESSAGES/gdm.mo share/locale/es/LC_MESSAGES/gdm.mo share/locale/et/LC_MESSAGES/gdm.mo @@ -145,6 +145,7 @@ share/locale/it/LC_MESSAGES/gdm.mo share/locale/ja/LC_MESSAGES/gdm.mo share/locale/ka/LC_MESSAGES/gdm.mo share/locale/kk/LC_MESSAGES/gdm.mo +share/locale/km/LC_MESSAGES/gdm.mo share/locale/kn/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo share/locale/ku/LC_MESSAGES/gdm.mo @@ -197,11 +198,13 @@ share/locale/zh_HK/LC_MESSAGES/gdm.mo share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo share/omf/gdm/gdm-C.omf +share/omf/gdm/gdm-ca.omf share/omf/gdm/gdm-de.omf share/omf/gdm/gdm-el.omf share/omf/gdm/gdm-en_GB.omf share/omf/gdm/gdm-es.omf share/omf/gdm/gdm-fr.omf +share/omf/gdm/gdm-gl.omf share/omf/gdm/gdm-id.omf share/omf/gdm/gdm-it.omf share/omf/gdm/gdm-ko.omf @@ -209,6 +212,7 @@ share/omf/gdm/gdm-oc.omf share/omf/gdm/gdm-ru.omf share/omf/gdm/gdm-sl.omf share/omf/gdm/gdm-sv.omf +share/omf/gdm/gdm-te.omf share/omf/gdm/gdm-uk.omf share/omf/gdm/gdm-zh_CN.omf share/pixmaps/gdm-foot-logo.png @@ -222,6 +226,7 @@ share/pixmaps/nohost.png @dirrm share/omf/gdm @dirrm share/gnome/help/gdm/zh_CN @dirrm share/gnome/help/gdm/uk +@dirrm share/gnome/help/gdm/te @dirrm share/gnome/help/gdm/sv @dirrm share/gnome/help/gdm/sl @dirrm share/gnome/help/gdm/ru @@ -229,11 +234,13 @@ share/pixmaps/nohost.png @dirrm share/gnome/help/gdm/ko @dirrm share/gnome/help/gdm/it @dirrm share/gnome/help/gdm/id +@dirrm share/gnome/help/gdm/gl @dirrm share/gnome/help/gdm/fr @dirrm share/gnome/help/gdm/es @dirrm share/gnome/help/gdm/en_GB @dirrm share/gnome/help/gdm/el @dirrm share/gnome/help/gdm/de +@dirrm share/gnome/help/gdm/ca @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm @dirrm %%DATADIR%%/simple-greeter/extensions/unified @@ -247,16 +254,10 @@ share/pixmaps/nohost.png @dirrm %%DATADIR%% @dirrm lib/gdm/simple-greeter/extensions @dirrm lib/gdm/simple-greeter -@dirrm lib/gdm/greeter @dirrm lib/gdm @dirrm include/gdm/simple-greeter @dirrm include/gdm/greeter @dirrm include/gdm -@dirrm etc/gdm/Sessions -@dirrm etc/gdm/PreSession -@dirrm etc/gdm/PostSession -@dirrm etc/gdm/PostLogin -@dirrm etc/gdm/Init @dirrmtry etc/gdm/home/.local/share/applications @dirrmtry etc/gdm/home/.local/share @dirrmtry etc/gdm/home/.local @@ -264,6 +265,11 @@ share/pixmaps/nohost.png @dirrmtry etc/gdm/home/.config/dconf @dirrmtry etc/gdm/home/.config @dirrmtry etc/gdm/home +@dirrmtry etc/gdm/Sessions +@dirrmtry etc/gdm/PreSession +@dirrmtry etc/gdm/PostSession +@dirrmtry etc/gdm/PostLogin +@dirrmtry etc/gdm/Init @dirrmtry etc/gdm @dirrmtry etc/dm/Sessions @dirrmtry etc/dm @@ -312,6 +318,8 @@ share/pixmaps/nohost.png @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk @dirrmtry share/locale/hy/LC_MESSAGES |