From 7a2a86dca6b17399fd965f6cd31df4b5aa9bf805 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Sun, 27 Mar 2011 14:13:05 +0000 Subject: [PATCH] Update from 0.0.3 to 0.1.4. Also, update the name of project where it needed. Remove needless patches. PR: 155729 --- devel/thunar-vcs-plugin/Makefile | 58 ++++++++++++++----- devel/thunar-vcs-plugin/distinfo | 5 +- .../thunar-vcs-plugin/files/patch-Makefile.in | 11 ---- devel/thunar-vcs-plugin/files/patch-fix-svn | 22 ------- devel/thunar-vcs-plugin/pkg-descr | 6 +- devel/thunar-vcs-plugin/pkg-plist | 56 +++++++++++------- 6 files changed, 82 insertions(+), 76 deletions(-) delete mode 100644 devel/thunar-vcs-plugin/files/patch-Makefile.in delete mode 100644 devel/thunar-vcs-plugin/files/patch-fix-svn diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile index b787628bc7e5..395df3c6633a 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -1,39 +1,65 @@ -# New ports collection makefile for: thunar-svn-plugin +# New ports collection makefile for: thunar-vcs-plugin # Date created: 2008-10-15 # Whom: Sergey V. Dyatko # # $FreeBSD$ # -PORTNAME= thunar-svn-plugin -PORTVERSION= 0.0.3 -PORTREVISION= 10 +PORTNAME= thunar-vcs-plugin +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}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= sergey.dyatko@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+= LDFLAGS="-L${LOCALBASE}/lib" + +OPTIONS= NLS "Enable Native Language Support" on \ + GIT "Enable Git support" off \ + SVN "Enable Subversion support" on .include -.if ${OSVERSION} < 700000 -BROKEN= does not configure on 6.X +.if !defined(WITHOUT_NLS) +USE_GETTEXT= yes +CONFIGURE_ARGS+=--enable-nls +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \ - s|thunarx-1|thunarx-2|g' \ - ${WRKSRC}/configure +.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-freebsd +CONFIGURE_ARGS+=--enable-subversion +PLIST_SUB+= SVN="" +.else +CONFIGURE_ARGS+=--disable-subversion +PLIST_SUB+= SVN="@comment " +.endif + +post-install: + @-update-desktop-database .include diff --git a/devel/thunar-vcs-plugin/distinfo b/devel/thunar-vcs-plugin/distinfo index 4fc2f73f8960..68e240335d83 100644 --- a/devel/thunar-vcs-plugin/distinfo +++ b/devel/thunar-vcs-plugin/distinfo @@ -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 --git a/devel/thunar-vcs-plugin/files/patch-Makefile.in b/devel/thunar-vcs-plugin/files/patch-Makefile.in deleted file mode 100644 index 14f4c59fa5cf..000000000000 --- a/devel/thunar-vcs-plugin/files/patch-Makefile.in +++ /dev/null @@ -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 --git a/devel/thunar-vcs-plugin/files/patch-fix-svn b/devel/thunar-vcs-plugin/files/patch-fix-svn deleted file mode 100644 index fc78683790bb..000000000000 --- a/devel/thunar-vcs-plugin/files/patch-fix-svn +++ /dev/null @@ -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 - #include - #include -+#include - - #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 - - #include -+#include - - #include "tsh-common.h" - #include "tsh-properties-dialog.h" - - diff --git a/devel/thunar-vcs-plugin/pkg-descr b/devel/thunar-vcs-plugin/pkg-descr index b0af1fa18401..37629971e3ab 100644 --- a/devel/thunar-vcs-plugin/pkg-descr +++ b/devel/thunar-vcs-plugin/pkg-descr @@ -1,4 +1,5 @@ -The Thunar SVN Plugin adds Subversion actions to the context menu of thunar. +The Thunar VCS Plugin adds Subversion and Git actions to the context menu of +thunar. The current features are: Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete, @@ -6,4 +7,5 @@ export, import, lock, log, move, properties, relocate, resolved, revert, status, switch, unlock, update. Subversion info in file properties dialog. -WWW: http://goodies.xfce.org/projects/thunar-plugins/thunar-svn-plugin +WWW: http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin + diff --git a/devel/thunar-vcs-plugin/pkg-plist b/devel/thunar-vcs-plugin/pkg-plist index ab3669caf0ed..579523592b72 100644 --- a/devel/thunar-vcs-plugin/pkg-plist +++ b/devel/thunar-vcs-plugin/pkg-plist @@ -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 -@dirrmtry share/locale/ur/LC_MESSAGES -@dirrmtry share/locale/ur -@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 +@dirrmtry lib/thunarx-2 +@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true