diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2014-08-22 11:04:23 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2014-08-22 11:04:23 +0000 |
commit | 6e0c41ef7548b706b1e2ccded776f37ff081be25 (patch) | |
tree | 4e5655e52b6737cbd19a56d45857fbe796c396bb /devel | |
parent | 5088b48f952d171e7a11855986fbaab7b129d755 (diff) |
Notes
Diffstat (limited to 'devel')
-rw-r--r-- | devel/tex-kpathsea/Makefile | 9 | ||||
-rw-r--r-- | devel/tex-kpathsea/distinfo | 4 | ||||
-rw-r--r-- | devel/tex-kpathsea/files/patch-Makefile.in | 37 | ||||
-rw-r--r-- | devel/tex-kpathsea/files/patch-texmf.cnf | 20 | ||||
-rw-r--r-- | devel/tex-kpathsea/pkg-plist | 9 | ||||
-rw-r--r-- | devel/tex-web2c/Makefile | 17 | ||||
-rw-r--r-- | devel/tex-web2c/distinfo | 4 | ||||
-rw-r--r-- | devel/tex-web2c/pkg-plist | 1 |
8 files changed, 60 insertions, 41 deletions
diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile index 5bab0a27cf65..36857fb28e0d 100644 --- a/devel/tex-kpathsea/Makefile +++ b/devel/tex-kpathsea/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= kpathsea -PORTVERSION= 6.1.0 -PORTREVISION= 3 +PORTVERSION= 6.2.0 CATEGORIES= devel -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2012/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMEPREFIX= tex- -DISTNAME= texlive-20120701-source +DISTNAME= texlive-20140525-source DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org @@ -14,7 +13,7 @@ COMMENT= Path searching library for TeX USES= gmake tar:xz libtool USE_LDCONFIG= yes -USE_TEX= texlive +USE_TEX= yes EXTRACT_AFTER_ARGS= ${EXTRACT_FILES} EXTRACT_FILES= ${DISTNAME}/build-aux \ ${DISTNAME}/texk/kpathsea diff --git a/devel/tex-kpathsea/distinfo b/devel/tex-kpathsea/distinfo index 8da00c3ff428..e1dface9f9c6 100644 --- a/devel/tex-kpathsea/distinfo +++ b/devel/tex-kpathsea/distinfo @@ -1,2 +1,2 @@ -SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 -SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044 +SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be +SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688 diff --git a/devel/tex-kpathsea/files/patch-Makefile.in b/devel/tex-kpathsea/files/patch-Makefile.in index c2b7e9c568d5..141edbf02d0c 100644 --- a/devel/tex-kpathsea/files/patch-Makefile.in +++ b/devel/tex-kpathsea/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-05-16 16:44:41.000000000 +0900 -+++ Makefile.in 2013-05-22 15:09:13.000000000 +0900 -@@ -127,7 +127,7 @@ +--- 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 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ @@ -9,7 +9,7 @@ "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS) -@@ -1749,7 +1749,7 @@ +@@ -2044,7 +2044,7 @@ installdirs: installdirs-recursive installdirs-am: @@ -18,12 +18,29 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -1809,7 +1809,7 @@ +@@ -2108,8 +2108,7 @@ info-am: --install-data-am: install-dist_web2cDATA install-dist_web2cSCRIPTS \ -+install-data-am: installdirs-am \ - install-kpseincludeHEADERS install-nodist_kpseincludeHEADERS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook +-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-dvi: install-dvi-recursive +@@ -2256,13 +2255,13 @@ + 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@ 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'"; \ + 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 f157b3d608f5..271fca143a3e 100644 --- a/devel/tex-kpathsea/files/patch-texmf.cnf +++ b/devel/tex-kpathsea/files/patch-texmf.cnf @@ -1,5 +1,5 @@ ---- texmf.cnf.orig 2012-05-13 08:34:52.000000000 +0900 -+++ texmf.cnf 2013-03-03 03:22:42.000000000 +0900 +--- texmf.cnf.orig 2014-04-23 06:07:54.000000000 +0900 ++++ texmf.cnf 2014-08-20 21:50:36.000000000 +0900 @@ -51,7 +51,7 @@ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. % Kpathsea sets SELFAUTOLOC (the directory with the binary), @@ -7,19 +7,19 @@ -TEXMFROOT = $SELFAUTOPARENT +TEXMFROOT = $SELFAUTODIR/share - % The tree containing runtime files related to the specific - % distribution and version. -@@ -61,7 +61,7 @@ + % The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +@@ -61,7 +61,7 @@ + TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. --TEXMFLOCAL = $TEXMFROOT/../texmf-local +-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local +TEXMFLOCAL = $TEXMFROOT/texmf-local % TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = $TEXMFROOT/texmf-var -@@ -698,7 +698,7 @@ - pool_size = 3250000 +@@ -713,7 +713,7 @@ + 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. -string_vacancies = 90000 @@ -27,7 +27,7 @@ % Maximum number of strings. max_strings = 500000 % min pool space left after loading .fmt -@@ -708,7 +708,7 @@ +@@ -723,7 +723,7 @@ % 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 -@@ -719,7 +719,7 @@ +@@ -734,7 +734,7 @@ hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. % http://primes.utm.edu/curios/page.php/8191.html diff --git a/devel/tex-kpathsea/pkg-plist b/devel/tex-kpathsea/pkg-plist index d8bc6fbdede1..a661400357ef 100644 --- a/devel/tex-kpathsea/pkg-plist +++ b/devel/tex-kpathsea/pkg-plist @@ -41,6 +41,7 @@ include/kpathsea/pathsearch.h include/kpathsea/proginit.h include/kpathsea/progname.h include/kpathsea/readable.h +include/kpathsea/simpletypes.h include/kpathsea/str-list.h include/kpathsea/str-llist.h include/kpathsea/systypes.h @@ -65,7 +66,7 @@ man/man1/texhash.1.gz lib/libkpathsea.a lib/libkpathsea.so lib/libkpathsea.so.6 -lib/libkpathsea.so.6.1.0 -%%TEXMFDIR%%/web2c/texmf.cnf -@dirrmtry %%TEXMFDIR%%/web2c -@dirrmtry %%TEXMFDIR%% +lib/libkpathsea.so.6.2.0 +%%TEXMFDISTDIR%%/web2c/texmf.cnf +@dirrmtry %%TEXMFDISTDIR%%/web2c +@dirrmtry %%TEXMFDISTDIR%% diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile index 036563825bfe..435a63d63827 100644 --- a/devel/tex-web2c/Makefile +++ b/devel/tex-web2c/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= web2c -PORTVERSION= 20120701 -PORTREVISION= 3 +PORTVERSION= 20140525 CATEGORIES= devel -MASTER_SITES= ftp://tug.org/historic/systems/texlive/2012/ +MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${PORTVERSION}-source DIST_SUBDIR= TeX @@ -16,17 +15,20 @@ LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libpng15.so:${PORTSDIR}/graphics/png \ libzzip.so:${PORTSDIR}/devel/zziplib -USE_TEX= texlive kpathsea +USE_TEX= kpathsea +USE_XORG= pixman USES= pkgconfig gmake tar:xz EXTRACT_AFTER_ARGS= ${EXTRACT_FILES} EXTRACT_FILES= ${DISTNAME}/build-aux \ - ${DISTNAME}/libs/obsdcompat \ ${DISTNAME}/libs/xpdf \ + ${DISTNAME}/libs/cairo \ + ${DISTNAME}/libs/pixman \ ${DISTNAME}/texk/web2c WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c GNU_CONFIGURE= yes CONFIGURE_ENV= OBSDCOMPAT_INCLUDES=-I${WRKSRC}/../../libs/obsdcompat -CONFIGURE_ARGS= --disable-luatex \ +CONFIGURE_ARGS= --disable-luatex \ + --disable-luajittex \ --disable-xetex \ --disable-aleph \ --disable-ptex \ @@ -44,6 +46,7 @@ CONFIGURE_ARGS= --disable-luatex \ --with-system-libpng \ --with-libpng-includes=${LOCALBASE}/include \ --with-libpng-libdir=${LOCALBASE}/lib \ + --with-system-pixman \ --with-system-zlib \ --with-system-zziplib CFLAGS+= -I${LOCALBASE}/include @@ -51,7 +54,7 @@ CFLAGS+= -I${LOCALBASE}/include INFO= web2c pre-configure: - for D in libs/obsdcompat libs/xpdf; do \ + for D in libs/xpdf libs/cairo; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \ done diff --git a/devel/tex-web2c/distinfo b/devel/tex-web2c/distinfo index 8da00c3ff428..e1dface9f9c6 100644 --- a/devel/tex-web2c/distinfo +++ b/devel/tex-web2c/distinfo @@ -1,2 +1,2 @@ -SHA256 (TeX/texlive-20120701-source.tar.xz) = 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 -SIZE (TeX/texlive-20120701-source.tar.xz) = 131904044 +SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be +SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688 diff --git a/devel/tex-web2c/pkg-plist b/devel/tex-web2c/pkg-plist index d6662003ce74..aa934bc3eaa7 100644 --- a/devel/tex-web2c/pkg-plist +++ b/devel/tex-web2c/pkg-plist @@ -40,7 +40,6 @@ man/man1/cweb.1.gz man/man1/dvicopy.1.gz man/man1/dvitomp.1.gz man/man1/dvitype.1.gz -man/man1/eplain.1.gz man/man1/gftodvi.1.gz man/man1/gftopk.1.gz man/man1/gftype.1.gz |