- Update to 0.2.1

- Finish to convert USES
- Replace post-patch target by patch (configure script)

4 files changed, 19 insertions, 18 deletions

diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 1c0516b1f852..082d221e8617 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	garcon
-PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTVERSION=	0.2.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -14,11 +14,9 @@ COMMENT=	Xfce 4 essential utilities and scripts
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 intltool intlhack
+USE_GNOME=	glib20 intltool intlhack
 USE_XFCE=	configenv libutil
-USES=		pkgconfig
-
-CONFIGURE_ARGS+=--disable-gtk-doc-html
+USES=		pathfix pkgconfig
 
 OPTIONS_DEFINE=		DOCS NLS
 
@@ -41,9 +39,4 @@ CONFIGURE_ARGS+=--without-html-dir
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if empty(PORT_OPTIONS:MNLS)
-post-patch:
-	@${REINPLACE_CMD} -e 's|	po||' ${WRKSRC}/Makefile.in
-.endif
-
 .include <bsd.port.mk>
diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo
index 99909ff0ed0f..431e59852388 100644
--- a/sysutils/garcon/distinfo
+++ b/sysutils/garcon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/garcon-0.2.0.tar.bz2) = 02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c
-SIZE (xfce4/garcon-0.2.0.tar.bz2) = 431573
+SHA256 (xfce4/garcon-0.2.1.tar.bz2) = 48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7
+SIZE (xfce4/garcon-0.2.1.tar.bz2) = 454321
diff --git a/sysutils/garcon/files/patch-configure b/sysutils/garcon/files/patch-configure
new file mode 100644
index 000000000000..6e504ce79fda
--- /dev/null
+++ b/sysutils/garcon/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2013-05-05 16:32:02.000000000 +0000
++++ ./configure	2013-05-05 21:17:24.000000000 +0000
+@@ -13632,7 +13632,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist
index 4bb329231cf6..16f17fede031 100644
--- a/sysutils/garcon/pkg-plist
+++ b/sysutils/garcon/pkg-plist
@@ -14,7 +14,6 @@ include/garcon-1/garcon/garcon-menu-separator.h
 include/garcon-1/garcon/garcon-menu-tree-provider.h
 include/garcon-1/garcon/garcon-menu.h
 include/garcon-1/garcon/garcon.h
-lib/libgarcon-1.a
 lib/libgarcon-1.la
 lib/libgarcon-1.so
 lib/libgarcon-1.so.0
@@ -85,10 +84,8 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%share/locale/ja/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/garcon.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/garcon.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/garcon.mo
@@ -101,7 +98,9 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%share/locale/ro/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/te/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/garcon.mo
@@ -118,8 +117,6 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%@dirrmtry share/locale/te
 %%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/nb_NO
-%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ku
 %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/kk
 %%APIDOCS%%@dirrm share/gtk-doc/html/garcon