Attachment #149647 for bug #192068

Lines 811-816 Link Here

(-)Makefile (+1 lines)
811	SUBDIR += poppler-data	811	SUBDIR += poppler-data
812	SUBDIR += poppler-glib	812	SUBDIR += poppler-glib
813	SUBDIR += poppler-qt4	813	SUBDIR += poppler-qt4
		814	SUBDIR += poppler-qt5
814	SUBDIR += poppler-utils	815	SUBDIR += poppler-utils
815	SUBDIR += pornview	816	SUBDIR += pornview
816	SUBDIR += potrace	817	SUBDIR += potrace




#   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $

PORTNAME=	poppler
PORTVERSION=	0.26.3
PORTREVISION?=	0
CATEGORIES=	graphics print
MASTER_SITES=	http://poppler.freedesktop.org/


COMMENT?=	PDF rendering library

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
		libpng15.so:${PORTSDIR}/graphics/png \
		libtiff.so:${PORTSDIR}/graphics/tiff \
		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
		libfreetype.so:${PORTSDIR}/print/freetype2
RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data

USES=		gmake libtool pathfix pkgconfig tar:xz
USE_GNOME=	libxml2
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

CONFIGURE_ARGS=	--enable-zlib \
		--enable-xpdf-headers \
		--disable-gtk-test \
		--without-html-dir \
		--disable-static
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib


# see https://bugs.freedesktop.org/show_bug.cgi?id=72499
CPPFLAGS+=	 -D__LONG_LONG_SUPPORTED

INSTALL_TARGET=	install-strip

.if !defined(SLAVEPORT)
PORTSCOUT=	limitw:1,even

OPTIONS_DEFINE=	CAIRO CURL OPENJPEG
OPTIONS_DEFAULT=CAIRO OPENJPEG

USES+=		iconv

LIB_DEPENDS+=	libpoppler.so:${PORTSDIR}/graphics/poppler

.if ${SLAVEPORT}==glib
CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
USE_GNOME+=	cairo gnomehier glib20 introspection:build
BUILD_WRKSRC=	${WRKSRC}/glib
INSTALL_WRKSRC=	${WRKSRC}/glib

CONFIGURE_ARGS+=--disable-poppler-qt4
.endif

# needs checking when Qt5 is available
.if ${SLAVEPORT}==qt5
CONFIGURE_ARGS+=--enable-poppler-qt5
CONFIGURE_ENV+=	MOCQT5=${MOC}
USE_QT5=	core gui widgets xml buildtools_build testlib_build
BUILD_WRKSRC=	${WRKSRC}/qt5
INSTALL_WRKSRC=	${WRKSRC}/qt5
.else

PLIST_SUB+=	CAIRO="@comment "
.endif

.if ${PORT_OPTIONS:MCURL}
LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--enable-libcurl
PLIST_SUB+=	CURL=""
.else
CONFIGURE_ARGS+=--disable-libcurl
PLIST_SUB+=	CURL="@comment "
.endif

.if ${PORT_OPTIONS:MOPENJPEG}
CONFIGURE_ARGS+=--enable-libopenjpeg
LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15

		${WRKSRC}/configure
.endif
.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5
	@${REINPLACE_CMD} -e 's|MOCQT5=`.*|MOCQT5="${MOC}"|' \
		${WRKSRC}/configure
.endif


		${STAGEDIR}${PREFIX}/libdata/pkgconfig
. endif
.endif
	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpoppler*.so.*

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)poppler/distinfo (-2 / +2 lines)
1	SHA256 (poppler-0.24.5.tar.xz) = a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84	1	SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1
2	SIZE (poppler-0.24.5.tar.xz) = 1512476	2	SIZE (poppler-0.26.3.tar.xz) = 1593760

Line 0 Link Here

(-)poppler/files/patch-qt5__Makefile.in (+11 lines)
	1	--- ./qt5/Makefile.in.orig 2014-07-20 16:22:04.000000000 +0000
	2	+++ ./qt5/Makefile.in 2014-07-22 22:09:00.000000000 +0000
	3	@@ -384,7 +384,7 @@
	4	top_builddir = @top_builddir@
	5	top_srcdir = @top_srcdir@
	6	win32_libs = @win32_libs@
	7	-SUBDIRS = src tests demos
	8	+SUBDIRS = src
	9	all: all-recursive
	10
	11	.SUFFIXES:




