diff options
Diffstat (limited to 'devel/tex-kpathsea/files')
| -rw-r--r-- | devel/tex-kpathsea/files/patch-Makefile.in | 63 | ||||
| -rw-r--r-- | devel/tex-kpathsea/files/patch-texmf.cnf | 12 |
2 files changed, 57 insertions, 18 deletions
diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in index 141edbf02d0c..ec7b01f484f2 100644 --- a/devel/tex-kpathsea/files/patch-Makefile.in +++ b/devel/tex-kpathsea/files/patch-Makefile.in @@ -1,46 +1,85 @@ ---- Makefile.in.orig 2014-05-21 08:10:30.000000000 +0900 -+++ Makefile.in 2014-08-20 22:10:45.000000000 +0900 -@@ -175,7 +175,7 @@ +--- Makefile.in.orig 2015-03-16 07:52:01 UTC ++++ Makefile.in +@@ -170,8 +170,8 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \ +- "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \ + "$(DESTDIR)$(web2cdir)" \ - "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" ++ "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)" LTLIBRARIES = $(lib_LTLIBRARIES) libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS) -@@ -2044,7 +2044,7 @@ +@@ -306,7 +306,7 @@ am__can_run_installinfo = \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac + DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA) +-HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \ ++HEADERS = $(kpseinclude_HEADERS) \ + $(nodist_kpselib_HEADERS) $(noinst_HEADERS) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +@@ -717,12 +717,12 @@ libkpathsea_la_SOURCES = tex-file.c abso + kpseincludedir = ${includedir}/kpathsea + nodist_kpseinclude_HEADERS = \ + kpathsea.h \ +- paths.h ++ paths.h \ ++ c-auto.h + + kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers) + kpselibdir = ${libdir}/kpathsea +-nodist_kpselib_HEADERS = \ +- c-auto.h ++nodist_kpselib_HEADERS = + + + # Headers included directly into kpathsea.h +@@ -785,7 +785,7 @@ noinst_HEADERS = \ + xopendir.h \ + xstat.h + +-pkgconfigdir = ${libdir}/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = kpathsea.pc + DISTCLEANFILES = paths.h stamp-paths kpathsea.h + kpseaccess_SOURCES = access.c +@@ -2103,7 +2103,7 @@ install-binPROGRAMS: install-libLTLIBRAR installdirs: installdirs-recursive installdirs-am: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \ +- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibdir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -2108,8 +2108,7 @@ +@@ -2167,10 +2167,9 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_web2cDATA \ - install-dist_web2cSCRIPTS install-kpseincludeHEADERS \ +install-data-am: install-data-local install-kpseincludeHEADERS \ - install-nodist_kpseincludeHEADERS + install-nodist_kpseincludeHEADERS \ +- install-nodist_kpselibHEADERS install-pkgconfigDATA ++ install-pkgconfigDATA install-dvi: install-dvi-recursive -@@ -2256,13 +2255,13 @@ + +@@ -2319,13 +2318,13 @@ install-data-local: installdirs-am uninstall-local: @WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \ @WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \ -@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+@WIN32_FALSE@ echo " rm f '$(DESTDIR)$(bindir)/$$f'"; \ ++@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ @WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ @WIN32_FALSE@ else :; fi; \ @WIN32_FALSE@ done @for f in $(dist_noinst_DATA); do \ if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \ - echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ -+ echo " rm f '$(DESTDIR)$(web2cdir)/$$f'"; \ ++ echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ rm -f "$(DESTDIR)$(web2cdir)/$$f"; \ else :; fi; \ done diff --git a/devel/tex-kpathsea/files/patch-texmf.cnf b/devel/tex-kpathsea/files/patch-texmf.cnf index 271fca143a3e..ccb7aa455502 100644 --- a/devel/tex-kpathsea/files/patch-texmf.cnf +++ b/devel/tex-kpathsea/files/patch-texmf.cnf @@ -1,5 +1,5 @@ ---- texmf.cnf.orig 2014-04-23 06:07:54.000000000 +0900 -+++ texmf.cnf 2014-08-20 21:50:36.000000000 +0900 +--- texmf.cnf.orig 2015-04-12 15:20:30 UTC ++++ texmf.cnf @@ -51,7 +51,7 @@ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. % Kpathsea sets SELFAUTOLOC (the directory with the binary), @@ -9,7 +9,7 @@ % The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist -@@ -61,7 +61,7 @@ +@@ -61,7 +61,7 @@ TEXMFDIST = $TEXMFROOT/texmf-dist TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. @@ -18,7 +18,7 @@ % TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = $TEXMFROOT/texmf-var -@@ -713,7 +713,7 @@ +@@ -722,7 +722,7 @@ hash_extra = 600000 pool_size = 6250000 % Minimum pool space after TeX's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. @@ -27,7 +27,7 @@ % Maximum number of strings. max_strings = 500000 % min pool space left after loading .fmt -@@ -723,7 +723,7 @@ +@@ -732,7 +732,7 @@ pool_free = 47500 % expansion works by writing material into the buffer and reparsing the % line. As a consequence, certain constructs require the buffer to be % very large, even though most documents can be handled with a small value. @@ -36,7 +36,7 @@ % Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in % the sources), but we don't need that much. The value here suffices -@@ -734,7 +734,7 @@ +@@ -743,7 +743,7 @@ trie_size = 1000000 hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. % http://primes.utm.edu/curios/page.php/8191.html |