summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-10-28 06:10:10 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-10-28 06:10:10 +0800
commit752a66b40a757b50196fb97fda1143a42e96c295 (patch)
tree49bd85e2fc333a96c40e09b46a8027f64b1a470f /x11
parent2d81cfc3ccdf086d3ac5c107818ffe2f73f04d9a (diff)
downloadmarcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.gz
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.bz2
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.lz
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.xz
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.zst
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.zip
Move gnome3 ports into the place of the gnome2 locations.
Update to new port rules, remove conflicts, latest_link, enable stage support. gnome-games was skipped because I got a update for that. gnome-keyring 2 vs 3, needs to be looked at. zenity 2 vs 3, and libgnomekbd 2 vs 3 Use new lib_depend syntax in bsd.gnome.mk. Possible lots of broken links. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile122
-rw-r--r--x11/gdm/distinfo4
-rw-r--r--x11/gdm/files/gdm.pam.in4
-rw-r--r--x11/gdm/files/patch-common_Makefile.in14
-rw-r--r--x11/gdm/files/patch-common_gdm-address.h11
-rw-r--r--x11/gdm/files/patch-common_gdm-common.c13
-rw-r--r--x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c48
-rw-r--r--x11/gdm/files/patch-daemon_Makefile.in14
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c68
-rw-r--r--x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c (renamed from x11/gdm3/files/patch-daemon_gdm-xdmcp-display-factory.c)0
-rw-r--r--x11/gdm/files/patch-data_Xsession.in8
-rw-r--r--x11/gdm/files/patch-data_gconf.path9
-rw-r--r--x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in7
-rw-r--r--x11/gdm/files/patch-data_pam-redhat_gdm-password.pam (renamed from x11/gdm3/files/patch-data_pam-redhat_gdm-password.pam)0
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c (renamed from x11/gdm3/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c)0
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c11
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c57
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user.c34
-rw-r--r--x11/gdm/files/patch-gui_user-switch-applet_Makefile.in11
-rw-r--r--x11/gdm/pkg-install3
-rw-r--r--x11/gdm/pkg-plist247
-rw-r--r--x11/gdm3/Makefile149
-rw-r--r--x11/gdm3/distinfo2
-rw-r--r--x11/gdm3/files/gdm.in62
-rw-r--r--x11/gdm3/files/gdm.pam.in22
-rw-r--r--x11/gdm3/files/patch-common_Makefile.in20
-rw-r--r--x11/gdm3/files/patch-common_gdm-address.c27
-rw-r--r--x11/gdm3/files/patch-config.h.in12
-rw-r--r--x11/gdm3/files/patch-daemon_Makefile.in10
-rw-r--r--x11/gdm3/files/patch-data_Xsession.in39
-rw-r--r--x11/gdm3/files/patch-data_gdm.schemas.in.in11
-rw-r--r--x11/gdm3/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c11
-rw-r--r--x11/gdm3/files/patch-gui_simple-greeter_Makefile.in11
-rw-r--r--x11/gdm3/files/patch-gui_simple-greeter_gdm-remote-login-window.c10
-rw-r--r--x11/gdm3/pkg-deinstall15
-rw-r--r--x11/gdm3/pkg-descr4
-rw-r--r--x11/gdm3/pkg-install42
-rw-r--r--x11/gdm3/pkg-message6
-rw-r--r--x11/gdm3/pkg-plist345
-rw-r--r--x11/gnome-desktop/Makefile36
-rw-r--r--x11/gnome-desktop/distinfo4
-rw-r--r--x11/gnome-desktop/files/patch-glib2_34114
-rw-r--r--x11/gnome-desktop/pkg-descr2
-rw-r--r--x11/gnome-desktop/pkg-plist521
-rw-r--r--x11/gnome-desktop3/Makefile48
-rw-r--r--x11/gnome-desktop3/distinfo2
-rw-r--r--x11/gnome-desktop3/pkg-descr3
-rw-r--r--x11/gnome-desktop3/pkg-plist379
-rw-r--r--x11/gnome-menus/Makefile25
-rw-r--r--x11/gnome-menus/distinfo4
-rw-r--r--x11/gnome-menus/files/patch-Makefile.in11
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu42
-rw-r--r--x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py15
-rw-r--r--x11/gnome-menus/files/patch-util_Makefile.in10
-rw-r--r--x11/gnome-menus/pkg-plist271
-rw-r--r--x11/gnome-menus3/Makefile49
-rw-r--r--x11/gnome-menus3/distinfo2
-rw-r--r--x11/gnome-menus3/files/KDE.directory5
-rw-r--r--x11/gnome-menus3/files/patch-layout::applications.menu306
-rw-r--r--x11/gnome-menus3/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py11
-rw-r--r--x11/gnome-menus3/files/patch-util_Makefile.in10
-rw-r--r--x11/gnome-menus3/pkg-descr14
-rw-r--r--x11/gnome-menus3/pkg-plist244
-rw-r--r--x11/gnome-panel/Makefile81
-rw-r--r--x11/gnome-panel/distinfo4
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock-location.c11
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c11
-rw-r--r--x11/gnome-panel/files/patch-po_ja.po20
-rw-r--r--x11/gnome-panel/pkg-descr2
-rw-r--r--x11/gnome-panel/pkg-plist879
-rw-r--r--x11/gnome-panel3/Makefile75
-rw-r--r--x11/gnome-panel3/distinfo2
-rw-r--r--x11/gnome-panel3/pkg-descr3
-rw-r--r--x11/gnome-panel3/pkg-plist525
-rw-r--r--x11/gnome-screensaver/Makefile93
-rw-r--r--x11/gnome-screensaver/distinfo4
-rw-r--r--x11/gnome-screensaver/files/gnome-screensaver.pam.in2
-rw-r--r--x11/gnome-screensaver/files/patch-src_gs-auth-helper.c (renamed from x11/gnome-screensaver3/files/patch-src_gs-auth-helper.c)0
-rw-r--r--x11/gnome-screensaver/files/patch-src_gs-job.c12
-rw-r--r--x11/gnome-screensaver/files/patch-src_gs-lock-plug.c11
-rw-r--r--x11/gnome-screensaver/pkg-plist56
-rw-r--r--x11/gnome-screensaver3/Makefile53
-rw-r--r--x11/gnome-screensaver3/distinfo2
-rw-r--r--x11/gnome-screensaver3/files/gnome-screensaver.pam.in3
-rw-r--r--x11/gnome-screensaver3/files/patch-data_Makefile.in73
-rw-r--r--x11/gnome-screensaver3/pkg-descr7
-rw-r--r--x11/gnome-screensaver3/pkg-plist141
-rw-r--r--x11/gnome-session/Makefile38
-rw-r--r--x11/gnome-session/distinfo4
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in10
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c10
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-consolekit.c (renamed from x11/gnome-session3/files/patch-gnome-session_gsm-consolekit.c)0
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-gconf.c29
-rw-r--r--x11/gnome-session/pkg-descr2
-rw-r--r--x11/gnome-session/pkg-plist221
-rw-r--r--x11/gnome-session3/Makefile40
-rw-r--r--x11/gnome-session3/distinfo2
-rw-r--r--x11/gnome-session3/pkg-descr4
-rw-r--r--x11/gnome-session3/pkg-plist193
-rw-r--r--x11/gnome-terminal/Makefile23
-rw-r--r--x11/gnome-terminal/distinfo4
-rw-r--r--x11/gnome-terminal/files/patch-config.h.in6
-rw-r--r--x11/gnome-terminal/files/patch-configure69
-rw-r--r--x11/gnome-terminal/files/patch-configure.ac16
-rw-r--r--x11/gnome-terminal/files/patch-src-terminal.c11
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-screen.c8
-rw-r--r--x11/gnome-terminal/pkg-plist269
-rw-r--r--x11/gnome-terminal3/Makefile38
-rw-r--r--x11/gnome-terminal3/distinfo2
-rw-r--r--x11/gnome-terminal3/files/patch-config.h.in12
-rw-r--r--x11/gnome-terminal3/files/patch-configure55
-rw-r--r--x11/gnome-terminal3/files/patch-configure.ac13
-rw-r--r--x11/gnome-terminal3/files/patch-src_terminal-screen.c97
-rw-r--r--x11/gnome-terminal3/pkg-descr3
-rw-r--r--x11/gnome-terminal3/pkg-plist285
-rw-r--r--x11/gnome2-lite/Makefile35
-rw-r--r--x11/gnome2-lite/pkg-descr15
-rw-r--r--x11/gnome2-lite/pkg-message21
-rw-r--r--x11/gnome2/Makefile118
-rw-r--r--x11/gnome2/pkg-descr12
-rw-r--r--x11/gnome2/pkg-message8
-rw-r--r--x11/gnome2/pkg-plist1
-rw-r--r--x11/gnome3/Makefile78
-rw-r--r--x11/yelp/Makefile (renamed from x11/yelp3/Makefile)15
-rw-r--r--x11/yelp/distinfo (renamed from x11/yelp3/distinfo)0
-rw-r--r--x11/yelp/files/patch-configure (renamed from x11/yelp3/files/patch-configure)0
-rw-r--r--x11/yelp/pkg-descr (renamed from x11/yelp3/pkg-descr)0
-rw-r--r--x11/yelp/pkg-plist (renamed from x11/yelp3/pkg-plist)0
128 files changed, 1604 insertions, 5844 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 495090c20..295c25407 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,53 +1,69 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gdm/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gdm3/Makefile 18610 2013-06-30 16:33:05Z marcus $
PORTNAME= gdm
-PORTVERSION= 2.30.7
-PORTREVISION= 2
+PORTVERSION= 3.6.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 2 version of xdm display manager
+COMMENT= GNOME 3 version of xdm display manager
-BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
+BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
+ itstool:${PORTSDIR}/textproc/itstool \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \
- polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
- execinfo:${PORTSDIR}/devel/libexecinfo \
- 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 \
+LIB_DEPENDS= libck-connector.so:${PORTSDIR}/sysutils/consolekit \
+ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+ libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
+ libupower-glib.so:${PORTSDIR}/sysutils/upower \
+ libnss3.so:${PORTSDIR}/security/nss \
+ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+ libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
+ libxklavier.so:${PORTSDIR}/x11/libxklavier \
+ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+RUN_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
+ gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
+ gnome-keyring-3:${PORTSDIR}/security/gnome-keyring3 \
+ gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
+ gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
+ ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-
-CONFLICTS= gdm-3.[0-9]*
+# used in scripts
+RUN_DEPENDS+= xrdb:${PORTSDIR}/x11/xrdb \
+ setxkbmap:${PORTSDIR}/x11/setxkbmap \
+ xmodmap:${PORTSDIR}/x11/xmodmap \
+ xterm:${PORTSDIR}/x11/xterm
USERS= gdm
GROUPS= gdm
-NO_STAGE= yes
USE_XZ= yes
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
+INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
USES= gettext gmake pathfix pkgconfig
-USE_GNOME= intlhack gnomehier gconf2 librsvg2 \
- gnomedocutils gnomeprefix gnomepanel
-GCONF_SCHEMAS= gdm-simple-greeter.schemas
+USE_GNOME= dconf gnomehier gnomeprefix intlhack librsvg2 gnomepanel3
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
-CONFIGURE_ENV= LIBS="-lm" \
- GTKDOC="false"
+ --with-at-spi-registryd-directory=${LOCALBASE}/libexec \
+ --enable-authentication-scheme=pam \
+ --with-console-kit \
+ --with-initial-vt=9 \
+ --with-systemd=no
+# this is a hack until we can get our own pam dir and dir in order.
+CONFIGURE_ARGS+=--with-default-pam-config=redhat
CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN
LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGLIBS= -lm
+CONFIGURE_ENV= LIBS="${CONFIGLIBS}" \
+ GTKDOC="false" \
+ ac_cv_header_execinfo_h=no
SUB_FILES+= gdm.pam
@@ -57,13 +73,17 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
GNOME_LOCALSTATEDIR= /var
OPTIONS_DEFINE= IPV6 KEYRING
-OPTIONS_DEFAULt=KEYRING
-KEYRING_DESC= GnomeKeyring/PAM integration
+OPTIONS_DEFAULT=KEYRING
+KEYRING_DESC= Gnomekeyring/PAM integration
.include <bsd.port.options.mk>
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-debug
+.endif
+
.if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
SUB_LIST+= PAM_KEYRING=
.else
SUB_LIST+= PAM_KEYRING=\#
@@ -78,31 +98,45 @@ CONFIGURE_ARGS+= --disable-ipv6
post-patch:
@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
${WRKSRC}/data/Makefile.in
+ @${REINPLACE_CMD} -e 's|-lexecinfo||g' \
+ ${WRKSRC}/common/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
+# ${WRKSRC}/gui/simple-greeter/extensions/password/gdm-password.pam
@${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' \
${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
- @${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \
- ${WRKSRC}/data/greeter-autostart/*.desktop.in*
+ @${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
+ ${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
+ ${WRKSRC}/gui/simple-chooser/chooser-main.c
+ @${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
+ ${WRKSRC}/data/Init.in \
+ ${WRKSRC}/data/PostLogin \
+ ${WRKSRC}/data/PostSession.in \
+ ${WRKSRC}/data/PreSession.in \
+ ${WRKSRC}/data/Xsession.in
+ @${RM} ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
+ ${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
+ ${WRKSRC}/data/applications/gnome-mag.desktop \
+ ${WRKSRC}/data/applications/gnome-shell.desktop \
+ ${WRKSRC}/data/applications/gok.desktop
+# ${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
${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
- ${PREFIX}/etc/gdm/custom.conf.default
- ${MKDIR} ${PREFIX}/share/xsessions
- ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
+ ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
+ ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-welcome
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
- @${CAT} ${PKGMESSAGE}
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdm*.so.1
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdm/simple-greeter/extensions/lib*.so
+
+# logwtmp lives here.
+.if ${OSVERSION} < 900000
+CONFIGLIBS+= -lutil
+.endif
.include <bsd.port.mk>
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 1346e9a0c..0c85c0dcd 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdm-2.30.7.tar.xz) = e5a098ebf0fdb5aff669dfca6e696433c4c8962c005bd13f296b7e13a60bc03b
-SIZE (gnome2/gdm-2.30.7.tar.xz) = 1715056
+SHA256 (gnome3/gdm-3.6.2.tar.xz) = fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9
+SIZE (gnome3/gdm-3.6.2.tar.xz) = 1627356
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 014d6c815..3b7e5094b 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/trunk/x11/gdm3/files/gdm.pam.in 17268 2013-04-01 05:13:11Z marcus $
#
# PAM configuration for the "gdm" service
#
@@ -8,7 +8,7 @@
# auth
#auth sufficient pam_krb5.so no_warn try_first_pass
#auth sufficient pam_ssh.so no_warn try_first_pass
-auth required pam_unix.so no_warn try_first_pass
+auth required pam_permit.so no_warn try_first_pass
%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
# account
diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in
index 2ab0a5001..22b72966b 100644
--- a/x11/gdm/files/patch-common_Makefile.in
+++ b/x11/gdm/files/patch-common_Makefile.in
@@ -1,20 +1,20 @@
---- common/Makefile.in.orig 2008-08-20 14:34:16.000000000 -0400
-+++ common/Makefile.in 2008-08-20 14:36:50.000000000 -0400
-@@ -428,7 +428,8 @@ gdm_crash_logger_CPPFLAGS = \
+--- common/Makefile.in.orig 2011-03-11 13:17:04.000000000 +0100
++++ common/Makefile.in 2011-03-11 13:18:02.000000000 +0100
+@@ -463,7 +463,8 @@
-DLOCALSTATEDIR=\"$(localstatedir)\" \
$(NULL)
-gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
-+gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \
-+ -lexecinfo
++gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \
++ -lexecinfo
@MKDTEMP_MISSING_FALSE@MKDTEMP_FILES =
@MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
libgdmcommon_la_SOURCES = \
-@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \
+@@ -511,6 +512,7 @@
$(NULL)
libgdmcommon_la_LIBADD = \
-+ -lexecinfo \
++ -lexecinfo \
$(NULL)
libgdmcommon_la_LDFLAGS = \
diff --git a/x11/gdm/files/patch-common_gdm-address.h b/x11/gdm/files/patch-common_gdm-address.h
deleted file mode 100644
index a4fd39310..000000000
--- a/x11/gdm/files/patch-common_gdm-address.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/gdm-address.h.orig 2009-05-09 21:08:07.000000000 -0400
-+++ common/gdm-address.h 2009-05-09 21:08:34.000000000 -0400
-@@ -36,6 +36,8 @@ G_BEGIN_DECLS
-
- #define GDM_TYPE_ADDRESS (gdm_address_get_type ())
-
-+#define gdm_sockaddr_len(sa) (((struct sockaddr *)sa)->sa_family == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
-+
- typedef struct _GdmAddress GdmAddress;
-
- GType gdm_address_get_type (void);
diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c
deleted file mode 100644
index 9fa4acafa..000000000
--- a/x11/gdm/files/patch-common_gdm-common.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- common/gdm-common.c.orig 2007-12-23 10:29:20.000000000 +0100
-+++ common/gdm-common.c 2007-12-23 10:29:34.000000000 +0100
-@@ -33,6 +33,10 @@
-
- #include "gdm-common.h"
-
-+#ifndef ENODATA
-+#define ENODATA EAGAIN
-+#endif
-+
- void
- gdm_set_fatal_warnings_if_unstable (void)
- {
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
deleted file mode 100644
index ede7f2c2f..000000000
--- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- daemon/gdm-xdmcp-display-factory.c.orig 2009-12-21 17:36:30.000000000 +0100
-+++ daemon/gdm-xdmcp-display-factory.c 2009-12-26 23:26:24.000000000 +0100
-@@ -35,6 +35,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <net/if.h>
-+#include <netinet/in.h>
- #ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
- #endif
-@@ -76,7 +77,7 @@
- #define DEFAULT_USE_MULTICAST FALSE
- #define DEFAULT_MULTICAST_ADDRESS "ff02::1"
- #define DEFAULT_HONOR_INDIRECT TRUE
--#define DEFAULT_MAX_DISPLAYS_PER_HOST 1
-+#define DEFAULT_MAX_DISPLAYS_PER_HOST 2
- #define DEFAULT_MAX_DISPLAYS 16
- #define DEFAULT_MAX_PENDING_DISPLAYS 4
- #define DEFAULT_MAX_WAIT 30
-@@ -404,6 +405,11 @@
- create_socket (struct addrinfo *ai)
- {
- int sock;
-+#ifdef ENABLE_IPV6
-+#ifdef IPV6_V6ONLY
-+ int off = 0;
-+#endif
-+#endif
-
- sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (sock < 0) {
-@@ -411,6 +417,16 @@
- return sock;
- }
-
-+#ifdef ENABLE_IPV6
-+#ifdef IPV6_V6ONLY
-+ if (setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)) < 0) {
-+ g_warning ("setsockopt: %s", g_strerror (errno));
-+ close (sock);
-+ return -1;
-+ }
-+#endif
-+#endif
-+
- if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
- g_warning ("bind: %s", g_strerror (errno));
- close (sock);
diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in
index 137352970..4b6e01c7f 100644
--- a/x11/gdm/files/patch-daemon_Makefile.in
+++ b/x11/gdm/files/patch-daemon_Makefile.in
@@ -1,14 +1,6 @@
---- daemon/Makefile.in.orig 2009-05-31 15:51:18.000000000 -0400
-+++ daemon/Makefile.in 2009-05-31 15:56:32.000000000 -0400
-@@ -525,6 +525,7 @@ test_session_LDADD = \
- $(XLIB_LIBS) \
- $(EXTRA_DAEMON_LIBS) \
- $(DAEMON_LIBS) \
-+ $(EXTRA_DAEMON_LIBS) \
- $(PAM_LIBS) \
- $(NULL)
-
-@@ -660,6 +661,7 @@ gdm_session_worker_SOURCES = session-wor
+--- daemon/Makefile.in.orig 2013-04-12 00:53:59.667693353 +0000
++++ daemon/Makefile.in 2013-04-12 00:54:27.682691596 +0000
+@@ -752,6 +752,7 @@
gdm_session_worker_LDFLAGS = \
$(XLIB_LIBS) \
$(PAM_LIBS) \
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
deleted file mode 100644
index a15c91658..000000000
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- daemon/gdm-session-worker.c.orig 2011-06-02 09:50:17.000000000 -0500
-+++ daemon/gdm-session-worker.c 2011-06-24 17:59:50.000000000 -0500
-@@ -31,6 +31,9 @@
- #include <errno.h>
- #include <grp.h>
- #include <pwd.h>
-+#ifdef HAVE_LOGINCAP
-+#include <login_cap.h>
-+#endif
-
- #ifdef HAVE_LOGINDEVPERM
- #include <libdevinfo.h>
-@@ -341,7 +344,7 @@
- * what to search if PATH is unset. POSIX may, dunno.
- */
-
-- path = "/bin:/usr/bin:.";
-+ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:.";
- }
-
- len = strlen (file) + 1;
-@@ -2032,15 +2035,16 @@
- char *cachedirname;
- char *home_dir;
- int fd;
-+#ifdef HAVE_LOGINCAP
-+ char *login = worker->priv->username;
-+ struct passwd *pwent = getpwnam (login);
-+#endif
-
- /* Make sure cachedir gets created before we drop to user */
- cachedirname = gdm_session_worker_create_cachedir (worker);
- g_free (cachedirname);
-
-- if (setuid (worker->priv->uid) < 0) {
-- g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
-- _exit (1);
-- }
-+ /* Call setsid() before setusercontext() */
-
- if (setsid () < 0) {
- g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -2048,6 +2052,25 @@
- _exit (2);
- }
-
-+#ifdef HAVE_LOGINCAP
-+ if (setusercontext (NULL, pwent, pwent->pw_uid,
-+ LOGIN_SETALL & ~LOGIN_SETGROUP) < 0) {
-+ g_debug ("%s: setusercontext () failed for %s. "
-+ "Aborting.", "gdm_session_worker_start_user_session",
-+ login ? login : "(null)");
-+ }
-+
-+ /* Propagate PATH environment variable from user context to child processes */
-+
-+ gdm_session_worker_set_environment_variable (worker, "PATH", getenv ("PATH"));
-+
-+#else
-+ if (setuid (worker->priv->uid) < 0) {
-+ g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
-+ _exit (1);
-+ }
-+#endif
-+
- environment = gdm_session_worker_get_environment (worker);
-
- g_assert (geteuid () == getuid ());
diff --git a/x11/gdm3/files/patch-daemon_gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
index b6e79c441..b6e79c441 100644
--- a/x11/gdm3/files/patch-daemon_gdm-xdmcp-display-factory.c
+++ b/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in
index 894c97d16..14fa9788a 100644
--- a/x11/gdm/files/patch-data_Xsession.in
+++ b/x11/gdm/files/patch-data_Xsession.in
@@ -1,6 +1,6 @@
---- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400
-+++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400
-@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
+--- data/Xsession.in.orig 2011-03-11 13:18:54.000000000 +0100
++++ data/Xsession.in 2011-03-11 13:20:48.000000000 +0100
+@@ -189,12 +189,31 @@
fi
fi
@@ -18,7 +18,7 @@
+ echo "$0: seahorse-agent not found!"
+ fi
+fi
-+
++
# add ssh-agent if found
-sshagent="`gdmwhich ssh-agent`"
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
diff --git a/x11/gdm/files/patch-data_gconf.path b/x11/gdm/files/patch-data_gconf.path
deleted file mode 100644
index 2efdb3cc9..000000000
--- a/x11/gdm/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/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
deleted file mode 100644
index 7febf5165..000000000
--- a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig 2008-11-23 22:22:04.000000000 -0500
-+++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in 2008-11-23 22:22:09.000000000 -0500
-@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Autostart-Notify=true
--X-GNOME-AutoRestart=true
diff --git a/x11/gdm3/files/patch-data_pam-redhat_gdm-password.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
index 61737fae0..61737fae0 100644
--- a/x11/gdm3/files/patch-data_pam-redhat_gdm-password.pam
+++ b/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
diff --git a/x11/gdm3/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c b/x11/gdm/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
index 51b0d5492..51b0d5492 100644
--- a/x11/gdm3/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
deleted file mode 100644
index cd8a0f496..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-greeter/gdm-languages.c.orig 2010-01-13 16:20:08.000000000 +0000
-+++ gui/simple-greeter/gdm-languages.c 2010-01-17 13:10:50.000000000 +0000
-@@ -365,7 +365,7 @@ add_locale (const char *language_name,
- if (is_utf8) {
- name = g_strdup (language_name);
- } else if (utf8_only) {
-- name = g_strdup_printf ("%s.utf8", language_name);
-+ name = g_strdup_printf ("%s.UTF-8", language_name);
-
- language_name_get_codeset_details (name, NULL, &is_utf8);
- if (is_utf8) {
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
deleted file mode 100644
index a7bfbc883..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2010-06-26 00:09:31.000000000 +0200
-+++ gui/simple-greeter/gdm-user-manager.c 2010-07-20 23:23:07.000000000 +0200
-@@ -62,6 +62,8 @@
-
- #ifdef __sun
- #define DEFAULT_MINIMAL_UID 100
-+#elif defined(__FreeBSD__)
-+#define DEFAULT_MINIMAL_UID 1000
- #else
- #define DEFAULT_MINIMAL_UID 500
- #endif
-@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh
- NULL,
- g_object_unref);
-
-+#ifdef __FreeBSD__
-+ setpwent ();
-+#else
-+
- errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
- goto out;
- }
-+#endif
-
- /* Make sure we keep users who are logged in no matter what. */
- g_hash_table_iter_init (&iter, current_users_by_name);
-@@ -1733,9 +1740,15 @@ reload_passwd_file (GHashTable *valid_sh
-
- g_debug ("GdmUserManager: include_all is TRUE");
-
-+#ifdef __FreeBSD__
-+ for (pwent = getpwent ();
-+ pwent != NULL;
-+ pwent = getpwent ()) {
-+#else
- for (pwent = fgetpwent (fp);
- pwent != NULL;
- pwent = fgetpwent (fp)) {
-+#endif
-
- /* Skip users below MinimalUID... */
- if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
-@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh
- out:
- /* Cleanup */
-
-+#ifdef __FreeBSD__
-+ endpwent ();
-+#else
- fclose (fp);
-+#endif
-
- g_hash_table_iter_init (&iter, new_users_by_name);
- while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
deleted file mode 100644
index e5fb649c6..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- gui/simple-greeter/gdm-user.c.orig 2009-12-16 17:52:36.000000000 -0500
-+++ gui/simple-greeter/gdm-user.c 2009-12-18 21:43:38.000000000 -0500
-@@ -425,6 +425,7 @@ _gdm_user_update (GdmUser *u
- /* Display Name */
- if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
- gchar *first_comma = NULL;
-+ gchar *ampersand;
- gchar *valid_utf8_name = NULL;
-
- if (g_utf8_validate (pwent->pw_gecos, -1, NULL)) {
-@@ -449,6 +450,23 @@ _gdm_user_update (GdmUser *u
- g_free (real_name);
- real_name = NULL;
- }
-+
-+ while (real_name != NULL && (ampersand = strchr (real_name, '&')) != NULL) {
-+ gchar *temp_real_name1;
-+ gchar *temp_real_name2;
-+ gchar *temp_name;
-+
-+ temp_real_name1 = g_strndup (real_name,
-+ (ampersand - real_name));
-+ temp_real_name2 = g_strdup (ampersand + 1);
-+ temp_name = g_strdup (pwent->pw_name);
-+ temp_name[0] = toupper (temp_name[0]);
-+ g_free (real_name);
-+ real_name = g_strdup_printf ("%s%s%s", temp_real_name1, temp_name, temp_real_name2);
-+ g_free (temp_real_name1);
-+ g_free (temp_real_name2);
-+ g_free (temp_name);
-+ }
- } else {
- real_name = NULL;
- }
diff --git a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in
deleted file mode 100644
index d14791f00..000000000
--- a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/user-switch-applet/Makefile.in.orig 2010-03-20 15:19:16.000000000 -0500
-+++ gui/user-switch-applet/Makefile.in 2010-03-20 15:20:28.000000000 -0500
-@@ -324,7 +324,7 @@
- -DLIBDIR=\""$(libdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
-- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DGLADEDIR=\""$(pkgdatadir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 37802feab..d93dddb0a 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -25,12 +25,15 @@ POST-INSTALL)
${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
+ ${MKDIR} ${PKG_PREFIX}/etc/gdm/home/.config
+ ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.config
install -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
+ dconf update
${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 80a3d947d..0462751e1 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,6 +1,10 @@
bin/gdm-screenshot
bin/gdmflexiserver
etc/dbus-1/system.d/gdm.conf
+etc/dconf/db/gdm.d/00-upstream-settings
+etc/dconf/db/gdm.d/locks/00-upstream-settings-locks
+@unexec /bin/rm -f %D/etc/dconf/db/gdm
+etc/dconf/profile/gdm
etc/gdm/Init/Default
etc/gdm/PostLogin/Default.sample
etc/gdm/PostSession/Default
@@ -9,57 +13,107 @@ etc/gdm/Xsession
@unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
etc/gdm/custom.conf.default
@exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-etc/gdm/gdm.schemas
-etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop
-etc/gdm/home/.local/share/applications/mimeapps.list
-etc/pam.d/gdm
-libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
+etc/pam.d/gdm-welcome
+include/gdm/gdm-client-glue.h
+include/gdm/gdm-client.h
+include/gdm/gdm-sessions.h
+include/gdm/gdm-user-switching.h
+include/gdm/simple-greeter/gdm-login-extension.h
+lib/gdm/simple-greeter/extensions/libfingerprint.a
+lib/gdm/simple-greeter/extensions/libfingerprint.la
+lib/gdm/simple-greeter/extensions/libfingerprint.so
+lib/gdm/simple-greeter/extensions/libpassword.a
+lib/gdm/simple-greeter/extensions/libpassword.la
+lib/gdm/simple-greeter/extensions/libpassword.so
+lib/gdm/simple-greeter/extensions/libsmartcard.a
+lib/gdm/simple-greeter/extensions/libsmartcard.la
+lib/gdm/simple-greeter/extensions/libsmartcard.so
+lib/girepository-1.0/Gdm-1.0.typelib
+lib/libgdm.a
+lib/libgdm.la
+lib/libgdm.so
+lib/libgdm.so.1
+lib/libgdmsimplegreeter.a
+lib/libgdmsimplegreeter.la
+lib/libgdmsimplegreeter.so
+lib/libgdmsimplegreeter.so.1
+libdata/pkgconfig/gdm.pc
+libdata/pkgconfig/gdmsimplegreeter.pc
libexec/gdm-crash-logger
-libexec/gdm-factory-slave
libexec/gdm-host-chooser
-libexec/gdm-product-slave
libexec/gdm-session-worker
libexec/gdm-simple-chooser
libexec/gdm-simple-greeter
libexec/gdm-simple-slave
-libexec/gdm-user-switch-applet
+libexec/gdm-smartcard-worker
libexec/gdm-xdmcp-chooser-slave
sbin/gdm
sbin/gdm-binary
-%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
-%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-power-manager.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-settings-daemon.desktop
-%%DATADIR%%/autostart/LoginWindow/gok.desktop
-%%DATADIR%%/autostart/LoginWindow/metacity.desktop
-%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
-%%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
-%%DATADIR%%/gconf.path
%%DATADIR%%/gdb-cmd
%%DATADIR%%/gdm-greeter-login-window.ui
+%%DATADIR%%/gdm.schemas
+%%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/polkit-gnome-authentication-agent-1.desktop
+%%DATADIR%%/greeter/autostart/orca-autostart.desktop
%%DATADIR%%/locale.alias
-%%DATADIR%%/session-setup.entries
-share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
-share/gnome/help/gdm/C/gdm.xml
-share/gnome/help/gdm/C/legal.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/it/gdm.xml
-share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/oc/gdm.xml
-share/gnome/help/gdm/ru/gdm.xml
-share/gnome/help/gdm/sv/gdm.xml
-share/gnome/help/gdm/uk/gdm.xml
-share/gnome/help/gdm/zh_CN/gdm.xml
+%%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/Gdm-1.0.gir
+share/gnome-session/sessions/gdm-fallback.session
+share/gnome-session/sessions/gdm-shell.session
+share/help/C/gdm/index.docbook
+share/help/C/gdm/legal.xml
+share/help/ca/gdm/index.docbook
+share/help/ca/gdm/legal.xml
+share/help/de/gdm/index.docbook
+share/help/de/gdm/legal.xml
+share/help/el/gdm/index.docbook
+share/help/el/gdm/legal.xml
+share/help/en_GB/gdm/index.docbook
+share/help/en_GB/gdm/legal.xml
+share/help/es/gdm/index.docbook
+share/help/es/gdm/legal.xml
+share/help/fr/gdm/index.docbook
+share/help/fr/gdm/legal.xml
+share/help/gl/gdm/index.docbook
+share/help/gl/gdm/legal.xml
+share/help/id/gdm/index.docbook
+share/help/id/gdm/legal.xml
+share/help/it/gdm/index.docbook
+share/help/it/gdm/legal.xml
+share/help/ko/gdm/index.docbook
+share/help/ko/gdm/legal.xml
+share/help/oc/gdm/index.docbook
+share/help/oc/gdm/legal.xml
+share/help/ru/gdm/index.docbook
+share/help/ru/gdm/legal.xml
+share/help/sl/gdm/index.docbook
+share/help/sl/gdm/legal.xml
+share/help/sv/gdm/index.docbook
+share/help/sv/gdm/legal.xml
+share/help/te/gdm/index.docbook
+share/help/te/gdm/legal.xml
+share/help/uk/gdm/index.docbook
+share/help/uk/gdm/legal.xml
+share/help/zh_CN/gdm/index.docbook
+share/help/zh_CN/gdm/legal.xml
+share/icons/hicolor/16x16/apps/gdm-fingerprint.png
+share/icons/hicolor/16x16/apps/gdm-smartcard.png
share/icons/hicolor/16x16/apps/gdm-xnest.png
share/icons/hicolor/32x32/apps/gdm-setup.png
share/icons/hicolor/32x32/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm-fingerprint.png
+share/icons/hicolor/48x48/apps/gdm-smartcard.png
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
+share/locale/an/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
share/locale/as/LC_MESSAGES/gdm.mo
share/locale/ast/LC_MESSAGES/gdm.mo
@@ -75,14 +129,15 @@ share/locale/ca/LC_MESSAGES/gdm.mo
share/locale/ca@valencia/LC_MESSAGES/gdm.mo
share/locale/crh/LC_MESSAGES/gdm.mo
share/locale/cs/LC_MESSAGES/gdm.mo
+share/locale/csb/LC_MESSAGES/gdm.mo
share/locale/cy/LC_MESSAGES/gdm.mo
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
@@ -91,9 +146,11 @@ share/locale/fa/LC_MESSAGES/gdm.mo
share/locale/fi/LC_MESSAGES/gdm.mo
share/locale/fr/LC_MESSAGES/gdm.mo
share/locale/fur/LC_MESSAGES/gdm.mo
+share/locale/fy/LC_MESSAGES/gdm.mo
share/locale/ga/LC_MESSAGES/gdm.mo
share/locale/gl/LC_MESSAGES/gdm.mo
share/locale/gu/LC_MESSAGES/gdm.mo
+share/locale/gv/LC_MESSAGES/gdm.mo
share/locale/he/LC_MESSAGES/gdm.mo
share/locale/hi/LC_MESSAGES/gdm.mo
share/locale/hr/LC_MESSAGES/gdm.mo
@@ -105,9 +162,11 @@ 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
+share/locale/ky/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
share/locale/lv/LC_MESSAGES/gdm.mo
share/locale/mai/LC_MESSAGES/gdm.mo
@@ -156,43 +215,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
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-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-it.omf
-share/omf/gdm/gdm-ko.omf
-share/omf/gdm/gdm-oc.omf
-share/omf/gdm/gdm-ru.omf
-share/omf/gdm/gdm-sv.omf
-share/omf/gdm/gdm-uk.omf
-share/omf/gdm/gdm-zh_CN.omf
-share/pixmaps/faces/astronaut.jpg
-share/pixmaps/faces/baseball.png
-share/pixmaps/faces/butterfly.png
-share/pixmaps/faces/cat-eye.jpg
-share/pixmaps/faces/chess.jpg
-share/pixmaps/faces/coffee.jpg
-share/pixmaps/faces/dice.jpg
-share/pixmaps/faces/energy-arc.jpg
-share/pixmaps/faces/fish.jpg
-share/pixmaps/faces/flake.jpg
-share/pixmaps/faces/flower.jpg
-share/pixmaps/faces/grapes.jpg
-share/pixmaps/faces/guitar.jpg
-share/pixmaps/faces/launch.jpg
-share/pixmaps/faces/leaf.jpg
-share/pixmaps/faces/lightning.jpg
-share/pixmaps/faces/penguin.jpg
-share/pixmaps/faces/puppy.jpg
-share/pixmaps/faces/sky.jpg
-share/pixmaps/faces/soccerball.png
-share/pixmaps/faces/sunflower.jpg
-share/pixmaps/faces/sunset.jpg
-share/pixmaps/faces/tennis-ball.png
-share/pixmaps/faces/yellow-rose.jpg
share/pixmaps/gdm-foot-logo.png
share/pixmaps/gdm-setup.png
share/pixmaps/gdm-xnest.png
@@ -200,41 +222,60 @@ share/pixmaps/gdm.png
share/pixmaps/nobody.png
share/pixmaps/nohost.png
@exec mkdir -p %D/share/xsessions
+@exec dconf update
+@unexec dconf update
+@dirrm /var/gdm
+@dirrm /var/cache/gdm
@dirrmtry share/xsessions
-@dirrm share/pixmaps/faces
-@dirrm share/omf/gdm
-@dirrm share/gnome/help/gdm/zh_CN
-@dirrm share/gnome/help/gdm/uk
-@dirrm share/gnome/help/gdm/sv
-@dirrm share/gnome/help/gdm/ru
-@dirrm share/gnome/help/gdm/oc
-@dirrm share/gnome/help/gdm/ko
-@dirrm share/gnome/help/gdm/it
-@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/C
-@dirrm share/gnome/help/gdm
-@dirrm %%DATADIR%%/autostart/LoginWindow
-@dirrm %%DATADIR%%/autostart
+@dirrmtry share/help/zh_CN/gdm
+@dirrmtry share/help/uk/gdm
+@dirrmtry share/help/te/gdm
+@dirrmtry share/help/sv/gdm
+@dirrmtry share/help/sl/gdm
+@dirrmtry share/help/ru/gdm
+@dirrmtry share/help/oc/gdm
+@dirrmtry share/help/ko/gdm
+@dirrmtry share/help/it/gdm
+@dirrmtry share/help/id/gdm
+@dirrmtry share/help/gl/gdm
+@dirrmtry share/help/fr/gdm
+@dirrmtry share/help/es/gdm
+@dirrmtry share/help/en_GB/gdm
+@dirrmtry share/help/el/gdm
+@dirrmtry share/help/de/gdm
+@dirrmtry share/help/ca/gdm
+@dirrmtry share/help/C/gdm
+@dirrmtry share/gnome-session/sessions
+@dirrmtry share/gnome-session
+@dirrm %%DATADIR%%/simple-greeter/extensions/unified
+@dirrm %%DATADIR%%/simple-greeter/extensions/smartcard
+@dirrm %%DATADIR%%/simple-greeter/extensions/password
+@dirrm %%DATADIR%%/simple-greeter/extensions/fingerprint
+@dirrm %%DATADIR%%/simple-greeter/extensions
+@dirrm %%DATADIR%%/simple-greeter
+@dirrm %%DATADIR%%/greeter/applications
+@dirrm %%DATADIR%%/greeter/autostart
+@dirrm %%DATADIR%%/greeter
@dirrm %%DATADIR%%
-@dirrm etc/gdm/Sessions
-@dirrm etc/gdm/PreSession
-@dirrm etc/gdm/PostSession
-@dirrm etc/gdm/PostLogin
-@dirrm etc/gdm/Init
+@dirrm lib/gdm/simple-greeter/extensions
+@dirrm lib/gdm/simple-greeter
+@dirrm lib/gdm
+@dirrm include/gdm/simple-greeter
+@dirrm include/gdm
@dirrmtry etc/gdm/home/.local/share/applications
@dirrmtry etc/gdm/home/.local/share
@dirrmtry etc/gdm/home/.local
@unexec rm -rf %D/etc/gdm/home/.gconf*
+@dirrmtry etc/gdm/home/.config/dconf
+@dirrmtry etc/gdm/home/.config
@dirrmtry etc/gdm/home
+@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
-@dirrmtry share/log/gdm
-@dirrmtry share/log
+@dirrm etc/dconf/db/gdm.d/locks
+@dirrm etc/dconf/db/gdm.d
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -271,10 +312,16 @@ 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
@dirrmtry share/locale/hy
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@@ -293,3 +340,5 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
deleted file mode 100644
index 98d0f2adf..000000000
--- a/x11/gdm3/Makefile
+++ /dev/null
@@ -1,149 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gdm3/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME= gdm
-PORTVERSION= 3.6.2
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 3 version of xdm display manager
-
-BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
- itstool:${PORTSDIR}/textproc/itstool \
- ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= libck-connector.so:${PORTSDIR}/sysutils/consolekit \
- libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
- libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
- libupower-glib.so:${PORTSDIR}/sysutils/upower \
- libnss3.so:${PORTSDIR}/security/nss \
- libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
- libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
- libxklavier.so:${PORTSDIR}/x11/libxklavier \
- libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
- gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
- gnome-keyring-3:${PORTSDIR}/security/gnome-keyring3 \
- gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session3 \
- gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
- ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
- ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-# used in scripts
-RUN_DEPENDS+= xrdb:${PORTSDIR}/x11/xrdb \
- setxkbmap:${PORTSDIR}/x11/setxkbmap \
- xmodmap:${PORTSDIR}/x11/xmodmap \
- xterm:${PORTSDIR}/x11/xterm
-
-CONFLICTS= gdm-2.[0-9]*
-
-USERS= gdm
-GROUPS= gdm
-
-NO_STAGE= yes
-LATEST_LINK= gdm3
-USE_XZ= yes
-USE_LDCONFIG= yes
-USE_XORG= dmx dmxproto
-INSTALLS_OMF= yes
-INSTALLS_ICONS= yes
-USE_RC_SUBR= gdm
-USE_GNOME_SUBR= yes
-USES= gettext gmake pathfix pkgconfig
-USE_GNOME= dconf gnomehier gnomeprefix intlhack librsvg2 gnomepanel3
-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 \
- --with-console-kit \
- --with-initial-vt=9 \
- --with-systemd=no
-# this is a hack until we can get our own pam dir and dir in order.
-CONFIGURE_ARGS+=--with-default-pam-config=redhat
-CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGLIBS= -lm
-CONFIGURE_ENV= LIBS="${CONFIGLIBS}" \
- GTKDOC="false" \
- ac_cv_header_execinfo_h=no
-
-SUB_FILES+= gdm.pam
-
-GDMDIR?= ${PREFIX}/etc/gdm
-PKGMESSAGE= ${WRKDIR}/pkg-message
-
-GNOME_LOCALSTATEDIR= /var
-
-OPTIONS_DEFINE= IPV6 KEYRING
-OPTIONS_DEFAULT=KEYRING
-KEYRING_DESC= Gnomekeyring/PAM integration
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= --enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring
-SUB_LIST+= PAM_KEYRING=
-.else
-SUB_LIST+= PAM_KEYRING=\#
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
- ${WRKSRC}/data/Makefile.in
- @${REINPLACE_CMD} -e 's|-lexecinfo||g' \
- ${WRKSRC}/common/Makefile.in
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/daemon/gdm-session-worker.c
-# ${WRKSRC}/gui/simple-greeter/extensions/password/gdm-password.pam
- @${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' \
- ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
- @${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
- ${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
- ${WRKSRC}/gui/simple-chooser/chooser-main.c
- @${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
- ${WRKSRC}/data/Init.in \
- ${WRKSRC}/data/PostLogin \
- ${WRKSRC}/data/PostSession.in \
- ${WRKSRC}/data/PreSession.in \
- ${WRKSRC}/data/Xsession.in
- @${RM} ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
- ${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
- ${WRKSRC}/data/applications/gnome-mag.desktop \
- ${WRKSRC}/data/applications/gnome-shell.desktop \
- ${WRKSRC}/data/applications/gok.desktop
-# ${WRKSRC}/data/applications/orca-screen-reader.desktop
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
- ${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
- ${PREFIX}/etc/gdm/custom.conf.default
- ${MKDIR} ${PREFIX}/share/xsessions
- ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm-welcome
- @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
- | /usr/bin/fmt 75 79 > ${PKGMESSAGE}
- @dconf update
- @${CAT} ${PKGMESSAGE}
-
-# logwtmp lives here.
-.if ${OSVERSION} < 900000
-CONFIGLIBS+= -lutil
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11/gdm3/distinfo b/x11/gdm3/distinfo
deleted file mode 100644
index 0c85c0dcd..000000000
--- a/x11/gdm3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gdm-3.6.2.tar.xz) = fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9
-SIZE (gnome3/gdm-3.6.2.tar.xz) = 1627356
diff --git a/x11/gdm3/files/gdm.in b/x11/gdm3/files/gdm.in
deleted file mode 100644
index 2a47c5501..000000000
--- a/x11/gdm3/files/gdm.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-# $MCom$
-
-# PROVIDE: gdm
-# REQUIRE: LOGIN cleanvar moused syscons dbus
-#
-# Add the following to /etc/rc.conf to start GDM at boot time:
-#
-# gdm_enable="YES"
-#
-
-. /etc/rc.subr
-. %%GNOME_SUBR%%
-
-gdm_enable=${gdm_enable-${gnome_enable}}
-gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
-gdm_lang=${gdm_lang-${LANG}}
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
-
-name="gdm"
-rcvar=gdm_enable
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-procname="%%PREFIX%%/sbin/gdm-binary"
-start_cmd="gdm_start"
-
-gdm_start()
-{
- if ! checkyesno gdm_enable ; then
- return 0
- fi
- echo "Starting ${name}."
-
- # make sure there is no pam configuration for gdm service in base system
- if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
- cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled
- rm -f /etc/pam.d/gdm
- fi
-
- ( iter=0
- while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do
- if [ ${iter} -eq 60 ]; then
- break
- fi
- sleep 1
- iter=$(expr ${iter} + 1)
- done
- iter=0
- while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do
- if [ ${iter} -eq 60 ]; then
- break
- fi
- sleep 1
- iter=$(expr ${iter} + 1)
- done
- LANG=${gdm_lang} ${command} ${gdm_flags} ) &
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/x11/gdm3/files/gdm.pam.in b/x11/gdm3/files/gdm.pam.in
deleted file mode 100644
index a7c8334f3..000000000
--- a/x11/gdm3/files/gdm.pam.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $FreeBSD$
-# $MCom$
-#
-# PAM configuration for the "gdm" service
-#
-
-# auth
-#auth sufficient pam_krb5.so no_warn try_first_pass
-#auth sufficient pam_ssh.so no_warn try_first_pass
-auth required pam_permit.so no_warn try_first_pass
-%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
-
-# account
-account required pam_nologin.so
-#account required pam_krb5.so
-account required pam_unix.so
-
-# session
-#session optional pam_ssh.so
-session required pam_permit.so
-%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
diff --git a/x11/gdm3/files/patch-common_Makefile.in b/x11/gdm3/files/patch-common_Makefile.in
deleted file mode 100644
index 22b72966b..000000000
--- a/x11/gdm3/files/patch-common_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- common/Makefile.in.orig 2011-03-11 13:17:04.000000000 +0100
-+++ common/Makefile.in 2011-03-11 13:18:02.000000000 +0100
-@@ -463,7 +463,8 @@
- -DLOCALSTATEDIR=\"$(localstatedir)\" \
- $(NULL)
-
--gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
-+gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \
-+ -lexecinfo
- @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES =
- @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
- libgdmcommon_la_SOURCES = \
-@@ -511,6 +512,7 @@
- $(NULL)
-
- libgdmcommon_la_LIBADD = \
-+ -lexecinfo \
- $(NULL)
-
- libgdmcommon_la_LDFLAGS = \
diff --git a/x11/gdm3/files/patch-common_gdm-address.c b/x11/gdm3/files/patch-common_gdm-address.c
deleted file mode 100644
index 9a4e620ba..000000000
--- a/x11/gdm3/files/patch-common_gdm-address.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- common/gdm-address.c.orig 2010-01-13 17:32:59.000000000 +0000
-+++ common/gdm-address.c 2010-01-17 12:55:48.000000000 +0000
-@@ -29,6 +29,8 @@
- #include <stropts.h>
- #endif
- #include <string.h>
-+#include <sys/types.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-@@ -37,7 +39,6 @@
- #endif
- #include <netdb.h>
- #include <sys/ioctl.h>
--#include <net/if.h>
-
- #ifndef G_OS_WIN32
- #include <sys/select.h>
-@@ -47,6 +48,7 @@
- #include <winsock2.h>
- #include <ws2tcpip.h>
- #endif
-+#include <net/if.h>
-
- #include <glib-object.h>
-
diff --git a/x11/gdm3/files/patch-config.h.in b/x11/gdm3/files/patch-config.h.in
deleted file mode 100644
index d17901da1..000000000
--- a/x11/gdm3/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2007-11-02 20:48:28.000000000 -0400
-+++ config.h.in 2007-11-02 20:49:39.000000000 -0400
-@@ -23,6 +23,9 @@
- #undef HAVE_LC_MESSAGES
- #undef HAVE_LIBSM
- #undef HAVE_LIBXDMCP
-+#undef HAVE_LOGIN
-+#undef HAVE_LOGOUT
-+#undef HAVE_LOGWTMP
- #undef HAVE_LOGINCAP
- #undef HAVE_LOGINDEVPERM
- #undef HAVE_LOGINRESTRICTIONS
diff --git a/x11/gdm3/files/patch-daemon_Makefile.in b/x11/gdm3/files/patch-daemon_Makefile.in
deleted file mode 100644
index 4b6e01c7f..000000000
--- a/x11/gdm3/files/patch-daemon_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/Makefile.in.orig 2013-04-12 00:53:59.667693353 +0000
-+++ daemon/Makefile.in 2013-04-12 00:54:27.682691596 +0000
-@@ -752,6 +752,7 @@
- gdm_session_worker_LDFLAGS = \
- $(XLIB_LIBS) \
- $(PAM_LIBS) \
-+ $(EXTRA_DAEMON_LIBS) \
- $(NULL)
-
- gdm_session_worker_LDADD = \
diff --git a/x11/gdm3/files/patch-data_Xsession.in b/x11/gdm3/files/patch-data_Xsession.in
deleted file mode 100644
index 14fa9788a..000000000
--- a/x11/gdm3/files/patch-data_Xsession.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- data/Xsession.in.orig 2011-03-11 13:18:54.000000000 +0100
-+++ data/Xsession.in 2011-03-11 13:20:48.000000000 +0100
-@@ -189,12 +189,31 @@
- fi
- fi
-
-+is_gnome=0
-+if [ "x$command" = "xgnome-session" ]; then
-+ is_gnome=1
-+fi
-+
-+# add seahorse-agent if found
-+if [ ${is_gnome} = 1 ]; then
-+ seahorseagent="`gdmwhich seahorse-agent`"
-+ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then
-+ command="dbus-launch --exit-with-session $seahorseagent --execute $command"
-+ elif [ -z "$seahorseagent" ] ; then
-+ echo "$0: seahorse-agent not found!"
-+ fi
-+fi
-+
- # add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-- command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
-- echo "$0: ssh-agent not found!"
-+# ssh-agent functionality is handled by gnome-keyring-daemon which is launched
-+# from gnome-session
-+if [ ${is_gnome} != 1 ]; then
-+ sshagent="`gdmwhich ssh-agent`"
-+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-+ command="$sshagent -- $command"
-+ elif [ -z "$sshagent" ] ; then
-+ echo "$0: ssh-agent not found!"
-+ fi
- fi
-
- echo "$0: Setup done, will execute: $command"
diff --git a/x11/gdm3/files/patch-data_gdm.schemas.in.in b/x11/gdm3/files/patch-data_gdm.schemas.in.in
deleted file mode 100644
index f52dd8bd5..000000000
--- a/x11/gdm3/files/patch-data_gdm.schemas.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/gdm.schemas.in.in.orig 2009-05-16 18:17:53.000000000 -0400
-+++ data/gdm.schemas.in.in 2009-05-16 18:18:01.000000000 -0400
-@@ -77,7 +77,7 @@
- <schema>
- <key>xdmcp/DisplaysPerHost</key>
- <signature>i</signature>
-- <default>1</default>
-+ <default>2</default>
- </schema>
- <schema>
- <key>xdmcp/Port</key>
diff --git a/x11/gdm3/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm3/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
deleted file mode 100644
index b7ed32318..000000000
--- a/x11/gdm3/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000
-+++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000
-@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget
- #ifdef ENABLE_IPV6
- widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
- if (widget->priv->socket_fd != -1) {
-+ int off = 0;
-+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off));
- widget->priv->have_ipv6 = TRUE;
- }
- #endif
diff --git a/x11/gdm3/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm3/files/patch-gui_simple-greeter_Makefile.in
deleted file mode 100644
index e8a958e66..000000000
--- a/x11/gdm3/files/patch-gui_simple-greeter_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-greeter/Makefile.in.orig 2008-02-13 01:57:37.000000000 -0500
-+++ gui/simple-greeter/Makefile.in 2008-02-13 01:57:44.000000000 -0500
-@@ -445,7 +445,7 @@ INCLUDES = \
- -DGDMCONFDIR=\"$(gdmconfdir)\" \
- -DDATADIR=\""$(datadir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
-- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DGLADEDIR=\""$(pkgdatadir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/x11/gdm3/files/patch-gui_simple-greeter_gdm-remote-login-window.c b/x11/gdm3/files/patch-gui_simple-greeter_gdm-remote-login-window.c
deleted file mode 100644
index 059d72cf4..000000000
--- a/x11/gdm3/files/patch-gui_simple-greeter_gdm-remote-login-window.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gui/simple-greeter/gdm-remote-login-window.c.orig 2008-03-24 11:27:13.000000000 +0100
-+++ gui/simple-greeter/gdm-remote-login-window.c 2008-03-24 11:27:31.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
- #include <errno.h>
-
- #include <glib.h>
diff --git a/x11/gdm3/pkg-deinstall b/x11/gdm3/pkg-deinstall
deleted file mode 100644
index 6cb043cae..000000000
--- a/x11/gdm3/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-case $2 in
-DEINSTALL)
- echo ""
- echo "To really remove the gdm port, please remove the following"
- echo "directories manualy:"
- echo ""
- echo "/var/cache/gdm /var/gdm /var/log/gdm and /var/run/gdm"
- echo ""
- ;;
-esac
diff --git a/x11/gdm3/pkg-descr b/x11/gdm3/pkg-descr
deleted file mode 100644
index 1699cf5b7..000000000
--- a/x11/gdm3/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The GNOME 2.0 version of the xdm display manager. It supports user
-icons, multiple sessions, and clean system shutdowns.
-
-WWW: http://www.gnome.org/projects/gdm/
diff --git a/x11/gdm3/pkg-install b/x11/gdm3/pkg-install
deleted file mode 100644
index d93dddb0a..000000000
--- a/x11/gdm3/pkg-install
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- USER=gdm
- GROUP=gdm
- CHMOD=/bin/chmod
- CHOWN=/usr/sbin/chown
- MKDIR=/bin/mkdir
-
- ${MKDIR} -p /var/gdm
- ${MKDIR} -p /var/log/gdm
- ${CHMOD} 1770 /var/log/gdm
- ${CHOWN} ${USER}:${GROUP} /var/log/gdm
- ${CHOWN} -R root:${GROUP} /var/gdm
- ${CHMOD} 1770 /var/gdm
- ${MKDIR} -p /var/run/gdm
- ${CHOWN} root:${GROUP} /var/run/gdm
- ${CHMOD} 1777 /var/run/gdm
- ${MKDIR} -p /var/cache/gdm
- ${CHMOD} 1755 /var/cache/gdm
- ${CHOWN} root:${GROUP} /var/cache/gdm
- ${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
- ${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
- ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
- ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
- ${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
- ${MKDIR} ${PKG_PREFIX}/etc/gdm/home/.config
- ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.config
- install -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
- gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
- gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
- ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
- ${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
- ${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
- dconf update
-
- ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
- ${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
- exit 0
- ;;
-esac
diff --git a/x11/gdm3/pkg-message b/x11/gdm3/pkg-message
deleted file mode 100644
index 038101552..000000000
--- a/x11/gdm3/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-GDM is installed.
-
-Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm
-hanging or restarting constantly. Instead, add gdm_enable="YES" to
-/etc/rc.conf. GDM will be started automatic on the next reboot.
-
diff --git a/x11/gdm3/pkg-plist b/x11/gdm3/pkg-plist
deleted file mode 100644
index e5e325dd3..000000000
--- a/x11/gdm3/pkg-plist
+++ /dev/null
@@ -1,345 +0,0 @@
-bin/gdm-screenshot
-bin/gdmflexiserver
-etc/dbus-1/system.d/gdm.conf
-etc/dconf/db/gdm.d/00-upstream-settings
-etc/dconf/db/gdm.d/locks/00-upstream-settings-locks
-etc/dconf/db/gdm
-etc/dconf/profile/gdm
-etc/gdm/Init/Default
-etc/gdm/PostLogin/Default.sample
-etc/gdm/PostSession/Default
-etc/gdm/PreSession/Default
-etc/gdm/Xsession
-@unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
-etc/gdm/custom.conf.default
-@exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-etc/pam.d/gdm-welcome
-include/gdm/gdm-client-glue.h
-include/gdm/gdm-client.h
-include/gdm/gdm-sessions.h
-include/gdm/gdm-user-switching.h
-include/gdm/simple-greeter/gdm-login-extension.h
-lib/gdm/simple-greeter/extensions/libfingerprint.a
-lib/gdm/simple-greeter/extensions/libfingerprint.la
-lib/gdm/simple-greeter/extensions/libfingerprint.so
-lib/gdm/simple-greeter/extensions/libpassword.a
-lib/gdm/simple-greeter/extensions/libpassword.la
-lib/gdm/simple-greeter/extensions/libpassword.so
-lib/gdm/simple-greeter/extensions/libsmartcard.a
-lib/gdm/simple-greeter/extensions/libsmartcard.la
-lib/gdm/simple-greeter/extensions/libsmartcard.so
-lib/girepository-1.0/Gdm-1.0.typelib
-lib/libgdm.a
-lib/libgdm.la
-lib/libgdm.so
-lib/libgdm.so.1
-lib/libgdmsimplegreeter.a
-lib/libgdmsimplegreeter.la
-lib/libgdmsimplegreeter.so
-lib/libgdmsimplegreeter.so.1
-libdata/pkgconfig/gdm.pc
-libdata/pkgconfig/gdmsimplegreeter.pc
-libexec/gdm-crash-logger
-libexec/gdm-host-chooser
-libexec/gdm-session-worker
-libexec/gdm-simple-chooser
-libexec/gdm-simple-greeter
-libexec/gdm-simple-slave
-libexec/gdm-smartcard-worker
-libexec/gdm-xdmcp-chooser-slave
-sbin/gdm
-sbin/gdm-binary
-%%DATADIR%%/gdb-cmd
-%%DATADIR%%/gdm-greeter-login-window.ui
-%%DATADIR%%/gdm.schemas
-%%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/polkit-gnome-authentication-agent-1.desktop
-%%DATADIR%%/greeter/autostart/orca-autostart.desktop
-%%DATADIR%%/locale.alias
-%%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/Gdm-1.0.gir
-share/gnome-session/sessions/gdm-fallback.session
-share/gnome-session/sessions/gdm-shell.session
-share/help/C/gdm/index.docbook
-share/help/C/gdm/legal.xml
-share/help/ca/gdm/index.docbook
-share/help/ca/gdm/legal.xml
-share/help/de/gdm/index.docbook
-share/help/de/gdm/legal.xml
-share/help/el/gdm/index.docbook
-share/help/el/gdm/legal.xml
-share/help/en_GB/gdm/index.docbook
-share/help/en_GB/gdm/legal.xml
-share/help/es/gdm/index.docbook
-share/help/es/gdm/legal.xml
-share/help/fr/gdm/index.docbook
-share/help/fr/gdm/legal.xml
-share/help/gl/gdm/index.docbook
-share/help/gl/gdm/legal.xml
-share/help/id/gdm/index.docbook
-share/help/id/gdm/legal.xml
-share/help/it/gdm/index.docbook
-share/help/it/gdm/legal.xml
-share/help/ko/gdm/index.docbook
-share/help/ko/gdm/legal.xml
-share/help/oc/gdm/index.docbook
-share/help/oc/gdm/legal.xml
-share/help/ru/gdm/index.docbook
-share/help/ru/gdm/legal.xml
-share/help/sl/gdm/index.docbook
-share/help/sl/gdm/legal.xml
-share/help/sv/gdm/index.docbook
-share/help/sv/gdm/legal.xml
-share/help/te/gdm/index.docbook
-share/help/te/gdm/legal.xml
-share/help/uk/gdm/index.docbook
-share/help/uk/gdm/legal.xml
-share/help/zh_CN/gdm/index.docbook
-share/help/zh_CN/gdm/legal.xml
-share/icons/hicolor/16x16/apps/gdm-fingerprint.png
-share/icons/hicolor/16x16/apps/gdm-smartcard.png
-share/icons/hicolor/16x16/apps/gdm-xnest.png
-share/icons/hicolor/32x32/apps/gdm-setup.png
-share/icons/hicolor/32x32/apps/gdm-xnest.png
-share/icons/hicolor/48x48/apps/gdm-fingerprint.png
-share/icons/hicolor/48x48/apps/gdm-smartcard.png
-share/locale/af/LC_MESSAGES/gdm.mo
-share/locale/am/LC_MESSAGES/gdm.mo
-share/locale/an/LC_MESSAGES/gdm.mo
-share/locale/ar/LC_MESSAGES/gdm.mo
-share/locale/as/LC_MESSAGES/gdm.mo
-share/locale/ast/LC_MESSAGES/gdm.mo
-share/locale/az/LC_MESSAGES/gdm.mo
-share/locale/be/LC_MESSAGES/gdm.mo
-share/locale/be@latin/LC_MESSAGES/gdm.mo
-share/locale/bg/LC_MESSAGES/gdm.mo
-share/locale/bn/LC_MESSAGES/gdm.mo
-share/locale/bn_IN/LC_MESSAGES/gdm.mo
-share/locale/br/LC_MESSAGES/gdm.mo
-share/locale/bs/LC_MESSAGES/gdm.mo
-share/locale/ca/LC_MESSAGES/gdm.mo
-share/locale/ca@valencia/LC_MESSAGES/gdm.mo
-share/locale/crh/LC_MESSAGES/gdm.mo
-share/locale/cs/LC_MESSAGES/gdm.mo
-share/locale/csb/LC_MESSAGES/gdm.mo
-share/locale/cy/LC_MESSAGES/gdm.mo
-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/eo/LC_MESSAGES/gdm.mo
-share/locale/es/LC_MESSAGES/gdm.mo
-share/locale/et/LC_MESSAGES/gdm.mo
-share/locale/eu/LC_MESSAGES/gdm.mo
-share/locale/fa/LC_MESSAGES/gdm.mo
-share/locale/fi/LC_MESSAGES/gdm.mo
-share/locale/fr/LC_MESSAGES/gdm.mo
-share/locale/fur/LC_MESSAGES/gdm.mo
-share/locale/fy/LC_MESSAGES/gdm.mo
-share/locale/ga/LC_MESSAGES/gdm.mo
-share/locale/gl/LC_MESSAGES/gdm.mo
-share/locale/gu/LC_MESSAGES/gdm.mo
-share/locale/gv/LC_MESSAGES/gdm.mo
-share/locale/he/LC_MESSAGES/gdm.mo
-share/locale/hi/LC_MESSAGES/gdm.mo
-share/locale/hr/LC_MESSAGES/gdm.mo
-share/locale/hu/LC_MESSAGES/gdm.mo
-share/locale/hy/LC_MESSAGES/gdm.mo
-share/locale/id/LC_MESSAGES/gdm.mo
-share/locale/is/LC_MESSAGES/gdm.mo
-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
-share/locale/ky/LC_MESSAGES/gdm.mo
-share/locale/lt/LC_MESSAGES/gdm.mo
-share/locale/lv/LC_MESSAGES/gdm.mo
-share/locale/mai/LC_MESSAGES/gdm.mo
-share/locale/mg/LC_MESSAGES/gdm.mo
-share/locale/mi/LC_MESSAGES/gdm.mo
-share/locale/mk/LC_MESSAGES/gdm.mo
-share/locale/ml/LC_MESSAGES/gdm.mo
-share/locale/mn/LC_MESSAGES/gdm.mo
-share/locale/mr/LC_MESSAGES/gdm.mo
-share/locale/ms/LC_MESSAGES/gdm.mo
-share/locale/nb/LC_MESSAGES/gdm.mo
-share/locale/nds/LC_MESSAGES/gdm.mo
-share/locale/ne/LC_MESSAGES/gdm.mo
-share/locale/nl/LC_MESSAGES/gdm.mo
-share/locale/nn/LC_MESSAGES/gdm.mo
-share/locale/nso/LC_MESSAGES/gdm.mo
-share/locale/oc/LC_MESSAGES/gdm.mo
-share/locale/or/LC_MESSAGES/gdm.mo
-share/locale/pa/LC_MESSAGES/gdm.mo
-share/locale/pl/LC_MESSAGES/gdm.mo
-share/locale/ps/LC_MESSAGES/gdm.mo
-share/locale/pt/LC_MESSAGES/gdm.mo
-share/locale/pt_BR/LC_MESSAGES/gdm.mo
-share/locale/ro/LC_MESSAGES/gdm.mo
-share/locale/ru/LC_MESSAGES/gdm.mo
-share/locale/rw/LC_MESSAGES/gdm.mo
-share/locale/si/LC_MESSAGES/gdm.mo
-share/locale/sk/LC_MESSAGES/gdm.mo
-share/locale/sl/LC_MESSAGES/gdm.mo
-share/locale/sq/LC_MESSAGES/gdm.mo
-share/locale/sr/LC_MESSAGES/gdm.mo
-share/locale/sr@latin/LC_MESSAGES/gdm.mo
-share/locale/sv/LC_MESSAGES/gdm.mo
-share/locale/ta/LC_MESSAGES/gdm.mo
-share/locale/te/LC_MESSAGES/gdm.mo
-share/locale/th/LC_MESSAGES/gdm.mo
-share/locale/tr/LC_MESSAGES/gdm.mo
-share/locale/ug/LC_MESSAGES/gdm.mo
-share/locale/uk/LC_MESSAGES/gdm.mo
-share/locale/uz/LC_MESSAGES/gdm.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo
-share/locale/vi/LC_MESSAGES/gdm.mo
-share/locale/wa/LC_MESSAGES/gdm.mo
-share/locale/xh/LC_MESSAGES/gdm.mo
-share/locale/zh_CN/LC_MESSAGES/gdm.mo
-share/locale/zh_HK/LC_MESSAGES/gdm.mo
-share/locale/zh_TW/LC_MESSAGES/gdm.mo
-share/locale/zu/LC_MESSAGES/gdm.mo
-share/pixmaps/gdm-foot-logo.png
-share/pixmaps/gdm-setup.png
-share/pixmaps/gdm-xnest.png
-share/pixmaps/gdm.png
-share/pixmaps/nobody.png
-share/pixmaps/nohost.png
-@exec mkdir -p %D/share/xsessions
-@dirrm /var/gdm
-@dirrm /var/cache/gdm
-@dirrmtry share/xsessions
-@dirrmtry share/help/zh_CN/gdm
-@dirrmtry share/help/uk/gdm
-@dirrmtry share/help/te/gdm
-@dirrmtry share/help/sv/gdm
-@dirrmtry share/help/sl/gdm
-@dirrmtry share/help/ru/gdm
-@dirrmtry share/help/oc/gdm
-@dirrmtry share/help/ko/gdm
-@dirrmtry share/help/it/gdm
-@dirrmtry share/help/id/gdm
-@dirrmtry share/help/gl/gdm
-@dirrmtry share/help/fr/gdm
-@dirrmtry share/help/es/gdm
-@dirrmtry share/help/en_GB/gdm
-@dirrmtry share/help/el/gdm
-@dirrmtry share/help/de/gdm
-@dirrmtry share/help/ca/gdm
-@dirrmtry share/help/C/gdm
-@dirrmtry share/gnome-session/sessions
-@dirrmtry share/gnome-session
-@dirrm %%DATADIR%%/simple-greeter/extensions/unified
-@dirrm %%DATADIR%%/simple-greeter/extensions/smartcard
-@dirrm %%DATADIR%%/simple-greeter/extensions/password
-@dirrm %%DATADIR%%/simple-greeter/extensions/fingerprint
-@dirrm %%DATADIR%%/simple-greeter/extensions
-@dirrm %%DATADIR%%/simple-greeter
-@dirrm %%DATADIR%%/greeter/applications
-@dirrm %%DATADIR%%/greeter/autostart
-@dirrm %%DATADIR%%/greeter
-@dirrm %%DATADIR%%
-@dirrm lib/gdm/simple-greeter/extensions
-@dirrm lib/gdm/simple-greeter
-@dirrm lib/gdm
-@dirrm include/gdm/simple-greeter
-@dirrm include/gdm
-@dirrmtry etc/gdm/home/.local/share/applications
-@dirrmtry etc/gdm/home/.local/share
-@dirrmtry etc/gdm/home/.local
-@unexec rm -rf %D/etc/gdm/home/.gconf*
-@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
-@dirrm etc/dconf/db/gdm.d/locks
-@dirrm etc/dconf/db/gdm.d
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@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
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 848eba2ce..f43725b0e 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,44 +1,50 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-desktop/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gnome-desktop3/Makefile 18610 2013-06-30 16:33:05Z marcus $
PORTNAME= gnome-desktop
-PORTVERSION= 2.32.1
-PORTREVISION?= 4
+PORTVERSION= 3.6.2
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Additional UI API for GNOME 2
+COMMENT= Additional UI API for GNOME 3
-USE_BZIP2= yes
+USE_XZ= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
+ ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
+ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
+ itstool:${PORTSDIR}/textproc/itstool
+LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
+ ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
+ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
-NO_STAGE= yes
-USE_XORG= xpm
+USE_XORG= x11 xrandr xext
USES= bison gettext gmake pathfix pkgconfig
-USE_GNOME= gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
- ltverhack referencehack
+USE_GNOME= gnomeprefix intlhack gtk30 ltverhack referencehack \
+ introspection:build
USE_PYTHON= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
- --disable-desktop-docs
+CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= gnome-about.1
-
post-patch:
@${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
${WRKSRC}/desktop-docs/fdl/Makefile.in \
${WRKSRC}/desktop-docs/gpl/Makefile.in \
${WRKSRC}/desktop-docs/lgpl/Makefile.in
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnome-desktop-3.so.4
+
.include <bsd.port.mk>
.endif
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 2f432d4f6..6d7f87165 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-desktop-2.32.1.tar.bz2) = 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d
-SIZE (gnome2/gnome-desktop-2.32.1.tar.bz2) = 1633847
+SHA256 (gnome3/gnome-desktop-3.6.2.tar.xz) = ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236
+SIZE (gnome3/gnome-desktop-3.6.2.tar.xz) = 978108
diff --git a/x11/gnome-desktop/files/patch-glib2_34 b/x11/gnome-desktop/files/patch-glib2_34
deleted file mode 100644
index 26e9b425d..000000000
--- a/x11/gnome-desktop/files/patch-glib2_34
+++ /dev/null
@@ -1,114 +0,0 @@
---- libgnome-desktop/gnome-desktop-thumbnail.c.orig 2013-03-20 11:15:01.000000000 -0500
-+++ libgnome-desktop/gnome-desktop-thumbnail.c 2013-03-20 11:30:58.000000000 -0500
-@@ -525,9 +525,14 @@
- g_assert (digest_len == 16);
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
--
-+
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- file,
- NULL);
-@@ -587,8 +592,13 @@
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails/fail",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails/fail",
-+#endif
- appname,
- file,
- NULL);
-@@ -678,7 +688,8 @@
- /* Don't thumbnail thumbnails */
- if (uri &&
- strncmp (uri, "file:/", 6) == 0 &&
-- strstr (uri, "/.thumbnails/") != NULL)
-+ (strstr (uri, "/.thumbnails/") != NULL ||
-+ strstr (uri, "/.cache/thumbnails/") != NULL))
- return FALSE;
-
- if (!mime_type)
-@@ -917,8 +928,13 @@
-
- res = FALSE;
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- thumbnail_dir = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- NULL);
- if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
- {
-@@ -951,8 +967,13 @@
-
- res = FALSE;
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- thumbnail_dir = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- NULL);
- if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
- {
-@@ -1025,8 +1046,13 @@
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- file,
- NULL);
-@@ -1129,8 +1155,13 @@
-
- file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails/fail",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails/fail",
-+#endif
- appname,
- file,
- NULL);
-@@ -1220,9 +1251,14 @@
- md5 = gnome_desktop_thumbnail_md5 (uri);
- file = g_strconcat (md5, ".png", NULL);
- g_free (md5);
--
-+
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+ path = g_build_filename (g_get_user_cache_dir (),
-+ "thumbnails",
-+#else
- path = g_build_filename (g_get_home_dir (),
- ".thumbnails",
-+#endif
- (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- file,
- NULL);
diff --git a/x11/gnome-desktop/pkg-descr b/x11/gnome-desktop/pkg-descr
index bda4df791..541a0f2d0 100644
--- a/x11/gnome-desktop/pkg-descr
+++ b/x11/gnome-desktop/pkg-descr
@@ -1,3 +1,3 @@
-This is a collection of APIs not included in libgnomeui.
+This is a collection of APIs.
WWW: http://www.gnome.org/
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index bb683ddc1..047ac3771 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,211 +1,216 @@
-bin/gnome-about
-include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h
-include/gnome-desktop-2.0/libgnomeui/gnome-bg-crossfade.h
-include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
-include/gnome-desktop-2.0/libgnomeui/gnome-desktop-thumbnail.h
-include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h
-include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h
-include/gnome-desktop-2.0/libgnomeui/gnome-rr.h
-lib/libgnome-desktop-2.a
-lib/libgnome-desktop-2.la
-lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.17
-libdata/pkgconfig/gnome-desktop-2.0.pc
-share/applications/gnome-about.desktop
-share/gnome-about/contributors.list
-share/gnome-about/foundation-members.list
-share/gnome-about/gnome-64.png
-share/gnome-about/gnome-version.xml
-share/gnome-about/headers/header-bg-ancient01a.png
-share/gnome-about/headers/header-bg-city01.png
-share/gnome-about/headers/header-bg-clouds01.png
-share/gnome-about/headers/header-bg-clouds02.png
-share/gnome-about/headers/header-bg-hills01.png
-share/gnome-about/headers/header-bg-landscape01.png
-share/gnome-about/headers/header-bg-mountains01.png
-share/gnome-about/headers/header-bg-snow01.png
-share/gnome-about/headers/header-bg-sunset01.png
-share/libgnome-desktop/pnp.ids
-share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/an/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/as/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ast/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/crh/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/dz/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hy/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ig/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/kk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/lo/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nds/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nso/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/oc/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/or/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ps/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/pixmaps/apple-green.png
-share/pixmaps/apple-red.png
-share/pixmaps/gnome-aorta.png
-share/pixmaps/gnome-applets.png
-share/pixmaps/gnome-background-image.png
-share/pixmaps/gnome-background-pattern.png
-share/pixmaps/gnome-background.png
-share/pixmaps/gnome-calc2.png
-share/pixmaps/gnome-calc3.png
-share/pixmaps/gnome-calendar.png
-share/pixmaps/gnome-ccbackground.png
-share/pixmaps/gnome-ccdesktop.png
-share/pixmaps/gnome-ccdialog.png
-share/pixmaps/gnome-ccmime.png
-share/pixmaps/gnome-ccperiph.png
-share/pixmaps/gnome-ccscreensaver.png
-share/pixmaps/gnome-ccwindowmanager.png
-share/pixmaps/gnome-color-browser.png
-share/pixmaps/gnome-color-xterm.png
-share/pixmaps/gnome-computer.png
-share/pixmaps/gnome-cromagnon.png
-share/pixmaps/gnome-day.png
-share/pixmaps/gnome-debian.png
-share/pixmaps/gnome-diskfree.png
-share/pixmaps/gnome-emacs.png
-share/pixmaps/gnome-eterm.png
-share/pixmaps/gnome-file-c.png
-share/pixmaps/gnome-file-h.png
-share/pixmaps/gnome-folder.png
-share/pixmaps/gnome-gemvt.png
-share/pixmaps/gnome-gimp.png
-share/pixmaps/gnome-gmenu.png
-share/pixmaps/gnome-gmush.png
-share/pixmaps/gnome-gnomoku.png
-share/pixmaps/gnome-home.png
-share/pixmaps/gnome-html.png
-share/pixmaps/gnome-image-gif.png
-share/pixmaps/gnome-image-jpeg.png
-share/pixmaps/gnome-irc.png
-share/pixmaps/gnome-laptop.png
-share/pixmaps/gnome-log.png
-share/pixmaps/gnome-logo-icon-transparent.png
-share/pixmaps/gnome-logo-icon.png
-share/pixmaps/gnome-logo-large.png
-share/pixmaps/gnome-mdi.png
-share/pixmaps/gnome-mnemonic.png
-share/pixmaps/gnome-month.png
-share/pixmaps/gnome-mouse.png
-share/pixmaps/gnome-news.png
-share/pixmaps/gnome-note.png
-share/pixmaps/gnome-qeye.png
-share/pixmaps/gnome-set-time.png
-share/pixmaps/gnome-spider.png
-share/pixmaps/gnome-squeak.png
-share/pixmaps/gnome-suse.png
-share/pixmaps/gnome-talk.png
-share/pixmaps/gnome-term-linux.png
-share/pixmaps/gnome-term-linux2.png
-share/pixmaps/gnome-term-night.png
-share/pixmaps/gnome-term-tiger.png
-share/pixmaps/gnome-term.png
-share/pixmaps/gnome-tigert.png
-share/pixmaps/gnome-touristinfo.png
-share/pixmaps/gnome-user-interface.png
-share/pixmaps/gnome-week.png
-share/pixmaps/gnome-windows.png
-share/pixmaps/gnome-word.png
-share/pixmaps/gnome-xterm.png
-share/pixmaps/gtkvim.png
-share/pixmaps/kterm.xpm
-share/pixmaps/monitor.png
-share/pixmaps/vnterm.xpm
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-thumbnail.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-utils.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-pnp-ids.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-config.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-labeler.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
+lib/girepository-1.0/GnomeDesktop-3.0.typelib
+lib/libgnome-desktop-3.a
+lib/libgnome-desktop-3.la
+lib/libgnome-desktop-3.so
+lib/libgnome-desktop-3.so.4
+libdata/pkgconfig/gnome-desktop-3.0.pc
+libexec/gnome-rr-debug
+share/doc/gnome-desktop3/GnomeDesktopThumbnailFactory.html
+share/doc/gnome-desktop3/background.html
+share/doc/gnome-desktop3/gnome-desktop3-gnome-bg.html
+share/doc/gnome-desktop3/gnome-desktop3-gnome-desktop-utils.html
+share/doc/gnome-desktop3/gnome-desktop3-gnome-rr-config.html
+share/doc/gnome-desktop3/gnome-desktop3-gnome-rr-labeler.html
+share/doc/gnome-desktop3/gnome-desktop3.devhelp2
+share/doc/gnome-desktop3/home.png
+share/doc/gnome-desktop3/index.html
+share/doc/gnome-desktop3/index.sgml
+share/doc/gnome-desktop3/intro.html
+share/doc/gnome-desktop3/left.png
+share/doc/gnome-desktop3/libgnome.html
+share/doc/gnome-desktop3/randr.html
+share/doc/gnome-desktop3/right.png
+share/doc/gnome-desktop3/gnome-desktop3-gnome-rr.html
+share/doc/gnome-desktop3/style.css
+share/doc/gnome-desktop3/thumbnail.html
+share/doc/gnome-desktop3/up.png
+share/gnome/gnome-version.xml
+share/help/C/fdl/index.docbook
+share/help/C/gpl/index.docbook
+share/help/C/lgpl/index.docbook
+share/help/ar/fdl/index.docbook
+share/help/ar/gpl/index.docbook
+share/help/ar/lgpl/index.docbook
+share/help/ca/fdl/index.docbook
+share/help/ca/gpl/index.docbook
+share/help/cs/gpl/index.docbook
+share/help/de/fdl/index.docbook
+share/help/de/gpl/index.docbook
+share/help/de/lgpl/index.docbook
+share/help/el/fdl/index.docbook
+share/help/el/gpl/index.docbook
+share/help/el/lgpl/index.docbook
+share/help/es/fdl/index.docbook
+share/help/es/gpl/index.docbook
+share/help/es/lgpl/index.docbook
+share/help/eu/fdl/index.docbook
+share/help/eu/gpl/index.docbook
+share/help/eu/lgpl/index.docbook
+share/help/fi/gpl/index.docbook
+share/help/fi/lgpl/index.docbook
+share/help/fr/fdl/index.docbook
+share/help/fr/gpl/index.docbook
+share/help/fr/lgpl/index.docbook
+share/help/gl/fdl/index.docbook
+share/help/hu/fdl/index.docbook
+share/help/hu/gpl/index.docbook
+share/help/hu/lgpl/index.docbook
+share/help/ko/fdl/index.docbook
+share/help/ko/gpl/index.docbook
+share/help/ko/lgpl/index.docbook
+share/help/nds/gpl/index.docbook
+share/help/oc/fdl/index.docbook
+share/help/oc/gpl/index.docbook
+share/help/oc/lgpl/index.docbook
+share/help/pa/gpl/index.docbook
+share/help/pa/lgpl/index.docbook
+share/help/pl/fdl/index.docbook
+share/help/pt_BR/lgpl/index.docbook
+share/help/sl/fdl/index.docbook
+share/help/sl/gpl/index.docbook
+share/help/sl/lgpl/index.docbook
+share/help/sr/gpl/index.docbook
+share/help/sr@latin/gpl/index.docbook
+share/help/sv/fdl/index.docbook
+share/help/sv/gpl/index.docbook
+share/help/sv/lgpl/index.docbook
+share/help/uk/fdl/index.docbook
+share/help/uk/gpl/index.docbook
+share/help/uk/lgpl/index.docbook
+share/help/vi/fdl/index.docbook
+share/help/vi/gpl/index.docbook
+share/help/vi/lgpl/index.docbook
+share/help/zh_CN/fdl/index.docbook
+share/help/zh_CN/gpl/index.docbook
+share/help/zh_CN/lgpl/index.docbook
+share/gir-1.0/GnomeDesktop-3.0.gir
+share/libgnome-desktop-3.0/pnp.ids
+share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/an/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ar/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/as/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ast/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/az/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/be/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/br/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bs/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ca/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/crh/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/cs/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/csb/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/cy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/da/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/de/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/dz/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/el/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/eo/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/es/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/et/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/eu/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fa/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ga/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gu/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ha/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/he/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hu/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/id/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ig/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/is/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/it/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ja/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ka/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/kg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/kk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/km/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/kn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ko/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ku/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ky/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/li/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/lo/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/lt/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/lv/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mai/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ml/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ms/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nb/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nds/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ne/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nso/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/oc/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/or/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pa/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ps/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pt/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ro/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ru/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/rw/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sq/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sv/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ta/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/te/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/th/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/tk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/tr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ug/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/uk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ur/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/uz/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/vi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/wa/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/xh/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/yi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/yo/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zu/LC_MESSAGES/gnome-desktop-3.0.mo
+@dirrm share/libgnome-desktop-3.0
+@dirrm share/doc/gnome-desktop3
+@dirrm include/gnome-desktop-3.0/libgnome-desktop
+@dirrm include/gnome-desktop-3.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -252,18 +257,28 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/ky
@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/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
@dirrmtry share/locale/ig/LC_MESSAGES
@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/csb/LC_MESSAGES
+@dirrmtry share/locale/csb
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -278,9 +293,87 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/as
@dirrmtry share/locale/an/LC_MESSAGES
@dirrmtry share/locale/an
-@dirrm share/libgnome-desktop
-@dirrm share/gnome-about/headers
-@dirrmtry share/applications
-@dirrm include/gnome-desktop-2.0/libgnomeui
-@dirrm include/gnome-desktop-2.0/libgnome
-@dirrm include/gnome-desktop-2.0
+@dirrmtry share/help/zh_CN/lgpl
+@dirrmtry share/help/zh_CN/gpl
+@dirrmtry share/help/zh_CN/fdl
+@dirrmtry share/help/zh_CN
+@dirrmtry share/help/vi/lgpl
+@dirrmtry share/help/vi/gpl
+@dirrmtry share/help/vi/fdl
+@dirrmtry share/help/vi
+@dirrmtry share/help/uk/lgpl
+@dirrmtry share/help/uk/gpl
+@dirrmtry share/help/uk/fdl
+@dirrmtry share/help/uk
+@dirrmtry share/help/sv/lgpl
+@dirrmtry share/help/sv/gpl
+@dirrmtry share/help/sv/fdl
+@dirrmtry share/help/sv
+@dirrmtry share/help/sr@latin/gpl
+@dirrmtry share/help/sr@latin
+@dirrmtry share/help/sr/gpl
+@dirrmtry share/help/sr
+@dirrmtry share/help/sl/lgpl
+@dirrmtry share/help/sl/gpl
+@dirrmtry share/help/sl/fdl
+@dirrmtry share/help/sl
+@dirrmtry share/help/pt_BR/lgpl
+@dirrmtry share/help/pt_BR
+@dirrmtry share/help/pl/fdl
+@dirrmtry share/help/pl
+@dirrmtry share/help/pa/lgpl
+@dirrmtry share/help/pa/gpl
+@dirrmtry share/help/pa
+@dirrmtry share/help/oc/lgpl
+@dirrmtry share/help/oc/gpl
+@dirrmtry share/help/oc/fdl
+@dirrmtry share/help/oc
+@dirrmtry share/help/nds/gpl
+@dirrmtry share/help/nds
+@dirrmtry share/help/ko/lgpl
+@dirrmtry share/help/ko/gpl
+@dirrmtry share/help/ko/fdl
+@dirrmtry share/help/ko
+@dirrmtry share/help/hu/lgpl
+@dirrmtry share/help/hu/gpl
+@dirrmtry share/help/hu/fdl
+@dirrmtry share/help/hu
+@dirrmtry share/help/gl/fdl
+@dirrmtry share/help/gl
+@dirrmtry share/help/fr/lgpl
+@dirrmtry share/help/fr/gpl
+@dirrmtry share/help/fr/fdl
+@dirrmtry share/help/fr
+@dirrmtry share/help/fi/lgpl
+@dirrmtry share/help/fi/gpl
+@dirrmtry share/help/fi
+@dirrmtry share/help/eu/lgpl
+@dirrmtry share/help/eu/gpl
+@dirrmtry share/help/eu/fdl
+@dirrmtry share/help/eu
+@dirrmtry share/help/es/lgpl
+@dirrmtry share/help/es/gpl
+@dirrmtry share/help/es/fdl
+@dirrmtry share/help/es
+@dirrmtry share/help/el/lgpl
+@dirrmtry share/help/el/gpl
+@dirrmtry share/help/el/fdl
+@dirrmtry share/help/el
+@dirrmtry share/help/de/lgpl
+@dirrmtry share/help/de/gpl
+@dirrmtry share/help/de/fdl
+@dirrmtry share/help/de
+@dirrmtry share/help/cs/gpl
+@dirrmtry share/help/cs
+@dirrmtry share/help/ca/gpl
+@dirrmtry share/help/ca/fdl
+@dirrmtry share/help/ca
+@dirrmtry share/help/ar/lgpl
+@dirrmtry share/help/ar/gpl
+@dirrmtry share/help/ar/fdl
+@dirrmtry share/help/ar
+@dirrmtry share/help/C/lgpl
+@dirrmtry share/help/C/gpl
+@dirrmtry share/help/C/fdl
+@dirrmtry share/help/C
+@dirrmtry share/help
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
deleted file mode 100644
index 7b89daf75..000000000
--- a/x11/gnome-desktop3/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-desktop3/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME= gnome-desktop
-PORTVERSION= 3.6.2
-PORTREVISION?= 0
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-PKGNAMESUFFIX= 3
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Additional UI API for GNOME 3
-
-USE_XZ= yes
-
-.if !defined(REFERENCE_PORT)
-
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
- ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
- ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
- itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
- ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
- ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
-
-USE_XORG= x11 xrandr xext
-USES= bison gettext gmake pathfix pkgconfig
-USE_GNOME= gnomeprefix intlhack gtk30 ltverhack referencehack \
- introspection:build
-USE_PYTHON= yes
-USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-post-patch:
- @${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
- ${WRKSRC}/desktop-docs/fdl/Makefile.in \
- ${WRKSRC}/desktop-docs/gpl/Makefile.in \
- ${WRKSRC}/desktop-docs/lgpl/Makefile.in
-
-.include <bsd.port.mk>
-
-.endif
diff --git a/x11/gnome-desktop3/distinfo b/x11/gnome-desktop3/distinfo
deleted file mode 100644
index 6d7f87165..000000000
--- a/x11/gnome-desktop3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gnome-desktop-3.6.2.tar.xz) = ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236
-SIZE (gnome3/gnome-desktop-3.6.2.tar.xz) = 978108
diff --git a/x11/gnome-desktop3/pkg-descr b/x11/gnome-desktop3/pkg-descr
deleted file mode 100644
index 541a0f2d0..000000000
--- a/x11/gnome-desktop3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a collection of APIs.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnome-desktop3/pkg-plist b/x11/gnome-desktop3/pkg-plist
deleted file mode 100644
index 047ac3771..000000000
--- a/x11/gnome-desktop3/pkg-plist
+++ /dev/null
@@ -1,379 +0,0 @@
-include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-thumbnail.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-utils.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-pnp-ids.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-config.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-labeler.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
-lib/girepository-1.0/GnomeDesktop-3.0.typelib
-lib/libgnome-desktop-3.a
-lib/libgnome-desktop-3.la
-lib/libgnome-desktop-3.so
-lib/libgnome-desktop-3.so.4
-libdata/pkgconfig/gnome-desktop-3.0.pc
-libexec/gnome-rr-debug
-share/doc/gnome-desktop3/GnomeDesktopThumbnailFactory.html
-share/doc/gnome-desktop3/background.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-bg.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-desktop-utils.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-rr-config.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-rr-labeler.html
-share/doc/gnome-desktop3/gnome-desktop3.devhelp2
-share/doc/gnome-desktop3/home.png
-share/doc/gnome-desktop3/index.html
-share/doc/gnome-desktop3/index.sgml
-share/doc/gnome-desktop3/intro.html
-share/doc/gnome-desktop3/left.png
-share/doc/gnome-desktop3/libgnome.html
-share/doc/gnome-desktop3/randr.html
-share/doc/gnome-desktop3/right.png
-share/doc/gnome-desktop3/gnome-desktop3-gnome-rr.html
-share/doc/gnome-desktop3/style.css
-share/doc/gnome-desktop3/thumbnail.html
-share/doc/gnome-desktop3/up.png
-share/gnome/gnome-version.xml
-share/help/C/fdl/index.docbook
-share/help/C/gpl/index.docbook
-share/help/C/lgpl/index.docbook
-share/help/ar/fdl/index.docbook
-share/help/ar/gpl/index.docbook
-share/help/ar/lgpl/index.docbook
-share/help/ca/fdl/index.docbook
-share/help/ca/gpl/index.docbook
-share/help/cs/gpl/index.docbook
-share/help/de/fdl/index.docbook
-share/help/de/gpl/index.docbook
-share/help/de/lgpl/index.docbook
-share/help/el/fdl/index.docbook
-share/help/el/gpl/index.docbook
-share/help/el/lgpl/index.docbook
-share/help/es/fdl/index.docbook
-share/help/es/gpl/index.docbook
-share/help/es/lgpl/index.docbook
-share/help/eu/fdl/index.docbook
-share/help/eu/gpl/index.docbook
-share/help/eu/lgpl/index.docbook
-share/help/fi/gpl/index.docbook
-share/help/fi/lgpl/index.docbook
-share/help/fr/fdl/index.docbook
-share/help/fr/gpl/index.docbook
-share/help/fr/lgpl/index.docbook
-share/help/gl/fdl/index.docbook
-share/help/hu/fdl/index.docbook
-share/help/hu/gpl/index.docbook
-share/help/hu/lgpl/index.docbook
-share/help/ko/fdl/index.docbook
-share/help/ko/gpl/index.docbook
-share/help/ko/lgpl/index.docbook
-share/help/nds/gpl/index.docbook
-share/help/oc/fdl/index.docbook
-share/help/oc/gpl/index.docbook
-share/help/oc/lgpl/index.docbook
-share/help/pa/gpl/index.docbook
-share/help/pa/lgpl/index.docbook
-share/help/pl/fdl/index.docbook
-share/help/pt_BR/lgpl/index.docbook
-share/help/sl/fdl/index.docbook
-share/help/sl/gpl/index.docbook
-share/help/sl/lgpl/index.docbook
-share/help/sr/gpl/index.docbook
-share/help/sr@latin/gpl/index.docbook
-share/help/sv/fdl/index.docbook
-share/help/sv/gpl/index.docbook
-share/help/sv/lgpl/index.docbook
-share/help/uk/fdl/index.docbook
-share/help/uk/gpl/index.docbook
-share/help/uk/lgpl/index.docbook
-share/help/vi/fdl/index.docbook
-share/help/vi/gpl/index.docbook
-share/help/vi/lgpl/index.docbook
-share/help/zh_CN/fdl/index.docbook
-share/help/zh_CN/gpl/index.docbook
-share/help/zh_CN/lgpl/index.docbook
-share/gir-1.0/GnomeDesktop-3.0.gir
-share/libgnome-desktop-3.0/pnp.ids
-share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/an/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ar/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/as/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ast/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/az/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/be/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/br/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bs/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ca/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/crh/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/cs/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/csb/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/cy/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/da/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/de/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/dz/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/el/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/eo/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/es/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/et/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/eu/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fa/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ga/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/gl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/gu/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ha/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/he/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hu/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hy/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/id/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ig/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/is/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/it/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ja/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ka/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/kg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/kk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/km/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/kn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ko/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ku/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ky/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/li/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/lo/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/lt/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/lv/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mai/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ml/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ms/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nb/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nds/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ne/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nso/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/oc/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/or/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pa/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ps/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pt/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ro/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ru/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/rw/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/si/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sq/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sv/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ta/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/te/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/th/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/tk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/tr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ug/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/uk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ur/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/vi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/wa/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/xh/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/yi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/yo/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zu/LC_MESSAGES/gnome-desktop-3.0.mo
-@dirrm share/libgnome-desktop-3.0
-@dirrm share/doc/gnome-desktop3
-@dirrm include/gnome-desktop-3.0/libgnome-desktop
-@dirrm include/gnome-desktop-3.0
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/lo/LC_MESSAGES
-@dirrmtry share/locale/lo
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@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/kg/LC_MESSAGES
-@dirrmtry share/locale/kg
-@dirrmtry share/locale/ig/LC_MESSAGES
-@dirrmtry share/locale/ig
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/ha/LC_MESSAGES
-@dirrmtry share/locale/ha
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/csb/LC_MESSAGES
-@dirrmtry share/locale/csb
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
-@dirrmtry share/help/zh_CN/lgpl
-@dirrmtry share/help/zh_CN/gpl
-@dirrmtry share/help/zh_CN/fdl
-@dirrmtry share/help/zh_CN
-@dirrmtry share/help/vi/lgpl
-@dirrmtry share/help/vi/gpl
-@dirrmtry share/help/vi/fdl
-@dirrmtry share/help/vi
-@dirrmtry share/help/uk/lgpl
-@dirrmtry share/help/uk/gpl
-@dirrmtry share/help/uk/fdl
-@dirrmtry share/help/uk
-@dirrmtry share/help/sv/lgpl
-@dirrmtry share/help/sv/gpl
-@dirrmtry share/help/sv/fdl
-@dirrmtry share/help/sv
-@dirrmtry share/help/sr@latin/gpl
-@dirrmtry share/help/sr@latin
-@dirrmtry share/help/sr/gpl
-@dirrmtry share/help/sr
-@dirrmtry share/help/sl/lgpl
-@dirrmtry share/help/sl/gpl
-@dirrmtry share/help/sl/fdl
-@dirrmtry share/help/sl
-@dirrmtry share/help/pt_BR/lgpl
-@dirrmtry share/help/pt_BR
-@dirrmtry share/help/pl/fdl
-@dirrmtry share/help/pl
-@dirrmtry share/help/pa/lgpl
-@dirrmtry share/help/pa/gpl
-@dirrmtry share/help/pa
-@dirrmtry share/help/oc/lgpl
-@dirrmtry share/help/oc/gpl
-@dirrmtry share/help/oc/fdl
-@dirrmtry share/help/oc
-@dirrmtry share/help/nds/gpl
-@dirrmtry share/help/nds
-@dirrmtry share/help/ko/lgpl
-@dirrmtry share/help/ko/gpl
-@dirrmtry share/help/ko/fdl
-@dirrmtry share/help/ko
-@dirrmtry share/help/hu/lgpl
-@dirrmtry share/help/hu/gpl
-@dirrmtry share/help/hu/fdl
-@dirrmtry share/help/hu
-@dirrmtry share/help/gl/fdl
-@dirrmtry share/help/gl
-@dirrmtry share/help/fr/lgpl
-@dirrmtry share/help/fr/gpl
-@dirrmtry share/help/fr/fdl
-@dirrmtry share/help/fr
-@dirrmtry share/help/fi/lgpl
-@dirrmtry share/help/fi/gpl
-@dirrmtry share/help/fi
-@dirrmtry share/help/eu/lgpl
-@dirrmtry share/help/eu/gpl
-@dirrmtry share/help/eu/fdl
-@dirrmtry share/help/eu
-@dirrmtry share/help/es/lgpl
-@dirrmtry share/help/es/gpl
-@dirrmtry share/help/es/fdl
-@dirrmtry share/help/es
-@dirrmtry share/help/el/lgpl
-@dirrmtry share/help/el/gpl
-@dirrmtry share/help/el/fdl
-@dirrmtry share/help/el
-@dirrmtry share/help/de/lgpl
-@dirrmtry share/help/de/gpl
-@dirrmtry share/help/de/fdl
-@dirrmtry share/help/de
-@dirrmtry share/help/cs/gpl
-@dirrmtry share/help/cs
-@dirrmtry share/help/ca/gpl
-@dirrmtry share/help/ca/fdl
-@dirrmtry share/help/ca
-@dirrmtry share/help/ar/lgpl
-@dirrmtry share/help/ar/gpl
-@dirrmtry share/help/ar/fdl
-@dirrmtry share/help/ar
-@dirrmtry share/help/C/lgpl
-@dirrmtry share/help/C/gpl
-@dirrmtry share/help/C/fdl
-@dirrmtry share/help/C
-@dirrmtry share/help
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 16f8ff5ed..f360adeeb 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -1,24 +1,20 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-menus/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gnome-menus3/Makefile 18610 2013-06-30 16:33:05Z marcus $
PORTNAME= gnome-menus
-PORTVERSION= 2.30.5
-PORTREVISION= 1
+PORTVERSION= 3.6.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Implementation of the FreeDesktop Desktop Menu Spec
-CONFLICTS= gnome-menus-3.[0-9]*
-
-NO_STAGE= yes
USES= gettext gmake pathfix pkgconfig
-USE_BZIP2= yes
-USE_GNOME= gnomehier gnomeprefix intlhack glib20 ltverhack \
- introspection:build
+USE_XZ= yes
+USE_GNOME= glib20 gnomehier gnomeprefix intlhack introspection:build \
+ ltverhack
USE_AUTOTOOLS= libtool
USE_PYTHON= yes
USE_LDCONFIG= yes
@@ -31,8 +27,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
${WRKSRC}/util/test-menu-spec.c
@${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
- ${WRKSRC}/layout/applications.menu \
- ${WRKSRC}/layout/settings.menu
+ ${WRKSRC}/layout/applications.menu
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -41,9 +36,11 @@ post-patch:
${WRKSRC}/util/Makefile.in
post-install:
+ @${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/xdg/menus/
@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
- ${PREFIX}/etc/xdg/menus/gnome-applications.menu
+ ${STAGEDIR}${PREFIX}/etc/xdg/menus/gnome-applications.menu
@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
- ${PREFIX}/share/desktop-directories
+ ${STAGEDIR}${PREFIX}/share/desktop-directories
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnome-menu-3.so.0
.include <bsd.port.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index a11734649..98119ce84 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-menus-2.30.5.tar.bz2) = 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
-SIZE (gnome2/gnome-menus-2.30.5.tar.bz2) = 471327
+SHA256 (gnome3/gnome-menus-3.6.2.tar.xz) = f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f
+SIZE (gnome3/gnome-menus-3.6.2.tar.xz) = 423948
diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in
deleted file mode 100644
index 915e1b5a1..000000000
--- a/x11/gnome-menus/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2010-09-27 14:11:42.000000000 +0000
-+++ Makefile.in 2010-09-27 14:12:05.000000000 +0000
-@@ -33,7 +33,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@HAVE_PYTHON_TRUE@am__append_1 = python simple-editor
-+@HAVE_PYTHON_TRUE@am__append_1 = python
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 116dad13f..9a0719a38 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,17 +1,19 @@
---- layout/applications.menu.orig 2008-04-21 15:49:29.000000000 -0400
-+++ layout/applications.menu 2008-04-28 14:51:24.000000000 -0400
-@@ -6,9 +6,8 @@
+--- layout/applications.menu.orig 2012-07-10 01:54:30.000000000 +0000
++++ layout/applications.menu 2013-03-30 10:41:37.311882486 +0000
+@@ -6,10 +6,9 @@
<Name>Applications</Name>
<Directory>X-GNOME-Menu-Applications.directory</Directory>
- <!-- Scan legacy dirs first, as later items take priority -->
- <KDELegacyDirs/>
- <LegacyDir>/etc/X11/applnk</LegacyDir>
+- <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+ <!-- Scan legacy dirs first, as later items take priority
+ <LegacyDir>/etc/X11/applnk</LegacyDir> -->
- <LegacyDir>/usr/share/gnome/apps</LegacyDir>
++ <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
+ <DefaultAppDirs/>
@@ -31,6 +30,8 @@
applications here -->
<Not><Category>Accessibility</Category></Not>
@@ -70,12 +72,12 @@
<Include>
<And>
<Category>Network</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Internet -->
-@@ -110,6 +123,8 @@
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ <Not>
+ <Category>X-GNOME-WebApplication</Category>
+ </Not>
+@@ -125,6 +138,8 @@
<Include>
<And>
<Category>AudioVideo</Category>
@@ -84,7 +86,7 @@
</And>
</Include>
</Menu> <!-- End Multimedia -->
-@@ -121,6 +136,8 @@
+@@ -136,6 +151,8 @@
<Include>
<And>
<Category>Office</Category>
@@ -93,7 +95,7 @@
</And>
</Include>
</Menu> <!-- End Office -->
-@@ -133,6 +150,8 @@
+@@ -148,6 +165,8 @@
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
@@ -102,12 +104,12 @@
</And>
</Include>
</Menu> <!-- End System Tools -->
-@@ -147,8 +166,197 @@
+@@ -162,10 +181,199 @@
<Not><Category>Core</Category></Not>
- <Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
+ <Not><Category>X-GNOME-Settings-Panel</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
@@ -174,7 +176,7 @@
+
+ <!-- KEducation -->
+ <Menu>
-+ <Name>Education</Name>
++ <Name>Education</Name>
+ <Directory>Education.directory</Directory>
+ <Include>
+ <And>
@@ -194,7 +196,7 @@
+ <Include>
+ <And>
+ <Or>
-+ <Category>Qt</Category>
++ <Category>Qt</Category>
+ <Category>KDE</Category>
+ </Or>
+ <Category>Game</Category>
@@ -299,4 +301,6 @@
+ </Menu> <!-- End KOther -->
+ </Menu> <!-- KDE -->
+
- </Menu> <!-- End Applications -->
+ <Layout>
+ <Merge type="menus" />
+ <Menuname>Other</Menuname>
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
index b134a5817..d57d4f523 100644
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -1,6 +1,6 @@
---- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Mon Apr 11 05:36:04 2005
-+++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 6 11:04:46 2005
-@@ -29,7 +29,7 @@
+--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig 2011-08-16 14:04:56.000000000 +0200
++++ simple-editor/GMenuSimpleEditor/menutreemodel.py 2011-09-17 13:01:18.000000000 +0200
+@@ -29,7 +29,7 @@ def lookup_system_menu_file (menu_file):
if os.environ.has_key ("XDG_CONFIG_DIRS"):
conf_dirs = os.environ["XDG_CONFIG_DIRS"]
if not conf_dirs:
@@ -9,12 +9,3 @@
for conf_dir in conf_dirs.split (":"):
menu_file_path = os.path.join (conf_dir, "menus", menu_file)
-@@ -51,7 +51,7 @@
- if os.environ.has_key ("XDG_DATA_DIRS"):
- data_dirs = os.environ["XDG_DATA_DIRS"]
- if not data_dirs:
-- data_dirs = "/usr/local/share/:/usr/share/"
-+ data_dirs = "%%LOCALBASE%%/share/"
-
- for data_dir in data_dirs.split (":"):
- retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))
diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in
index 658861905..bd9515e01 100644
--- a/x11/gnome-menus/files/patch-util_Makefile.in
+++ b/x11/gnome-menus/files/patch-util_Makefile.in
@@ -1,10 +1,10 @@
---- util/Makefile.in.orig 2010-09-27 14:12:22.000000000 +0000
-+++ util/Makefile.in 2010-09-27 14:13:51.000000000 +0000
-@@ -298,6 +298,7 @@
+--- util/Makefile.in.orig 2011-09-17 13:03:46.000000000 +0200
++++ util/Makefile.in 2011-09-17 13:04:20.000000000 +0200
+@@ -267,6 +267,7 @@
test-menu-spec.c
gnome_menu_spec_test_LDADD = \
+ %%PTHREAD_LIBS%% \
- $(GLIB_LIBS) \
- ../libmenu/libgnome-menu.la
+ $(GIO_UNIX_LIBS) \
+ ../libmenu/libgnome-menu-3.la
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index a0703b292..d1ca3ae38 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,144 +1,165 @@
+bin/gmenu-simple-editor
etc/xdg/menus/gnome-applications.menu
-etc/xdg/menus/settings.menu
-include/gnome-menus/gmenu-tree.h
-lib/girepository-1.0/GMenu-2.0.typelib
-lib/libgnome-menu.a
-lib/libgnome-menu.la
-lib/libgnome-menu.so
-lib/libgnome-menu.so.2
-%%PYTHON_SITELIBDIR%%/gmenu.a
-%%PYTHON_SITELIBDIR%%/gmenu.la
-%%PYTHON_SITELIBDIR%%/gmenu.so
-libdata/pkgconfig/libgnome-menu.pc
+include/gnome-menus-3.0/gmenu-tree.h
+lib/girepository-1.0/GMenu-3.0.typelib
+lib/libgnome-menu-3.a
+lib/libgnome-menu-3.la
+lib/libgnome-menu-3.so
+lib/libgnome-menu-3.so.0
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.py
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyc
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyo
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.py
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyc
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyo
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.py
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyc
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyo
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.py
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyc
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyo
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.py
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyc
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyo
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.py
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyc
+%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyo
+libdata/pkgconfig/libgnome-menu-3.0.pc
+share/applications/gmenu-simple-editor.desktop
share/desktop-directories/AudioVideo.directory
share/desktop-directories/Development.directory
share/desktop-directories/Education.directory
share/desktop-directories/Game.directory
share/desktop-directories/Graphics.directory
share/desktop-directories/Hardware.directory
-share/desktop-directories/InternetAndNetwork.directory
share/desktop-directories/KDE.directory
-share/desktop-directories/LookAndFeel.directory
share/desktop-directories/Network.directory
share/desktop-directories/Office.directory
share/desktop-directories/Personal.directory
-share/desktop-directories/Settings-System.directory
-share/desktop-directories/Settings.directory
share/desktop-directories/System-Tools.directory
share/desktop-directories/System.directory
share/desktop-directories/Utility-Accessibility.directory
share/desktop-directories/Utility.directory
share/desktop-directories/X-GNOME-Menu-Applications.directory
-share/desktop-directories/X-GNOME-Menu-System.directory
share/desktop-directories/X-GNOME-Other.directory
-share/gir-1.0/GMenu-2.0.gir
-share/gnome-menus/examples/gnome-menus-ls.py
-share/locale/af/LC_MESSAGES/gnome-menus.mo
-share/locale/an/LC_MESSAGES/gnome-menus.mo
-share/locale/ar/LC_MESSAGES/gnome-menus.mo
-share/locale/as/LC_MESSAGES/gnome-menus.mo
-share/locale/ast/LC_MESSAGES/gnome-menus.mo
-share/locale/be/LC_MESSAGES/gnome-menus.mo
-share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
-share/locale/bg/LC_MESSAGES/gnome-menus.mo
-share/locale/bn/LC_MESSAGES/gnome-menus.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-menus.mo
-share/locale/br/LC_MESSAGES/gnome-menus.mo
-share/locale/ca/LC_MESSAGES/gnome-menus.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-menus.mo
-share/locale/crh/LC_MESSAGES/gnome-menus.mo
-share/locale/cs/LC_MESSAGES/gnome-menus.mo
-share/locale/cy/LC_MESSAGES/gnome-menus.mo
-share/locale/da/LC_MESSAGES/gnome-menus.mo
-share/locale/de/LC_MESSAGES/gnome-menus.mo
-share/locale/dv/LC_MESSAGES/gnome-menus.mo
-share/locale/dz/LC_MESSAGES/gnome-menus.mo
-share/locale/el/LC_MESSAGES/gnome-menus.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-menus.mo
-share/locale/en_CA/LC_MESSAGES/gnome-menus.mo
-share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
-share/locale/eo/LC_MESSAGES/gnome-menus.mo
-share/locale/es/LC_MESSAGES/gnome-menus.mo
-share/locale/et/LC_MESSAGES/gnome-menus.mo
-share/locale/eu/LC_MESSAGES/gnome-menus.mo
-share/locale/fa/LC_MESSAGES/gnome-menus.mo
-share/locale/fi/LC_MESSAGES/gnome-menus.mo
-share/locale/fr/LC_MESSAGES/gnome-menus.mo
-share/locale/fur/LC_MESSAGES/gnome-menus.mo
-share/locale/fy/LC_MESSAGES/gnome-menus.mo
-share/locale/ga/LC_MESSAGES/gnome-menus.mo
-share/locale/gl/LC_MESSAGES/gnome-menus.mo
-share/locale/gn/LC_MESSAGES/gnome-menus.mo
-share/locale/gu/LC_MESSAGES/gnome-menus.mo
-share/locale/gv/LC_MESSAGES/gnome-menus.mo
-share/locale/ha/LC_MESSAGES/gnome-menus.mo
-share/locale/he/LC_MESSAGES/gnome-menus.mo
-share/locale/hi/LC_MESSAGES/gnome-menus.mo
-share/locale/hr/LC_MESSAGES/gnome-menus.mo
-share/locale/hu/LC_MESSAGES/gnome-menus.mo
-share/locale/hy/LC_MESSAGES/gnome-menus.mo
-share/locale/id/LC_MESSAGES/gnome-menus.mo
-share/locale/ig/LC_MESSAGES/gnome-menus.mo
-share/locale/io/LC_MESSAGES/gnome-menus.mo
-share/locale/is/LC_MESSAGES/gnome-menus.mo
-share/locale/it/LC_MESSAGES/gnome-menus.mo
-share/locale/ja/LC_MESSAGES/gnome-menus.mo
-share/locale/ka/LC_MESSAGES/gnome-menus.mo
-share/locale/kg/LC_MESSAGES/gnome-menus.mo
-share/locale/kk/LC_MESSAGES/gnome-menus.mo
-share/locale/kn/LC_MESSAGES/gnome-menus.mo
-share/locale/ko/LC_MESSAGES/gnome-menus.mo
-share/locale/ku/LC_MESSAGES/gnome-menus.mo
-share/locale/ky/LC_MESSAGES/gnome-menus.mo
-share/locale/lt/LC_MESSAGES/gnome-menus.mo
-share/locale/lv/LC_MESSAGES/gnome-menus.mo
-share/locale/mai/LC_MESSAGES/gnome-menus.mo
-share/locale/mg/LC_MESSAGES/gnome-menus.mo
-share/locale/mk/LC_MESSAGES/gnome-menus.mo
-share/locale/ml/LC_MESSAGES/gnome-menus.mo
-share/locale/mn/LC_MESSAGES/gnome-menus.mo
-share/locale/mr/LC_MESSAGES/gnome-menus.mo
-share/locale/ms/LC_MESSAGES/gnome-menus.mo
-share/locale/nb/LC_MESSAGES/gnome-menus.mo
-share/locale/nds/LC_MESSAGES/gnome-menus.mo
-share/locale/ne/LC_MESSAGES/gnome-menus.mo
-share/locale/nl/LC_MESSAGES/gnome-menus.mo
-share/locale/nn/LC_MESSAGES/gnome-menus.mo
-share/locale/oc/LC_MESSAGES/gnome-menus.mo
-share/locale/or/LC_MESSAGES/gnome-menus.mo
-share/locale/pa/LC_MESSAGES/gnome-menus.mo
-share/locale/pl/LC_MESSAGES/gnome-menus.mo
-share/locale/ps/LC_MESSAGES/gnome-menus.mo
-share/locale/pt/LC_MESSAGES/gnome-menus.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
-share/locale/ro/LC_MESSAGES/gnome-menus.mo
-share/locale/ru/LC_MESSAGES/gnome-menus.mo
-share/locale/rw/LC_MESSAGES/gnome-menus.mo
-share/locale/si/LC_MESSAGES/gnome-menus.mo
-share/locale/sk/LC_MESSAGES/gnome-menus.mo
-share/locale/sl/LC_MESSAGES/gnome-menus.mo
-share/locale/sq/LC_MESSAGES/gnome-menus.mo
-share/locale/sr/LC_MESSAGES/gnome-menus.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-menus.mo
-share/locale/sv/LC_MESSAGES/gnome-menus.mo
-share/locale/ta/LC_MESSAGES/gnome-menus.mo
-share/locale/te/LC_MESSAGES/gnome-menus.mo
-share/locale/th/LC_MESSAGES/gnome-menus.mo
-share/locale/tr/LC_MESSAGES/gnome-menus.mo
-share/locale/ug/LC_MESSAGES/gnome-menus.mo
-share/locale/uk/LC_MESSAGES/gnome-menus.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo
-share/locale/vi/LC_MESSAGES/gnome-menus.mo
-share/locale/xh/LC_MESSAGES/gnome-menus.mo
-share/locale/yo/LC_MESSAGES/gnome-menus.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
-@dirrm share/gnome-menus/examples
+share/desktop-directories/X-GNOME-WebApplications.directory
+share/gir-1.0/GMenu-3.0.gir
+share/gnome-menus/ui/gmenu-simple-editor.ui
+share/locale/af/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/an/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ar/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/as/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ast/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/be/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/bg/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/bn/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/br/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ca/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/crh/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/cs/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/csb/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/cy/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/da/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/de/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/dv/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/dz/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/el/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/eo/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/es/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/et/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/eu/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/fa/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/fi/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/fr/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/fur/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/fy/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ga/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/gl/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/gn/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/gu/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/gv/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ha/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/he/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/hi/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/hr/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/hu/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/hy/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/id/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ig/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/io/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/is/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/it/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ja/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ka/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/kg/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/kk/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/km/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/kn/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ko/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ku/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ky/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/lo/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/lt/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/lv/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/mai/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/mg/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/mk/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ml/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/mn/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/mr/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ms/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/nb/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/nds/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ne/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/nl/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/nn/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/oc/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/or/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/pa/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/pl/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ps/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/pt/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ro/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ru/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/rw/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/si/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/sk/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/sl/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/sq/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/sr/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/sv/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/szl/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ta/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/te/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/th/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/tr/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ug/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/uk/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/vi/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/xh/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/yo/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
+@dirrm share/gnome-menus/ui
@dirrm share/gnome-menus
@dirrmtry share/desktop-directories
-@dirrm include/gnome-menus
+@dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/GMenuSimpleEditor
+@dirrm include/gnome-menus-3.0
@dirrmtry etc/xdg/menus
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yo/LC_MESSAGES
@@ -151,6 +172,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrm share/locale/szl/LC_MESSAGES
+@dirrm share/locale/szl
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@@ -169,10 +192,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/mg
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/lo/LC_MESSAGES
+@dirrmtry share/locale/lo
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@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/kg/LC_MESSAGES
@@ -199,6 +226,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/dv/LC_MESSAGES
@dirrmtry share/locale/dv
+@dirrmtry share/locale/csb/LC_MESSAGES
+@dirrmtry share/locale/csb
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
deleted file mode 100644
index a9753662b..000000000
--- a/x11/gnome-menus3/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-menus3/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME= gnome-menus
-PORTVERSION= 3.6.2
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Implementation of the FreeDesktop Desktop Menu Spec
-
-CONFLICTS= gnome-menus-2.[0-9]*
-
-NO_STAGE= yes
-LATEST_LINK= gnome-menus3
-USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
-USE_GNOME= glib20 gnomehier gnomeprefix intlhack introspection:build \
- ltverhack
-USE_AUTOTOOLS= libtool
-USE_PYTHON= yes
-USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-post-patch:
- @${REINPLACE_CMD} -e 's|applications.menu||' \
- ${WRKSRC}/layout/Makefile.in
- @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
- ${WRKSRC}/util/test-menu-spec.c
- @${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
- ${WRKSRC}/layout/applications.menu
- @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
- < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${WRKSRC}/util/Makefile.in
-
-post-install:
- @${MKDIR} -p ${PREFIX}/etc/xdg/menus/
- @${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
- ${PREFIX}/etc/xdg/menus/gnome-applications.menu
- @${INSTALL_DATA} ${WRKSRC}/KDE.directory \
- ${PREFIX}/share/desktop-directories
-
-.include <bsd.port.mk>
diff --git a/x11/gnome-menus3/distinfo b/x11/gnome-menus3/distinfo
deleted file mode 100644
index 98119ce84..000000000
--- a/x11/gnome-menus3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gnome-menus-3.6.2.tar.xz) = f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f
-SIZE (gnome3/gnome-menus-3.6.2.tar.xz) = 423948
diff --git a/x11/gnome-menus3/files/KDE.directory b/x11/gnome-menus3/files/KDE.directory
deleted file mode 100644
index d8cacb750..000000000
--- a/x11/gnome-menus3/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=KDE
-Comment=Some comment about KDE menu
-Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png
-Type=Directory
diff --git a/x11/gnome-menus3/files/patch-layout::applications.menu b/x11/gnome-menus3/files/patch-layout::applications.menu
deleted file mode 100644
index 9a0719a38..000000000
--- a/x11/gnome-menus3/files/patch-layout::applications.menu
+++ /dev/null
@@ -1,306 +0,0 @@
---- layout/applications.menu.orig 2012-07-10 01:54:30.000000000 +0000
-+++ layout/applications.menu 2013-03-30 10:41:37.311882486 +0000
-@@ -6,10 +6,9 @@
- <Name>Applications</Name>
- <Directory>X-GNOME-Menu-Applications.directory</Directory>
-
-- <!-- Scan legacy dirs first, as later items take priority -->
-- <KDELegacyDirs/>
-- <LegacyDir>/etc/X11/applnk</LegacyDir>
-- <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-+ <!-- Scan legacy dirs first, as later items take priority
-+ <LegacyDir>/etc/X11/applnk</LegacyDir> -->
-+ <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
-
- <!-- Read standard .directory and .desktop file locations -->
- <DefaultAppDirs/>
-@@ -31,6 +30,8 @@
- applications here -->
- <Not><Category>Accessibility</Category></Not>
- <Not><Category>System</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Accessories -->
-@@ -43,6 +44,8 @@
- <And>
- <Category>Accessibility</Category>
- <Not><Category>Settings</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Accessibility -->
-@@ -54,6 +57,8 @@
- <Include>
- <And>
- <Category>Development</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- <Filename>emacs.desktop</Filename>
- </Include>
-@@ -66,6 +71,8 @@
- <Include>
- <And>
- <Category>Education</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Education -->
-@@ -77,6 +84,8 @@
- <Include>
- <And>
- <Category>Game</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Games -->
-@@ -88,6 +97,8 @@
- <Include>
- <And>
- <Category>Graphics</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Graphics -->
-@@ -99,6 +110,8 @@
- <Include>
- <And>
- <Category>Network</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- <Not>
- <Category>X-GNOME-WebApplication</Category>
- </Not>
-@@ -125,6 +138,8 @@
- <Include>
- <And>
- <Category>AudioVideo</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Multimedia -->
-@@ -136,6 +151,8 @@
- <Include>
- <And>
- <Category>Office</Category>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Office -->
-@@ -148,6 +165,8 @@
- <And>
- <Category>System</Category>
- <Not><Category>Settings</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End System Tools -->
-@@ -162,10 +181,199 @@
- <Not><Category>Core</Category></Not>
- <Not><Category>Screensaver</Category></Not>
- <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+ <Not><Category>Qt</Category></Not>
-+ <Not><Category>KDE</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
-
-+ <!-- Read in overrides and child menus from applications-merged/ -->
-+ <DefaultMergeDirs/>
-+
-+ <!-- KDE -->
-+ <Menu>
-+ <KDELegacyDirs/>
-+ <Name>KDE</Name>
-+ <Directory>KDE.directory</Directory>
-+
-+ <!-- KAccessories submenu -->
-+ <Menu>
-+ <Name>Accessories</Name>
-+ <Directory>Accessories.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Utility</Category>
-+ <Not>
-+ <Category>System</Category>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KAccessories -->
-+
-+ <!-- KAccessibility submenu -->
-+ <Menu>
-+ <Name>Accessibility</Name>
-+ <Directory>Accessibility.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Accessibility</Category>
-+ <Not>
-+ <Category>Settings</Category>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KAccessibility -->
-+
-+ <!-- KDevelopment Tools -->
-+ <Menu>
-+ <Name>Development</Name>
-+ <Directory>Development.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Development</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KDevelopment Tools -->
-+
-+ <!-- KEducation -->
-+ <Menu>
-+ <Name>Education</Name>
-+ <Directory>Education.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Education</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KEducation -->
-+
-+ <!-- KGames -->
-+ <Menu>
-+ <Name>Games</Name>
-+ <Directory>Games.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Game</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KGames -->
-+
-+ <!-- KGraphics -->
-+ <Menu>
-+ <Name>Graphics</Name>
-+ <Directory>Graphics.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Graphics</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KGraphics -->
-+
-+ <!-- KInternet -->
-+ <Menu>
-+ <Name>Internet</Name>
-+ <Directory>Internet.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Network</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KInternet -->
-+
-+ <!-- KMultimedia -->
-+ <Menu>
-+ <Name>Multimedia</Name>
-+ <Directory>Multimedia.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>AudioVideo</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KMultimedia -->
-+
-+ <!-- KOffice -->
-+ <Menu>
-+ <Name>Office</Name>
-+ <Directory>Office.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Or>
-+ <Category>Office</Category>
-+ </Or>
-+ </And>
-+ </Include>
-+ </Menu><!-- End KOffice -->
-+
-+ <!-- KSystem Tools-->
-+ <Menu>
-+ <Name>System</Name>
-+ <Directory>System-Tools.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>System</Category>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KSystem Tools -->
-+
-+ <!-- KOther -->
-+ <Menu>
-+ <Name>Other</Name>
-+ <Directory>Other.directory</Directory>
-+ <OnlyUnallocated/>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Application</Category>
-+ <Not><Category>Core</Category></Not>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KOther -->
-+ </Menu> <!-- KDE -->
-+
- <Layout>
- <Merge type="menus" />
- <Menuname>Other</Menuname>
diff --git a/x11/gnome-menus3/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus3/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
deleted file mode 100644
index d57d4f523..000000000
--- a/x11/gnome-menus3/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig 2011-08-16 14:04:56.000000000 +0200
-+++ simple-editor/GMenuSimpleEditor/menutreemodel.py 2011-09-17 13:01:18.000000000 +0200
-@@ -29,7 +29,7 @@ def lookup_system_menu_file (menu_file):
- if os.environ.has_key ("XDG_CONFIG_DIRS"):
- conf_dirs = os.environ["XDG_CONFIG_DIRS"]
- if not conf_dirs:
-- conf_dirs = "/etc/xdg"
-+ conf_dirs = "%%LOCALBASE%%/etc/xdg"
-
- for conf_dir in conf_dirs.split (":"):
- menu_file_path = os.path.join (conf_dir, "menus", menu_file)
diff --git a/x11/gnome-menus3/files/patch-util_Makefile.in b/x11/gnome-menus3/files/patch-util_Makefile.in
deleted file mode 100644
index bd9515e01..000000000
--- a/x11/gnome-menus3/files/patch-util_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/Makefile.in.orig 2011-09-17 13:03:46.000000000 +0200
-+++ util/Makefile.in 2011-09-17 13:04:20.000000000 +0200
-@@ -267,6 +267,7 @@
- test-menu-spec.c
-
- gnome_menu_spec_test_LDADD = \
-+ %%PTHREAD_LIBS%% \
- $(GIO_UNIX_LIBS) \
- ../libmenu/libgnome-menu-3.la
-
diff --git a/x11/gnome-menus3/pkg-descr b/x11/gnome-menus3/pkg-descr
deleted file mode 100644
index 7b27b4e2e..000000000
--- a/x11/gnome-menus3/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-This package is free software and is part of the
-GNOME project.
-
-The package contains an implementation of the draft "Desktop
-Menu Specification" from freedesktop.org:
-
- http://www.freedesktop.org/Standards/menu-spec
-
-Also contained here are the GNOME menu layout configuration
-files, .directory files and assorted menu related utility programs.
-
--- gnome-menus README
-
-WWW: http://www.freedesktop.org/Standards/menu-spec
diff --git a/x11/gnome-menus3/pkg-plist b/x11/gnome-menus3/pkg-plist
deleted file mode 100644
index d1ca3ae38..000000000
--- a/x11/gnome-menus3/pkg-plist
+++ /dev/null
@@ -1,244 +0,0 @@
-bin/gmenu-simple-editor
-etc/xdg/menus/gnome-applications.menu
-include/gnome-menus-3.0/gmenu-tree.h
-lib/girepository-1.0/GMenu-3.0.typelib
-lib/libgnome-menu-3.a
-lib/libgnome-menu-3.la
-lib/libgnome-menu-3.so
-lib/libgnome-menu-3.so.0
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyo
-libdata/pkgconfig/libgnome-menu-3.0.pc
-share/applications/gmenu-simple-editor.desktop
-share/desktop-directories/AudioVideo.directory
-share/desktop-directories/Development.directory
-share/desktop-directories/Education.directory
-share/desktop-directories/Game.directory
-share/desktop-directories/Graphics.directory
-share/desktop-directories/Hardware.directory
-share/desktop-directories/KDE.directory
-share/desktop-directories/Network.directory
-share/desktop-directories/Office.directory
-share/desktop-directories/Personal.directory
-share/desktop-directories/System-Tools.directory
-share/desktop-directories/System.directory
-share/desktop-directories/Utility-Accessibility.directory
-share/desktop-directories/Utility.directory
-share/desktop-directories/X-GNOME-Menu-Applications.directory
-share/desktop-directories/X-GNOME-Other.directory
-share/desktop-directories/X-GNOME-WebApplications.directory
-share/gir-1.0/GMenu-3.0.gir
-share/gnome-menus/ui/gmenu-simple-editor.ui
-share/locale/af/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/an/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ar/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/as/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ast/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/be/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/bg/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/bn/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/br/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ca/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/crh/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/cs/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/csb/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/cy/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/da/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/de/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/dv/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/dz/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/el/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/eo/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/es/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/et/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/eu/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/fa/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/fi/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/fr/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/fur/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/fy/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ga/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/gl/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/gn/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/gu/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/gv/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ha/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/he/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/hi/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/hr/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/hu/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/hy/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/id/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ig/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/io/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/is/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/it/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ja/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ka/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/kg/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/kk/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/km/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/kn/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ko/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ku/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ky/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/lo/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/lt/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/lv/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/mai/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/mg/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/mk/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ml/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/mn/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/mr/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ms/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/nb/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/nds/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ne/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/nl/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/nn/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/oc/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/or/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/pa/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/pl/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ps/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/pt/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ro/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ru/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/rw/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/si/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/sk/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/sl/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/sq/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/sr/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/sv/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/szl/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ta/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/te/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/th/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/tr/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/ug/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/uk/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/vi/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/xh/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/yo/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-menus-3.0.mo
-share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
-@dirrm share/gnome-menus/ui
-@dirrm share/gnome-menus
-@dirrmtry share/desktop-directories
-@dirrmtry share/applications
-@dirrm %%PYTHON_SITELIBDIR%%/GMenuSimpleEditor
-@dirrm include/gnome-menus-3.0
-@dirrmtry etc/xdg/menus
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrm share/locale/szl/LC_MESSAGES
-@dirrm share/locale/szl
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/lo/LC_MESSAGES
-@dirrmtry share/locale/lo
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@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/kg/LC_MESSAGES
-@dirrmtry share/locale/kg
-@dirrmtry share/locale/io/LC_MESSAGES
-@dirrmtry share/locale/io
-@dirrmtry share/locale/ig/LC_MESSAGES
-@dirrmtry share/locale/ig
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/ha/LC_MESSAGES
-@dirrmtry share/locale/ha
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/gn/LC_MESSAGES
-@dirrmtry share/locale/gn
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/dv/LC_MESSAGES
-@dirrmtry share/locale/dv
-@dirrmtry share/locale/csb/LC_MESSAGES
-@dirrmtry share/locale/csb
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index b0f063490..6fe794fc5 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,71 +1,61 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-panel/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gnome-panel3/Makefile 18610 2013-06-30 16:33:05Z marcus $
PORTNAME= gnome-panel
-PORTVERSION= 2.32.1
-PORTREVISION?= 3
+PORTVERSION= 3.6.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Panel component for the GNOME 2 Desktop
+COMMENT= Panel component for the GNOME 3 Desktop
-USE_BZIP2= yes
-NO_STAGE= yes
+USE_XZ= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= gweather:${PORTSDIR}/net/libgweather \
- dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
- canberra-gtk:${PORTSDIR}/audio/libcanberra
-
-CONFLICTS= gnome-panel-3.[0-9]*
+BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
+LIB_DEPENDS= libgweather-3.so:${PORTSDIR}/net/libgweather3 \
+ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
+ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
+ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+RUN_DEPENDS= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+USES= gettext gmake pathfix pkgconfig
USE_XORG= ice sm x11 xau xrandr
-USE_PYTHON= yes
-INSTALLS_OMF= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USES= gettext gmake pathfix
-USE_GNOME= gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
- gnomedocutils ltverhack referencehack librsvg2
+USE_GNOME= gnomeprefix intlhack gnomedesktop3 librsvg2 libwnck3 \
+ gnomemenus3 ltverhack referencehack
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-network-manager
-LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= gnome-panel.1
-GCONF_SCHEMAS= clock.schemas fish.schemas \
- panel-compatibility.schemas panel-general.schemas \
- panel-global.schemas panel-object.schemas \
- panel-toplevel.schemas window-list.schemas \
- workspace-switcher.schemas
-
-
-OPTIONS_DEFINE= EVOLUTION BONOBO
-OPTIONS_DEFAULT=EVOLUTION BONOBO
-EVOLUTION_DESC= Use the Evolution calendar
-BONOBO_DESC= Support for bonobo applets aka Gnome 2 applets
+GLIB_SCHEMAS= org.gnome.gnome-panel.applet.clock.gschema.xml \
+ org.gnome.gnome-panel.applet.fish.gschema.xml \
+ org.gnome.gnome-panel.applet.window-list.gschema.xml \
+ org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml \
+ org.gnome.gnome-panel.enums.xml \
+ org.gnome.gnome-panel.gschema.xml \
+ org.gnome.gnome-panel.launcher.gschema.xml \
+ org.gnome.gnome-panel.menu-button.gschema.xml \
+ org.gnome.gnome-panel.object.gschema.xml \
+ org.gnome.gnome-panel.toplevel.gschema.xml
+
+#OPTIONS_DEFINE= EVOLUTION
+#OPTIONS_DEFAULT=EVOLUTION
+#EVOLUTION_DESC= Evolution calendar support
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MEVOLUTION}
-USE_GNOME+= evolutiondataserver
+#.if ${PORT_OPTIONS:MEVOLUTION}
+#USE_GNOME+= evolutiondataserver3
#CONFIGURE_ARGS+=--enable-eds
-.else
+#.else
CONFIGURE_ARGS+=--disable-eds
-.endif
-
-.if ${PORT_OPTIONS:MBONOBO}
-USE_GNOME+= libbonoboui
-CONFIGURE_ARGS+=--enable-bonobo
-PLIST_SUB+= BONOBO=""
-.else
-CONFIGURE_ARGS+=--disable-bonobo
-PLIST_SUB+= BONOBO="@comment "
-.endif
+#.endif
post-patch:
@${FIND} ${WRKSRC} -type f | \
@@ -74,12 +64,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
${WRKSRC}/help/clock/Makefile.in \
${WRKSRC}/help/fish/Makefile.in
- @${REINPLACE_CMD} -e 's|python.* python2\.0|${PYTHON_VERSION}|g' \
- ${WRKSRC}/configure
post-install:
- @${MKDIR} ${PREFIX}/lib/gnome-panel/modules
- -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpanel-applet-4.so.0
.include <bsd.port.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d0b90eeb5..5caf47117 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-panel-2.32.1.tar.bz2) = 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
-SIZE (gnome2/gnome-panel-2.32.1.tar.bz2) = 3132156
+SHA256 (gnome3/gnome-panel-3.6.2.tar.xz) = a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079
+SIZE (gnome3/gnome-panel-3.6.2.tar.xz) = 2432152
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
deleted file mode 100644
index aa25ac2fc..000000000
--- a/x11/gnome-panel/files/patch-applets_clock_clock-location.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/clock/clock-location.c.orig 2008-04-07 17:17:51.000000000 -0400
-+++ applets/clock/clock-location.c 2008-04-07 22:54:31.000000000 -0400
-@@ -27,6 +27,8 @@
- #include "clock-marshallers.h"
- #include "set-timezone.h"
-
-+#define daylight 1
-+
- G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT)
-
- typedef struct {
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
deleted file mode 100644
index a9b459b74..000000000
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/clock/clock.c.orig 2009-07-01 15:06:23.000000000 +0200
-+++ applets/clock/clock.c 2009-07-19 15:59:26.000000000 +0200
-@@ -71,6 +71,8 @@
- #include "set-timezone.h"
- #include "system-timezone.h"
-
-+#define daylight 1
-+
- #define INTERNETSECOND (864)
- #define INTERNETBEAT (86400)
-
diff --git a/x11/gnome-panel/files/patch-po_ja.po b/x11/gnome-panel/files/patch-po_ja.po
deleted file mode 100644
index 5a71e3919..000000000
--- a/x11/gnome-panel/files/patch-po_ja.po
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/ja.po.orig 2007-08-13 19:37:02.000000000 -0400
-+++ po/ja.po 2007-08-14 17:00:06.000000000 -0400
-@@ -97,7 +97,7 @@ msgstr "%k:%M"
- #. * possible.
- #: ../applets/clock/calendar-window.c:234
- msgid "%b %d"
--msgstr "%b%eæ—¥"
-+msgstr "%B%eæ—¥"
-
- #: ../applets/clock/calendar-window.c:742
- msgid "_Tasks"
-@@ -138,7 +138,7 @@ msgstr "%k:%M:%S"
- #.
- #: ../applets/clock/clock.c:369
- msgid "%a %b %e"
--msgstr "%b%eæ—¥ (%a)"
-+msgstr "%B%eæ—¥ (%a)"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
diff --git a/x11/gnome-panel/pkg-descr b/x11/gnome-panel/pkg-descr
index 263044b5e..3da96680d 100644
--- a/x11/gnome-panel/pkg-descr
+++ b/x11/gnome-panel/pkg-descr
@@ -1,3 +1,3 @@
-This drives the GNOME 2 panel.
+This drives the GNOME 3 panel.
WWW: http://www.gnome.org/
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 2bffc2fcc..ec45af34f 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -1,235 +1,195 @@
bin/gnome-desktop-item-edit
bin/gnome-panel
bin/panel-test-applets
-%%BONOBO%%bin/panel-test-applets-bonobo
-@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
-@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-default-setup.entries
-@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
-@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
-%%BONOBO%%include/panel-2.0/GNOME_Panel.h
-%%BONOBO%%include/panel-2.0/panel-applet-enums.h
-%%BONOBO%%include/panel-2.0/panel-applet-gconf.h
-%%BONOBO%%include/panel-2.0/panel-applet.h
-include/gnome-panel-3.0/libpanel-applet/panel-applet-enums.h
-include/gnome-panel-3.0/libpanel-applet/panel-applet-gconf.h
-include/gnome-panel-3.0/libpanel-applet/panel-applet.h
-lib/girepository-1.0/PanelApplet-3.0.typelib
-@exec mkdir -p %D/lib/gnome-panel/modules
-%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.a
-%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.la
-%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.so
-@exec %%LOCALBASE%%/bin/gio-querymodules %D/lib/gnome-panel/modules 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -f %D/lib/gnome-panel/modules/giomodule.cache
-%%BONOBO%%lib/libpanel-applet-2.a
-%%BONOBO%%lib/libpanel-applet-2.la
-%%BONOBO%%lib/libpanel-applet-2.so
-%%BONOBO%%lib/libpanel-applet-2.so.0
-lib/libpanel-applet-3.a
-lib/libpanel-applet-3.la
-lib/libpanel-applet-3.so
-lib/libpanel-applet-3.so.0
-%%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc
-libdata/pkgconfig/libpanelapplet-3.0.pc
+include/gnome-panel-4.0/libpanel-applet/panel-applet-enums.h
+include/gnome-panel-4.0/libpanel-applet/panel-applet-gconf.h
+include/gnome-panel-4.0/libpanel-applet/panel-applet.h
+lib/girepository-1.0/PanelApplet-4.0.typelib
+lib/libpanel-applet-4.a
+lib/libpanel-applet-4.la
+lib/libpanel-applet-4.so
+lib/libpanel-applet-4.so.0
+libdata/pkgconfig/libpanelapplet-4.0.pc
libexec/clock-applet
libexec/fish-applet
libexec/gnome-panel-add
libexec/notification-area-applet
libexec/wnck-applet
+man/man1/gnome-panel.1.gz
share/applications/gnome-panel.desktop
share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
share/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
share/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-%%BONOBO%%share/gnome-2.0/ui/GNOME_Panel_Popup.xml
-share/gir-1.0/PanelApplet-3.0.gir
-%%DATADIR%%/applets/org.gnome.panel.ClockApplet.panel-applet
-%%DATADIR%%/applets/org.gnome.panel.FishApplet.panel-applet
-%%DATADIR%%/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
-%%DATADIR%%/applets/org.gnome.panel.Wncklet.panel-applet
-%%DATADIR%%/ui/clock.ui
-%%DATADIR%%/ui/clock-menu.xml
-%%DATADIR%%/ui/fish.ui
-%%DATADIR%%/ui/fish-menu.xml
-%%DATADIR%%/ui/notification-area-menu.xml
-%%BONOBO%%%%DATADIR%%/ui/panel-test-applets-bonobo.ui
-%%DATADIR%%/ui/panel-properties-dialog.ui
-%%DATADIR%%/ui/panel-run-dialog.ui
-%%DATADIR%%/ui/showdesktop-menu.xml
-%%DATADIR%%/ui/panel-test-applets.ui
-%%DATADIR%%/ui/window-list.ui
-%%DATADIR%%/ui/window-list-menu.xml
-%%DATADIR%%/ui/window-menu-menu.xml
-%%DATADIR%%/ui/workspace-switcher.ui
-%%DATADIR%%/ui/workspace-switcher-menu.xml
-%%DATADIR%%/pixmaps/clock-calendar-icon.png
-%%DATADIR%%/pixmaps/clock-face-large.svg
-%%DATADIR%%/pixmaps/clock-face-small-day.svg
-%%DATADIR%%/pixmaps/clock-face-small-evening.svg
-%%DATADIR%%/pixmaps/clock-face-small-morning.svg
-%%DATADIR%%/pixmaps/clock-face-small-night.svg
-%%DATADIR%%/pixmaps/clock-face-small.svg
-%%DATADIR%%/pixmaps/clock-map-location-current.png
-%%DATADIR%%/pixmaps/clock-map-location-hilight.png
-%%DATADIR%%/pixmaps/clock-map-location-marker.png
-%%DATADIR%%/pixmaps/clock-map.png
-%%DATADIR%%/pixmaps/fishanim.png
-%%DATADIR%%/pixmaps/footguy.png
-%%DATADIR%%/pixmaps/gnome-gegl2-2.png
-%%DATADIR%%/pixmaps/gnome-gegl2.png
-%%DATADIR%%/pixmaps/monkey.png
-%%DATADIR%%/pixmaps/oldwanda.png
-%%DATADIR%%/pixmaps/wanda.png
-share/gnome-panelrc
-share/gnome/help/clock/C/clock.xml
-share/gnome/help/clock/C/figures/clock_applet.png
-share/gnome/help/clock/C/legal.xml
-share/gnome/help/clock/ar/clock.xml
-share/gnome/help/clock/ar/figures/clock_applet.png
-share/gnome/help/clock/ar/legal.xml
-share/gnome/help/clock/ca/clock.xml
-share/gnome/help/clock/ca/figures/clock_applet.png
-share/gnome/help/clock/ca/legal.xml
-share/gnome/help/clock/cs/clock.xml
-share/gnome/help/clock/cs/figures/clock_applet.png
-share/gnome/help/clock/cs/legal.xml
-share/gnome/help/clock/da/clock.xml
-share/gnome/help/clock/da/figures/clock_applet.png
-share/gnome/help/clock/da/legal.xml
-share/gnome/help/clock/de/clock.xml
-share/gnome/help/clock/de/figures/clock_applet.png
-share/gnome/help/clock/de/legal.xml
-share/gnome/help/clock/el/clock.xml
-share/gnome/help/clock/el/figures/clock_applet.png
-share/gnome/help/clock/el/legal.xml
-share/gnome/help/clock/en_GB/clock.xml
-share/gnome/help/clock/en_GB/figures/clock_applet.png
-share/gnome/help/clock/en_GB/legal.xml
-share/gnome/help/clock/es/clock.xml
-share/gnome/help/clock/es/figures/clock_applet.png
-share/gnome/help/clock/es/legal.xml
-share/gnome/help/clock/eu/clock.xml
-share/gnome/help/clock/eu/figures/clock_applet.png
-share/gnome/help/clock/eu/legal.xml
-share/gnome/help/clock/fi/clock.xml
-share/gnome/help/clock/fi/figures/clock_applet.png
-share/gnome/help/clock/fi/legal.xml
-share/gnome/help/clock/fr/clock.xml
-share/gnome/help/clock/fr/figures/clock_applet.png
-share/gnome/help/clock/fr/legal.xml
-share/gnome/help/clock/it/clock.xml
-share/gnome/help/clock/it/figures/clock_applet.png
-share/gnome/help/clock/it/legal.xml
-share/gnome/help/clock/ja/clock.xml
-share/gnome/help/clock/ja/figures/clock_applet.png
-share/gnome/help/clock/ja/legal.xml
-share/gnome/help/clock/ko/clock.xml
-share/gnome/help/clock/ko/figures/clock_applet.png
-share/gnome/help/clock/ko/legal.xml
-share/gnome/help/clock/nl/clock.xml
-share/gnome/help/clock/nl/figures/clock_applet.png
-share/gnome/help/clock/nl/legal.xml
-share/gnome/help/clock/oc/clock.xml
-share/gnome/help/clock/oc/figures/clock_applet.png
-share/gnome/help/clock/oc/legal.xml
-share/gnome/help/clock/pa/clock.xml
-share/gnome/help/clock/pa/figures/clock_applet.png
-share/gnome/help/clock/pa/legal.xml
-share/gnome/help/clock/pt/clock.xml
-share/gnome/help/clock/pt/figures/clock_applet.png
-share/gnome/help/clock/pt/legal.xml
-share/gnome/help/clock/pt_BR/clock.xml
-share/gnome/help/clock/pt_BR/figures/clock_applet.png
-share/gnome/help/clock/pt_BR/legal.xml
-share/gnome/help/clock/ru/clock.xml
-share/gnome/help/clock/ru/figures/clock_applet.png
-share/gnome/help/clock/ru/legal.xml
-share/gnome/help/clock/sl/clock.xml
-share/gnome/help/clock/sl/figures/clock_applet.png
-share/gnome/help/clock/sl/legal.xml
-share/gnome/help/clock/sr/clock.xml
-share/gnome/help/clock/sr/figures/clock_applet.png
-share/gnome/help/clock/sr/legal.xml
-share/gnome/help/clock/sv/clock.xml
-share/gnome/help/clock/sv/figures/clock_applet.png
-share/gnome/help/clock/sv/legal.xml
-share/gnome/help/clock/th/clock.xml
-share/gnome/help/clock/th/figures/clock_applet.png
-share/gnome/help/clock/th/legal.xml
-share/gnome/help/clock/uk/clock.xml
-share/gnome/help/clock/uk/figures/clock_applet.png
-share/gnome/help/clock/uk/legal.xml
-share/gnome/help/clock/zh_CN/clock.xml
-share/gnome/help/clock/zh_CN/figures/clock_applet.png
-share/gnome/help/clock/zh_CN/legal.xml
-share/gnome/help/clock/zh_HK/clock.xml
-share/gnome/help/clock/zh_HK/figures/clock_applet.png
-share/gnome/help/clock/zh_HK/legal.xml
-share/gnome/help/clock/zh_TW/clock.xml
-share/gnome/help/clock/zh_TW/figures/clock_applet.png
-share/gnome/help/clock/zh_TW/legal.xml
-share/gnome/help/fish/C/figures/fish_applet.png
-share/gnome/help/fish/C/fish.xml
-share/gnome/help/fish/C/legal.xml
-share/gnome/help/fish/ca/figures/fish_applet.png
-share/gnome/help/fish/ca/fish.xml
-share/gnome/help/fish/ca/legal.xml
-share/gnome/help/fish/cs/figures/fish_applet.png
-share/gnome/help/fish/cs/fish.xml
-share/gnome/help/fish/cs/legal.xml
-share/gnome/help/fish/de/figures/fish_applet.png
-share/gnome/help/fish/de/fish.xml
-share/gnome/help/fish/de/legal.xml
-share/gnome/help/fish/el/figures/fish_applet.png
-share/gnome/help/fish/el/fish.xml
-share/gnome/help/fish/el/legal.xml
-share/gnome/help/fish/en_GB/figures/fish_applet.png
-share/gnome/help/fish/en_GB/fish.xml
-share/gnome/help/fish/en_GB/legal.xml
-share/gnome/help/fish/es/figures/fish_applet.png
-share/gnome/help/fish/es/fish.xml
-share/gnome/help/fish/es/legal.xml
-share/gnome/help/fish/eu/figures/fish_applet.png
-share/gnome/help/fish/eu/fish.xml
-share/gnome/help/fish/eu/legal.xml
-share/gnome/help/fish/fi/figures/fish_applet.png
-share/gnome/help/fish/fi/fish.xml
-share/gnome/help/fish/fi/legal.xml
-share/gnome/help/fish/fr/figures/fish_applet.png
-share/gnome/help/fish/fr/fish.xml
-share/gnome/help/fish/fr/legal.xml
-share/gnome/help/fish/it/figures/fish_applet.png
-share/gnome/help/fish/it/fish.xml
-share/gnome/help/fish/it/legal.xml
-share/gnome/help/fish/ja/figures/fish_applet.png
-share/gnome/help/fish/ja/fish.xml
-share/gnome/help/fish/ja/legal.xml
-share/gnome/help/fish/ko/figures/fish_applet.png
-share/gnome/help/fish/ko/fish.xml
-share/gnome/help/fish/ko/legal.xml
-share/gnome/help/fish/oc/figures/fish_applet.png
-share/gnome/help/fish/oc/fish.xml
-share/gnome/help/fish/oc/legal.xml
-share/gnome/help/fish/ru/figures/fish_applet.png
-share/gnome/help/fish/ru/fish.xml
-share/gnome/help/fish/ru/legal.xml
-share/gnome/help/fish/sl/figures/fish_applet.png
-share/gnome/help/fish/sl/fish.xml
-share/gnome/help/fish/sl/legal.xml
-share/gnome/help/fish/sv/figures/fish_applet.png
-share/gnome/help/fish/sv/fish.xml
-share/gnome/help/fish/sv/legal.xml
-share/gnome/help/fish/th/figures/fish_applet.png
-share/gnome/help/fish/th/fish.xml
-share/gnome/help/fish/th/legal.xml
-share/gnome/help/fish/uk/figures/fish_applet.png
-share/gnome/help/fish/uk/fish.xml
-share/gnome/help/fish/uk/legal.xml
-share/gnome/help/fish/zh_CN/figures/fish_applet.png
-share/gnome/help/fish/zh_CN/fish.xml
-share/gnome/help/fish/zh_CN/legal.xml
+share/doc/panel-applet-4.0/getting-started.concepts.html
+share/doc/panel-applet-4.0/getting-started.concepts.html.bak
+share/doc/panel-applet-4.0/getting-started.context-menu.html
+share/doc/panel-applet-4.0/getting-started.context-menu.html.bak
+share/doc/panel-applet-4.0/getting-started.example.html
+share/doc/panel-applet-4.0/getting-started.example.html.bak
+share/doc/panel-applet-4.0/getting-started.html
+share/doc/panel-applet-4.0/getting-started.html.bak
+share/doc/panel-applet-4.0/getting-started.in-out-process.html
+share/doc/panel-applet-4.0/getting-started.in-out-process.html.bak
+share/doc/panel-applet-4.0/getting-started.install.html
+share/doc/panel-applet-4.0/getting-started.install.html.bak
+share/doc/panel-applet-4.0/getting-started.integration.html
+share/doc/panel-applet-4.0/getting-started.integration.html.bak
+share/doc/panel-applet-4.0/getting-started.intro.html
+share/doc/panel-applet-4.0/getting-started.intro.html.bak
+share/doc/panel-applet-4.0/getting-started.introspection.html
+share/doc/panel-applet-4.0/getting-started.introspection.html.bak
+share/doc/panel-applet-4.0/getting-started.settings.html
+share/doc/panel-applet-4.0/getting-started.settings.html.bak
+share/doc/panel-applet-4.0/home.png
+share/doc/panel-applet-4.0/home.png.bak
+share/doc/panel-applet-4.0/index.html
+share/doc/panel-applet-4.0/index.html.bak
+share/doc/panel-applet-4.0/index.sgml
+share/doc/panel-applet-4.0/index.sgml.bak
+share/doc/panel-applet-4.0/left.png
+share/doc/panel-applet-4.0/left.png.bak
+share/doc/panel-applet-4.0/overview.html
+share/doc/panel-applet-4.0/overview.html.bak
+share/doc/panel-applet-4.0/panel-applet-4.0.devhelp2
+share/doc/panel-applet-4.0/panel-applet-GConf-Utilities.html
+share/doc/panel-applet-4.0/panel-applet-GConf-Utilities.html.bak
+share/doc/panel-applet-4.0/panel-applet-Panel-Applet-Factory.html
+share/doc/panel-applet-4.0/panel-applet-Panel-Applet-Factory.html.bak
+share/doc/panel-applet-4.0/panel-applet-Panel-Applet.html
+share/doc/panel-applet-4.0/panel-applet-Panel-Applet.html.bak
+share/doc/panel-applet-4.0/panel-applet.devhelp2.bak
+share/doc/panel-applet-4.0/port-gnome2.html
+share/doc/panel-applet-4.0/port-gnome2.html.bak
+share/doc/panel-applet-4.0/reference.html
+share/doc/panel-applet-4.0/reference.html.bak
+share/doc/panel-applet-4.0/right.png
+share/doc/panel-applet-4.0/right.png.bak
+share/doc/panel-applet-4.0/style.css
+share/doc/panel-applet-4.0/style.css.bak
+share/doc/panel-applet-4.0/up.png
+share/doc/panel-applet-4.0/up.png.bak
+share/gir-1.0/PanelApplet-4.0.gir
+%%DATADIR%%/4.0/applets/org.gnome.panel.ClockApplet.panel-applet
+%%DATADIR%%/4.0/applets/org.gnome.panel.FishApplet.panel-applet
+%%DATADIR%%/4.0/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
+%%DATADIR%%/4.0/applets/org.gnome.panel.Wncklet.panel-applet
+%%DATADIR%%/fish/fishanim.fish
+%%DATADIR%%/fish/fishanim.png
+%%DATADIR%%/fish/footguy.fish
+%%DATADIR%%/fish/footguy.png
+%%DATADIR%%/fish/monkey.fish
+%%DATADIR%%/fish/monkey.png
+%%DATADIR%%/fish/oldwanda.fish
+%%DATADIR%%/fish/oldwanda.png
+%%DATADIR%%/fish/wanda.fish
+%%DATADIR%%/fish/wanda.png
+%%DATADIR%%/panel-default-layout.layout
+share/help/C/clock/index.docbook
+share/help/C/clock/legal.xml
+share/help/C/fish/index.docbook
+share/help/C/fish/legal.xml
+share/help/ar/clock/index.docbook
+share/help/ar/clock/legal.xml
+share/help/ca/clock/index.docbook
+share/help/ca/clock/legal.xml
+share/help/ca/fish/index.docbook
+share/help/ca/fish/legal.xml
+share/help/cs/clock/index.docbook
+share/help/cs/clock/legal.xml
+share/help/cs/fish/index.docbook
+share/help/cs/fish/legal.xml
+share/help/da/clock/index.docbook
+share/help/da/clock/legal.xml
+share/help/da/fish/index.docbook
+share/help/da/fish/legal.xml
+share/help/de/clock/index.docbook
+share/help/de/clock/legal.xml
+share/help/de/fish/index.docbook
+share/help/de/fish/legal.xml
+share/help/el/clock/index.docbook
+share/help/el/clock/legal.xml
+share/help/el/fish/index.docbook
+share/help/el/fish/legal.xml
+share/help/en_GB/clock/index.docbook
+share/help/en_GB/clock/legal.xml
+share/help/en_GB/fish/index.docbook
+share/help/en_GB/fish/legal.xml
+share/help/es/clock/index.docbook
+share/help/es/clock/legal.xml
+share/help/es/fish/index.docbook
+share/help/es/fish/legal.xml
+share/help/eu/clock/index.docbook
+share/help/eu/clock/legal.xml
+share/help/eu/fish/index.docbook
+share/help/eu/fish/legal.xml
+share/help/fi/clock/index.docbook
+share/help/fi/clock/legal.xml
+share/help/fi/fish/index.docbook
+share/help/fi/fish/legal.xml
+share/help/fr/clock/index.docbook
+share/help/fr/clock/legal.xml
+share/help/fr/fish/index.docbook
+share/help/fr/fish/legal.xml
+share/help/id/clock/index.docbook
+share/help/id/clock/legal.xml
+share/help/it/clock/index.docbook
+share/help/it/clock/legal.xml
+share/help/it/fish/index.docbook
+share/help/it/fish/legal.xml
+share/help/ja/clock/index.docbook
+share/help/ja/clock/legal.xml
+share/help/ja/fish/index.docbook
+share/help/ja/fish/legal.xml
+share/help/ko/clock/index.docbook
+share/help/ko/clock/legal.xml
+share/help/ko/fish/index.docbook
+share/help/ko/fish/legal.xml
+share/help/nl/clock/index.docbook
+share/help/nl/clock/legal.xml
+share/help/oc/clock/index.docbook
+share/help/oc/clock/legal.xml
+share/help/oc/fish/index.docbook
+share/help/oc/fish/legal.xml
+share/help/pa/clock/index.docbook
+share/help/pa/clock/legal.xml
+share/help/pt/clock/index.docbook
+share/help/pt/clock/legal.xml
+share/help/pt_BR/clock/index.docbook
+share/help/pt_BR/clock/legal.xml
+share/help/ru/clock/index.docbook
+share/help/ru/clock/legal.xml
+share/help/ru/fish/index.docbook
+share/help/ru/fish/legal.xml
+share/help/sl/clock/index.docbook
+share/help/sl/clock/legal.xml
+share/help/sl/fish/index.docbook
+share/help/sl/fish/legal.xml
+share/help/sr/clock/index.docbook
+share/help/sr/clock/legal.xml
+share/help/sv/clock/index.docbook
+share/help/sv/clock/legal.xml
+share/help/sv/fish/index.docbook
+share/help/sv/fish/legal.xml
+share/help/te/clock/index.docbook
+share/help/te/clock/legal.xml
+share/help/th/clock/index.docbook
+share/help/th/clock/legal.xml
+share/help/th/fish/index.docbook
+share/help/th/fish/legal.xml
+share/help/uk/clock/index.docbook
+share/help/uk/clock/legal.xml
+share/help/uk/fish/index.docbook
+share/help/uk/fish/legal.xml
+share/help/zh_CN/clock/index.docbook
+share/help/zh_CN/clock/legal.xml
+share/help/zh_CN/fish/index.docbook
+share/help/zh_CN/fish/legal.xml
+share/help/zh_HK/clock/index.docbook
+share/help/zh_HK/clock/legal.xml
+share/help/zh_TW/clock/index.docbook
+share/help/zh_TW/clock/legal.xml
share/icons/hicolor/16x16/apps/gnome-panel-clock.png
-share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
share/icons/hicolor/16x16/apps/gnome-panel-fish.png
share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png
share/icons/hicolor/16x16/apps/gnome-panel-launcher.png
@@ -240,7 +200,6 @@ share/icons/hicolor/16x16/apps/gnome-panel-window-menu.png
share/icons/hicolor/16x16/apps/gnome-panel-workspace-switcher.png
share/icons/hicolor/16x16/apps/gnome-panel.png
share/icons/hicolor/22x22/apps/gnome-panel-clock.png
-share/icons/hicolor/22x22/apps/gnome-panel-drawer.png
share/icons/hicolor/22x22/apps/gnome-panel-fish.png
share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png
share/icons/hicolor/22x22/apps/gnome-panel-launcher.png
@@ -251,7 +210,6 @@ share/icons/hicolor/22x22/apps/gnome-panel-window-menu.png
share/icons/hicolor/22x22/apps/gnome-panel-workspace-switcher.png
share/icons/hicolor/22x22/apps/gnome-panel.png
share/icons/hicolor/24x24/apps/gnome-panel-clock.png
-share/icons/hicolor/24x24/apps/gnome-panel-drawer.png
share/icons/hicolor/24x24/apps/gnome-panel-fish.png
share/icons/hicolor/24x24/apps/gnome-panel-force-quit.png
share/icons/hicolor/24x24/apps/gnome-panel-launcher.png
@@ -262,7 +220,6 @@ share/icons/hicolor/24x24/apps/gnome-panel-window-menu.png
share/icons/hicolor/24x24/apps/gnome-panel-workspace-switcher.png
share/icons/hicolor/24x24/apps/gnome-panel.png
share/icons/hicolor/32x32/apps/gnome-panel-clock.png
-share/icons/hicolor/32x32/apps/gnome-panel-drawer.png
share/icons/hicolor/32x32/apps/gnome-panel-fish.png
share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png
share/icons/hicolor/32x32/apps/gnome-panel-launcher.png
@@ -274,7 +231,6 @@ share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png
share/icons/hicolor/32x32/apps/gnome-panel.png
share/icons/hicolor/48x48/apps/gnome-panel.png
share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
-share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg
share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg
share/icons/hicolor/scalable/apps/gnome-panel-launcher.svg
@@ -284,277 +240,117 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
share/icons/hicolor/scalable/apps/gnome-panel.svg
-%%BONOBO%%share/idl/gnome-panel-2.0/GNOME_Panel.idl
-share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/as/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ast/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/crh/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/fy/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/gv/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ha/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ig/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/kk/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/la/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/mai/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/mg/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/mi/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/nds/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/nso/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/oc/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/or/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ps/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/si/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/ug/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/yo/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-share/omf/clock/clock-C.omf
-share/omf/clock/clock-ar.omf
-share/omf/clock/clock-ca.omf
-share/omf/clock/clock-cs.omf
-share/omf/clock/clock-da.omf
-share/omf/clock/clock-de.omf
-share/omf/clock/clock-el.omf
-share/omf/clock/clock-en_GB.omf
-share/omf/clock/clock-es.omf
-share/omf/clock/clock-eu.omf
-share/omf/clock/clock-fi.omf
-share/omf/clock/clock-fr.omf
-share/omf/clock/clock-it.omf
-share/omf/clock/clock-ja.omf
-share/omf/clock/clock-ko.omf
-share/omf/clock/clock-nl.omf
-share/omf/clock/clock-oc.omf
-share/omf/clock/clock-pa.omf
-share/omf/clock/clock-pt.omf
-share/omf/clock/clock-pt_BR.omf
-share/omf/clock/clock-ru.omf
-share/omf/clock/clock-sl.omf
-share/omf/clock/clock-sr.omf
-share/omf/clock/clock-sv.omf
-share/omf/clock/clock-th.omf
-share/omf/clock/clock-uk.omf
-share/omf/clock/clock-zh_CN.omf
-share/omf/clock/clock-zh_HK.omf
-share/omf/clock/clock-zh_TW.omf
-share/omf/fish/fish-C.omf
-share/omf/fish/fish-ca.omf
-share/omf/fish/fish-cs.omf
-share/omf/fish/fish-de.omf
-share/omf/fish/fish-el.omf
-share/omf/fish/fish-en_GB.omf
-share/omf/fish/fish-es.omf
-share/omf/fish/fish-eu.omf
-share/omf/fish/fish-fi.omf
-share/omf/fish/fish-fr.omf
-share/omf/fish/fish-it.omf
-share/omf/fish/fish-ja.omf
-share/omf/fish/fish-ko.omf
-share/omf/fish/fish-oc.omf
-share/omf/fish/fish-ru.omf
-share/omf/fish/fish-sl.omf
-share/omf/fish/fish-sv.omf
-share/omf/fish/fish-th.omf
-share/omf/fish/fish-uk.omf
-share/omf/fish/fish-zh_CN.omf
-@dirrm share/omf/fish
-@dirrm share/omf/clock
-%%BONOBO%%@dirrm share/idl/gnome-panel-2.0
-@dirrm share/gnome/help/fish/zh_CN/figures
-@dirrm share/gnome/help/fish/zh_CN
-@dirrm share/gnome/help/fish/uk/figures
-@dirrm share/gnome/help/fish/uk
-@dirrm share/gnome/help/fish/th/figures
-@dirrm share/gnome/help/fish/th
-@dirrm share/gnome/help/fish/sv/figures
-@dirrm share/gnome/help/fish/sv
-@dirrm share/gnome/help/fish/sl/figures
-@dirrm share/gnome/help/fish/sl
-@dirrm share/gnome/help/fish/ru/figures
-@dirrm share/gnome/help/fish/ru
-@dirrm share/gnome/help/fish/oc/figures
-@dirrm share/gnome/help/fish/oc
-@dirrm share/gnome/help/fish/ko/figures
-@dirrm share/gnome/help/fish/ko
-@dirrm share/gnome/help/fish/ja/figures
-@dirrm share/gnome/help/fish/ja
-@dirrm share/gnome/help/fish/it/figures
-@dirrm share/gnome/help/fish/it
-@dirrm share/gnome/help/fish/fr/figures
-@dirrm share/gnome/help/fish/fr
-@dirrm share/gnome/help/fish/fi/figures
-@dirrm share/gnome/help/fish/fi
-@dirrm share/gnome/help/fish/eu/figures
-@dirrm share/gnome/help/fish/eu
-@dirrm share/gnome/help/fish/es/figures
-@dirrm share/gnome/help/fish/es
-@dirrm share/gnome/help/fish/en_GB/figures
-@dirrm share/gnome/help/fish/en_GB
-@dirrm share/gnome/help/fish/el/figures
-@dirrm share/gnome/help/fish/el
-@dirrm share/gnome/help/fish/de/figures
-@dirrm share/gnome/help/fish/de
-@dirrm share/gnome/help/fish/cs/figures
-@dirrm share/gnome/help/fish/cs
-@dirrm share/gnome/help/fish/ca/figures
-@dirrm share/gnome/help/fish/ca
-@dirrm share/gnome/help/fish/C/figures
-@dirrm share/gnome/help/fish/C
-@dirrm share/gnome/help/fish
-@dirrm share/gnome/help/clock/zh_TW/figures
-@dirrm share/gnome/help/clock/zh_TW
-@dirrm share/gnome/help/clock/zh_HK/figures
-@dirrm share/gnome/help/clock/zh_HK
-@dirrm share/gnome/help/clock/zh_CN/figures
-@dirrm share/gnome/help/clock/zh_CN
-@dirrm share/gnome/help/clock/uk/figures
-@dirrm share/gnome/help/clock/uk
-@dirrm share/gnome/help/clock/th/figures
-@dirrm share/gnome/help/clock/th
-@dirrm share/gnome/help/clock/sv/figures
-@dirrm share/gnome/help/clock/sv
-@dirrm share/gnome/help/clock/sr/figures
-@dirrm share/gnome/help/clock/sr
-@dirrm share/gnome/help/clock/sl/figures
-@dirrm share/gnome/help/clock/sl
-@dirrm share/gnome/help/clock/ru/figures
-@dirrm share/gnome/help/clock/ru
-@dirrm share/gnome/help/clock/pt_BR/figures
-@dirrm share/gnome/help/clock/pt_BR
-@dirrm share/gnome/help/clock/pt/figures
-@dirrm share/gnome/help/clock/pt
-@dirrm share/gnome/help/clock/pa/figures
-@dirrm share/gnome/help/clock/pa
-@dirrm share/gnome/help/clock/oc/figures
-@dirrm share/gnome/help/clock/oc
-@dirrm share/gnome/help/clock/nl/figures
-@dirrm share/gnome/help/clock/nl
-@dirrm share/gnome/help/clock/ko/figures
-@dirrm share/gnome/help/clock/ko
-@dirrm share/gnome/help/clock/ja/figures
-@dirrm share/gnome/help/clock/ja
-@dirrm share/gnome/help/clock/it/figures
-@dirrm share/gnome/help/clock/it
-@dirrm share/gnome/help/clock/fr/figures
-@dirrm share/gnome/help/clock/fr
-@dirrm share/gnome/help/clock/fi/figures
-@dirrm share/gnome/help/clock/fi
-@dirrm share/gnome/help/clock/eu/figures
-@dirrm share/gnome/help/clock/eu
-@dirrm share/gnome/help/clock/es/figures
-@dirrm share/gnome/help/clock/es
-@dirrm share/gnome/help/clock/en_GB/figures
-@dirrm share/gnome/help/clock/en_GB
-@dirrm share/gnome/help/clock/el/figures
-@dirrm share/gnome/help/clock/el
-@dirrm share/gnome/help/clock/de/figures
-@dirrm share/gnome/help/clock/de
-@dirrm share/gnome/help/clock/da/figures
-@dirrm share/gnome/help/clock/da
-@dirrm share/gnome/help/clock/cs/figures
-@dirrm share/gnome/help/clock/cs
-@dirrm share/gnome/help/clock/ca/figures
-@dirrm share/gnome/help/clock/ca
-@dirrm share/gnome/help/clock/ar/figures
-@dirrm share/gnome/help/clock/ar
-@dirrm share/gnome/help/clock/C/figures
-@dirrm share/gnome/help/clock/C
-@dirrm share/gnome/help/clock
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/applets
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry lib/gnome-panel/modules
-@dirrmtry lib/gnome-panel
-@dirrm include/gnome-panel-3.0/libpanel-applet
-@dirrm include/gnome-panel-3.0
-%%BONOBO%%@dirrm include/panel-2.0
+share/locale/af/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/am/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ar/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/as/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ast/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/az/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/be/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/bg/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/bn/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/br/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/bs/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ca/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/crh/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/cs/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/csb/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/cy/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/da/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/de/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/dz/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/el/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/eo/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/es/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/et/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/eu/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/fa/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/fi/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/fr/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/fur/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/fy/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ga/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/gl/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/gu/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/gv/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ha/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/he/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/hi/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/hr/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/hu/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/hy/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/id/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ig/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/is/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/it/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ja/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ka/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/kk/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/km/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/kn/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ko/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ku/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ky/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/la/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/li/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/lt/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/lv/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/mai/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/mg/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/mi/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/mk/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ml/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/mn/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/mr/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ms/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/my/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/nb/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/nds/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ne/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/nl/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/nn/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/nso/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/oc/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/or/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/pa/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/pl/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ps/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/pt/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ro/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ru/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/rw/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/si/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sk/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sl/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sq/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sr/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/sv/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ta/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/te/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/th/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/tr/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/ug/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/uk/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/uz/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/vi/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/wa/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/xh/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/yi/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/yo/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-panel-3.0.mo
+share/locale/zu/LC_MESSAGES/gnome-panel-3.0.mo
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -587,6 +383,8 @@ share/omf/fish/fish-zh_CN.omf
@dirrmtry share/locale/nso
@dirrmtry share/locale/nds/LC_MESSAGES
@dirrmtry share/locale/nds
+@dirrmtry share/locale/my/LC_MESSAGES
+@dirrmtry share/locale/my
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@@ -601,6 +399,8 @@ share/omf/fish/fish-zh_CN.omf
@dirrmtry share/locale/ky
@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/ig/LC_MESSAGES
@@ -619,6 +419,8 @@ share/omf/fish/fish-zh_CN.omf
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/csb/LC_MESSAGES
+@dirrmtry share/locale/csb
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -631,3 +433,94 @@ share/omf/fish/fish-zh_CN.omf
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrm share/help/zh_TW/clock
+@dirrmtry share/help/zh_TW
+@dirrm share/help/zh_HK/clock
+@dirrmtry share/help/zh_HK
+@dirrm share/help/zh_CN/fish
+@dirrm share/help/zh_CN/clock
+@dirrmtry share/help/zh_CN
+@dirrm share/help/uk/fish
+@dirrm share/help/uk/clock
+@dirrmtry share/help/uk
+@dirrm share/help/th/fish
+@dirrm share/help/th/clock
+@dirrmtry share/help/th
+@dirrm share/help/te/clock
+@dirrmtry share/help/te
+@dirrm share/help/sv/fish
+@dirrm share/help/sv/clock
+@dirrmtry share/help/sv
+@dirrm share/help/sr/clock
+@dirrmtry share/help/sr
+@dirrm share/help/sl/fish
+@dirrm share/help/sl/clock
+@dirrmtry share/help/sl
+@dirrm share/help/ru/fish
+@dirrm share/help/ru/clock
+@dirrmtry share/help/ru
+@dirrm share/help/pt_BR/clock
+@dirrmtry share/help/pt_BR
+@dirrm share/help/pt/clock
+@dirrmtry share/help/pt
+@dirrm share/help/pa/clock
+@dirrmtry share/help/pa
+@dirrm share/help/oc/fish
+@dirrm share/help/oc/clock
+@dirrmtry share/help/oc
+@dirrm share/help/nl/clock
+@dirrmtry share/help/nl
+@dirrm share/help/ko/fish
+@dirrm share/help/ko/clock
+@dirrmtry share/help/ko
+@dirrm share/help/ja/fish
+@dirrm share/help/ja/clock
+@dirrmtry share/help/ja
+@dirrm share/help/it/fish
+@dirrm share/help/it/clock
+@dirrmtry share/help/it
+@dirrm share/help/id/clock
+@dirrmtry share/help/id
+@dirrm share/help/fr/fish
+@dirrm share/help/fr/clock
+@dirrmtry share/help/fr
+@dirrm share/help/fi/fish
+@dirrm share/help/fi/clock
+@dirrmtry share/help/fi
+@dirrm share/help/eu/fish
+@dirrm share/help/eu/clock
+@dirrmtry share/help/eu
+@dirrm share/help/es/fish
+@dirrm share/help/es/clock
+@dirrmtry share/help/es
+@dirrm share/help/en_GB/fish
+@dirrm share/help/en_GB/clock
+@dirrmtry share/help/en_GB
+@dirrm share/help/el/fish
+@dirrm share/help/el/clock
+@dirrmtry share/help/el
+@dirrm share/help/de/fish
+@dirrm share/help/de/clock
+@dirrmtry share/help/de
+@dirrm share/help/da/fish
+@dirrm share/help/da/clock
+@dirrmtry share/help/da
+@dirrm share/help/cs/fish
+@dirrm share/help/cs/clock
+@dirrmtry share/help/cs
+@dirrm share/help/ca/fish
+@dirrm share/help/ca/clock
+@dirrmtry share/help/ca
+@dirrm share/help/ar/clock
+@dirrmtry share/help/ar
+@dirrm share/help/C/fish
+@dirrm share/help/C/clock
+@dirrmtry share/help/C
+@dirrm %%DATADIR%%/fish
+@dirrm %%DATADIR%%/4.0/applets
+@dirrm %%DATADIR%%/4.0
+@dirrm %%DATADIR%%
+@dirrm share/doc/panel-applet-4.0
+@dirrmtry share/applications
+@dirrm include/gnome-panel-4.0/libpanel-applet
+@dirrm include/gnome-panel-4.0
diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile
deleted file mode 100644
index 208975684..000000000
--- a/x11/gnome-panel3/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-panel3/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME= gnome-panel
-PORTVERSION= 3.6.2
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Panel component for the GNOME 3 Desktop
-
-USE_XZ= yes
-NO_STAGE= yes
-
-.if !defined(REFERENCE_PORT)
-
-BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= gweather-3:${PORTSDIR}/net/libgweather3 \
- telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
- canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
- polkit-gobject-1:${PORTSDIR}/sysutils/polkit
-RUN_DEPENDS= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
-
-CONFLICTS= gnome-panel-2.[0-9]*
-
-LATEST_LINK= gnome-panel3
-USES= gettext gmake pathfix pkgconfig
-USE_XORG= ice sm x11 xau xrandr
-USE_LDCONFIG= yes
-INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix intlhack gnomedesktop3 librsvg2 libwnck3 \
- gnomemenus3 ltverhack referencehack
-USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS= --disable-network-manager
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-MAN1= gnome-panel.1
-GLIB_SCHEMAS= org.gnome.gnome-panel.applet.clock.gschema.xml \
- org.gnome.gnome-panel.applet.fish.gschema.xml \
- org.gnome.gnome-panel.applet.window-list.gschema.xml \
- org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml \
- org.gnome.gnome-panel.enums.xml \
- org.gnome.gnome-panel.gschema.xml \
- org.gnome.gnome-panel.launcher.gschema.xml \
- org.gnome.gnome-panel.menu-button.gschema.xml \
- org.gnome.gnome-panel.object.gschema.xml \
- org.gnome.gnome-panel.toplevel.gschema.xml
-
-#OPTIONS_DEFINE= EVOLUTION
-#OPTIONS_DEFAULT=EVOLUTION
-#EVOLUTION_DESC= Evolution calendar support
-
-.include <bsd.port.options.mk>
-
-#.if ${PORT_OPTIONS:MEVOLUTION}
-#USE_GNOME+= evolutiondataserver3
-#CONFIGURE_ARGS+=--enable-eds
-#.else
-CONFIGURE_ARGS+=--disable-eds
-#.endif
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|"applications.menu"|"gnome-applications.menu"|'
- @${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
- ${WRKSRC}/help/clock/Makefile.in \
- ${WRKSRC}/help/fish/Makefile.in
-
-.include <bsd.port.mk>
-
-.endif
diff --git a/x11/gnome-panel3/distinfo b/x11/gnome-panel3/distinfo
deleted file mode 100644
index 5caf47117..000000000
--- a/x11/gnome-panel3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gnome-panel-3.6.2.tar.xz) = a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079
-SIZE (gnome3/gnome-panel-3.6.2.tar.xz) = 2432152
diff --git a/x11/gnome-panel3/pkg-descr b/x11/gnome-panel3/pkg-descr
deleted file mode 100644
index 3da96680d..000000000
--- a/x11/gnome-panel3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This drives the GNOME 3 panel.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnome-panel3/pkg-plist b/x11/gnome-panel3/pkg-plist
deleted file mode 100644
index 07f792948..000000000
--- a/x11/gnome-panel3/pkg-plist
+++ /dev/null
@@ -1,525 +0,0 @@
-bin/gnome-desktop-item-edit
-bin/gnome-panel
-bin/panel-test-applets
-include/gnome-panel-4.0/libpanel-applet/panel-applet-enums.h
-include/gnome-panel-4.0/libpanel-applet/panel-applet-gconf.h
-include/gnome-panel-4.0/libpanel-applet/panel-applet.h
-lib/girepository-1.0/PanelApplet-4.0.typelib
-lib/libpanel-applet-4.a
-lib/libpanel-applet-4.la
-lib/libpanel-applet-4.so
-lib/libpanel-applet-4.so.0
-libdata/pkgconfig/libpanelapplet-4.0.pc
-libexec/clock-applet
-libexec/fish-applet
-libexec/gnome-panel-add
-libexec/notification-area-applet
-libexec/wnck-applet
-share/applications/gnome-panel.desktop
-share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
-share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
-share/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
-share/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-share/doc/panel-applet-4.0/getting-started.concepts.html
-share/doc/panel-applet-4.0/getting-started.concepts.html.bak
-share/doc/panel-applet-4.0/getting-started.context-menu.html
-share/doc/panel-applet-4.0/getting-started.context-menu.html.bak
-share/doc/panel-applet-4.0/getting-started.example.html
-share/doc/panel-applet-4.0/getting-started.example.html.bak
-share/doc/panel-applet-4.0/getting-started.html
-share/doc/panel-applet-4.0/getting-started.html.bak
-share/doc/panel-applet-4.0/getting-started.in-out-process.html
-share/doc/panel-applet-4.0/getting-started.in-out-process.html.bak
-share/doc/panel-applet-4.0/getting-started.install.html
-share/doc/panel-applet-4.0/getting-started.install.html.bak
-share/doc/panel-applet-4.0/getting-started.integration.html
-share/doc/panel-applet-4.0/getting-started.integration.html.bak
-share/doc/panel-applet-4.0/getting-started.intro.html
-share/doc/panel-applet-4.0/getting-started.intro.html.bak
-share/doc/panel-applet-4.0/getting-started.introspection.html
-share/doc/panel-applet-4.0/getting-started.introspection.html.bak
-share/doc/panel-applet-4.0/getting-started.settings.html
-share/doc/panel-applet-4.0/getting-started.settings.html.bak
-share/doc/panel-applet-4.0/home.png
-share/doc/panel-applet-4.0/home.png.bak
-share/doc/panel-applet-4.0/index.html
-share/doc/panel-applet-4.0/index.html.bak
-share/doc/panel-applet-4.0/index.sgml
-share/doc/panel-applet-4.0/index.sgml.bak
-share/doc/panel-applet-4.0/left.png
-share/doc/panel-applet-4.0/left.png.bak
-share/doc/panel-applet-4.0/overview.html
-share/doc/panel-applet-4.0/overview.html.bak
-share/doc/panel-applet-4.0/panel-applet-4.0.devhelp2
-share/doc/panel-applet-4.0/panel-applet-GConf-Utilities.html
-share/doc/panel-applet-4.0/panel-applet-GConf-Utilities.html.bak
-share/doc/panel-applet-4.0/panel-applet-Panel-Applet-Factory.html
-share/doc/panel-applet-4.0/panel-applet-Panel-Applet-Factory.html.bak
-share/doc/panel-applet-4.0/panel-applet-Panel-Applet.html
-share/doc/panel-applet-4.0/panel-applet-Panel-Applet.html.bak
-share/doc/panel-applet-4.0/panel-applet.devhelp2.bak
-share/doc/panel-applet-4.0/port-gnome2.html
-share/doc/panel-applet-4.0/port-gnome2.html.bak
-share/doc/panel-applet-4.0/reference.html
-share/doc/panel-applet-4.0/reference.html.bak
-share/doc/panel-applet-4.0/right.png
-share/doc/panel-applet-4.0/right.png.bak
-share/doc/panel-applet-4.0/style.css
-share/doc/panel-applet-4.0/style.css.bak
-share/doc/panel-applet-4.0/up.png
-share/doc/panel-applet-4.0/up.png.bak
-share/gir-1.0/PanelApplet-4.0.gir
-%%DATADIR%%/4.0/applets/org.gnome.panel.ClockApplet.panel-applet
-%%DATADIR%%/4.0/applets/org.gnome.panel.FishApplet.panel-applet
-%%DATADIR%%/4.0/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
-%%DATADIR%%/4.0/applets/org.gnome.panel.Wncklet.panel-applet
-%%DATADIR%%/fish/fishanim.fish
-%%DATADIR%%/fish/fishanim.png
-%%DATADIR%%/fish/footguy.fish
-%%DATADIR%%/fish/footguy.png
-%%DATADIR%%/fish/monkey.fish
-%%DATADIR%%/fish/monkey.png
-%%DATADIR%%/fish/oldwanda.fish
-%%DATADIR%%/fish/oldwanda.png
-%%DATADIR%%/fish/wanda.fish
-%%DATADIR%%/fish/wanda.png
-%%DATADIR%%/panel-default-layout.layout
-share/help/C/clock/index.docbook
-share/help/C/clock/legal.xml
-share/help/C/fish/index.docbook
-share/help/C/fish/legal.xml
-share/help/ar/clock/index.docbook
-share/help/ar/clock/legal.xml
-share/help/ca/clock/index.docbook
-share/help/ca/clock/legal.xml
-share/help/ca/fish/index.docbook
-share/help/ca/fish/legal.xml
-share/help/cs/clock/index.docbook
-share/help/cs/clock/legal.xml
-share/help/cs/fish/index.docbook
-share/help/cs/fish/legal.xml
-share/help/da/clock/index.docbook
-share/help/da/clock/legal.xml
-share/help/da/fish/index.docbook
-share/help/da/fish/legal.xml
-share/help/de/clock/index.docbook
-share/help/de/clock/legal.xml
-share/help/de/fish/index.docbook
-share/help/de/fish/legal.xml
-share/help/el/clock/index.docbook
-share/help/el/clock/legal.xml
-share/help/el/fish/index.docbook
-share/help/el/fish/legal.xml
-share/help/en_GB/clock/index.docbook
-share/help/en_GB/clock/legal.xml
-share/help/en_GB/fish/index.docbook
-share/help/en_GB/fish/legal.xml
-share/help/es/clock/index.docbook
-share/help/es/clock/legal.xml
-share/help/es/fish/index.docbook
-share/help/es/fish/legal.xml
-share/help/eu/clock/index.docbook
-share/help/eu/clock/legal.xml
-share/help/eu/fish/index.docbook
-share/help/eu/fish/legal.xml
-share/help/fi/clock/index.docbook
-share/help/fi/clock/legal.xml
-share/help/fi/fish/index.docbook
-share/help/fi/fish/legal.xml
-share/help/fr/clock/index.docbook
-share/help/fr/clock/legal.xml
-share/help/fr/fish/index.docbook
-share/help/fr/fish/legal.xml
-share/help/id/clock/index.docbook
-share/help/id/clock/legal.xml
-share/help/it/clock/index.docbook
-share/help/it/clock/legal.xml
-share/help/it/fish/index.docbook
-share/help/it/fish/legal.xml
-share/help/ja/clock/index.docbook
-share/help/ja/clock/legal.xml
-share/help/ja/fish/index.docbook
-share/help/ja/fish/legal.xml
-share/help/ko/clock/index.docbook
-share/help/ko/clock/legal.xml
-share/help/ko/fish/index.docbook
-share/help/ko/fish/legal.xml
-share/help/nl/clock/index.docbook
-share/help/nl/clock/legal.xml
-share/help/oc/clock/index.docbook
-share/help/oc/clock/legal.xml
-share/help/oc/fish/index.docbook
-share/help/oc/fish/legal.xml
-share/help/pa/clock/index.docbook
-share/help/pa/clock/legal.xml
-share/help/pt/clock/index.docbook
-share/help/pt/clock/legal.xml
-share/help/pt_BR/clock/index.docbook
-share/help/pt_BR/clock/legal.xml
-share/help/ru/clock/index.docbook
-share/help/ru/clock/legal.xml
-share/help/ru/fish/index.docbook
-share/help/ru/fish/legal.xml
-share/help/sl/clock/index.docbook
-share/help/sl/clock/legal.xml
-share/help/sl/fish/index.docbook
-share/help/sl/fish/legal.xml
-share/help/sr/clock/index.docbook
-share/help/sr/clock/legal.xml
-share/help/sv/clock/index.docbook
-share/help/sv/clock/legal.xml
-share/help/sv/fish/index.docbook
-share/help/sv/fish/legal.xml
-share/help/te/clock/index.docbook
-share/help/te/clock/legal.xml
-share/help/th/clock/index.docbook
-share/help/th/clock/legal.xml
-share/help/th/fish/index.docbook
-share/help/th/fish/legal.xml
-share/help/uk/clock/index.docbook
-share/help/uk/clock/legal.xml
-share/help/uk/fish/index.docbook
-share/help/uk/fish/legal.xml
-share/help/zh_CN/clock/index.docbook
-share/help/zh_CN/clock/legal.xml
-share/help/zh_CN/fish/index.docbook
-share/help/zh_CN/fish/legal.xml
-share/help/zh_HK/clock/index.docbook
-share/help/zh_HK/clock/legal.xml
-share/help/zh_TW/clock/index.docbook
-share/help/zh_TW/clock/legal.xml
-share/icons/hicolor/16x16/apps/gnome-panel-clock.png
-share/icons/hicolor/16x16/apps/gnome-panel-fish.png
-share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png
-share/icons/hicolor/16x16/apps/gnome-panel-launcher.png
-share/icons/hicolor/16x16/apps/gnome-panel-notification-area.png
-share/icons/hicolor/16x16/apps/gnome-panel-separator.png
-share/icons/hicolor/16x16/apps/gnome-panel-window-list.png
-share/icons/hicolor/16x16/apps/gnome-panel-window-menu.png
-share/icons/hicolor/16x16/apps/gnome-panel-workspace-switcher.png
-share/icons/hicolor/16x16/apps/gnome-panel.png
-share/icons/hicolor/22x22/apps/gnome-panel-clock.png
-share/icons/hicolor/22x22/apps/gnome-panel-fish.png
-share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png
-share/icons/hicolor/22x22/apps/gnome-panel-launcher.png
-share/icons/hicolor/22x22/apps/gnome-panel-notification-area.png
-share/icons/hicolor/22x22/apps/gnome-panel-separator.png
-share/icons/hicolor/22x22/apps/gnome-panel-window-list.png
-share/icons/hicolor/22x22/apps/gnome-panel-window-menu.png
-share/icons/hicolor/22x22/apps/gnome-panel-workspace-switcher.png
-share/icons/hicolor/22x22/apps/gnome-panel.png
-share/icons/hicolor/24x24/apps/gnome-panel-clock.png
-share/icons/hicolor/24x24/apps/gnome-panel-fish.png
-share/icons/hicolor/24x24/apps/gnome-panel-force-quit.png
-share/icons/hicolor/24x24/apps/gnome-panel-launcher.png
-share/icons/hicolor/24x24/apps/gnome-panel-notification-area.png
-share/icons/hicolor/24x24/apps/gnome-panel-separator.png
-share/icons/hicolor/24x24/apps/gnome-panel-window-list.png
-share/icons/hicolor/24x24/apps/gnome-panel-window-menu.png
-share/icons/hicolor/24x24/apps/gnome-panel-workspace-switcher.png
-share/icons/hicolor/24x24/apps/gnome-panel.png
-share/icons/hicolor/32x32/apps/gnome-panel-clock.png
-share/icons/hicolor/32x32/apps/gnome-panel-fish.png
-share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png
-share/icons/hicolor/32x32/apps/gnome-panel-launcher.png
-share/icons/hicolor/32x32/apps/gnome-panel-notification-area.png
-share/icons/hicolor/32x32/apps/gnome-panel-separator.png
-share/icons/hicolor/32x32/apps/gnome-panel-window-list.png
-share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png
-share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png
-share/icons/hicolor/32x32/apps/gnome-panel.png
-share/icons/hicolor/48x48/apps/gnome-panel.png
-share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
-share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
-share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg
-share/icons/hicolor/scalable/apps/gnome-panel-launcher.svg
-share/icons/hicolor/scalable/apps/gnome-panel-notification-area.svg
-share/icons/hicolor/scalable/apps/gnome-panel-separator.svg
-share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
-share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
-share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
-share/icons/hicolor/scalable/apps/gnome-panel.svg
-share/locale/af/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/am/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ar/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/as/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ast/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/az/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/be/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/bg/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/bn/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/br/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/bs/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ca/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/crh/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/cs/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/csb/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/cy/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/da/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/de/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/dz/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/el/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/eo/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/es/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/et/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/eu/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/fa/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/fi/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/fr/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/fur/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/fy/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ga/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/gl/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/gu/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/gv/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ha/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/he/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/hi/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/hr/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/hu/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/hy/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/id/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ig/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/is/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/it/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ja/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ka/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/kk/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/km/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/kn/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ko/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ku/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ky/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/la/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/li/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/lt/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/lv/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/mai/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/mg/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/mi/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/mk/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ml/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/mn/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/mr/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ms/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/my/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/nb/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/nds/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ne/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/nl/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/nn/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/nso/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/oc/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/or/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/pa/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/pl/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ps/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/pt/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ro/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ru/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/rw/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/si/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sk/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sl/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sq/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sr/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sr@ije/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/sv/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ta/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/te/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/th/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/tr/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/ug/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/uk/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/uz/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/vi/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/wa/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/xh/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/yi/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/yo/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-panel-3.0.mo
-share/locale/zu/LC_MESSAGES/gnome-panel-3.0.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/my/LC_MESSAGES
-@dirrmtry share/locale/my
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@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/ig/LC_MESSAGES
-@dirrmtry share/locale/ig
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/ha/LC_MESSAGES
-@dirrmtry share/locale/ha
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/csb/LC_MESSAGES
-@dirrmtry share/locale/csb
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm share/help/zh_TW/clock
-@dirrmtry share/help/zh_TW
-@dirrm share/help/zh_HK/clock
-@dirrmtry share/help/zh_HK
-@dirrm share/help/zh_CN/fish
-@dirrm share/help/zh_CN/clock
-@dirrmtry share/help/zh_CN
-@dirrm share/help/uk/fish
-@dirrm share/help/uk/clock
-@dirrmtry share/help/uk
-@dirrm share/help/th/fish
-@dirrm share/help/th/clock
-@dirrmtry share/help/th
-@dirrm share/help/te/clock
-@dirrmtry share/help/te
-@dirrm share/help/sv/fish
-@dirrm share/help/sv/clock
-@dirrmtry share/help/sv
-@dirrm share/help/sr/clock
-@dirrmtry share/help/sr
-@dirrm share/help/sl/fish
-@dirrm share/help/sl/clock
-@dirrmtry share/help/sl
-@dirrm share/help/ru/fish
-@dirrm share/help/ru/clock
-@dirrmtry share/help/ru
-@dirrm share/help/pt_BR/clock
-@dirrmtry share/help/pt_BR
-@dirrm share/help/pt/clock
-@dirrmtry share/help/pt
-@dirrm share/help/pa/clock
-@dirrmtry share/help/pa
-@dirrm share/help/oc/fish
-@dirrm share/help/oc/clock
-@dirrmtry share/help/oc
-@dirrm share/help/nl/clock
-@dirrmtry share/help/nl
-@dirrm share/help/ko/fish
-@dirrm share/help/ko/clock
-@dirrmtry share/help/ko
-@dirrm share/help/ja/fish
-@dirrm share/help/ja/clock
-@dirrmtry share/help/ja
-@dirrm share/help/it/fish
-@dirrm share/help/it/clock
-@dirrmtry share/help/it
-@dirrm share/help/id/clock
-@dirrmtry share/help/id
-@dirrm share/help/fr/fish
-@dirrm share/help/fr/clock
-@dirrmtry share/help/fr
-@dirrm share/help/fi/fish
-@dirrm share/help/fi/clock
-@dirrmtry share/help/fi
-@dirrm share/help/eu/fish
-@dirrm share/help/eu/clock
-@dirrmtry share/help/eu
-@dirrm share/help/es/fish
-@dirrm share/help/es/clock
-@dirrmtry share/help/es
-@dirrm share/help/en_GB/fish
-@dirrm share/help/en_GB/clock
-@dirrmtry share/help/en_GB
-@dirrm share/help/el/fish
-@dirrm share/help/el/clock
-@dirrmtry share/help/el
-@dirrm share/help/de/fish
-@dirrm share/help/de/clock
-@dirrmtry share/help/de
-@dirrm share/help/da/fish
-@dirrm share/help/da/clock
-@dirrmtry share/help/da
-@dirrm share/help/cs/fish
-@dirrm share/help/cs/clock
-@dirrmtry share/help/cs
-@dirrm share/help/ca/fish
-@dirrm share/help/ca/clock
-@dirrmtry share/help/ca
-@dirrm share/help/ar/clock
-@dirrmtry share/help/ar
-@dirrm share/help/C/fish
-@dirrm share/help/C/clock
-@dirrmtry share/help/C
-@dirrm %%DATADIR%%/fish
-@dirrm %%DATADIR%%/4.0/applets
-@dirrm %%DATADIR%%/4.0
-@dirrm %%DATADIR%%
-@dirrm share/doc/panel-applet-4.0
-@dirrmtry share/applications
-@dirrm include/gnome-panel-4.0/libpanel-applet
-@dirrm include/gnome-panel-4.0
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 28e2dc66e..11a3cae05 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,94 +1,47 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-screensaver/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gnome-screensaver3/Makefile 18580 2013-06-23 08:40:31Z kwm $
PORTNAME= gnome-screensaver
-PORTVERSION= 2.30.2
-PORTREVISION= 4
+PORTVERSION= 3.6.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen saver and locker
-LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
+BUILD_DEPENDS= gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \
+ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS= pam_helper:${PORTSDIR}/security/pam_helper \
+ gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
+ ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring3
-CONFLICTS= gnome-screensaver-3.[0-9]*
-
-NO_STAGE= yes
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
-USE_XORG= xtst xxf86vm
+USE_XZ= yes
USES= gettext gmake pathfix pkgconfig
-USE_GNOME= gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
-CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
- --with-xscreensaverdir=${XSCREENSAVER_DIR} \
- --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
+GNU_CONFIGURE= yes
+USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver
+USE_GNOME= gnomedesktop3 gnomeprefix intlhack libgnomekbd3
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS= --with-pam-prefix=${PREFIX}/etc/pam.d \
+ --without-systemd
-GCONF_SCHEMAS= gnome-screensaver.schemas
-MAN1= gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
- gnome-screensaver.1
-
-PLIST= ${WRKDIR}/pkg-plist
SUB_FILES+= gnome-screensaver.pam
-XSCREENSAVER_DIR= ${LOCALBASE}/share/xscreensaver/config
-SCREENSAVER_DIR= share/applications/screensavers
-
-XSCREENSAVER_EXCLUDE= "(popsquares.xml)"
-
-OPTIONS_DEFINE= PAM KEYRING
-OPTIONS_DEFAULT=PAM KEYRING
-PAM_DESC= Pluggable Authentication Module support
-KEYRING_DESC= GnomeKeyring integration (needs PAM)
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPAM}
-RUN_DEPENDS+= pam_helper:${PORTSDIR}/security/pam_helper
-CONFIGURE_ARGS+= --enable-authentication-scheme=helper \
- --with-passwd-helper=${LOCALBASE}/bin/pam_helper
-PLIST_SUB+= PAM=""
-.else
-CONFIGURE_ARGS+= --disable-pam
-PLIST_SUB+= PAM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MKEYRING} && ${PORT_OPTIONS:MPAM}
-SUB_LIST+= PAM_KEYRING=
-RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
-.else
-SUB_LIST+= PAM_KEYRING=\#
-.endif
-
post-patch:
-.if ${PORT_OPTIONS:MPAM}
@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
${WRKSRC}/src/gs-auth-pam.c
-.endif
-
-pre-install:
- @${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
- @cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
- ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
- ${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
- ${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
- @${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
+ @${REINPLACE_CMD} -e 's|@AUTH_SCHEME@|helper|g' \
+ ${WRKSRC}/src/Makefile.in
+ @${ECHO} "#define PASSWD_HELPER_PROGRAM \"/usr/local/bin/pam_helper\"" \
+ >> ${WRKSRC}/config.h.in
post-install:
- ${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
- ${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
- ${MKDIR} ${PREFIX}/${SCREENSAVER_DIR}
- cd ${PREFIX}/${SCREENSAVER_DIR} && \
- ${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
- ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
- ${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
-.if ${PORT_OPTIONS:MPAM}
- ${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver
-.endif
+# ${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
+# ${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
+ ${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gnome-screensaver
.include <bsd.port.mk>
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index e5ff234df..ed0855028 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
-SIZE (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 4814653
+SHA256 (gnome3/gnome-screensaver-3.6.1.tar.xz) = f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+SIZE (gnome3/gnome-screensaver-3.6.1.tar.xz) = 568340
diff --git a/x11/gnome-screensaver/files/gnome-screensaver.pam.in b/x11/gnome-screensaver/files/gnome-screensaver.pam.in
index c2f8394ff..539ca0ee7 100644
--- a/x11/gnome-screensaver/files/gnome-screensaver.pam.in
+++ b/x11/gnome-screensaver/files/gnome-screensaver.pam.in
@@ -1,3 +1,3 @@
auth include system
-%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
+auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
account include system
diff --git a/x11/gnome-screensaver3/files/patch-src_gs-auth-helper.c b/x11/gnome-screensaver/files/patch-src_gs-auth-helper.c
index 00e8766f4..00e8766f4 100644
--- a/x11/gnome-screensaver3/files/patch-src_gs-auth-helper.c
+++ b/x11/gnome-screensaver/files/patch-src_gs-auth-helper.c
diff --git a/x11/gnome-screensaver/files/patch-src_gs-job.c b/x11/gnome-screensaver/files/patch-src_gs-job.c
deleted file mode 100644
index 39e303d27..000000000
--- a/x11/gnome-screensaver/files/patch-src_gs-job.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gs-job.c.orig Wed Sep 7 09:23:59 2005
-+++ src/gs-job.c Mon Sep 12 13:24:11 2005
-@@ -29,7 +29,8 @@
- #include <sys/wait.h>
- #include <errno.h>
-
--#if defined(HAVE_SETPRIORITY) && defined(PRIO_PROCESS)
-+#if defined(HAVE_SETPRIORITY)
-+#include <sys/time.h>
- #include <sys/resource.h>
- #endif
-
diff --git a/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c b/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c
deleted file mode 100644
index af5d39f8e..000000000
--- a/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gs-lock-plug.c.orig 2011-03-06 21:27:00.000000000 +0100
-+++ src/gs-lock-plug.c 2011-03-06 21:27:36.000000000 +0100
-@@ -1090,7 +1090,7 @@ submit_note (GtkButton *button,
- strftime (summary, 128, "%X", tmp);
-
- notify_init ("gnome-screensaver-dialog");
-- note = notify_notification_new (summary, escaped_text, NULL, NULL);
-+ note = notify_notification_new (summary, escaped_text, NULL);
- notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER);
- notify_notification_show (note, NULL);
- g_object_unref (note);
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 4333ecdb3..50d43c211 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -1,24 +1,12 @@
bin/gnome-screensaver
bin/gnome-screensaver-command
-bin/gnome-screensaver-preferences
-%%PAM%%etc/pam.d/gnome-screensaver
+etc/pam.d/gnome-screensaver
etc/xdg/autostart/gnome-screensaver.desktop
-etc/xdg/menus/gnome-screensavers.menu
-libdata/pkgconfig/gnome-screensaver.pc
libexec/gnome-screensaver-dialog
-libexec/gnome-screensaver-gl-helper
-libexec/gnome-screensaver/floaters
-libexec/gnome-screensaver/popsquares
-libexec/gnome-screensaver/slideshow
-share/applications/gnome-screensaver-preferences.desktop
-share/applications/screensavers/cosmos-slideshow.desktop
-share/applications/screensavers/footlogo-floaters.desktop
-share/applications/screensavers/personal-slideshow.desktop
-share/applications/screensavers/popsquares.desktop
-share/dbus-1/services/org.gnome.ScreenSaver.service
-share/desktop-directories/gnome-screensaver.directory
-%%DATADIR%%/gnome-screensaver-preferences.ui
-%%DATADIR%%/lock-dialog-default.ui
+man/man1/gnome-screensaver-command.1.gz
+man/man1/gnome-screensaver.1.gz
+share/locale/af/LC_MESSAGES/gnome-screensaver.mo
+share/locale/an/LC_MESSAGES/gnome-screensaver.mo
share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
share/locale/as/LC_MESSAGES/gnome-screensaver.mo
share/locale/ast/LC_MESSAGES/gnome-screensaver.mo
@@ -40,6 +28,7 @@ share/locale/el/LC_MESSAGES/gnome-screensaver.mo
share/locale/en@shaw/LC_MESSAGES/gnome-screensaver.mo
share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo
share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo
+share/locale/eo/LC_MESSAGES/gnome-screensaver.mo
share/locale/es/LC_MESSAGES/gnome-screensaver.mo
share/locale/et/LC_MESSAGES/gnome-screensaver.mo
share/locale/eu/LC_MESSAGES/gnome-screensaver.mo
@@ -58,6 +47,7 @@ share/locale/is/LC_MESSAGES/gnome-screensaver.mo
share/locale/it/LC_MESSAGES/gnome-screensaver.mo
share/locale/ja/LC_MESSAGES/gnome-screensaver.mo
share/locale/ka/LC_MESSAGES/gnome-screensaver.mo
+share/locale/km/LC_MESSAGES/gnome-screensaver.mo
share/locale/kn/LC_MESSAGES/gnome-screensaver.mo
share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
@@ -69,6 +59,8 @@ share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
share/locale/mr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ms/LC_MESSAGES/gnome-screensaver.mo
+share/locale/my/LC_MESSAGES/gnome-screensaver.mo
share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
share/locale/nds/LC_MESSAGES/gnome-screensaver.mo
share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
@@ -94,31 +86,19 @@ share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
share/locale/te/LC_MESSAGES/gnome-screensaver.mo
share/locale/th/LC_MESSAGES/gnome-screensaver.mo
share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ug/LC_MESSAGES/gnome-screensaver.mo
share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
+share/locale/xh/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-share/backgrounds/cosmos/background-1.xml
-share/backgrounds/cosmos/blue-marble-west.jpg
-share/backgrounds/cosmos/cloud.jpg
-share/backgrounds/cosmos/comet.jpg
-share/backgrounds/cosmos/earth-horizon.jpg
-share/backgrounds/cosmos/galaxy-ngc3370.jpg
-share/backgrounds/cosmos/helix-nebula.jpg
-share/backgrounds/cosmos/jupiter.jpg
-share/backgrounds/cosmos/sombrero.jpg
-share/backgrounds/cosmos/whirlpool.jpg
-share/gnome-background-properties/cosmos.xml
-share/pixmaps/gnome-logo-white.svg
-@dirrm share/gnome-background-properties
-@dirrm share/backgrounds/cosmos
-@dirrmtry share/backgrounds
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrm libexec/gnome-screensaver
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -131,6 +111,8 @@ share/pixmaps/gnome-logo-white.svg
@dirrmtry share/locale/oc
@dirrmtry share/locale/nds/LC_MESSAGES
@dirrmtry share/locale/nds
+@dirrmtry share/locale/my/LC_MESSAGES
+@dirrmtry share/locale/my
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -139,6 +121,8 @@ share/pixmaps/gnome-logo-white.svg
@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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@@ -155,3 +139,5 @@ share/pixmaps/gnome-logo-white.svg
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
deleted file mode 100644
index 58ad020b8..000000000
--- a/x11/gnome-screensaver3/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-screensaver3/Makefile 18580 2013-06-23 08:40:31Z kwm $
-
-PORTNAME= gnome-screensaver
-PORTVERSION= 3.6.1
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME screen saver and locker
-
-BUILD_DEPENDS= gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify \
- dbus-glib-1:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS= pam_helper:${PORTSDIR}/security/pam_helper \
- gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
- ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring3
-
-CONFLICTS= gnome-screensaver-2.[0-9]*
-
-NO_STAGE= yes
-LATEST_LINK= gnome-screensaver3
-USE_XZ= yes
-USES= gettext gmake pathfix pkgconfig
-GNU_CONFIGURE= yes
-USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver
-USE_GNOME= gnomedesktop3 gnomeprefix intlhack libgnomekbd3
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-pam-prefix=${PREFIX}/etc/pam.d \
- --without-systemd
-
-MAN1= gnome-screensaver-command.1 gnome-screensaver.1
-
-SUB_FILES+= gnome-screensaver.pam
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
- ${WRKSRC}/src/gs-auth-pam.c
- @${REINPLACE_CMD} -e 's|@AUTH_SCHEME@|helper|g' \
- ${WRKSRC}/src/Makefile.in
- @${ECHO} "#define PASSWD_HELPER_PROGRAM \"/usr/local/bin/pam_helper\"" \
- >> ${WRKSRC}/config.h.in
-
-post-install:
- ${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
- ${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
- ${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam \
- ${PREFIX}/etc/pam.d/gnome-screensaver
-
-.include <bsd.port.mk>
diff --git a/x11/gnome-screensaver3/distinfo b/x11/gnome-screensaver3/distinfo
deleted file mode 100644
index ed0855028..000000000
--- a/x11/gnome-screensaver3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gnome-screensaver-3.6.1.tar.xz) = f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
-SIZE (gnome3/gnome-screensaver-3.6.1.tar.xz) = 568340
diff --git a/x11/gnome-screensaver3/files/gnome-screensaver.pam.in b/x11/gnome-screensaver3/files/gnome-screensaver.pam.in
deleted file mode 100644
index 539ca0ee7..000000000
--- a/x11/gnome-screensaver3/files/gnome-screensaver.pam.in
+++ /dev/null
@@ -1,3 +0,0 @@
-auth include system
-auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
-account include system
diff --git a/x11/gnome-screensaver3/files/patch-data_Makefile.in b/x11/gnome-screensaver3/files/patch-data_Makefile.in
deleted file mode 100644
index b61f2225d..000000000
--- a/x11/gnome-screensaver3/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,73 +0,0 @@
---- data/Makefile.in.orig 2009-06-15 22:41:37.000000000 +0200
-+++ data/Makefile.in 2009-06-15 22:42:51.000000000 +0200
-@@ -916,38 +916,38 @@
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
-
- install-data-hook:
-- @system=`uname`; \
-- if test -f /usr/include/security/pam_appl.h; then \
-- if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
-- $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
-- chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
-- fi; \
-- if test $$system = Linux; then \
-- if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; then \
-- $(INSTALL_DATA) gnome-screensaver $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; \
-- fi; \
-- if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
-- echo "***" ; \
-- echo "*** Warning: gnome-screensaver has been compiled with support for" ; \
-- echo "*** Pluggable Authentication Modules (PAM). However, you may need to" ; \
-- echo "*** manually install $(PAM_PREFIX)/pam.d/gnome-screensaver" ; \
-- echo "*** to /etc/pam.d/gnome-screensaver. Otherwise, unlocking might" ; \
-- echo "*** not work." ; \
-- echo "***" ; \
-- echo "*** Note: If you are using SuSE/Novell you may have to modify this file." ; \
-- echo "***" ; \
-- fi; \
-- fi; \
-- if test $$system = SunOS; then \
-- echo "***" ; \
-- echo "*** Warning: gnome-screensaver has been compiled with support for" ; \
-- echo "*** Pluggable Authentication Modules (PAM). However, you" ; \
-- echo "*** need to manually add authentication for gnome-screensaver in" ; \
-- echo "*** $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
-- echo "*** Otherwise, unlocking might not work." ; \
-- echo "***" ; \
-- fi; \
-- fi
-+# @system=`uname`; \
-+# if test -f /usr/include/security/pam_appl.h; then \
-+# if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
-+# $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
-+# chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
-+# fi; \
-+# if test $$system = Linux; then \
-+# if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; then \
-+# $(INSTALL_DATA) gnome-screensaver $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-screensaver; \
-+# fi; \
-+# if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
-+# echo "***" ; \
-+# echo "*** Warning: gnome-screensaver has been compiled with support for" ; \
-+# echo "*** Pluggable Authentication Modules (PAM). However, you may need to" ; \
-+# echo "*** manually install $(PAM_PREFIX)/pam.d/gnome-screensaver" ; \
-+# echo "*** to /etc/pam.d/gnome-screensaver. Otherwise, unlocking might" ; \
-+# echo "*** not work." ; \
-+# echo "***" ; \
-+# echo "*** Note: If you are using SuSE/Novell you may have to modify this file." ; \
-+# echo "***" ; \
-+# fi; \
-+# fi; \
-+# if test $$system = SunOS; then \
-+# echo "***" ; \
-+# echo "*** Warning: gnome-screensaver has been compiled with support for" ; \
-+# echo "*** Pluggable Authentication Modules (PAM). However, you" ; \
-+# echo "*** need to manually add authentication for gnome-screensaver in" ; \
-+# echo "*** $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
-+# echo "*** Otherwise, unlocking might not work." ; \
-+# echo "***" ; \
-+# fi; \
-+# fi
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/gnome-screensaver3/pkg-descr b/x11/gnome-screensaver3/pkg-descr
deleted file mode 100644
index 96af92f11..000000000
--- a/x11/gnome-screensaver3/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Gnome-screensaver is GNOME-based screen saver and locker that aims to have
-simple, sane, secure defaults and be well integrated with the desktop.
-It is designed to support:
-
- * the ability to lock down configuration settings
- * translation into other languages
- * user switching
diff --git a/x11/gnome-screensaver3/pkg-plist b/x11/gnome-screensaver3/pkg-plist
deleted file mode 100644
index ce09d6647..000000000
--- a/x11/gnome-screensaver3/pkg-plist
+++ /dev/null
@@ -1,141 +0,0 @@
-bin/gnome-screensaver
-bin/gnome-screensaver-command
-etc/pam.d/gnome-screensaver
-etc/xdg/autostart/gnome-screensaver.desktop
-libexec/gnome-screensaver-dialog
-share/locale/af/LC_MESSAGES/gnome-screensaver.mo
-share/locale/an/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
-share/locale/as/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ast/LC_MESSAGES/gnome-screensaver.mo
-share/locale/be/LC_MESSAGES/gnome-screensaver.mo
-share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
-share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
-share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo
-share/locale/br/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ca/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-screensaver.mo
-share/locale/crh/LC_MESSAGES/gnome-screensaver.mo
-share/locale/cs/LC_MESSAGES/gnome-screensaver.mo
-share/locale/cy/LC_MESSAGES/gnome-screensaver.mo
-share/locale/da/LC_MESSAGES/gnome-screensaver.mo
-share/locale/de/LC_MESSAGES/gnome-screensaver.mo
-share/locale/dz/LC_MESSAGES/gnome-screensaver.mo
-share/locale/el/LC_MESSAGES/gnome-screensaver.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-screensaver.mo
-share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo
-share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo
-share/locale/eo/LC_MESSAGES/gnome-screensaver.mo
-share/locale/es/LC_MESSAGES/gnome-screensaver.mo
-share/locale/et/LC_MESSAGES/gnome-screensaver.mo
-share/locale/eu/LC_MESSAGES/gnome-screensaver.mo
-share/locale/fa/LC_MESSAGES/gnome-screensaver.mo
-share/locale/fi/LC_MESSAGES/gnome-screensaver.mo
-share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ga/LC_MESSAGES/gnome-screensaver.mo
-share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
-share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
-share/locale/he/LC_MESSAGES/gnome-screensaver.mo
-share/locale/hi/LC_MESSAGES/gnome-screensaver.mo
-share/locale/hr/LC_MESSAGES/gnome-screensaver.mo
-share/locale/hu/LC_MESSAGES/gnome-screensaver.mo
-share/locale/id/LC_MESSAGES/gnome-screensaver.mo
-share/locale/is/LC_MESSAGES/gnome-screensaver.mo
-share/locale/it/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ja/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ka/LC_MESSAGES/gnome-screensaver.mo
-share/locale/km/LC_MESSAGES/gnome-screensaver.mo
-share/locale/kn/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
-share/locale/lt/LC_MESSAGES/gnome-screensaver.mo
-share/locale/lv/LC_MESSAGES/gnome-screensaver.mo
-share/locale/mai/LC_MESSAGES/gnome-screensaver.mo
-share/locale/mg/LC_MESSAGES/gnome-screensaver.mo
-share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
-share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
-share/locale/mr/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ms/LC_MESSAGES/gnome-screensaver.mo
-share/locale/my/LC_MESSAGES/gnome-screensaver.mo
-share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
-share/locale/nds/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
-share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
-share/locale/nn/LC_MESSAGES/gnome-screensaver.mo
-share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
-share/locale/or/LC_MESSAGES/gnome-screensaver.mo
-share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
-share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ps/LC_MESSAGES/gnome-screensaver.mo
-share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ro/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ru/LC_MESSAGES/gnome-screensaver.mo
-share/locale/si/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-screensaver.mo
-share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
-share/locale/te/LC_MESSAGES/gnome-screensaver.mo
-share/locale/th/LC_MESSAGES/gnome-screensaver.mo
-share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
-share/locale/ug/LC_MESSAGES/gnome-screensaver.mo
-share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
-share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
-share/locale/xh/LC_MESSAGES/gnome-screensaver.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/my/LC_MESSAGES
-@dirrmtry share/locale/my
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@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/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 8ca80cab9..9b082e91d 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,44 +1,34 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-session/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gnome-session3/Makefile 18610 2013-06-30 16:33:05Z marcus $
PORTNAME= gnome-session
-PORTVERSION= 2.32.1
-PORTREVISION= 3
+PORTVERSION= 3.6.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Session component for the GNOME 2 desktop
+COMMENT= Session component for the GNOME 3 desktop
-CONFLICTS= gnome-session-3.[0-9]*
-
-BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
- gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
- notify:${PORTSDIR}/devel/libnotify \
- execinfo:${PORTSDIR}/devel/libexecinfo \
- upower-glib:${PORTSDIR}/sysutils/upower
-RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
- ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
+LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
+ libupower-glib.so:${PORTSDIR}/sysutils/upower
+RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
-NO_STAGE= yes
INSTALLS_ICONS= yes
USES= gettext gmake pathfix pkgconfig
-USE_BZIP2= yes
-USE_XORG= ice sm xau xrandr
-USE_GNOME= gnomeprefix intlhack gconf2
+USE_XZ= yes
+USE_XORG= ice sm xau xext xtst xrender xtrans xcomposite
+USE_GL= gl
+USE_GNOME= gnomeprefix intlhack gconf2 intltool gtk30
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docbook-docs
-# us gconftool-2 instead of sanity-check because that got removed from gconf2.
-CONFIGURE_ENV= ac_cv_path_GCONF_SANITY_CHECK=${LOCALBASE}/bin/gconftool-2
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
- gnome-session-save.1
-GCONF_SCHEMAS= gnome-session.schemas
+GLIB_SCHEMAS= org.gnome.SessionManager.gschema.xml
.include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 6ad5a3646..00924c963 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-session-2.32.1.tar.bz2) = 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
-SIZE (gnome2/gnome-session-2.32.1.tar.bz2) = 774842
+SHA256 (gnome3/gnome-session-3.6.2.tar.xz) = 2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4
+SIZE (gnome3/gnome-session-3.6.2.tar.xz) = 729676
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
deleted file mode 100644
index 48f55c540..000000000
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-session/Makefile.in.orig 2009-08-26 14:18:15.000000000 -0400
-+++ gnome-session/Makefile.in 2009-08-26 14:20:10.000000000 -0400
-@@ -360,6 +360,7 @@ test_client_dbus_LDADD = \
-
- gnome_session_LDADD = \
- libgsmutil.la \
-+ -lexecinfo \
- $(top_builddir)/egg/libeggdesktopfile.la \
- $(SM_LIBS) \
- $(ICE_LIBS) \
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c
deleted file mode 100644
index 3044f1b89..000000000
--- a/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-session/gsm-autostart-app.c.orig 2008-08-20 14:18:52.000000000 -0400
-+++ gnome-session/gsm-autostart-app.c 2008-08-20 14:19:02.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <sys/wait.h>
- #include <errno.h>
-+#include <signal.h>
-
- #include <glib.h>
- #include <gio/gio.h>
diff --git a/x11/gnome-session3/files/patch-gnome-session_gsm-consolekit.c b/x11/gnome-session/files/patch-gnome-session_gsm-consolekit.c
index 96e771191..96e771191 100644
--- a/x11/gnome-session3/files/patch-gnome-session_gsm-consolekit.c
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-consolekit.c
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-gconf.c b/x11/gnome-session/files/patch-gnome-session_gsm-gconf.c
deleted file mode 100644
index 8955091af..000000000
--- a/x11/gnome-session/files/patch-gnome-session_gsm-gconf.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnome-session/gsm-gconf.c.orig 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session/gsm-gconf.c 2013-01-24 12:52:40.000000000 +0100
-@@ -46,20 +46,23 @@
- gsm_gconf_init (void)
- {
- GError *error = NULL;
-- char *argv[2];
-+ char *argv[3];
-
- /* Run gconf-sanity-check. As a side effect, this will cause gconfd
- * to be started. (We do this asynchronously so that other GSM
- * initialization can happen in parallel.)
- */
-
-+ /* run gconftool-2 --spawn instead of removed gconf-sanity-check. */
-+
- argv[0] = GCONF_SANITY_CHECK;
-- argv[1] = NULL;
-+ argv[1] = "--spawn";
-+ argv[2] = NULL;
-
- g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
- unset_display_setup, NULL, &gsc_pid, &error);
- if (error != NULL) {
-- g_warning ("Failed to run gconf-sanity-check-2: %s\n",
-+ g_warning ("Failed to run gconftool-2: %s\n",
- error->message);
- g_error_free (error);
-
diff --git a/x11/gnome-session/pkg-descr b/x11/gnome-session/pkg-descr
index ee3e0826e..1790ccdfb 100644
--- a/x11/gnome-session/pkg-descr
+++ b/x11/gnome-session/pkg-descr
@@ -1,4 +1,4 @@
-This provides session management for the GNOME 2 desktop, and
+This provides session management for the GNOME 3 desktop, and
provides the tools used to start the desktop.
WWW: http://www.gnome.org
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index bacb06aac..47e46c4b1 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,120 +1,131 @@
bin/gnome-session
bin/gnome-session-properties
-bin/gnome-session-save
-bin/gnome-wm
+bin/gnome-session-quit
+libexec/gnome-session-check-accelerated
+libexec/gnome-session-check-accelerated-helper
+man/man1/gnome-session.1.gz
+man/man1/gnome-session-properties.1.gz
+man/man1/gnome-session-quit.1.gz
share/applications/session-properties.desktop
+share/GConf/gsettings/gnome-session.convert
%%DATADIR%%/gsm-inhibit-dialog.ui
+%%DATADIR%%/hardware-compatibility
%%DATADIR%%/session-properties.ui
+%%DATADIR%%/sessions/gnome-fallback.session
+%%DATADIR%%/sessions/gnome.session
share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/apps/session-properties.png
share/icons/hicolor/32x32/apps/session-properties.png
share/icons/hicolor/48x48/apps/session-properties.png
share/icons/hicolor/scalable/apps/session-properties.svg
-share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/as/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/crh/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/fy/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ha/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ig/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ka/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/mai/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/nds/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/oc/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ps/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/ug/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/yo/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/af/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/am/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ar/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/as/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ast/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/az/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/be/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/bg/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/bn/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/br/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/bs/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ca/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/crh/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/cs/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/csb/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/cy/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/da/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/de/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/dz/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/el/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/eo/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/es/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/et/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/eu/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/fa/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/fi/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/fr/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/fur/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/fy/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ga/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/gl/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/gu/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ha/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/he/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/hi/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/hr/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/hu/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/hy/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/id/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ig/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/is/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/it/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ja/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ka/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/km/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/kn/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ko/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ku/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/lt/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/lv/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mai/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mg/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mi/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mk/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ml/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mn/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mr/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ms/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/nb/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/nds/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ne/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/nl/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/nn/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/nso/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/oc/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/or/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/pa/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/pl/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ps/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/pt/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ro/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ru/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/rw/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/si/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/sk/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/sl/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/sq/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/sr/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/sv/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ta/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/te/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/th/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/tk/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/tr/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ug/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/uk/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/uz/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/vi/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/wa/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/xh/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/yo/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/zu/LC_MESSAGES/gnome-session-3.0.mo
share/xsessions/gnome.desktop
@dirrmtry share/xsessions
+@dirrm %%DATADIR%%/sessions
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zu/LC_MESSAGES
@@ -169,6 +180,8 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/csb/LC_MESSAGES
+@dirrmtry share/locale/csb
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/x11/gnome-session3/Makefile b/x11/gnome-session3/Makefile
deleted file mode 100644
index 462b48d25..000000000
--- a/x11/gnome-session3/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-session3/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME= gnome-session
-PORTVERSION= 3.6.2
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Session component for the GNOME 3 desktop
-
-LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
- execinfo:${PORTSDIR}/devel/libexecinfo \
- json-glib-1.0:${PORTSDIR}/devel/json-glib \
- upower-glib:${PORTSDIR}/sysutils/upower
-RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
- ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
-
-CONFLICTS= gnome-session-2.[0-9]*
-
-NO_STAGE= yes
-LATEST_LINK= gnome-session3
-INSTALLS_ICONS= yes
-USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
-USE_XORG= ice sm xau xext xtst xrender xtrans xcomposite
-USE_GL= gl
-USE_GNOME= gnomeprefix intlhack gconf2 intltool gtk30
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-docbook-docs
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-MAN1= gnome-session.1 gnome-session-properties.1 \
- gnome-session-quit.1
-GLIB_SCHEMAS= org.gnome.SessionManager.gschema.xml
-
-.include <bsd.port.mk>
diff --git a/x11/gnome-session3/distinfo b/x11/gnome-session3/distinfo
deleted file mode 100644
index 00924c963..000000000
--- a/x11/gnome-session3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gnome-session-3.6.2.tar.xz) = 2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4
-SIZE (gnome3/gnome-session-3.6.2.tar.xz) = 729676
diff --git a/x11/gnome-session3/pkg-descr b/x11/gnome-session3/pkg-descr
deleted file mode 100644
index 1790ccdfb..000000000
--- a/x11/gnome-session3/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This provides session management for the GNOME 3 desktop, and
-provides the tools used to start the desktop.
-
-WWW: http://www.gnome.org
diff --git a/x11/gnome-session3/pkg-plist b/x11/gnome-session3/pkg-plist
deleted file mode 100644
index 9c6c168f2..000000000
--- a/x11/gnome-session3/pkg-plist
+++ /dev/null
@@ -1,193 +0,0 @@
-bin/gnome-session
-bin/gnome-session-properties
-bin/gnome-session-quit
-libexec/gnome-session-check-accelerated
-libexec/gnome-session-check-accelerated-helper
-share/applications/session-properties.desktop
-share/GConf/gsettings/gnome-session.convert
-%%DATADIR%%/gsm-inhibit-dialog.ui
-%%DATADIR%%/hardware-compatibility
-%%DATADIR%%/session-properties.ui
-%%DATADIR%%/sessions/gnome-fallback.session
-%%DATADIR%%/sessions/gnome.session
-share/icons/hicolor/16x16/apps/session-properties.png
-share/icons/hicolor/22x22/apps/session-properties.png
-share/icons/hicolor/24x24/apps/session-properties.png
-share/icons/hicolor/32x32/apps/session-properties.png
-share/icons/hicolor/48x48/apps/session-properties.png
-share/icons/hicolor/scalable/apps/session-properties.svg
-share/locale/af/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/am/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ar/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/as/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ast/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/az/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/be/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/bg/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/bn/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/br/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/bs/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ca/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/crh/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/cs/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/csb/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/cy/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/da/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/de/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/dz/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/el/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/eo/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/es/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/et/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/eu/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/fa/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/fi/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/fr/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/fur/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/fy/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ga/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/gl/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/gu/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ha/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/he/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/hi/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/hr/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/hu/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/hy/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/id/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ig/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/is/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/it/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ja/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ka/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/km/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/kn/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ko/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ku/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/lt/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/lv/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/mai/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/mg/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/mi/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/mk/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ml/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/mn/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/mr/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ms/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/nb/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/nds/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ne/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/nl/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/nn/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/nso/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/oc/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/or/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/pa/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/pl/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ps/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/pt/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ro/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ru/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/rw/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/si/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/sk/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/sl/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/sq/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/sr/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/sv/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ta/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/te/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/th/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/tk/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/tr/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/ug/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/uk/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/uz/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/vi/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/wa/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/xh/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/yo/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/zu/LC_MESSAGES/gnome-session-3.0.mo
-share/xsessions/gnome.desktop
-@dirrmtry share/xsessions
-@dirrm %%DATADIR%%/sessions
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ig/LC_MESSAGES
-@dirrmtry share/locale/ig
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/ha/LC_MESSAGES
-@dirrmtry share/locale/ha
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/csb/LC_MESSAGES
-@dirrmtry share/locale/csb
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 8958da444..edeb9cf2f 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,27 +1,26 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-terminal/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom: ports/trunk/x11/gnome-terminal3/Makefile 18559 2013-06-17 20:56:34Z kwm $
PORTNAME= gnome-terminal
-PORTVERSION= 2.32.1
-PORTREVISION= 3
+PORTVERSION= 3.6.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Terminal component for the GNOME 2 Desktop
+COMMENT= Terminal component for the GNOME 3 Desktop
-LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification
+BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
+ itstool:${PORTSDIR}/textproc/itstool
+LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-CONFLICTS= gnome-terminal-3.[0-9]*
-
-NO_STAGE= yes
USES= gettext gmake pathfix pkgconfig
-USE_BZIP2= yes
+USE_XZ= yes
INSTALLS_OMF= yes
-USE_XORG= sm
-USE_GNOME= gnomeprefix intlhack gconf2 vte gnomedocutils libgnome
+USE_XORG= sm ice
+USE_GNOME= gconf2 gnomeprefix intlhack vte3 gnomedocutils
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 0c439fb39..8cb0ad839 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-terminal-2.32.1.tar.bz2) = 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
-SIZE (gnome2/gnome-terminal-2.32.1.tar.bz2) = 2319315
+SHA256 (gnome3/gnome-terminal-3.6.2.tar.xz) = 2df2f07c5dae9b2bb85ab75be249a285f97197ca954e9b80d8babf65832c416c
+SIZE (gnome3/gnome-terminal-3.6.2.tar.xz) = 1648532
diff --git a/x11/gnome-terminal/files/patch-config.h.in b/x11/gnome-terminal/files/patch-config.h.in
index 1617731fa..a752d5eff 100644
--- a/x11/gnome-terminal/files/patch-config.h.in
+++ b/x11/gnome-terminal/files/patch-config.h.in
@@ -1,6 +1,6 @@
---- config.h.in.orig 2009-05-03 15:26:39.000000000 -0400
-+++ config.h.in 2009-05-03 15:26:55.000000000 -0400
-@@ -24,6 +24,9 @@
+--- config.h.in.orig 2011-01-13 04:05:18.243479000 +0000
++++ config.h.in 2011-01-13 04:05:35.000000000 +0000
+@@ -27,6 +27,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/x11/gnome-terminal/files/patch-configure b/x11/gnome-terminal/files/patch-configure
index 45c938236..54434bd97 100644
--- a/x11/gnome-terminal/files/patch-configure
+++ b/x11/gnome-terminal/files/patch-configure
@@ -1,21 +1,17 @@
---- configure.orig 2009-05-03 15:26:45.000000000 -0400
-+++ configure 2009-05-03 15:27:01.000000000 -0400
-@@ -15099,6 +15099,79 @@ GLIB_GENMARSHAL="$($PKG_CONFIG --variabl
- GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
+--- configure.orig 2011-01-13 04:08:02.000000000 +0000
++++ configure 2011-01-13 04:08:30.000000000 +0000
+@@ -14510,6 +13851,52 @@
+ ;;
+ esac
-
-+{ echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
-+echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5
++$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; }
++if ${ac_cv_lib_util_kinfo_getfile+:} false; then :
++ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lutil $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
@@ -33,50 +29,27 @@
+ return 0;
+}
+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_util_kinfo_getfile=yes
+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_util_kinfo_getfile=no
++ ac_cv_lib_util_kinfo_getfile=no
+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test $ac_cv_lib_util_kinfo_getfile = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5
++$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; }
++if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then :
+ LIBS="${LIBS} -lutil"
+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KINFO_GETFILE 1
-+_ACEOF
++$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
+
+else
+ :
+fi
+
+
- # Extract the first word of "gtk-builder-convert", so it can be a program name with args.
- set dummy gtk-builder-convert; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ if test "$GTK_BUILDER_CONVERT" = "false"; then
+ as_fn_error $? "gtk-builder-convert not found" "$LINENO" 5
+ fi
diff --git a/x11/gnome-terminal/files/patch-configure.ac b/x11/gnome-terminal/files/patch-configure.ac
index 131e4c85b..5e3a59f60 100644
--- a/x11/gnome-terminal/files/patch-configure.ac
+++ b/x11/gnome-terminal/files/patch-configure.ac
@@ -1,13 +1,13 @@
---- configure.ac.orig 2009-05-03 15:25:26.000000000 -0400
-+++ configure.ac 2009-05-03 15:26:34.000000000 -0400
-@@ -96,6 +96,10 @@ AC_SUBST([GLIB_GENMARSHAL])
- GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
- AC_SUBST([GLIB_MKENUMS])
+--- configure.ac.orig 2011-01-11 19:41:06.000000000 +0000
++++ configure.ac 2011-01-13 04:07:54.000000000 +0000
+@@ -136,6 +136,10 @@
+ 3.0) AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert gtk-builder-convert-3.0],[false]) ;;
+ esac
+AC_CHECK_LIB(util, kinfo_getfile,
-+ [LIBS="${LIBS} -lutil"
-+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
++ [LIBS="${LIBS} -lutil"
++ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
+
- AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
if test "$GTK_BUILDER_CONVERT" = "false"; then
AC_MSG_ERROR([gtk-builder-convert not found])
+ fi
diff --git a/x11/gnome-terminal/files/patch-src-terminal.c b/x11/gnome-terminal/files/patch-src-terminal.c
deleted file mode 100644
index a434ca7ab..000000000
--- a/x11/gnome-terminal/files/patch-src-terminal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/terminal.c.orig 2010-11-10 10:47:14.000000000 -0800
-+++ src/terminal.c 2012-03-23 21:10:08.520503912 -0700
-@@ -579,7 +579,7 @@
- data = g_new (OwnData, 1);
- data->factory_name = get_factory_name_for_display (display_name);
- data->options = options;
-- data->exit_code = -1;
-+ data->exit_code = EXIT_SUCCESS;
- data->argv = argv_copy;
- data->argc = argc_copy;
-
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
index 69c4aa802..096a53103 100644
--- a/x11/gnome-terminal/files/patch-src_terminal-screen.c
+++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c
@@ -1,5 +1,5 @@
---- src/terminal-screen.c.orig 2009-08-13 14:39:24.000000000 +0200
-+++ src/terminal-screen.c 2009-08-20 10:41:58.000000000 +0200
+--- src/terminal-screen.c.orig 2010-12-03 01:12:50.000000000 +0000
++++ src/terminal-screen.c 2011-01-13 04:06:12.000000000 +0000
@@ -18,6 +18,15 @@
#include <config.h>
@@ -16,7 +16,7 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-@@ -184,15 +193,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
+@@ -179,15 +188,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
static char *
cwd_of_pid (int pid)
{
@@ -45,7 +45,7 @@
/* Try to get the working directory using various OS-specific mechanisms */
for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
{
-@@ -230,6 +252,49 @@ cwd_of_pid (int pid)
+@@ -225,6 +247,49 @@ cwd_of_pid (int pid)
return working_dir;
}
}
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index ec21cc0a5..1a007282d 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -6,77 +6,84 @@ share/applications/gnome-terminal.desktop
%%DATADIR%%/profile-manager.ui
%%DATADIR%%/profile-new-dialog.ui
%%DATADIR%%/profile-preferences.ui
-%%DATADIR%%/skey-challenge.ui
%%DATADIR%%/terminal.about
%%DATADIR%%/terminal.xml
-share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/C/gnome-terminal.xml
-share/gnome/help/gnome-terminal/C/legal.xml
-share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
-share/gnome/help/gnome-terminal/bg/legal.xml
-share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
-share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/cs/gnome-terminal.xml
-share/gnome/help/gnome-terminal/da/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/da/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/da/gnome-terminal.xml
-share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/de/gnome-terminal.xml
-share/gnome/help/gnome-terminal/el/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/el/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/el/gnome-terminal.xml
-share/gnome/help/gnome-terminal/en_GB/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/en_GB/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/en_GB/gnome-terminal.xml
-share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/es/gnome-terminal.xml
-share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
-share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/it/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ja/legal.xml
-share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
-share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/oc/gnome-terminal.xml
-share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/pt_BR/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ro/legal.xml
-share/gnome/help/gnome-terminal/ru/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ru/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ru/gnome-terminal.xml
-share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
-share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_TW/legal.xml
+share/help/C/gnome-terminal/figures/gnome-terminal-default.png
+share/help/C/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/C/gnome-terminal/index.docbook
+share/help/C/gnome-terminal/legal.xml
+share/help/ca/gnome-terminal/figures/gnome-terminal-default.png
+share/help/ca/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/ca/gnome-terminal/index.docbook
+share/help/ca/gnome-terminal/legal.xml
+share/help/cs/gnome-terminal/figures/gnome-terminal-default.png
+share/help/cs/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/cs/gnome-terminal/index.docbook
+share/help/cs/gnome-terminal/legal.xml
+share/help/da/gnome-terminal/figures/gnome-terminal-default.png
+share/help/da/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/da/gnome-terminal/index.docbook
+share/help/da/gnome-terminal/legal.xml
+share/help/de/gnome-terminal/figures/gnome-terminal-default.png
+share/help/de/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/de/gnome-terminal/index.docbook
+share/help/de/gnome-terminal/legal.xml
+share/help/el/gnome-terminal/figures/gnome-terminal-default.png
+share/help/el/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/el/gnome-terminal/index.docbook
+share/help/el/gnome-terminal/legal.xml
+share/help/en_GB/gnome-terminal/figures/gnome-terminal-default.png
+share/help/en_GB/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/en_GB/gnome-terminal/index.docbook
+share/help/en_GB/gnome-terminal/legal.xml
+share/help/es/gnome-terminal/figures/gnome-terminal-default.png
+share/help/es/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/es/gnome-terminal/index.docbook
+share/help/es/gnome-terminal/legal.xml
+share/help/fr/gnome-terminal/figures/gnome-terminal-default.png
+share/help/fr/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/fr/gnome-terminal/index.docbook
+share/help/fr/gnome-terminal/legal.xml
+share/help/gl/gnome-terminal/figures/gnome-terminal-default.png
+share/help/gl/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/gl/gnome-terminal/index.docbook
+share/help/gl/gnome-terminal/legal.xml
+share/help/it/gnome-terminal/figures/gnome-terminal-default.png
+share/help/it/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/it/gnome-terminal/index.docbook
+share/help/it/gnome-terminal/legal.xml
+share/help/ko/gnome-terminal/figures/gnome-terminal-default.png
+share/help/ko/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/ko/gnome-terminal/index.docbook
+share/help/ko/gnome-terminal/legal.xml
+share/help/oc/gnome-terminal/figures/gnome-terminal-default.png
+share/help/oc/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/oc/gnome-terminal/index.docbook
+share/help/oc/gnome-terminal/legal.xml
+share/help/pt_BR/gnome-terminal/figures/gnome-terminal-default.png
+share/help/pt_BR/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/pt_BR/gnome-terminal/index.docbook
+share/help/pt_BR/gnome-terminal/legal.xml
+share/help/ru/gnome-terminal/figures/gnome-terminal-default.png
+share/help/ru/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/ru/gnome-terminal/index.docbook
+share/help/ru/gnome-terminal/legal.xml
+share/help/sl/gnome-terminal/figures/gnome-terminal-default.png
+share/help/sl/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/sl/gnome-terminal/index.docbook
+share/help/sl/gnome-terminal/legal.xml
+share/help/sv/gnome-terminal/figures/gnome-terminal-default.png
+share/help/sv/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/sv/gnome-terminal/index.docbook
+share/help/sv/gnome-terminal/legal.xml
+share/help/uk/gnome-terminal/figures/gnome-terminal-default.png
+share/help/uk/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/uk/gnome-terminal/index.docbook
+share/help/uk/gnome-terminal/legal.xml
+share/help/zh_CN/gnome-terminal/figures/gnome-terminal-default.png
+share/help/zh_CN/gnome-terminal/figures/gnome-terminal-tabbed.png
+share/help/zh_CN/gnome-terminal/index.docbook
+share/help/zh_CN/gnome-terminal/legal.xml
share/locale/am/LC_MESSAGES/gnome-terminal.mo
share/locale/ar/LC_MESSAGES/gnome-terminal.mo
share/locale/as/LC_MESSAGES/gnome-terminal.mo
@@ -121,6 +128,7 @@ share/locale/it/LC_MESSAGES/gnome-terminal.mo
share/locale/ja/LC_MESSAGES/gnome-terminal.mo
share/locale/ka/LC_MESSAGES/gnome-terminal.mo
share/locale/kk/LC_MESSAGES/gnome-terminal.mo
+share/locale/km/LC_MESSAGES/gnome-terminal.mo
share/locale/kn/LC_MESSAGES/gnome-terminal.mo
share/locale/ko/LC_MESSAGES/gnome-terminal.mo
share/locale/ku/LC_MESSAGES/gnome-terminal.mo
@@ -167,71 +175,6 @@ share/locale/xh/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-share/omf/gnome-terminal/gnome-terminal-C.omf
-share/omf/gnome-terminal/gnome-terminal-bg.omf
-share/omf/gnome-terminal/gnome-terminal-ca.omf
-share/omf/gnome-terminal/gnome-terminal-cs.omf
-share/omf/gnome-terminal/gnome-terminal-da.omf
-share/omf/gnome-terminal/gnome-terminal-de.omf
-share/omf/gnome-terminal/gnome-terminal-el.omf
-share/omf/gnome-terminal/gnome-terminal-en_GB.omf
-share/omf/gnome-terminal/gnome-terminal-es.omf
-share/omf/gnome-terminal/gnome-terminal-fr.omf
-share/omf/gnome-terminal/gnome-terminal-it.omf
-share/omf/gnome-terminal/gnome-terminal-ja.omf
-share/omf/gnome-terminal/gnome-terminal-ko.omf
-share/omf/gnome-terminal/gnome-terminal-oc.omf
-share/omf/gnome-terminal/gnome-terminal-pt_BR.omf
-share/omf/gnome-terminal/gnome-terminal-ro.omf
-share/omf/gnome-terminal/gnome-terminal-ru.omf
-share/omf/gnome-terminal/gnome-terminal-sv.omf
-share/omf/gnome-terminal/gnome-terminal-uk.omf
-share/omf/gnome-terminal/gnome-terminal-zh_CN.omf
-share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-@dirrm share/omf/gnome-terminal
-@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
-@dirrm share/gnome/help/gnome-terminal/zh_TW
-@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
-@dirrm share/gnome/help/gnome-terminal/zh_CN
-@dirrm share/gnome/help/gnome-terminal/uk/figures
-@dirrm share/gnome/help/gnome-terminal/uk
-@dirrm share/gnome/help/gnome-terminal/sv/figures
-@dirrm share/gnome/help/gnome-terminal/sv
-@dirrm share/gnome/help/gnome-terminal/ru/figures
-@dirrm share/gnome/help/gnome-terminal/ru
-@dirrm share/gnome/help/gnome-terminal/ro/figures
-@dirrm share/gnome/help/gnome-terminal/ro
-@dirrm share/gnome/help/gnome-terminal/pt_BR/figures
-@dirrm share/gnome/help/gnome-terminal/pt_BR
-@dirrm share/gnome/help/gnome-terminal/oc/figures
-@dirrm share/gnome/help/gnome-terminal/oc
-@dirrm share/gnome/help/gnome-terminal/ko/figures
-@dirrm share/gnome/help/gnome-terminal/ko
-@dirrm share/gnome/help/gnome-terminal/ja/figures
-@dirrm share/gnome/help/gnome-terminal/ja
-@dirrm share/gnome/help/gnome-terminal/it/figures
-@dirrm share/gnome/help/gnome-terminal/it
-@dirrm share/gnome/help/gnome-terminal/fr/figures
-@dirrm share/gnome/help/gnome-terminal/fr
-@dirrm share/gnome/help/gnome-terminal/es/figures
-@dirrm share/gnome/help/gnome-terminal/es
-@dirrm share/gnome/help/gnome-terminal/en_GB/figures
-@dirrm share/gnome/help/gnome-terminal/en_GB
-@dirrm share/gnome/help/gnome-terminal/el/figures
-@dirrm share/gnome/help/gnome-terminal/el
-@dirrm share/gnome/help/gnome-terminal/de/figures
-@dirrm share/gnome/help/gnome-terminal/de
-@dirrm share/gnome/help/gnome-terminal/da/figures
-@dirrm share/gnome/help/gnome-terminal/da
-@dirrm share/gnome/help/gnome-terminal/cs/figures
-@dirrm share/gnome/help/gnome-terminal/cs
-@dirrm share/gnome/help/gnome-terminal/ca/figures
-@dirrm share/gnome/help/gnome-terminal/ca
-@dirrm share/gnome/help/gnome-terminal/bg/figures
-@dirrm share/gnome/help/gnome-terminal/bg
-@dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm share/gnome/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -282,3 +225,61 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/help/zh_CN/gnome-terminal/figures
+@dirrmtry share/help/zh_CN/gnome-terminal
+@dirrmtry share/help/zh_CN
+@dirrmtry share/help/uk/gnome-terminal/figures
+@dirrmtry share/help/uk/gnome-terminal
+@dirrmtry share/help/uk
+@dirrmtry share/help/sv/gnome-terminal/figures
+@dirrmtry share/help/sv/gnome-terminal
+@dirrmtry share/help/sv
+@dirrmtry share/help/sl/gnome-terminal/figures
+@dirrmtry share/help/sl/gnome-terminal
+@dirrmtry share/help/sl
+@dirrmtry share/help/ru/gnome-terminal/figures
+@dirrmtry share/help/ru/gnome-terminal
+@dirrmtry share/help/ru
+@dirrmtry share/help/pt_BR/gnome-terminal/figures
+@dirrmtry share/help/pt_BR/gnome-terminal
+@dirrmtry share/help/pt_BR
+@dirrmtry share/help/oc/gnome-terminal/figures
+@dirrmtry share/help/oc/gnome-terminal
+@dirrmtry share/help/oc
+@dirrmtry share/help/ko/gnome-terminal/figures
+@dirrmtry share/help/ko/gnome-terminal
+@dirrmtry share/help/ko
+@dirrmtry share/help/it/gnome-terminal/figures
+@dirrmtry share/help/it/gnome-terminal
+@dirrmtry share/help/it
+@dirrmtry share/help/gl/gnome-terminal/figures
+@dirrmtry share/help/gl/gnome-terminal
+@dirrmtry share/help/gl
+@dirrmtry share/help/fr/gnome-terminal/figures
+@dirrmtry share/help/fr/gnome-terminal
+@dirrmtry share/help/fr
+@dirrmtry share/help/es/gnome-terminal/figures
+@dirrmtry share/help/es/gnome-terminal
+@dirrmtry share/help/es
+@dirrmtry share/help/en_GB/gnome-terminal/figures
+@dirrmtry share/help/en_GB/gnome-terminal
+@dirrmtry share/help/en_GB
+@dirrmtry share/help/el/gnome-terminal/figures
+@dirrmtry share/help/el/gnome-terminal
+@dirrmtry share/help/el
+@dirrmtry share/help/de/gnome-terminal/figures
+@dirrmtry share/help/de/gnome-terminal
+@dirrmtry share/help/de
+@dirrmtry share/help/da/gnome-terminal/figures
+@dirrmtry share/help/da/gnome-terminal
+@dirrmtry share/help/da
+@dirrmtry share/help/cs/gnome-terminal/figures
+@dirrmtry share/help/cs/gnome-terminal
+@dirrmtry share/help/cs
+@dirrmtry share/help/ca/gnome-terminal/figures
+@dirrmtry share/help/ca/gnome-terminal
+@dirrmtry share/help/ca
+@dirrmtry share/help/C/gnome-terminal/figures
+@dirrmtry share/help/C/gnome-terminal
+@dirrmtry share/help/C
+@dirrmtry share/help
diff --git a/x11/gnome-terminal3/Makefile b/x11/gnome-terminal3/Makefile
deleted file mode 100644
index e5c644adb..000000000
--- a/x11/gnome-terminal3/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome-terminal3/Makefile 18559 2013-06-17 20:56:34Z kwm $
-
-PORTNAME= gnome-terminal
-PORTVERSION= 3.6.2
-CATEGORIES= x11 gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Terminal component for the GNOME 3 Desktop
-
-CONFLICTS= gnome-terminal-2.[0-9]*
-
-BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
- itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-
-NO_STAGE= yes
-LATEST_LINK= gnome-terminal3
-USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
-INSTALLS_OMF= yes
-USE_XORG= sm ice
-USE_GNOME= gconf2 gnomeprefix intlhack vte3 gnomedocutils
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-GCONF_SCHEMAS= gnome-terminal.schemas
-
-post-patch:
- @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \
- ${WRKSRC}/configure ${WRKSRC}/config.h.in
-
-.include <bsd.port.mk>
diff --git a/x11/gnome-terminal3/distinfo b/x11/gnome-terminal3/distinfo
deleted file mode 100644
index 8cb0ad839..000000000
--- a/x11/gnome-terminal3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/gnome-terminal-3.6.2.tar.xz) = 2df2f07c5dae9b2bb85ab75be249a285f97197ca954e9b80d8babf65832c416c
-SIZE (gnome3/gnome-terminal-3.6.2.tar.xz) = 1648532
diff --git a/x11/gnome-terminal3/files/patch-config.h.in b/x11/gnome-terminal3/files/patch-config.h.in
deleted file mode 100644
index a752d5eff..000000000
--- a/x11/gnome-terminal3/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2011-01-13 04:05:18.243479000 +0000
-+++ config.h.in 2011-01-13 04:05:35.000000000 +0000
-@@ -27,6 +27,9 @@
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-+/* Define if you have the kinfo_getfile function */
-+#undef HAVE_KINFO_GETFILE
-+
- /* Define if your <locale.h> file defines LC_MESSAGES. */
- #undef HAVE_LC_MESSAGES
-
diff --git a/x11/gnome-terminal3/files/patch-configure b/x11/gnome-terminal3/files/patch-configure
deleted file mode 100644
index 54434bd97..000000000
--- a/x11/gnome-terminal3/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.orig 2011-01-13 04:08:02.000000000 +0000
-+++ configure 2011-01-13 04:08:30.000000000 +0000
-@@ -14510,6 +13851,52 @@
- ;;
- esac
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5
-+$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; }
-+if ${ac_cv_lib_util_kinfo_getfile+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kinfo_getfile ();
-+int
-+main ()
-+{
-+return kinfo_getfile ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_util_kinfo_getfile=yes
-+else
-+ ac_cv_lib_util_kinfo_getfile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then :
-+ LIBS="${LIBS} -lutil"
-+
-+$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
-+
-+else
-+ :
-+fi
-+
-+
- if test "$GTK_BUILDER_CONVERT" = "false"; then
- as_fn_error $? "gtk-builder-convert not found" "$LINENO" 5
- fi
diff --git a/x11/gnome-terminal3/files/patch-configure.ac b/x11/gnome-terminal3/files/patch-configure.ac
deleted file mode 100644
index 5e3a59f60..000000000
--- a/x11/gnome-terminal3/files/patch-configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig 2011-01-11 19:41:06.000000000 +0000
-+++ configure.ac 2011-01-13 04:07:54.000000000 +0000
-@@ -136,6 +136,10 @@
- 3.0) AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert gtk-builder-convert-3.0],[false]) ;;
- esac
-
-+AC_CHECK_LIB(util, kinfo_getfile,
-+ [LIBS="${LIBS} -lutil"
-+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
-+
- if test "$GTK_BUILDER_CONVERT" = "false"; then
- AC_MSG_ERROR([gtk-builder-convert not found])
- fi
diff --git a/x11/gnome-terminal3/files/patch-src_terminal-screen.c b/x11/gnome-terminal3/files/patch-src_terminal-screen.c
deleted file mode 100644
index 096a53103..000000000
--- a/x11/gnome-terminal3/files/patch-src_terminal-screen.c
+++ /dev/null
@@ -1,97 +0,0 @@
---- src/terminal-screen.c.orig 2010-12-03 01:12:50.000000000 +0000
-+++ src/terminal-screen.c 2011-01-13 04:06:12.000000000 +0000
-@@ -18,6 +18,15 @@
-
- #include <config.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <sys/param.h>
-+#include <sys/user.h>
-+#ifdef HAVE_KINFO_GETFILE
-+#include <libutil.h>
-+#endif
-+#endif
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -179,15 +188,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
- static char *
- cwd_of_pid (int pid)
- {
-+#ifndef __FreeBSD__
- static const char patterns[][18] = {
- "/proc/%d/cwd", /* Linux */
- "/proc/%d/path/cwd", /* Solaris >= 10 */
- };
-+#else
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+ struct kinfo_file *freep, *kif;
-+#ifndef HAVE_KINFO_GETFILE
-+ size_t len;
-+ int name[4];
-+#else
-+ int cnt;
-+#endif /* HAVE_KINFO_GETFILE */
-+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
-+#endif /* __FreeBSD__ */
- guint i;
-
- if (pid == -1)
- return NULL;
-
-+#ifndef __FreeBSD__
- /* Try to get the working directory using various OS-specific mechanisms */
- for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
- {
-@@ -225,6 +247,49 @@ cwd_of_pid (int pid)
- return working_dir;
- }
- }
-+#else
-+ int fgpid = pid;
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+#ifndef HAVE_KINFO_GETFILE
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_FILEDESC;
-+ name[3] = fgpid;
-+
-+ if (sysctl (name, 4, NULL, &len, NULL, 0) < 0)
-+ return NULL;
-+ freep = kif = g_malloc (len);
-+ if (sysctl (name, 4, kif, &len, NULL, 0) < 0)
-+ {
-+ g_free (freep);
-+ return NULL;
-+ }
-+#else
-+ freep = kinfo_getfile (fgpid, &cnt);
-+#endif /* HAVE_KINFO_GETFILE */
-+
-+#ifndef HAVE_KINFO_GETFILE
-+ for (i = 0; i < len / sizeof (*kif); i++, kif++)
-+ {
-+ if (kif->kf_structsize != sizeof (*kif))
-+ continue;
-+#else
-+ for (i = 0; i < cnt; i++)
-+ {
-+ kif = &freep[i];
-+#endif /* HAVE_KINFO_GETFILE */
-+ if (kif->kf_fd == KF_FD_TYPE_CWD)
-+ {
-+ char *working_dir;
-+
-+ working_dir = g_strdup (kif->kf_path);
-+ g_free (freep);
-+ return working_dir;
-+ }
-+ }
-+ g_free (freep);
-+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
-+#endif /* __FreeBSD__ */
-
- return NULL;
- }
diff --git a/x11/gnome-terminal3/pkg-descr b/x11/gnome-terminal3/pkg-descr
deleted file mode 100644
index 1193c30f7..000000000
--- a/x11/gnome-terminal3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Default terminal emulator for the GNOME 2.0 Desktop.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnome-terminal3/pkg-plist b/x11/gnome-terminal3/pkg-plist
deleted file mode 100644
index 1a007282d..000000000
--- a/x11/gnome-terminal3/pkg-plist
+++ /dev/null
@@ -1,285 +0,0 @@
-bin/gnome-terminal
-share/applications/gnome-terminal.desktop
-%%DATADIR%%/encodings-dialog.ui
-%%DATADIR%%/find-dialog.ui
-%%DATADIR%%/keybinding-editor.ui
-%%DATADIR%%/profile-manager.ui
-%%DATADIR%%/profile-new-dialog.ui
-%%DATADIR%%/profile-preferences.ui
-%%DATADIR%%/terminal.about
-%%DATADIR%%/terminal.xml
-share/help/C/gnome-terminal/figures/gnome-terminal-default.png
-share/help/C/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/C/gnome-terminal/index.docbook
-share/help/C/gnome-terminal/legal.xml
-share/help/ca/gnome-terminal/figures/gnome-terminal-default.png
-share/help/ca/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/ca/gnome-terminal/index.docbook
-share/help/ca/gnome-terminal/legal.xml
-share/help/cs/gnome-terminal/figures/gnome-terminal-default.png
-share/help/cs/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/cs/gnome-terminal/index.docbook
-share/help/cs/gnome-terminal/legal.xml
-share/help/da/gnome-terminal/figures/gnome-terminal-default.png
-share/help/da/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/da/gnome-terminal/index.docbook
-share/help/da/gnome-terminal/legal.xml
-share/help/de/gnome-terminal/figures/gnome-terminal-default.png
-share/help/de/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/de/gnome-terminal/index.docbook
-share/help/de/gnome-terminal/legal.xml
-share/help/el/gnome-terminal/figures/gnome-terminal-default.png
-share/help/el/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/el/gnome-terminal/index.docbook
-share/help/el/gnome-terminal/legal.xml
-share/help/en_GB/gnome-terminal/figures/gnome-terminal-default.png
-share/help/en_GB/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/en_GB/gnome-terminal/index.docbook
-share/help/en_GB/gnome-terminal/legal.xml
-share/help/es/gnome-terminal/figures/gnome-terminal-default.png
-share/help/es/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/es/gnome-terminal/index.docbook
-share/help/es/gnome-terminal/legal.xml
-share/help/fr/gnome-terminal/figures/gnome-terminal-default.png
-share/help/fr/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/fr/gnome-terminal/index.docbook
-share/help/fr/gnome-terminal/legal.xml
-share/help/gl/gnome-terminal/figures/gnome-terminal-default.png
-share/help/gl/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/gl/gnome-terminal/index.docbook
-share/help/gl/gnome-terminal/legal.xml
-share/help/it/gnome-terminal/figures/gnome-terminal-default.png
-share/help/it/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/it/gnome-terminal/index.docbook
-share/help/it/gnome-terminal/legal.xml
-share/help/ko/gnome-terminal/figures/gnome-terminal-default.png
-share/help/ko/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/ko/gnome-terminal/index.docbook
-share/help/ko/gnome-terminal/legal.xml
-share/help/oc/gnome-terminal/figures/gnome-terminal-default.png
-share/help/oc/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/oc/gnome-terminal/index.docbook
-share/help/oc/gnome-terminal/legal.xml
-share/help/pt_BR/gnome-terminal/figures/gnome-terminal-default.png
-share/help/pt_BR/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/pt_BR/gnome-terminal/index.docbook
-share/help/pt_BR/gnome-terminal/legal.xml
-share/help/ru/gnome-terminal/figures/gnome-terminal-default.png
-share/help/ru/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/ru/gnome-terminal/index.docbook
-share/help/ru/gnome-terminal/legal.xml
-share/help/sl/gnome-terminal/figures/gnome-terminal-default.png
-share/help/sl/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/sl/gnome-terminal/index.docbook
-share/help/sl/gnome-terminal/legal.xml
-share/help/sv/gnome-terminal/figures/gnome-terminal-default.png
-share/help/sv/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/sv/gnome-terminal/index.docbook
-share/help/sv/gnome-terminal/legal.xml
-share/help/uk/gnome-terminal/figures/gnome-terminal-default.png
-share/help/uk/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/uk/gnome-terminal/index.docbook
-share/help/uk/gnome-terminal/legal.xml
-share/help/zh_CN/gnome-terminal/figures/gnome-terminal-default.png
-share/help/zh_CN/gnome-terminal/figures/gnome-terminal-tabbed.png
-share/help/zh_CN/gnome-terminal/index.docbook
-share/help/zh_CN/gnome-terminal/legal.xml
-share/locale/am/LC_MESSAGES/gnome-terminal.mo
-share/locale/ar/LC_MESSAGES/gnome-terminal.mo
-share/locale/as/LC_MESSAGES/gnome-terminal.mo
-share/locale/ast/LC_MESSAGES/gnome-terminal.mo
-share/locale/az/LC_MESSAGES/gnome-terminal.mo
-share/locale/be/LC_MESSAGES/gnome-terminal.mo
-share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo
-share/locale/bg/LC_MESSAGES/gnome-terminal.mo
-share/locale/bn/LC_MESSAGES/gnome-terminal.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo
-share/locale/br/LC_MESSAGES/gnome-terminal.mo
-share/locale/bs/LC_MESSAGES/gnome-terminal.mo
-share/locale/ca/LC_MESSAGES/gnome-terminal.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-terminal.mo
-share/locale/cs/LC_MESSAGES/gnome-terminal.mo
-share/locale/cy/LC_MESSAGES/gnome-terminal.mo
-share/locale/da/LC_MESSAGES/gnome-terminal.mo
-share/locale/de/LC_MESSAGES/gnome-terminal.mo
-share/locale/dz/LC_MESSAGES/gnome-terminal.mo
-share/locale/el/LC_MESSAGES/gnome-terminal.mo
-share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
-share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
-share/locale/eo/LC_MESSAGES/gnome-terminal.mo
-share/locale/es/LC_MESSAGES/gnome-terminal.mo
-share/locale/et/LC_MESSAGES/gnome-terminal.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-terminal.mo
-share/locale/eu/LC_MESSAGES/gnome-terminal.mo
-share/locale/fa/LC_MESSAGES/gnome-terminal.mo
-share/locale/fi/LC_MESSAGES/gnome-terminal.mo
-share/locale/fr/LC_MESSAGES/gnome-terminal.mo
-share/locale/fur/LC_MESSAGES/gnome-terminal.mo
-share/locale/ga/LC_MESSAGES/gnome-terminal.mo
-share/locale/gl/LC_MESSAGES/gnome-terminal.mo
-share/locale/gu/LC_MESSAGES/gnome-terminal.mo
-share/locale/he/LC_MESSAGES/gnome-terminal.mo
-share/locale/hi/LC_MESSAGES/gnome-terminal.mo
-share/locale/hr/LC_MESSAGES/gnome-terminal.mo
-share/locale/hu/LC_MESSAGES/gnome-terminal.mo
-share/locale/hy/LC_MESSAGES/gnome-terminal.mo
-share/locale/id/LC_MESSAGES/gnome-terminal.mo
-share/locale/it/LC_MESSAGES/gnome-terminal.mo
-share/locale/ja/LC_MESSAGES/gnome-terminal.mo
-share/locale/ka/LC_MESSAGES/gnome-terminal.mo
-share/locale/kk/LC_MESSAGES/gnome-terminal.mo
-share/locale/km/LC_MESSAGES/gnome-terminal.mo
-share/locale/kn/LC_MESSAGES/gnome-terminal.mo
-share/locale/ko/LC_MESSAGES/gnome-terminal.mo
-share/locale/ku/LC_MESSAGES/gnome-terminal.mo
-share/locale/lt/LC_MESSAGES/gnome-terminal.mo
-share/locale/lv/LC_MESSAGES/gnome-terminal.mo
-share/locale/mai/LC_MESSAGES/gnome-terminal.mo
-share/locale/mg/LC_MESSAGES/gnome-terminal.mo
-share/locale/mk/LC_MESSAGES/gnome-terminal.mo
-share/locale/ml/LC_MESSAGES/gnome-terminal.mo
-share/locale/mn/LC_MESSAGES/gnome-terminal.mo
-share/locale/mr/LC_MESSAGES/gnome-terminal.mo
-share/locale/ms/LC_MESSAGES/gnome-terminal.mo
-share/locale/nb/LC_MESSAGES/gnome-terminal.mo
-share/locale/nds/LC_MESSAGES/gnome-terminal.mo
-share/locale/ne/LC_MESSAGES/gnome-terminal.mo
-share/locale/nl/LC_MESSAGES/gnome-terminal.mo
-share/locale/nn/LC_MESSAGES/gnome-terminal.mo
-share/locale/oc/LC_MESSAGES/gnome-terminal.mo
-share/locale/or/LC_MESSAGES/gnome-terminal.mo
-share/locale/pa/LC_MESSAGES/gnome-terminal.mo
-share/locale/pl/LC_MESSAGES/gnome-terminal.mo
-share/locale/ps/LC_MESSAGES/gnome-terminal.mo
-share/locale/pt/LC_MESSAGES/gnome-terminal.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
-share/locale/ro/LC_MESSAGES/gnome-terminal.mo
-share/locale/ru/LC_MESSAGES/gnome-terminal.mo
-share/locale/rw/LC_MESSAGES/gnome-terminal.mo
-share/locale/si/LC_MESSAGES/gnome-terminal.mo
-share/locale/sk/LC_MESSAGES/gnome-terminal.mo
-share/locale/sl/LC_MESSAGES/gnome-terminal.mo
-share/locale/sq/LC_MESSAGES/gnome-terminal.mo
-share/locale/sr/LC_MESSAGES/gnome-terminal.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-terminal.mo
-share/locale/sv/LC_MESSAGES/gnome-terminal.mo
-share/locale/ta/LC_MESSAGES/gnome-terminal.mo
-share/locale/te/LC_MESSAGES/gnome-terminal.mo
-share/locale/th/LC_MESSAGES/gnome-terminal.mo
-share/locale/tr/LC_MESSAGES/gnome-terminal.mo
-share/locale/ug/LC_MESSAGES/gnome-terminal.mo
-share/locale/uk/LC_MESSAGES/gnome-terminal.mo
-share/locale/vi/LC_MESSAGES/gnome-terminal.mo
-share/locale/wa/LC_MESSAGES/gnome-terminal.mo
-share/locale/xh/LC_MESSAGES/gnome-terminal.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/help/zh_CN/gnome-terminal/figures
-@dirrmtry share/help/zh_CN/gnome-terminal
-@dirrmtry share/help/zh_CN
-@dirrmtry share/help/uk/gnome-terminal/figures
-@dirrmtry share/help/uk/gnome-terminal
-@dirrmtry share/help/uk
-@dirrmtry share/help/sv/gnome-terminal/figures
-@dirrmtry share/help/sv/gnome-terminal
-@dirrmtry share/help/sv
-@dirrmtry share/help/sl/gnome-terminal/figures
-@dirrmtry share/help/sl/gnome-terminal
-@dirrmtry share/help/sl
-@dirrmtry share/help/ru/gnome-terminal/figures
-@dirrmtry share/help/ru/gnome-terminal
-@dirrmtry share/help/ru
-@dirrmtry share/help/pt_BR/gnome-terminal/figures
-@dirrmtry share/help/pt_BR/gnome-terminal
-@dirrmtry share/help/pt_BR
-@dirrmtry share/help/oc/gnome-terminal/figures
-@dirrmtry share/help/oc/gnome-terminal
-@dirrmtry share/help/oc
-@dirrmtry share/help/ko/gnome-terminal/figures
-@dirrmtry share/help/ko/gnome-terminal
-@dirrmtry share/help/ko
-@dirrmtry share/help/it/gnome-terminal/figures
-@dirrmtry share/help/it/gnome-terminal
-@dirrmtry share/help/it
-@dirrmtry share/help/gl/gnome-terminal/figures
-@dirrmtry share/help/gl/gnome-terminal
-@dirrmtry share/help/gl
-@dirrmtry share/help/fr/gnome-terminal/figures
-@dirrmtry share/help/fr/gnome-terminal
-@dirrmtry share/help/fr
-@dirrmtry share/help/es/gnome-terminal/figures
-@dirrmtry share/help/es/gnome-terminal
-@dirrmtry share/help/es
-@dirrmtry share/help/en_GB/gnome-terminal/figures
-@dirrmtry share/help/en_GB/gnome-terminal
-@dirrmtry share/help/en_GB
-@dirrmtry share/help/el/gnome-terminal/figures
-@dirrmtry share/help/el/gnome-terminal
-@dirrmtry share/help/el
-@dirrmtry share/help/de/gnome-terminal/figures
-@dirrmtry share/help/de/gnome-terminal
-@dirrmtry share/help/de
-@dirrmtry share/help/da/gnome-terminal/figures
-@dirrmtry share/help/da/gnome-terminal
-@dirrmtry share/help/da
-@dirrmtry share/help/cs/gnome-terminal/figures
-@dirrmtry share/help/cs/gnome-terminal
-@dirrmtry share/help/cs
-@dirrmtry share/help/ca/gnome-terminal/figures
-@dirrmtry share/help/ca/gnome-terminal
-@dirrmtry share/help/ca
-@dirrmtry share/help/C/gnome-terminal/figures
-@dirrmtry share/help/C/gnome-terminal
-@dirrmtry share/help/C
-@dirrmtry share/help
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
deleted file mode 100644
index f07f9b507..000000000
--- a/x11/gnome2-lite/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom$
-
-PORTREVISION= 0
-CATEGORIES= x11 gnome
-PKGNAMESUFFIX= -lite
-
-COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
-
-RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
- gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \
- gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
- eog:${PORTSDIR}/graphics/eog \
- gedit:${PORTSDIR}/editors/gedit \
- gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
- gnome-session:${PORTSDIR}/x11/gnome-session \
- gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
- nautilus:${PORTSDIR}/x11-fm/nautilus \
- ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
- ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
- ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
- gcalctool:${PORTSDIR}/math/gcalctool \
- ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
- gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
- gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
- gnome-mount:${PORTSDIR}/sysutils/gnome-mount
-
-MASTERDIR= ${.CURDIR}/../gnome2
-CONFLICTS= gnome2-[0-9]* gnome3-[0-9]* gnome3-lite-[0-9]*
-
-DESCR= ${.CURDIR}/pkg-descr
-PKGMESSAGE= ${.CURDIR}/pkg-message
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11/gnome2-lite/pkg-descr b/x11/gnome2-lite/pkg-descr
deleted file mode 100644
index 1c85098c1..000000000
--- a/x11/gnome2-lite/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Network Object Model Environment
-
-This metaport installs the pieces of the GNOME 2 desktop that
-are needed to provide a functional desktop. x11/gnome2
-contains the full version of the GNOME 2 desktop environment.
-
-Other popular GNOME applications can be installed from the other
-GNOME 2 metaports:
-
- * x11/gnome2-fifth-toe
- * x11/gnome2-power-tools
- * editors/gnome2-office
- * devel/gnome2-hacker-tools
-
-WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2-lite/pkg-message b/x11/gnome2-lite/pkg-message
deleted file mode 100644
index 0b0e5564e..000000000
--- a/x11/gnome2-lite/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-************************************************************
-
-The GNOME 2 desktop Lite edition has been successfully installed.
-
-The Lite edition does not include all the components of the standard
-GNOME 2 desktop as detailed at http://www.gnome.org. If you wish to
-install the full desktop, you can remove this port, and install the
-x11/gnome2 port or package. That can be best accomplished using
-the following commands:
-
-# pkg_delete gnome2-lite
-# cd /usr/ports/x11/gnome2
-# make install clean
-
-Alternatively, you can install additional GNOME components individually
-using either their ports or packages.
-
-For more help on using GNOME on FreeBSD, please see the FreeBSD GNOME project
-site at http://www.FreeBSD.org/gnome.
-
-************************************************************
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
deleted file mode 100644
index 7e1e4b28e..000000000
--- a/x11/gnome2/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome2/Makefile 18610 2013-06-30 16:33:05Z marcus $
-
-PORTNAME= gnome2
-PORTVERSION= 2.32.1
-PORTREVISION?= 6
-CATEGORIES?= x11 gnome
-MASTER_SITES= # empty
-DISTFILES= # empty
-EXTRACT_ONLY= # empty
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop
-
-RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
- gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \
- gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
- eog:${PORTSDIR}/graphics/eog \
- gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
- gnect:${PORTSDIR}/games/gnome-games \
- gedit:${PORTSDIR}/editors/gedit \
- gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
- gnome-session:${PORTSDIR}/x11/gnome-session \
- bug-buddy:${PORTSDIR}/devel/bug-buddy \
- gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
- nautilus:${PORTSDIR}/x11-fm/nautilus \
- ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
- ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
- ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
- file-roller:${PORTSDIR}/archivers/file-roller \
- ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
- gok:${PORTSDIR}/accessibility/gok \
- gcalctool:${PORTSDIR}/math/gcalctool \
- ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
- ${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
- dasher:${PORTSDIR}/accessibility/dasher \
- evolution:${PORTSDIR}/mail/evolution \
- ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
- network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
- vino-passwd:${PORTSDIR}/net/vino \
- exchange-connector-setup-2.32:${PORTSDIR}/mail/evolution-exchange \
- ${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
- ${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
- totem:${PORTSDIR}/multimedia/totem \
- gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
- ${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
- evince:${PORTSDIR}/graphics/evince \
- alacarte:${PORTSDIR}/deskutils/alacarte \
- gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
- orca:${PORTSDIR}/accessibility/orca \
- gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
- ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
- seahorse-agent:${PORTSDIR}/security/seahorse-plugins \
- mousetweaks:${PORTSDIR}/accessibility/mousetweaks \
- ${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
- ${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme
-
-CONFLICTS= gnome2-lite-[0-9]* gnome3-[0-9]* gnome3-lite-[0-9]*
-
-NO_BUILD= yes
-
-.if !defined(GNOME_SLAVE)
-USE_PYTHON= yes
-.endif
-
-.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-OPTIONS_DEFINE= XSCREENSAVER
-# MAPI
-
-XSCREENSAVER_DESC= Use xscreensaver as screen saver app
-#MAPI_DESC= include evolution-mapi (pulls in samba4)
-.endif
-
-do-install: # empty
-
-.include <bsd.port.pre.mk>
-
-.if !defined(GNOME_SLAVE)
-. if ${ARCH}!="sparc64" && ${ARCH}!="ia64"
-RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \
- epiphany:${PORTSDIR}/www/epiphany
-. endif
-
-. if ${.CURDIR:T}!="gnome2-lite"
-RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \
- gucharmap:${PORTSDIR}/deskutils/gucharmap \
- sound-juicer:${PORTSDIR}/audio/sound-juicer \
- zenity:${PORTSDIR}/x11/zenity \
- gnome-nettool:${PORTSDIR}/net/gnome-nettool \
- swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
- vinagre:${PORTSDIR}/net/vinagre \
- brasero:${PORTSDIR}/sysutils/brasero \
- gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
- ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
- ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
- ${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \
- ekiga:${PORTSDIR}/net-im/ekiga \
- cheese:${PORTSDIR}/multimedia/cheese
-
-. if ${ARCH} == "i386"
-#RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
-. endif
-. if ${PORT_OPTIONS:MMAPI}
-RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi
-. endif
-. endif
-.endif
-
-.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
-. if ${PORT_OPTIONS:MXSCREENSAVER}
-RUN_DEPENDS+= ${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
-. else
-RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
-. endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11/gnome2/pkg-descr b/x11/gnome2/pkg-descr
deleted file mode 100644
index a7051fc7b..000000000
--- a/x11/gnome2/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-GNU Network Object Model Environment
-
-This metaport installs the entire GNOME 2 desktop, including
-the the most common user applications. Other popular GNOME
-applications can be installed from the other GNOME 2 metaports:
-
- * x11/gnome2-fifth-toe
- * x11/gnome2-power-tools
- * editors/gnome2-office
- * devel/gnome2-hacker-tools
-
-WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2/pkg-message b/x11/gnome2/pkg-message
deleted file mode 100644
index d8f296a70..000000000
--- a/x11/gnome2/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-**************************************************************************
-Congratulations! GNOME 2 has been successfully installed on your system.
-For help on starting it up, as well as answers to common questions, and
-some known issues, please see the FreeBSD GNOME homepage at:
-
- http://www.FreeBSD.org/gnome/
-
-**************************************************************************
diff --git a/x11/gnome2/pkg-plist b/x11/gnome2/pkg-plist
deleted file mode 100644
index 549a621fe..000000000
--- a/x11/gnome2/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment this plist intentionally left empty
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 1bc19f427..98e7c20e8 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -15,35 +15,34 @@ COMMENT?= The "meta-port" for the GNOME 3 integrated X11 desktop
CONFLICTS?= gnome2-[0-9]* gnome2-lite-[0-9]* gnome3-lite-[0-9]*
-RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel3 \
+RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel \
dconf-editor:${PORTSDIR}/devel/dconf-editor \
- gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session3 \
+ gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
gnome-icon-theme-extras>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme-extras \
gnome-icon-theme-symbolic>=3.0.0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring3 \
- gnome-power-manager>=3.0.0:${PORTSDIR}/sysutils/gnome-power-manager3 \
- orca>=3.0.0:${PORTSDIR}/accessibility/orca3 \
+ gnome-power-manager>=3.0.0:${PORTSDIR}/sysutils/gnome-power-manager \
+ orca>=3.0.0:${PORTSDIR}/accessibility/orca \
gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
+ gnome-shell>=3.0.0:${PORTSDIR}/x11/gnome-shell \
gnome-tweak-tool:${PORTSDIR}/deskutils/gnome-tweak-tool \
- nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus3 \
+ nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus \
${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
- yelp>=3.0.0:${PORTSDIR}/x11/yelp3 \
+ yelp>=3.0.0:${PORTSDIR}/x11/yelp \
zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
- seahorse>=3.0.0:${PORTSDIR}/security/seahorse3 \
- metacity>=2.34.0:${PORTSDIR}/x11-wm/metacity3 \
- gnome-control-center>=3.0.0:${PORTSDIR}/sysutils/gnome-control-center3 \
+ seahorse>=3.0.0:${PORTSDIR}/security/seahorse \
+ metacity>=2.34.0:${PORTSDIR}/x11-wm/metacity \
+ gnome-control-center>=3.0.0:${PORTSDIR}/sysutils/gnome-control-center \
${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
caribou:${PORTSDIR}/accessibility/caribou \
- ${LOCALBASE}/share/help/C/gnome-help/index.page:${PORTSDIR}/misc/gnome-user-docs3 \
+ ${LOCALBASE}/share/help/C/gnome-help/index.page:${PORTSDIR}/misc/gnome-user-docs \
${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme \
ekiga:${PORTSDIR}/net-im/ekiga
NO_BUILD= yes
-
-OPTIONS_DEFINE= SHELL
-SHELL_DESC= Include Gnome-shell
+NO_MTREE= yes
.if ${.CURDIR:T}!="gnome3-lite"
#OPTIONS_DEFINE+=MAPI
@@ -52,45 +51,42 @@ MAPI_DESC= Depend on evolution-mapi (pulls in samba4)" off
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSHELL}
-RUN_DEPENDS+= gnome-shell>=3.0.0:${PORTSDIR}/x11/gnome-shell
-.endif
-
.if ${.CURDIR:T}!="gnome3-lite"
-RUN_DEPENDS+= empathy>=3.0.0:${PORTSDIR}/net-im/empathy3 \
- epiphany>=3.0.0:${PORTSDIR}/www/epiphany3 \
- epiphany-extensions3>=3.0.0:${PORTSDIR}/www/epiphany-extensions3 \
- gnome-screensaver>=3.0.0:${PORTSDIR}/x11/gnome-screensaver3 \
- gucharmap>=3.0.0:${PORTSDIR}/deskutils/gucharmap3 \
- eog>=3.0.0:${PORTSDIR}/graphics/eog3 \
- eog-plugins>=3.0.0:${PORTSDIR}/graphics/eog-plugins3 \
- gedit>=3.0.0:${PORTSDIR}/editors/gedit3 \
- gedit-plugins>=3.0.0:${PORTSDIR}/editors/gedit-plugins3 \
- gnome-terminal>=3.0.0:${PORTSDIR}/x11/gnome-terminal3 \
- mousetweaks>=3.0.0:${PORTSDIR}/accessibility/mousetweaks3 \
- brasero>=3.0.0:${PORTSDIR}/sysutils/brasero3 \
- gcalctool>=3.0.0:${PORTSDIR}/math/gcalctool3 \
+RUN_DEPENDS+= empathy>=3.0.0:${PORTSDIR}/net-im/empathy \
+ epiphany>=3.0.0:${PORTSDIR}/www/epiphany \
+ epiphany-extensions3>=3.0.0:${PORTSDIR}/www/epiphany-extensions \
+ gnome-screensaver>=3.0.0:${PORTSDIR}/x11/gnome-screensaver \
+ gucharmap>=3.0.0:${PORTSDIR}/deskutils/gucharmap \
+ eog>=3.0.0:${PORTSDIR}/graphics/eog \
+ eog-plugins>=3.0.0:${PORTSDIR}/graphics/eog-plugins \
+ gedit>=3.0.0:${PORTSDIR}/editors/gedit \
+ gedit-plugins>=3.0.0:${PORTSDIR}/editors/gedit-plugins \
+ gnome-terminal>=3.0.0:${PORTSDIR}/x11/gnome-terminal \
+ mousetweaks>=3.0.0:${PORTSDIR}/accessibility/mousetweaks \
+ brasero>=3.0.0:${PORTSDIR}/sysutils/brasero \
+ accerciser>=3.0.0:${PORTSDIR}/accessibility/accerciser \
+ gcalctool>=3.0.0:${PORTSDIR}/math/gcalctool \
baobab>=3.4.0:${PORTSDIR}/deskutils/baobab \
gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary \
gnome-font-viewer>=3.4.0:${PORTSDIR}/deskutils/gnome-font-viewer \
gnome-screenshot>=3.4.0:${PORTSDIR}/deskutils/gnome-screenshot \
gnome-search-tool>=3.4.0:${PORTSDIR}/deskutils/gnome-search-tool \
gnome-system-log>=3.4.0:${PORTSDIR}/deskutils/gnome-system-log \
- gnome-system-monitor>=3.0.0:${PORTSDIR}/sysutils/gnome-system-monitor3 \
- file-roller>=3.0.0:${PORTSDIR}/archivers/file-roller3 \
- evince>=3.0.0:${PORTSDIR}/graphics/evince3 \
- vino>=3.0.0:${PORTSDIR}/net/vino3 \
- vinagre>=3.0.0:${PORTSDIR}/net/vinagre3 \
+ gnome-system-monitor>=3.0.0:${PORTSDIR}/sysutils/gnome-system-monitor \
+ file-roller>=3.0.0:${PORTSDIR}/archivers/file-roller \
+ evince>=3.0.0:${PORTSDIR}/graphics/evince \
+ vino>=3.0.0:${PORTSDIR}/net/vino \
+ vinagre>=3.0.0:${PORTSDIR}/net/vinagre \
gnome-games>=3.0.0:${PORTSDIR}/games/gnome-games3 \
- totem>=3.0.0:${PORTSDIR}/multimedia/totem3 \
- gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor3 \
- gdm>=3.0.0:${PORTSDIR}/x11/gdm3 \
- evolution>=3.0.0:${PORTSDIR}/mail/evolution3 \
- cheese>=3.0.0:${PORTSDIR}/multimedia/cheese3
+ totem>=3.0.0:${PORTSDIR}/multimedia/totem \
+ gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor \
+ gdm>=3.0.0:${PORTSDIR}/x11/gdm \
+ evolution>=3.0.0:${PORTSDIR}/mail/evolution \
+ cheese>=3.0.0:${PORTSDIR}/multimedia/cheese
.if ${PORT_OPTIONS:MMAPI}
-RUN_DEPENDS+= evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi3
+#RUN_DEPENDS+= evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi
.endif
.endif # !gnome3-lite section
diff --git a/x11/yelp3/Makefile b/x11/yelp/Makefile
index 357f554be..201a2640d 100644
--- a/x11/yelp3/Makefile
+++ b/x11/yelp/Makefile
@@ -1,6 +1,6 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD$
-# $MCom$
+# $MCom: ports/trunk/x11/yelp3/Makefile 18692 2013-09-22 00:45:30Z kwm $
PORTNAME= yelp
PORTVERSION= 3.6.2
@@ -9,20 +9,16 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A help browser for the GNOME 3 desktop
+COMMENT= Help browser for the GNOME 3 desktop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/yelp-xsl.pc:${PORTSDIR}/textproc/yelp-xsl \
itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3
+LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/yelp-xsl.pc:${PORTSDIR}/textproc/yelp-xsl
-CONFLICTS= yelp-2.[0-9]*
-
-NO_STAGE= yes
-LATEST_LINK= yelp3
USES= desktop-file-utils gettext gmake pathfix pkgconfig
USE_XZ= yes
USE_XORG= x11 ice
@@ -40,7 +36,10 @@ GLIB_SCHEMAS= org.gnome.yelp.gschema.xml
CONFIGURE_ENV+= YELP_LZMA_CFLAGS="-I/usr/include" \
YELP_LZMA_LIBS="-L/usr/lib -llzma"
.else
-LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
+LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz
.endif
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libyelp.so.0
+
.include <bsd.port.post.mk>
diff --git a/x11/yelp3/distinfo b/x11/yelp/distinfo
index c9a45c3dc..c9a45c3dc 100644
--- a/x11/yelp3/distinfo
+++ b/x11/yelp/distinfo
diff --git a/x11/yelp3/files/patch-configure b/x11/yelp/files/patch-configure
index 61097483c..61097483c 100644
--- a/x11/yelp3/files/patch-configure
+++ b/x11/yelp/files/patch-configure
diff --git a/x11/yelp3/pkg-descr b/x11/yelp/pkg-descr
index 985ffefd8..985ffefd8 100644
--- a/x11/yelp3/pkg-descr
+++ b/x11/yelp/pkg-descr
diff --git a/x11/yelp3/pkg-plist b/x11/yelp/pkg-plist
index 3a0275b5d..3a0275b5d 100644
--- a/x11/yelp3/pkg-plist
+++ b/x11/yelp/pkg-plist