--- ./qt5/src/Makefile.in.orig	2014-07-20 16:22:04.000000000 +0000
+++ ./qt5/src/Makefile.in	2014-07-22 22:12:19.000000000 +0000
@@ -129,7 +129,7 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libpoppler_qt5_la_DEPENDENCIES =  \
-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
 	libpoppler_qt5_la-poppler-page.lo \
 	libpoppler_qt5_la-poppler-fontinfo.lo \
@@ -505,7 +505,7 @@
 	-Dpoppler_qt5_EXPORTS -fPIC
 
 libpoppler_qt5_la_LIBADD = \
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler	\
 	$(POPPLER_QT5_LIBS)
 
 libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@




--- ./utils/Makefile.in.orig	2014-07-20 16:22:05.000000000 +0000
+++ ./utils/Makefile.in	2014-07-21 19:54:18.000000000 +0000
@@ -111,7 +111,7 @@
 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)

-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdffonts_DEPENDENCIES =
 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
 	JSInfo.$(OBJEXT) $(am__objects_1)
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
 pdfimages_LDADD = $(LDADD)
-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdfimages_DEPENDENCIES =
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
 	JSInfo.$(OBJEXT) $(am__objects_1)
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
 pdfinfo_LDADD = $(LDADD)
-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la

 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
 pdftohtml_LDADD = $(LDADD)
-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+pdftohtml_DEPENDENCIES =
 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

Lines 8-13 Link Here

(-)poppler/pkg-plist (-11 / +8 lines)
8	include/poppler/CharCodeToUnicode.h	8	include/poppler/CharCodeToUnicode.h
9	include/poppler/CharTypes.h	9	include/poppler/CharTypes.h
10	include/poppler/CompactFontTables.h	10	include/poppler/CompactFontTables.h
		11	%%CURL%%include/poppler/CurlCachedFile.h
		12	%%CURL%%include/poppler/CurlPDFDocBuilder.h
11	include/poppler/DateInfo.h	13	include/poppler/DateInfo.h
12	include/poppler/Decrypt.h	14	include/poppler/Decrypt.h
13	include/poppler/Dict.h	15	include/poppler/Dict.h
Lines 30-35 Link Here
30	include/poppler/Linearization.h	32	include/poppler/Linearization.h
31	include/poppler/Link.h	33	include/poppler/Link.h
32	include/poppler/LocalPDFDocBuilder.h	34	include/poppler/LocalPDFDocBuilder.h
		35	include/poppler/MarkedContentOutputDev.h
33	include/poppler/Movie.h	36	include/poppler/Movie.h
34	include/poppler/NameToCharCode.h	37	include/poppler/NameToCharCode.h
35	include/poppler/NameToUnicodeTable.h	38	include/poppler/NameToUnicodeTable.h
Lines 57-62 Link Here
57	include/poppler/StdinPDFDocBuilder.h	60	include/poppler/StdinPDFDocBuilder.h
58	include/poppler/Stream-CCITT.h	61	include/poppler/Stream-CCITT.h
59	include/poppler/Stream.h	62	include/poppler/Stream.h
		63	include/poppler/StructElement.h
		64	include/poppler/StructTreeRoot.h
60	include/poppler/TextOutputDev.h	65	include/poppler/TextOutputDev.h
61	include/poppler/UTF.h	66	include/poppler/UTF.h
62	include/poppler/UTF8.h	67	include/poppler/UTF8.h
Lines 95-100 Link Here
95	include/poppler/goo/GooTimer.h	100	include/poppler/goo/GooTimer.h
96	include/poppler/goo/ImgWriter.h	101	include/poppler/goo/ImgWriter.h
97	include/poppler/goo/JpegWriter.h	102	include/poppler/goo/JpegWriter.h
		103	include/poppler/goo/NetPBMWriter.h
