svn commit: r449705 - in head/graphics: . xpdf xpdf/files xpdf3

[Cy Schubert]

Author: cy
Date: Tue Sep 12 19:22:01 2017
New Revision: 449705
URL: https://svnweb.freebsd.org/changeset/ports/449705

Log:
  This is the functional update of xpdf to xpdf 4.00.
  
  graphics/xpdf is renamed (actually copied) to xpdf3. Those who want to
  continue to use xpdf with a Motif interface can either install xpdf3 or
  set XPDF_VERSION=3 in make.conf and continue to install graphics/xpdf.
  This works around any POLA issues people might have between the
  old and the new.
  
  PR:		222002

Added:
  head/graphics/xpdf3/
     - copied from r449703, head/graphics/xpdf/
Deleted:
  head/graphics/xpdf/distinfo
  head/graphics/xpdf/files/
  head/graphics/xpdf/pkg-descr
  head/graphics/xpdf/pkg-message
  head/graphics/xpdf/pkg-plist
Modified:
  head/graphics/Makefile
  head/graphics/xpdf/Makefile

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Tue Sep 12 19:13:34 2017	(r449704)
+++ head/graphics/Makefile	Tue Sep 12 19:22:01 2017	(r449705)
@@ -1095,6 +1095,7 @@
     SUBDIR += xournal
     SUBDIR += xpaint
     SUBDIR += xpdf
+    SUBDIR += xpdf3
     SUBDIR += xpdf4
     SUBDIR += xpeps
     SUBDIR += xpx

Modified: head/graphics/xpdf/Makefile
==============================================================================
--- head/graphics/xpdf/Makefile	Tue Sep 12 19:13:34 2017	(r449704)
+++ head/graphics/xpdf/Makefile	Tue Sep 12 19:22:01 2017	(r449705)
@@ -1,67 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	xpdf
-PORTVERSION=	3.04
-PORTREVISION=	8
-CATEGORIES=	graphics print
-MASTER_SITES=	http://mirrors.rit.edu/zi/ \
-		ftp://ftp.foolabs.com/pub/xpdf/ \
-		TEX_CTAN/support/xpdf \
-		http://komquats.com/distfiles/
+VERSIONS=		3 4
+XPDF_VERSION?=		4
 
-MAINTAINER=	cy at FreeBSD.org
-COMMENT=	Display PDF files and convert them to other formats
+MASTERDIR=		${.CURDIR}/../xpdf${XPDF_VERSION}
 
-LICENSE=	GPLv2
-
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libpng.so:graphics/png
-
-GNU_CONFIGURE=	yes
-USES=		gmake cpe localbase
-CPE_VENDOR=	foolabs
-CONFIGURE_ARGS=	--enable-opi \
-		--with-freetype2-library="${LOCALBASE}/lib" \
-		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
-		--bindir="${PREFIX}/libexec/xpdf" \
-		--mandir="${PREFIX}/share/xpdf/man"
-
-MANPREFIX=	${PREFIX}/share/xpdf
-
-OPTIONS_DEFINE=	LIBPAPER TYPE1 X11 DOCS
-LIBPAPER_DESC=	Enable libpaper
-TYPE1_DESC=	Ghostscript type1 fonts
-OPTIONS_DEFAULT=	TYPE1 X11
-OPTIONS_SUB=		yes
-
-SUB_FILES=	xpdf-man.conf
-
-TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
-
-LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
-LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
-		--with-libpaper-includes="${LOCALBASE}/include"
-LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
-
-.if defined(A4)
-CONFIGURE_ARGS+=	--enable-a4-paper
-.endif
-
-X11_CONFIGURE_WITH=	x
-X11_USES=		motif
-
-post-patch:
-	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
-		${WRKSRC}/xpdf/XPDFViewer.h
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ANNOUNCE CHANGES README misc/hello.pdf
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
-	@cd ${STAGEDIR}${PREFIX}; \
-	${LN} -sf libexec/xpdf/xpdf bin/xpdf
-	${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
-		${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"