ports/155729: [UPDATE] devel/thunar-svn-plugin to 0.1.4

Olivier Duchateau duchateau.olivier at gmail.com
Sun Mar 20 19:10:01 UTC 2011 

>Number:         155729
>Category:       ports
>Synopsis:       [UPDATE] devel/thunar-svn-plugin to 0.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 20 19:10:00 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.2-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Announce: http://foo-projects.org/pipermail/xfce/2011-March/028474.html

Add OPTIONS macro (for NLS, Git and Subversion).

Note: This plugin was tested with Git enabled, but I noticed, clone repository doesn't work (or I don't know how it works).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/devel/thunar-svn-plugin/Makefile thunar-svn-plugin/Makefile
--- /usr/ports/devel/thunar-svn-plugin/Makefile	2011-03-03 11:12:22.000000000 +0100
+++ thunar-svn-plugin/Makefile	2011-03-20 19:43:42.000000000 +0100
@@ -6,24 +6,30 @@
 #
 
 PORTNAME=	thunar-svn-plugin
-PORTVERSION=	0.0.3
-PORTREVISION=	10
+PORTVERSION=	0.1.4
 CATEGORIES=	devel xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	src/thunar-plugins/${PORTNAME:S/svn/vcs/}/${PORTVERSION:R}
+DISTNAME=	${PORTNAME:S/svn/vcs/}-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	sergey.dyatko at gmail.com
 COMMENT=	Subversion plugin for Thunar
 
-LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
-
+USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20
-USE_XFCE=	configenv libexo thunar thunarvfs
+USE_GNOME=	desktopfileutils gnomehack gtk20 glib20 intltool intlhack \
+		pkgconfig
+USE_XFCE=	configenv libexo libutil thunar
+INSTALLS_ICONS=	yes
+
+CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
+
+OPTIONS=	NLS "Enable Native Language Support" on \
+		GIT "Enable Git support" off \
+		SVN "Enable Subversion support" on
 
 .include <bsd.port.pre.mk>
 
@@ -31,9 +37,34 @@
 BROKEN=		does not configure on 6.X
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \
-		s|thunarx-1|thunarx-2|g' \
-		${WRKSRC}/configure
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if defined(WITH_GIT)
+RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
+CONFIGURE_ARGS+=--enable-git
+PLIST_SUB+=	GIT=""
+.else
+CONFIGURE_ARGS+=--disable-git
+PLIST_SUB+=	GIT="@comment "
+.endif
+
+.if !defined(WITHOUT_SVN)
+LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+CONFIGURE_ARGS+=--enable-subversion
+PLIST_SUB+=	SVN=""
+.else
+CONFIGURE_ARGS+=--disable-subversion
+PLIST_SUB+=	SVN="@comment "
+.endif
+
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/devel/thunar-svn-plugin/distinfo thunar-svn-plugin/distinfo
--- /usr/ports/devel/thunar-svn-plugin/distinfo	2009-03-23 19:51:40.000000000 +0100
+++ thunar-svn-plugin/distinfo	2011-03-20 19:30:24.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (xfce4/thunar-svn-plugin-0.0.3.tar.bz2) = 0686a3c02e8bd0d536ccce30cefa34fc
-SHA256 (xfce4/thunar-svn-plugin-0.0.3.tar.bz2) = ebe50225401bd90ca8603403a7c5b00de7846aca3fd1cec44a3b9c295114f598
-SIZE (xfce4/thunar-svn-plugin-0.0.3.tar.bz2) = 354641
+SHA256 (xfce4/thunar-vcs-plugin-0.1.4.tar.bz2) = 7dbbdb22113cec40f6dc46cf4fd113b47928af15ba64e9fc66305a01c4291d4c
+SIZE (xfce4/thunar-vcs-plugin-0.1.4.tar.bz2) = 435835
diff -urN /usr/ports/devel/thunar-svn-plugin/files/patch-Makefile.in thunar-svn-plugin/files/patch-Makefile.in
--- /usr/ports/devel/thunar-svn-plugin/files/patch-Makefile.in	2009-06-12 20:30:21.000000000 +0200
+++ thunar-svn-plugin/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- thunar-svn-plugin/Makefile.in.orig	2008-10-15 11:57:39.000000000 +0300
-+++ thunar-svn-plugin/Makefile.in	2008-10-15 11:55:46.000000000 +0300
-@@ -140,7 +140,7 @@
- INTLLIBS = @INTLLIBS@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -L${LOCALBASE}/lib
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
diff -urN /usr/ports/devel/thunar-svn-plugin/files/patch-fix-svn thunar-svn-plugin/files/patch-fix-svn
--- /usr/ports/devel/thunar-svn-plugin/files/patch-fix-svn	2009-04-23 10:58:54.000000000 +0200
+++ thunar-svn-plugin/files/patch-fix-svn	1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
---- tsp-svn-helper/tsh-common.c.orig   2009-03-14 22:54:06.000000000 +0200
-+++ tsp-svn-helper/tsh-common.c        2009-04-21 09:12:45.000000000 +0300
-@@ -34,6 +34,7 @@
- #include <subversion-1/svn_pools.h>
- #include <subversion-1/svn_fs.h>
- #include <subversion-1/svn_time.h>
-+#include <subversion-1/svn_props.h>
- 
- #include "tsh-dialog-common.h"
- #include "tsh-login-dialog.h"
---- tsp-svn-helper/tsh-properties-dialog.c.orig        2009-03-14 22:54:06.000000000 +0200
-+++ tsp-svn-helper/tsh-properties-dialog.c     2009-04-21 09:13:12.000000000 +0300
-@@ -25,6 +25,7 @@
- #include <gtk/gtk.h>
- 
- #include <subversion-1/svn_client.h>
-+#include <subversion-1/svn_props.h>
- 
- #include "tsh-common.h"
- #include "tsh-properties-dialog.h"
-
-
diff -urN /usr/ports/devel/thunar-svn-plugin/pkg-plist thunar-svn-plugin/pkg-plist
--- /usr/ports/devel/thunar-svn-plugin/pkg-plist	2009-03-23 19:51:40.000000000 +0100
+++ thunar-svn-plugin/pkg-plist	2011-03-20 19:30:24.000000000 +0100
@@ -1,24 +1,36 @@
-lib/thunarx-1/thunar-svn-plugin.la
-lib/thunarx-1/thunar-svn-plugin.so
-libexec/tsp-svn-helper
+lib/thunarx-2/thunar-vcs-plugin.a
+lib/thunarx-2/thunar-vcs-plugin.la
+lib/thunarx-2/thunar-vcs-plugin.so
+%%GIT%%libexec/tvp-git-helper
+%%SVN%%libexec/tvp-svn-helper
+share/icons/hicolor/24x24/apps/git.png
 share/icons/hicolor/24x24/apps/subversion.png
+share/icons/hicolor/48x48/apps/git.png
 share/icons/hicolor/48x48/apps/subversion.png
-share/locale/ar/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/cs/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/da/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/en_GB/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/es/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/fr/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/gl/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/hu/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/id/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/lv/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/nl/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/pl/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/pt/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/sv/LC_MESSAGES/thunar-svn-plugin.mo
-share/locale/ur/LC_MESSAGES/thunar-svn-plugin.mo
- at dirrmtry share/locale/ur/LC_MESSAGES
- at dirrmtry share/locale/ur
- at dirrmtry lib/thunarx-1
+%%NLS%%share/locale/ar/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+ at dirrmtry lib/thunarx-2
+ at exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
+ at unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list