98	include/poppler/goo/PNGWriter.h	104	include/poppler/goo/PNGWriter.h
99	include/poppler/goo/TiffWriter.h	105	include/poppler/goo/TiffWriter.h
100	include/poppler/goo/gfile.h	106	include/poppler/goo/gfile.h
Lines 126-147 Link Here
126	include/poppler/splash/SplashTypes.h	132	include/poppler/splash/SplashTypes.h
127	include/poppler/splash/SplashXPath.h	133	include/poppler/splash/SplashXPath.h
128	include/poppler/splash/SplashXPathScanner.h	134	include/poppler/splash/SplashXPathScanner.h
129	lib/libpoppler-cpp.a
130	lib/libpoppler-cpp.la
131	lib/libpoppler-cpp.so	135	lib/libpoppler-cpp.so
132	lib/libpoppler-cpp.so.0	136	lib/libpoppler-cpp.so.0
133	lib/libpoppler-cpp.so.0.2.0	137	lib/libpoppler-cpp.so.0.2.0
134	lib/libpoppler.a
135	lib/libpoppler.la
136	lib/libpoppler.so	138	lib/libpoppler.so
137	lib/libpoppler.so.44	139	lib/libpoppler.so.46
138	lib/libpoppler.so.44.0.0	140	lib/libpoppler.so.46.0.0
139	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc	141	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
140	libdata/pkgconfig/poppler-cpp.pc	142	libdata/pkgconfig/poppler-cpp.pc
141	libdata/pkgconfig/poppler-splash.pc	143	libdata/pkgconfig/poppler-splash.pc
142	libdata/pkgconfig/poppler.pc	144	libdata/pkgconfig/poppler.pc
143	@dirrm include/poppler/splash
144	@dirrm include/poppler/goo
145	@dirrm include/poppler/fofi
146	@dirrm include/poppler/cpp
147	@dirrm include/poppler

Lines 2-12 Link Here

(-)poppler-glib/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $	3	# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
4		4
5	PORTREVISION= 1	5	PORTREVISION= 0
6	PKGNAMESUFFIX= -glib	6	PKGNAMESUFFIX= -glib
7		7
8	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org
9	COMMENT= Glib bindings to poppler	9	COMMENT= GLib bindings to poppler
10		10
11	MASTERDIR= ${.CURDIR}/../../graphics/poppler	11	MASTERDIR= ${.CURDIR}/../../graphics/poppler
12	SLAVEPORT= glib	12	SLAVEPORT= glib




include/poppler/glib/poppler-media.h
include/poppler/glib/poppler-movie.h
include/poppler/glib/poppler-page.h
include/poppler/glib/poppler-structure-element.h
include/poppler/glib/poppler.h
lib/girepository-1.0/Poppler-0.18.typelib
lib/libpoppler-glib.a
lib/libpoppler-glib.la
lib/libpoppler-glib.so
lib/libpoppler-glib.so.8
lib/libpoppler-glib.so.8.6.0
libdata/pkgconfig/poppler-glib.pc
%%DOCSDIR%%/poppler/PopplerAnnot.html
%%DOCSDIR%%/poppler/PopplerAttachment.html
%%DOCSDIR%%/poppler/PopplerDocument.html
%%DOCSDIR%%/poppler/PopplerFormField.html
%%DOCSDIR%%/poppler/PopplerLayer.html
%%DOCSDIR%%/poppler/PopplerMedia.html
%%DOCSDIR%%/poppler/PopplerMovie.html
%%DOCSDIR%%/poppler/PopplerPage.html
%%DOCSDIR%%/poppler/annotation-glossary.html
%%DOCSDIR%%/poppler/api-index-0-12.html
%%DOCSDIR%%/poppler/api-index-0-14.html
%%DOCSDIR%%/poppler/api-index-0-16.html
%%DOCSDIR%%/poppler/api-index-0-18.html
%%DOCSDIR%%/poppler/api-index-0-20.html
%%DOCSDIR%%/poppler/api-index-0-22.html
%%DOCSDIR%%/poppler/api-index-deprecated.html
%%DOCSDIR%%/poppler/api-index-full.html
%%DOCSDIR%%/poppler/ch01.html
%%DOCSDIR%%/poppler/home.png
%%DOCSDIR%%/poppler/index.html
%%DOCSDIR%%/poppler/index.sgml
%%DOCSDIR%%/poppler/left.png
%%DOCSDIR%%/poppler/poppler-PopplerAction.html
%%DOCSDIR%%/poppler/poppler-Version-and-Features-Information.html
%%DOCSDIR%%/poppler/poppler-poppler.html
%%DOCSDIR%%/poppler/poppler.devhelp2
%%DOCSDIR%%/poppler/right.png
%%DOCSDIR%%/poppler/style.css
%%DOCSDIR%%/poppler/up.png
share/gir-1.0/Poppler-0.18.gir
@dirrmtry share/gir-1.0
@dirrmtry lib/girepository-1.0
@dirrmtry %%DOCSDIR%%/poppler
@dirrmtry %%DOCSDIR%%
@dirrm include/poppler/glib

