diff options
Diffstat (limited to 'devel/rudiments/files')
| -rw-r--r-- | devel/rudiments/files/patch-Makefile | 24 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-bin_Makefile | 16 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-configure | 63 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-doc_Makefile | 90 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-include_Makefile.in | 39 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-man_Makefile | 18 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-src_Makefile.in | 33 |
7 files changed, 12 insertions, 271 deletions
diff --git a/devel/rudiments/files/patch-Makefile b/devel/rudiments/files/patch-Makefile index 9cfc45f9df14..242e3b042695 100644 --- a/devel/rudiments/files/patch-Makefile +++ b/devel/rudiments/files/patch-Makefile @@ -1,28 +1,20 @@ ---- Makefile.orig 2015-08-05 23:06:25.000000000 +0200 -+++ Makefile 2015-08-08 12:40:43.305908000 +0200 -@@ -16,12 +16,9 @@ +--- Makefile.orig 2016-10-03 12:37:06 UTC ++++ Makefile +@@ -17,9 +17,6 @@ install: cd bin $(AND) $(MAKE) install cd doc $(AND) $(MAKE) install cd man $(AND) $(MAKE) install - $(MKINSTALLDIRS) $(licensedir) - $(CP) COPYING $(licensedir) - $(CHMOD) 0644 $(licensedir)/COPYING -- $(MKINSTALLDIRS) $(libdir)/pkgconfig -- $(CP) rudiments.pc $(libdir)/pkgconfig -- $(CHMOD) 644 $(libdir)/pkgconfig/rudiments.pc -+ $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/libdata/pkgconfig -+ $(CP) rudiments.pc $(DESTDIR)$(prefix)/libdata/pkgconfig -+ $(CHMOD) 644 $(DESTDIR)$(prefix)/libdata/pkgconfig/rudiments.pc - - uninstall: - cd src $(AND) $(MAKE) uninstall -@@ -29,8 +26,7 @@ + $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig + $(CP) rudiments.pc $(prefix)/libdata/pkgconfig + $(CHMOD) 644 $(prefix)/libdata/pkgconfig/rudiments.pc +@@ -30,7 +27,6 @@ uninstall: cd bin $(AND) $(MAKE) uninstall cd doc $(AND) $(MAKE) uninstall cd man $(AND) $(MAKE) uninstall - $(RMTREE) $(licensedir) -- $(RM) $(libdir)/pkgconfig/rudiments.pc -+ $(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/rudiments.pc + $(RM) $(prefix)/libdata/pkgconfig/rudiments.pc distclean: clean - $(RM) config.mk config.cache config.h config.log config.status features.mk libtool rudiments.pc include/Makefile include/rudiments/private/config.h include/rudiments/private/config.h.in~ bin/rudiments-config src/Makefile msvc/rudiments.opensdf msvc/rudiments.sdf msvc/rudiments.suo diff --git a/devel/rudiments/files/patch-bin_Makefile b/devel/rudiments/files/patch-bin_Makefile deleted file mode 100644 index dff40e40467f..000000000000 --- a/devel/rudiments/files/patch-bin_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- bin/Makefile.orig 2015-01-13 22:38:32 UTC -+++ bin/Makefile -@@ -3,9 +3,9 @@ top_builddir = .. - include ../config.mk - - install: -- $(MKINSTALLDIRS) $(bindir) -- $(CP) rudiments-config $(bindir) -- $(CHMOD) 755 $(bindir)/rudiments-config -+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) -+ $(CP) rudiments-config $(DESTDIR)$(bindir) -+ $(CHMOD) 755 $(DESTDIR)$(bindir)/rudiments-config - - uninstall: -- $(RM) $(bindir)/rudiments-config -+ $(RM) $(DESTDIR)$(bindir)/rudiments-config diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure index d47d7e23e3cc..0f73640eb2ef 100644 --- a/devel/rudiments/files/patch-configure +++ b/devel/rudiments/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-04-11 01:05:36 UTC +--- configure.orig 2016-03-26 17:20:08 UTC +++ configure -@@ -9216,7 +9216,7 @@ $as_echo_n "checking whether the $compil +@@ -9284,7 +9284,7 @@ $as_echo_n "checking whether the $compil hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no @@ -28,62 +28,3 @@ *) ;; esac -@@ -31537,47 +31540,47 @@ fi - # prepend DESTDIR where appropriate - if ( test "`echo $ac_default_prefix | cut -c1`" = "/" ) - then -- ac_default_prefix='${DESTDIR}'"$ac_default_prefix" -+ ac_default_prefix="$ac_default_prefix" - fi - if ( test "`echo $prefix | cut -c1`" = "/" ) - then -- prefix='${DESTDIR}'"$prefix" -+ prefix="$prefix" - fi - if ( test "`echo $exec_prefix | cut -c1`" = "/" ) - then -- exec_prefix='${DESTDIR}'"$exec_prefix" -+ exec_prefix="$exec_prefix" - fi - if ( test "`echo $includedir | cut -c1`" = "/" ) - then -- includedir='${DESTDIR}'"$includedir" -+ includedir="$includedir" - fi - if ( test "`echo $libdir | cut -c1`" = "/" ) - then -- libdir='${DESTDIR}'"$libdir" -+ libdir="$libdir" - fi - if ( test "`echo $libexecdir | cut -c1`" = "/" ) - then -- libexecdir='${DESTDIR}'"$libexecdir" -+ libexecdir="$libexecdir" - fi - if ( test "`echo $bindir | cut -c1`" = "/" ) - then -- bindir='${DESTDIR}'"$bindir" -+ bindir="$bindir" - fi - if ( test "`echo $localstatedir | cut -c1`" = "/" ) - then -- localstatedir='${DESTDIR}'"$localstatedir" -+ localstatedir="$localstatedir" - fi - if ( test "`echo $sysconfdir | cut -c1`" = "/" ) - then -- sysconfdir='${DESTDIR}'"$sysconfdir" -+ sysconfdir="$sysconfdir" - fi - if ( test "`echo $mandir | cut -c1`" = "/" ) - then -- mandir='${DESTDIR}'"$mandir" -+ mandir="$mandir" - fi - if ( test "`echo $datadir | cut -c1`" = "/" ) - then -- datadir='${DESTDIR}'"$datadir" -+ datadir="$datadir" - fi - - diff --git a/devel/rudiments/files/patch-doc_Makefile b/devel/rudiments/files/patch-doc_Makefile deleted file mode 100644 index d4856a11dc54..000000000000 --- a/devel/rudiments/files/patch-doc_Makefile +++ /dev/null @@ -1,90 +0,0 @@ ---- doc/Makefile.orig 2015-09-02 20:19:17 UTC -+++ doc/Makefile -@@ -5,46 +5,46 @@ include ../config.mk - all: - - install: -- $(MKINSTALLDIRS) $(docdir) -- $(MKINSTALLDIRS) $(docdir)/css -- $(MKINSTALLDIRS) $(docdir)/classes/html -- $(MKINSTALLDIRS) $(docdir)/features -- $(MKINSTALLDIRS) $(docdir)/programming -- $(CP) installing.html $(docdir) -- $(CP) index.html $(docdir) -- $(CP) css/styles.css $(docdir)/css -- $(CP) classes/html/*.html $(docdir)/classes/html -- $(CP) classes/html/*.png $(docdir)/classes/html -- $(CP) classes/html/*.css $(docdir)/classes/html -- $(CP) classes/html/*.js $(docdir)/classes/html -- $(CP) features/*.html $(docdir)/features -- $(CP) programming/*.html $(docdir)/programming -- $(CHMOD) 644 $(docdir)/*.html -- $(CHMOD) 644 $(docdir)/css/* -- $(CHMOD) 644 $(docdir)/classes/html/a*.html -- $(CHMOD) 644 $(docdir)/classes/html/b*.html -- $(CHMOD) 644 $(docdir)/classes/html/c*.html -- $(CHMOD) 644 $(docdir)/classes/html/d*.html -- $(CHMOD) 644 $(docdir)/classes/html/e*.html -- $(CHMOD) 644 $(docdir)/classes/html/f*.html -- $(CHMOD) 644 $(docdir)/classes/html/g*.html -- $(CHMOD) 644 $(docdir)/classes/html/h*.html -- $(CHMOD) 644 $(docdir)/classes/html/i*.html -- $(CHMOD) 644 $(docdir)/classes/html/l*.html -- $(CHMOD) 644 $(docdir)/classes/html/m*.html -- $(CHMOD) 644 $(docdir)/classes/html/n*.html -- $(CHMOD) 644 $(docdir)/classes/html/p*.html -- $(CHMOD) 644 $(docdir)/classes/html/r*.html -- $(CHMOD) 644 $(docdir)/classes/html/s*.html -- $(CHMOD) 644 $(docdir)/classes/html/t*.html -- $(CHMOD) 644 $(docdir)/classes/html/u*.html -- $(CHMOD) 644 $(docdir)/classes/html/w*.html -- $(CHMOD) 644 $(docdir)/classes/html/x*.html -- $(CHMOD) 644 $(docdir)/classes/html/*.png -- $(CHMOD) 644 $(docdir)/classes/html/*.css -- $(CHMOD) 644 $(docdir)/classes/html/*.js -- $(CHMOD) 644 $(docdir)/features/*.html -- $(CHMOD) 644 $(docdir)/programming/*.html -+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/css -+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/classes/html -+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/features -+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/programming -+ $(CP) installing.html $(DESTDIR)$(docdir) -+ $(CP) index.html $(DESTDIR)$(docdir) -+ $(CP) css/styles.css $(DESTDIR)$(docdir)/css -+ $(CP) classes/html/*.html $(DESTDIR)$(docdir)/classes/html -+ $(CP) classes/html/*.png $(DESTDIR)$(docdir)/classes/html -+ $(CP) classes/html/*.css $(DESTDIR)$(docdir)/classes/html -+ $(CP) classes/html/*.js $(DESTDIR)$(docdir)/classes/html -+ $(CP) features/*.html $(DESTDIR)$(docdir)/features -+ $(CP) programming/*.html $(DESTDIR)$(docdir)/programming -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/css/* -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/a*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/b*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/c*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/d*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/e*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/f*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/g*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/h*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/i*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/l*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/m*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/n*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/p*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/r*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/s*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/t*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/u*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/w*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/x*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.png -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.css -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.js -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/features/*.html -+ $(CHMOD) 644 $(DESTDIR)$(docdir)/programming/*.html - - uninstall: -- $(RMTREE) $(docdir) -+ $(RMTREE) $(DESTDIR)$(docdir) diff --git a/devel/rudiments/files/patch-include_Makefile.in b/devel/rudiments/files/patch-include_Makefile.in deleted file mode 100644 index 267f6159ba6f..000000000000 --- a/devel/rudiments/files/patch-include_Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ ---- include/Makefile.in.orig 2015-02-08 07:07:44 UTC -+++ include/Makefile.in -@@ -18,21 +18,21 @@ PRIVATEHEADERS7 = @PRIVATEHEADERS7@ - all: - - install: -- $(MKINSTALLDIRS) $(includedir)/rudiments -- $(MKINSTALLDIRS) $(includedir)/rudiments/private -- cd rudiments $(AND) $(CP) $(HEADERS0) $(includedir)/rudiments -- cd rudiments $(AND) $(CP) $(HEADERS1) $(includedir)/rudiments -- cd rudiments $(AND) $(CP) $(HEADERS2) $(includedir)/rudiments -- cd rudiments $(AND) $(CP) $(HEADERS3) $(includedir)/rudiments -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS0) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS1) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS2) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS3) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS4) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS5) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS6) $(includedir)/rudiments/private -- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS7) $(includedir)/rudiments/private -- $(CHMOD) 644 $(includedir)/rudiments/*.h $(includedir)/rudiments/private/*.h -+ $(MKINSTALLDIRS) ${DESTDIR}$(includedir)/rudiments -+ $(MKINSTALLDIRS) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) $(CP) $(HEADERS0) ${DESTDIR}$(includedir)/rudiments -+ cd rudiments $(AND) $(CP) $(HEADERS1) ${DESTDIR}$(includedir)/rudiments -+ cd rudiments $(AND) $(CP) $(HEADERS2) ${DESTDIR}$(includedir)/rudiments -+ cd rudiments $(AND) $(CP) $(HEADERS3) ${DESTDIR}$(includedir)/rudiments -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS0) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS1) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS2) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS3) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS4) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS5) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS6) ${DESTDIR}$(includedir)/rudiments/private -+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS7) ${DESTDIR}$(includedir)/rudiments/private -+ $(CHMOD) 644 ${DESTDIR}$(includedir)/rudiments/*.h ${DESTDIR}$(includedir)/rudiments/private/*.h - - uninstall: - $(RMTREE) $(includedir)/rudiments diff --git a/devel/rudiments/files/patch-man_Makefile b/devel/rudiments/files/patch-man_Makefile deleted file mode 100644 index 4869b8649dcd..000000000000 --- a/devel/rudiments/files/patch-man_Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- man/Makefile.orig 2015-01-13 22:38:32 UTC -+++ man/Makefile -@@ -3,10 +3,10 @@ top_builddir = .. - include ../config.mk - - install: -- $(MKINSTALLDIRS) $(mandir) -- $(MKINSTALLDIRS) $(mandir)/man1 -- $(CP) rudiments-config.1 $(mandir)/man1 -- $(CHMOD) 644 $(mandir)/man1/rudiments-config.1 -+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 -+ $(CP) rudiments-config.1 $(DESTDIR)$(mandir)/man1 -+ $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/rudiments-config.1 - - uninstall: -- $(RM) $(mandir)/man1/rudiments-config.1 -+ $(RM) $(DESTDIR)$(mandir)/man1/rudiments-config.1 diff --git a/devel/rudiments/files/patch-src_Makefile.in b/devel/rudiments/files/patch-src_Makefile.in index 8a23a18db1a6..a27afe5a56fe 100644 --- a/devel/rudiments/files/patch-src_Makefile.in +++ b/devel/rudiments/files/patch-src_Makefile.in @@ -1,4 +1,4 @@ ---- src/Makefile.in.orig 2015-02-06 03:20:27 UTC +--- src/Makefile.in.orig 2016-02-06 03:58:09 UTC +++ src/Makefile.in @@ -11,7 +11,7 @@ LOBJS = @LOBJS@ .SUFFIXES: .lo @@ -9,7 +9,7 @@ .cpp.obj: $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $< -@@ -22,26 +22,26 @@ clean: +@@ -22,7 +22,7 @@ clean: $(LTCLEAN) $(RM) *.lo *.o *.obj *.$(LIBEXT) *.lib *.exp *.idb *.pdb *.manifest librudiments.$(LIBEXT): $(SRCS) $(LOBJS) @@ -18,32 +18,3 @@ install: $(INSTALLLIB) - installdll: -- $(MKINSTALLDIRS) $(bindir) -- $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(bindir) -- $(MKINSTALLDIRS) $(libdir) -- $(LTINSTALL) $(CP) librudiments.lib $(libdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) -+ $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(DESTDIR)$(bindir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -+ $(LTINSTALL) $(CP) librudiments.lib $(DESTDIR)$(libdir) - - installlib: -- $(MKINSTALLDIRS) $(libdir) -- $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(libdir) -- $(LTFINISH) $(libdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -+ $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(DESTDIR)$(libdir) -+ $(LTFINISH) $(DESTDIR)$(libdir) - - uninstall: $(UNINSTALLLIB) - - uninstalldll: -- $(LTUNINSTALL) $(RM) $(bindir)/librudiments.$(LIBEXT) -- $(LTUNINSTALL) $(RM) $(libdir)/librudiments.lib -+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(bindir)/librudiments.$(LIBEXT) -+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/librudiments.lib - - uninstalllib: -- $(LTUNINSTALL) $(RM) $(libdir)/librudiments.$(LIBEXT) -+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/librudiments.$(LIBEXT) |