- Split xpdfopen package from texlive-base. This is because it is the only

  package depending on X11 library in it.

- Remove unnecessary libttf.so dependency [*].

PR:	202910 [*]

8 files changed, 68 insertions, 15 deletions

diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index e29067818053..0accb73e3a3a 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -27,6 +27,7 @@ TEX_MAINTAINER=	hrs@FreeBSD.org
 #  texlua:	texlua52 library
 #  texluajit:	texluajit library
 #  synctex:	synctex library
+#  xpdfopen:	pdfopen/pdfclose utility
 #
 #  dvipsk:	dvipsk
 #  dvipdfmx:	DVIPDFMx
@@ -142,6 +143,9 @@ _USE_TEX_FORMATS_PKGNAME=tex-formats
 _USE_TEX_SYNCTEX_DEP=	libsynctex.so
 _USE_TEX_SYNCTEX_PORT=	devel/${_USE_TEX_SYNCTEX_PKGNAME}
 _USE_TEX_SYNCTEX_PKGNAME=tex-synctex
+_USE_TEX_XPDFOPEN_DEP=	pdfopen
+_USE_TEX_XPDFOPEN_PORT=	print/${_USE_TEX_XPDFOPEN_PKGNAME}
+_USE_TEX_XPDFOPEN_PKGNAME=	xpdfopen
 _USE_TEX_ALEPH_DEP=	aleph
 _USE_TEX_ALEPH_PORT=	print/${_USE_TEX_ALEPH_PKGNAME}
 _USE_TEX_ALEPH_PKGNAME=	tex-aleph
@@ -152,10 +156,10 @@ _USE_TEX_XETEX_DEP=	xetex
 _USE_TEX_XETEX_PORT=	print/${_USE_TEX_XETEX_PKGNAME}
 _USE_TEX_XETEX_PKGNAME=	tex-xetex
 
-_USE_TEX_FULLLIST=	texmf>=20150523 base>=20150521 \
+_USE_TEX_FULLLIST=	texmf>=20150523_3 base>=20150521_5 \
 		web2c tlmgr:run \
 		basic formats aleph xetex jadetex luatex xmltex ptex \
-		dvipsk dvipdfmx xdvik \
+		dvipsk dvipdfmx xdvik xpdfopen:run \
 		kpathsea:lib ptexenc:lib texlua:lib texluajit:lib synctex:lib
 
 .if !empty(USE_TEX:tu:MFULL)
@@ -166,10 +170,10 @@ USE_TEX:=	${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu}
 _U:=	${_UU}	# ugly but necessary in for loop
 _VOP:=
 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*)
-_U:=	${_U}>=20150523
+_U:=	${_U}>=20150523_3
 . endif
 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*)
-_U:=	${_U}>=20150521
+_U:=	${_U}>=20150521_5
 . endif
 . if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \
      !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \
diff --git a/UPDATING b/UPDATING
index 29fbc6522c08..040e9c10aeca 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20150908:
+  AFFECTS: users of print/texlive-base
+  AUTHOR: hrs@FreeBSD.org
+
+ pdfclose and pdfopen utilities in print/texlive-base are now in a separate
+ port print/xpdfopen.  While upgrading print/texlive-base, a conflict may
+ occur between pdfclose utility installed by an old print/texlive-base and
+ one being installed by print/xpdfopen.  If it occurred on your system,
+ remove the installed print/texlive-base first by using the following
+ command:
+
+  # pkg delete -f texlive-base
+
 20150901:
   AFFECTS: users of editors/libreoffice
   AUTHOR: jkim@FreeBSD.org
diff --git a/print/Makefile b/print/Makefile
index 580c3db59a09..0a220d33c57a 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -260,6 +260,7 @@
     SUBDIR += utopia
     SUBDIR += xfce4-print
     SUBDIR += xmbibtex
+    SUBDIR += xpdfopen
     SUBDIR += xpp
     SUBDIR += xtexsh
     SUBDIR += yatex
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index 2296cf8f53ab..161e7700cfeb 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20150521
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMESUFFIX=	-base
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libicuio.so:${PORTSDIR}/devel/icu \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libttf.so:${PORTSDIR}/print/freetype \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libzzip.so:${PORTSDIR}/devel/zziplib \
 		libpoppler.so:${PORTSDIR}/graphics/poppler \
@@ -31,7 +30,6 @@ CONFLICTS_INSTALL=	texlive-texmf-201[234]*
 USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
 USES=		ghostscript pkgconfig perl5 shebangfix tar:xz
 USE_PERL5=	run