Lines 2-8 Link Here

(-)poppler-qt4/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.18 2012/10/14 23:04:21 kwm Exp $	3	# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.18 2012/10/14 23:04:21 kwm Exp $
4		4
5	PORTREVISION= 1	5	PORTREVISION= 0
6	PKGNAMESUFFIX= -qt4	6	PKGNAMESUFFIX= -qt4
7		7
8	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org

Lines 6-14 Link Here

(-)poppler-qt4/pkg-plist (-3 / +2 lines)
6	include/poppler/qt4/poppler-optcontent.h	6	include/poppler/qt4/poppler-optcontent.h
7	include/poppler/qt4/poppler-page-transition.h	7	include/poppler/qt4/poppler-page-transition.h
8	include/poppler/qt4/poppler-qt4.h	8	include/poppler/qt4/poppler-qt4.h
9	lib/libpoppler-qt4.a
10	lib/libpoppler-qt4.la
11	lib/libpoppler-qt4.so	9	lib/libpoppler-qt4.so
12	lib/libpoppler-qt4.so.4	10	lib/libpoppler-qt4.so.4
13	lib/libpoppler-qt4.so.4.3.0	11	lib/libpoppler-qt4.so.4.4.0
14	libdata/pkgconfig/poppler-qt4.pc	12	libdata/pkgconfig/poppler-qt4.pc
		13	@dirrm include/poppler/qt4




# $FreeBSD$

PORTREVISION=	0
PKGNAMESUFFIX=	-qt5

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Qt5 bindings to poppler

MASTERDIR=	${.CURDIR}/../../graphics/poppler
SLAVEPORT=	qt5
PLIST=		${.CURDIR}/pkg-plist

.include "${MASTERDIR}/Makefile"




include/poppler/qt5/poppler-annotation.h
include/poppler/qt5/poppler-export.h
include/poppler/qt5/poppler-form.h
include/poppler/qt5/poppler-link.h
include/poppler/qt5/poppler-media.h
include/poppler/qt5/poppler-optcontent.h
include/poppler/qt5/poppler-page-transition.h
include/poppler/qt5/poppler-qt5.h
lib/libpoppler-qt5.so
lib/libpoppler-qt5.so.1
lib/libpoppler-qt5.so.1.1.0
libdata/pkgconfig/poppler-qt5.pc

Lines 2-8 Link Here

(-)poppler-utils/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/graphics/poppler-utils/Makefile,v 1.8 2012/10/14 23:04:21 kwm Exp $	3	# $MCom: ports/graphics/poppler-utils/Makefile,v 1.8 2012/10/14 23:04:21 kwm Exp $
4		4
5	PORTREVISION= 1	5	PORTREVISION= 0
6	PKGNAMESUFFIX= -utils	6	PKGNAMESUFFIX= -utils
7		7
8	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org

Return to bug 192068

Lines 3-10 Link Here

(-)poppler/Makefile (-12 / +26 lines)
3	# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $	3	# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
4		4
5	PORTNAME= poppler	5	PORTNAME= poppler
6	PORTVERSION= 0.24.5	6	PORTVERSION= 0.26.3
7	PORTREVISION?= 4	7	PORTREVISION?= 0
8	CATEGORIES= graphics print	8	CATEGORIES= graphics print
9	MASTER_SITES= http://poppler.freedesktop.org/	9	MASTER_SITES= http://poppler.freedesktop.org/
10		10
Lines 12-24 Link Here
12	COMMENT?= PDF rendering library	12	COMMENT?= PDF rendering library
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
		15	LICENSE_FILE= ${WRKSRC}/COPYING
15		16
16	LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \	17	LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
		18	libpng15.so:${PORTSDIR}/graphics/png \
		19	libtiff.so:${PORTSDIR}/graphics/tiff \
17	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \	20	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
18	liblcms2.so:${PORTSDIR}/graphics/lcms2	21	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
		22	libfreetype.so:${PORTSDIR}/print/freetype2
