From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- devel/cppunit/files/patch-config::ltmain.sh | 15 ------------ devel/cppunit/files/patch-config__ltmain.sh | 15 ++++++++++++ devel/cppunit/files/patch-doc::Makefile.in | 36 ----------------------------- devel/cppunit/files/patch-doc__Makefile.in | 36 +++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 devel/cppunit/files/patch-config::ltmain.sh create mode 100644 devel/cppunit/files/patch-config__ltmain.sh delete mode 100644 devel/cppunit/files/patch-doc::Makefile.in create mode 100644 devel/cppunit/files/patch-doc__Makefile.in (limited to 'devel/cppunit/files') diff --git a/devel/cppunit/files/patch-config::ltmain.sh b/devel/cppunit/files/patch-config::ltmain.sh deleted file mode 100644 index 3f7106f94a09..000000000000 --- a/devel/cppunit/files/patch-config::ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- config/ltmain.sh.orig 2008-07-11 18:31:19.000000000 +0800 -+++ config/ltmain.sh 2008-07-11 18:32:49.000000000 +0800 -@@ -6092,10 +6092,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/cppunit/files/patch-config__ltmain.sh b/devel/cppunit/files/patch-config__ltmain.sh new file mode 100644 index 000000000000..3f7106f94a09 --- /dev/null +++ b/devel/cppunit/files/patch-config__ltmain.sh @@ -0,0 +1,15 @@ +--- config/ltmain.sh.orig 2008-07-11 18:31:19.000000000 +0800 ++++ config/ltmain.sh 2008-07-11 18:32:49.000000000 +0800 +@@ -6092,10 +6092,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/cppunit/files/patch-doc::Makefile.in b/devel/cppunit/files/patch-doc::Makefile.in deleted file mode 100644 index 1b4a4017e60e..000000000000 --- a/devel/cppunit/files/patch-doc::Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ ---- doc/Makefile.in.orig 2008-02-20 00:59:51.000000000 -0500 -+++ doc/Makefile.in 2008-07-13 18:52:35.000000000 -0400 -@@ -179,7 +179,7 @@ - # and an extra copy or two in the install-data-hook. - # However, the manpages do not appear to be tremendously useful, so - # let's not bother. --@DOC_TRUE@htmldir = $(pkgdatadir)/html -+@DOC_TRUE@htmldir = $(prefix)/share/doc/cppunit - htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ -@@ -248,6 +248,7 @@ - -rm -rf .libs _libs - install-htmlDATA: $(html_DATA) - @$(NORMAL_INSTALL) -+.if !defined(NOPORTDOCS) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" - @list='$(html_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -@@ -255,6 +256,7 @@ - echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ - $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ - done -+.endif - - uninstall-htmlDATA: - @$(NORMAL_UNINSTALL) -@@ -398,7 +400,7 @@ - - - @DOC_TRUE@install-data-hook: --@DOC_TRUE@ cp -pR html/* $(DESTDIR)$(htmldir) -+@DOC_TRUE@ cp -pR html/ $(DESTDIR)$(htmldir) - - # Automake's "distcheck" is sensitive to having files left over - # after "make uninstall", so we have to clean up the install hook. diff --git a/devel/cppunit/files/patch-doc__Makefile.in b/devel/cppunit/files/patch-doc__Makefile.in new file mode 100644 index 000000000000..1b4a4017e60e --- /dev/null +++ b/devel/cppunit/files/patch-doc__Makefile.in @@ -0,0 +1,36 @@ +--- doc/Makefile.in.orig 2008-02-20 00:59:51.000000000 -0500 ++++ doc/Makefile.in 2008-07-13 18:52:35.000000000 -0400 +@@ -179,7 +179,7 @@ + # and an extra copy or two in the install-data-hook. + # However, the manpages do not appear to be tremendously useful, so + # let's not bother. +-@DOC_TRUE@htmldir = $(pkgdatadir)/html ++@DOC_TRUE@htmldir = $(prefix)/share/doc/cppunit + htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ +@@ -248,6 +248,7 @@ + -rm -rf .libs _libs + install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) ++.if !defined(NOPORTDOCS) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +@@ -255,6 +256,7 @@ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done ++.endif + + uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) +@@ -398,7 +400,7 @@ + + + @DOC_TRUE@install-data-hook: +-@DOC_TRUE@ cp -pR html/* $(DESTDIR)$(htmldir) ++@DOC_TRUE@ cp -pR html/ $(DESTDIR)$(htmldir) + + # Automake's "distcheck" is sensitive to having files left over + # after "make uninstall", so we have to clean up the install hook. -- cgit v1.2.3