Hi,
Now that graphics/potrace emits a header and library, texlive can
consume these rather than embedding its own potrace.
While we are here, blast an inaccurate comment, and update an incorrect
conflict marker.
OK?
Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/print/texlive/base/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile 4 Apr 2016 22:57:45 -0000 1.81
+++ Makefile 18 Apr 2016 21:04:33 -0000
@@ -4,7 +4,7 @@ COMMENT = base binaries for TeXLive typ
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
-REVISION = 2
+REVISION = 3
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -16,8 +16,8 @@ WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext
WANTLIB += c cairo expat fontconfig freetype gd glib-2.0 graphite2
WANTLIB += harfbuzz harfbuzz-icu icudata icui18n icuio icuuc intl
WANTLIB += jpeg lcms2 m openjpeg paper pcre pixman-1 png poppler
-WANTLIB += pthread pthread-stubs stdc++ tiff vpx xcb xcb-render
-WANTLIB += xcb-shm z zzip
+WANTLIB += potrace pthread pthread-stubs stdc++ tiff vpx xcb
+WANTLIB += xcb-render xcb-shm z zzip
RUN_DEPENDS = print/ghostscript/gnu \
print/detex \
@@ -35,7 +35,8 @@ LIB_DEPENDS = graphics/png \
graphics/graphite2 \
devel/harfbuzz,-icu \
print/libpaper \
- archivers/zziplib
+ archivers/zziplib \
+ graphics/potrace
MODULES = textproc/intltool converters/libiconv perl
@@ -78,7 +79,6 @@ PKG_ARGS += -Dxindy=1
PKG_ARGS += -Dxindy=0
.endif
-# Do not link with system icu. TeXLive ICU is not vanilla (Yet)!
CONFIGURE_ARGS += --mandir=${PREFIX}/man \
--with-system-freetype2 \
--with-system-gd \
@@ -107,11 +107,8 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man
--with-system-graphite2 \
--with-system-poppler \
--with-system-libpaper \
- --with-system-zziplib
-# XXX need to hack graphics/potrace to emit a library and header.
-# Looks like you add --with-libpotrace to its CONFIGURE_ARGS. Then add a
-# LIB_DEPENDS obviously.
-#--with-system-potrace
+ --with-system-zziplib \
+ --with-system-potrace
SUBST_VARS += TRUEPREFIX LOCALBASE
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/cvsync/ports/print/texlive/base/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -r1.28 PLIST
--- pkg/PLIST 4 Apr 2016 22:57:45 -0000 1.28
+++ pkg/PLIST 18 Apr 2016 20:29:54 -0000
@@ -2,7 +2,7 @@
@conflict teTeX_base-*
@conflict pdfjam-*
@conflict ht-<2
-@conflict texlive_texmf-buildset-<2013
+@conflict texlive_texmf-buildset-<2014
@pkgpath print/teTeX/base
@pkgpath print/pdfjam
@pkgpath print/teTeX/base,-fmt
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