19	RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data	23	RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
20		24
21	USES= gmake libtool:keepla pathfix pkgconfig tar:xz	25	USES= gmake libtool pathfix pkgconfig tar:xz
22	USE_GNOME= libxml2	26	USE_GNOME= libxml2
23	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
24	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
Lines 25-31 Link Here
25	CONFIGURE_ARGS= --enable-zlib \	29	CONFIGURE_ARGS= --enable-zlib \
26	--enable-xpdf-headers \	30	--enable-xpdf-headers \
27	--disable-gtk-test \	31	--disable-gtk-test \
28	--with-html-dir=${DOCSDIR}	32	--without-html-dir \
		33	--disable-static
29	CPPFLAGS+= -I${LOCALBASE}/include	34	CPPFLAGS+= -I${LOCALBASE}/include
30	LDFLAGS+= -L${LOCALBASE}/lib	35	LDFLAGS+= -L${LOCALBASE}/lib
31		36
Lines 32-41 Link Here
32	# see https://bugs.freedesktop.org/show_bug.cgi?id=72499	37	# see https://bugs.freedesktop.org/show_bug.cgi?id=72499
33	CPPFLAGS+= -D__LONG_LONG_SUPPORTED	38	CPPFLAGS+= -D__LONG_LONG_SUPPORTED
34		39
		40	INSTALL_TARGET= install-strip
		41
35	.if !defined(SLAVEPORT)	42	.if !defined(SLAVEPORT)
36	PORTSCOUT= limitw:1,even	43	PORTSCOUT= limitw:1,even
37		44
38	OPTIONS_DEFINE= CAIRO OPENJPEG	45	OPTIONS_DEFINE= CAIRO CURL OPENJPEG
39	OPTIONS_DEFAULT=CAIRO OPENJPEG	46	OPTIONS_DEFAULT=CAIRO OPENJPEG
40		47
41	USES+= iconv	48	USES+= iconv
Lines 48-54 Link Here
48	LIB_DEPENDS+= libpoppler.so:${PORTSDIR}/graphics/poppler	55	LIB_DEPENDS+= libpoppler.so:${PORTSDIR}/graphics/poppler
49		56
50	.if ${SLAVEPORT}==glib	57	.if ${SLAVEPORT}==glib
51	CONFIGURE_ARGS+=--enable-poppler-glib	58	CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
52	USE_GNOME+= cairo gnomehier glib20 introspection:build	59	USE_GNOME+= cairo gnomehier glib20 introspection:build
53	BUILD_WRKSRC= ${WRKSRC}/glib	60	BUILD_WRKSRC= ${WRKSRC}/glib
54	INSTALL_WRKSRC= ${WRKSRC}/glib	61	INSTALL_WRKSRC= ${WRKSRC}/glib
Lines 66-76 Link Here
66	CONFIGURE_ARGS+=--disable-poppler-qt4	73	CONFIGURE_ARGS+=--disable-poppler-qt4
67	.endif	74	.endif
68		75
69	# needs checking when Qt5 is available
70	.if ${SLAVEPORT}==qt5	76	.if ${SLAVEPORT}==qt5
71	CONFIGURE_ARGS+=--enable-poppler-qt5	77	CONFIGURE_ARGS+=--enable-poppler-qt5
72	CONFIGURE_ENV+= ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt5	78	CONFIGURE_ENV+= MOCQT5=${MOC}
73	USE_QT5= gui corelib xml qtestlib moc_build	79	USE_QT5= core gui widgets xml buildtools_build testlib_build
74	BUILD_WRKSRC= ${WRKSRC}/qt5	80	BUILD_WRKSRC= ${WRKSRC}/qt5
75	INSTALL_WRKSRC= ${WRKSRC}/qt5	81	INSTALL_WRKSRC= ${WRKSRC}/qt5
76	.else	82	.else
Lines 100-105 Link Here
100	PLIST_SUB+= CAIRO="@comment "	106	PLIST_SUB+= CAIRO="@comment "
101	.endif	107	.endif
102		108
		109	.if ${PORT_OPTIONS:MCURL}
		110	LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
		111	CONFIGURE_ARGS+=--enable-libcurl
		112	PLIST_SUB+= CURL=""
		113	.else
		114	CONFIGURE_ARGS+=--disable-libcurl
		115	PLIST_SUB+= CURL="@comment "
		116	.endif
		117
103	.if ${PORT_OPTIONS:MOPENJPEG}	118	.if ${PORT_OPTIONS:MOPENJPEG}
104	CONFIGURE_ARGS+=--enable-libopenjpeg	119	CONFIGURE_ARGS+=--enable-libopenjpeg
105	LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15	120	LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
Lines 116-122 Link Here
116	${WRKSRC}/configure	131	${WRKSRC}/configure
117	.endif	132	.endif
118	.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5	133	.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5
119	@${REINPLACE_CMD} -e 's\|MOCQT5=`.*\|MOCQT5="${LOCALBASE}/bin/moc-qt5"\|' \	134	@${REINPLACE_CMD} -e 's\|MOCQT5=`.*\|MOCQT5="${MOC}"\|' \
120	${WRKSRC}/configure	135	${WRKSRC}/configure
121	.endif	136	.endif
122		137
Lines 133-138 Link Here
133	${STAGEDIR}${PREFIX}/libdata/pkgconfig	148	${STAGEDIR}${PREFIX}/libdata/pkgconfig
134	. endif	149	. endif
135	.endif	150	.endif
136	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpoppler.so.
137		151
138	.include <bsd.port.mk>	152	.include <bsd.port.mk>

Line 0 Link Here

(-)poppler/files/patch-qt5__src__Makefile.in (+20 lines)
	1	--- ./qt5/src/Makefile.in.orig 2014-07-20 16:22:04.000000000 +0000
	2	+++ ./qt5/src/Makefile.in 2014-07-22 22:12:19.000000000 +0000
	3	@@ -129,7 +129,7 @@
	4	LTLIBRARIES = $(lib_LTLIBRARIES)
	5	am__DEPENDENCIES_1 =
	6	libpoppler_qt5_la_DEPENDENCIES = \
	7	- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
	8	+ $(am__DEPENDENCIES_1)
	9	am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
	10	libpoppler_qt5_la-poppler-page.lo \
	11	libpoppler_qt5_la-poppler-fontinfo.lo \
	12	@@ -505,7 +505,7 @@
	13	-Dpoppler_qt5_EXPORTS -fPIC
	14
	15	libpoppler_qt5_la_LIBADD = \
	16	- $(top_builddir)/poppler/libpoppler.la \
	17	+ -lpoppler \
	18	$(POPPLER_QT5_LIBS)
	19
	20	libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@

Lines 1-5 Link Here

(-)poppler/files/patch-utils_Makefile.in (-5 / +5 lines)
1	--- utils/Makefile.in.orig 2013-12-02 19:00:03.000000000 +0100	1	--- ./utils/Makefile.in.orig 2014-07-20 16:22:05.000000000 +0000
2	+++ utils/Makefile.in 2013-12-02 19:01:25.000000000 +0100	2	+++ ./utils/Makefile.in 2014-07-21 19:54:18.000000000 +0000
3	@@ -111,7 +111,7 @@	3	@@ -111,7 +111,7 @@
4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)	4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)	5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
Lines 16-28 Link Here
16	-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	16	-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
17	+pdffonts_DEPENDENCIES =	17	+pdffonts_DEPENDENCIES =
18	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \	18	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
19	$(am__objects_1)	19	JSInfo.$(OBJEXT) $(am__objects_1)
20	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)	20	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
21	pdfimages_LDADD = $(LDADD)	21	pdfimages_LDADD = $(LDADD)
22	-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	22	-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
23	+pdfimages_DEPENDENCIES =	23	+pdfimages_DEPENDENCIES =
24	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \	24	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
25	$(am__objects_1)	25	JSInfo.$(OBJEXT) $(am__objects_1)
26	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)	26	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
27	pdfinfo_LDADD = $(LDADD)	27	pdfinfo_LDADD = $(LDADD)
28	-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	28	-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
Lines 52-58 Link Here
52	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)	52	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
53	pdftohtml_LDADD = $(LDADD)	53	pdftohtml_LDADD = $(LDADD)
54	-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	54	-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
55	+pdftohtml_DEPENDENCIES =	55	+pdftohtml_DEPENDENCIES =
56	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \	56	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
57	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \	57	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
58	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	58	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

Lines 10-55 Link Here

(-)poppler-glib/pkg-plist (-36 / +1 lines)
10	include/poppler/glib/poppler-media.h	10	include/poppler/glib/poppler-media.h
11	include/poppler/glib/poppler-movie.h	11	include/poppler/glib/poppler-movie.h
12	include/poppler/glib/poppler-page.h	12	include/poppler/glib/poppler-page.h
		13	include/poppler/glib/poppler-structure-element.h
