From b13800fe5b534b526b9c8cdb21ab04c51d8392c8 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 1 Apr 2015 19:42:41 +0300 Subject: [PATCH] cvs: fix rcs2log link path. Closes #103 --- dev-vcs/cvs/cvs-1.12.13.1.recipe | 2 +- dev-vcs/cvs/patches/cvs-1.12.13.1.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 15aed537c..9602750a5 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -38,7 +38,7 @@ LICENSE="GNU GPL v1 GNU LGPL v2" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_SHA256="de7f374d8c4ac414c04e8d44ce9a5d3da919825a6a332d747e299dc7a80c2218" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="cvs-1.12.13.1.patch" diff --git a/dev-vcs/cvs/patches/cvs-1.12.13.1.patch b/dev-vcs/cvs/patches/cvs-1.12.13.1.patch index 94eb64e2a..fa63acf1f 100644 --- a/dev-vcs/cvs/patches/cvs-1.12.13.1.patch +++ b/dev-vcs/cvs/patches/cvs-1.12.13.1.patch @@ -224,3 +224,16 @@ diff -up cvs-1.12.13.1/src/wrapper.c.orig cvs-1.12.13.1/src/wrapper.c /* If we can't find a home directory, ignore ~/.cvswrappers. This may make tracking down problems a bit of a pain, but on the other hand it might be obnoxious to complain when CVS will function +diff --git a/contrib/Makefile.in b/contrib/Makefile.in +index ed473e5..fccaa02 100644 +--- a/contrib/Makefile.in ++++ b/contrib/Makefile.in +@@ -767,7 +767,7 @@ install-data-local: + echo "test ! -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + echo " && cd $(DESTDIR)$(bindir) && $(LN_S) ../share/$(PACKAGE)/contrib/`echo $$p|sed '$(transform)'` ."; \ + (test ! -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'` \ +- && cd $(DESTDIR)$(bindir) && $(LN_S) ../share/$(PACKAGE)/contrib/`echo $$p|sed '$(transform)'` .) \ ++ && cd $(DESTDIR)$(bindir) && $(LN_S) ${datarootdir}/$(PACKAGE)/contrib/`echo $$p|sed '$(transform)'` .) \ + || (echo "Link creation failed" && if test -f $$p; then \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \