Update to 2.2.2.

4 files changed, 9 insertions, 16 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f30007d9959c..63ade0c1b7d2 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
@@ -15,7 +14,7 @@ DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional UI API for GNOME 2.0
+COMMENT=	Additional UI API for GNOME 2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,12 +27,13 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-about.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"| ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 9b5c1ebfe7b5..1ef3d1c22b0e 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.2.1.tar.bz2) = 95e6cf32afb647fdbb14d5c782b4ea9d
+MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900
diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure
index 5b2ae3a8310b..943558a25604 100644
--- a/x11/gnome-desktop/files/patch-configure
+++ b/x11/gnome-desktop/files/patch-configure
@@ -8,12 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8175,7 +8176,7 @@
- GNOME_PLATFORM=2
- GNOME_MINOR=2
- GNOME_MICRO=1
--GNOME_VENDOR="Gnome.Org"
-+GNOME_VENDOR="FreeBSD GNOME Project"
- GNOME_DATE="Tuesday, March 11th 2003"
- 
- 
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index d778276271c5..2cd64cb14824 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -186,6 +186,7 @@ share/locale/ko/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/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/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -198,9 +199,9 @@ share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/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/sp/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@Latn/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/th/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -208,6 +209,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/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/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/help/lgpl/C/figures