13	include/poppler/glib/poppler.h	14	include/poppler/glib/poppler.h
14	lib/girepository-1.0/Poppler-0.18.typelib	15	lib/girepository-1.0/Poppler-0.18.typelib
15	lib/libpoppler-glib.a
16	lib/libpoppler-glib.la
17	lib/libpoppler-glib.so	16	lib/libpoppler-glib.so
18	lib/libpoppler-glib.so.8	17	lib/libpoppler-glib.so.8
19	lib/libpoppler-glib.so.8.6.0	18	lib/libpoppler-glib.so.8.6.0
20	libdata/pkgconfig/poppler-glib.pc	19	libdata/pkgconfig/poppler-glib.pc
21	%%DOCSDIR%%/poppler/PopplerAnnot.html
22	%%DOCSDIR%%/poppler/PopplerAttachment.html
23	%%DOCSDIR%%/poppler/PopplerDocument.html
24	%%DOCSDIR%%/poppler/PopplerFormField.html
25	%%DOCSDIR%%/poppler/PopplerLayer.html
26	%%DOCSDIR%%/poppler/PopplerMedia.html
27	%%DOCSDIR%%/poppler/PopplerMovie.html
28	%%DOCSDIR%%/poppler/PopplerPage.html
29	%%DOCSDIR%%/poppler/annotation-glossary.html
30	%%DOCSDIR%%/poppler/api-index-0-12.html
31	%%DOCSDIR%%/poppler/api-index-0-14.html
32	%%DOCSDIR%%/poppler/api-index-0-16.html
33	%%DOCSDIR%%/poppler/api-index-0-18.html
34	%%DOCSDIR%%/poppler/api-index-0-20.html
35	%%DOCSDIR%%/poppler/api-index-0-22.html
36	%%DOCSDIR%%/poppler/api-index-deprecated.html
37	%%DOCSDIR%%/poppler/api-index-full.html
38	%%DOCSDIR%%/poppler/ch01.html
39	%%DOCSDIR%%/poppler/home.png
40	%%DOCSDIR%%/poppler/index.html
41	%%DOCSDIR%%/poppler/index.sgml
42	%%DOCSDIR%%/poppler/left.png
43	%%DOCSDIR%%/poppler/poppler-PopplerAction.html
44	%%DOCSDIR%%/poppler/poppler-Version-and-Features-Information.html
45	%%DOCSDIR%%/poppler/poppler-poppler.html
46	%%DOCSDIR%%/poppler/poppler.devhelp2
47	%%DOCSDIR%%/poppler/right.png
48	%%DOCSDIR%%/poppler/style.css
49	%%DOCSDIR%%/poppler/up.png
50	share/gir-1.0/Poppler-0.18.gir	20	share/gir-1.0/Poppler-0.18.gir
51	@dirrmtry share/gir-1.0
52	@dirrmtry lib/girepository-1.0
53	@dirrmtry %%DOCSDIR%%/poppler
54	@dirrmtry %%DOCSDIR%%
55	@dirrm include/poppler/glib

Line 0 Link Here

(-)poppler-qt5/Makefile (+13 lines)
	1	# $FreeBSD$
	2
	3	PORTREVISION= 0
	4	PKGNAMESUFFIX= -qt5
	5
	6	MAINTAINER= gnome@FreeBSD.org
	7	COMMENT= Qt5 bindings to poppler
	8
	9	MASTERDIR= ${.CURDIR}/../../graphics/poppler
	10	SLAVEPORT= qt5
	11	PLIST= ${.CURDIR}/pkg-plist
	12
	13	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)poppler-qt5/pkg-plist (+12 lines)
	1	include/poppler/qt5/poppler-annotation.h
	2	include/poppler/qt5/poppler-export.h
	3	include/poppler/qt5/poppler-form.h
	4	include/poppler/qt5/poppler-link.h
	5	include/poppler/qt5/poppler-media.h
	6	include/poppler/qt5/poppler-optcontent.h
	7	include/poppler/qt5/poppler-page-transition.h
	8	include/poppler/qt5/poppler-qt5.h
	9	lib/libpoppler-qt5.so
	10	lib/libpoppler-qt5.so.1
	11	lib/libpoppler-qt5.so.1.1.0
	12	libdata/pkgconfig/poppler-qt5.pc