-USE_XORG=	x11 xmu
 # during build phase gnu configure is run a lot
 MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}
 EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
@@ -41,7 +39,8 @@ EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
 		${DISTNAME}/texk/dvipdfm-x \
 		${DISTNAME}/texk/dvipsk \
 		${DISTNAME}/libs \
-		${DISTNAME}/utils/t1utils
+		${DISTNAME}/utils/t1utils \
+		${DISTNAME}/utils/xpdfopen
 EXTRACT_AFTER_ARGS=	${EXCLUDE_FILES:S,^,--exclude ,}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-native-texlive-build \
@@ -52,11 +51,9 @@ CONFIGURE_ARGS= --disable-native-texlive-build \
 		--disable-dvipdfmx \
 		--disable-dvipdfm-x \
 		--disable-xdvipdfmx \
+		--disable-xpdfopen \
 		--enable-build-in-source-tree \
 		--datarootdir=${LOCALBASE}/share \
-		--with-system-freetype \
-		--with-freetype-includes=${LOCALBASE}/include/freetype1/freetype \
-		--with-freetype-libdir=${LOCALBASE}/lib \
 		--with-system-freetype2 \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
 		--with-freetype2-libdir=${LOCALBASE}/lib \
@@ -112,6 +109,11 @@ SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
 
 INFO=	dvipng tlbuild
 
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+
+X11_USE=	TEX=xpdfopen:run
+
 post-patch:
 	cd ${WRKSRC}/texk/texlive && \
 	    ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
diff --git a/print/texlive-base/pkg-plist b/print/texlive-base/pkg-plist
index 1d141ade4361..a7817fb36ef7 100644
--- a/print/texlive-base/pkg-plist
+++ b/print/texlive-base/pkg-plist
@@ -159,7 +159,6 @@ bin/pdf90
 bin/pdfannotextractor
 bin/pdfatfi
 bin/pdfbook
-bin/pdfclose
 bin/pdfcrop
 bin/pdfflip
 bin/pdfjam
@@ -168,7 +167,6 @@ bin/pdfjam-slides3up
 bin/pdfjam-slides6up
 bin/pdfjoin
 bin/pdfnup
-bin/pdfopen
 bin/pdfpun
 bin/pedigree
 bin/perltex
@@ -299,8 +297,6 @@ man/man1/mmpfb.1.gz
 man/man1/msxlint.1.gz
 man/man1/otfinfo.1.gz
 man/man1/otftotfm.1.gz
-man/man1/pdfclose.1.gz
-man/man1/pdfopen.1.gz
 man/man1/pfb2pfa.1.gz
 man/man1/pk2bm.1.gz
 man/man1/pmxab.1.gz
diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile
new file mode 100644
index 000000000000..a34a675c86a8
--- /dev/null
+++ b/print/xpdfopen/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+PORTNAME=	xpdfopen
+PORTVERSION=	0.86
+CATEGORIES=	print
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
+DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
+DIST_SUBDIR=	TeX
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Command line utility for PDF viewers
+
+CONFLICTS=	texlive-base-20150521_[1-4]
+
+USES=		tar:xz
+USE_XORG=	x11 xmu
+EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
+EXTRACT_FILES=	build-aux \
+		utils/xpdfopen
+DISTVERSION_TEXLIVE_SOURCE=	20150521
+WRKSRC=		${WRKDIR}/${DISTNAME}/utils/xpdfopen
+GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+= 	-L${LOCALBASE}/lib
+
+PLIST_FILES=	bin/pdfclose \
+		bin/pdfopen \
+		man/man1/pdfclose.1.gz \
+		man/man1/pdfopen.1.gz
+
+.include <bsd.port.mk>
diff --git a/print/xpdfopen/distinfo b/print/xpdfopen/distinfo
new file mode 100644
index 000000000000..bf8979f82957
--- /dev/null
+++ b/print/xpdfopen/distinfo
@@ -0,0 +1,4 @@
+SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
+SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
+SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
diff --git a/print/xpdfopen/pkg-descr b/print/xpdfopen/pkg-descr
new file mode 100644
index 000000000000..e24dfd0a12b0
--- /dev/null
+++ b/print/xpdfopen/pkg-descr
@@ -0,0 +1,2 @@
+This is a X11 implementation of Fabrice Popineau's pdfclose/
+pdfopen commands to control Acrobat Reader, xpdf and evince.