Update to 0.24.5.

Switch to USES=libtool

4 files changed, 15 insertions, 15 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index c4934c9853cc..3fac1648f6a4 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
 
 PORTNAME=	poppler
-PORTVERSION=	0.24.4
+PORTVERSION=	0.24.5
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -19,8 +19,8 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
 USE_XZ=		yes
-USES=		gmake pathfix pkgconfig
-USE_GNOME=	libxml2 ltverhack
+USES=		gmake libtool pathfix pkgconfig
+USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
@@ -85,9 +85,10 @@ INSTALL_WRKSRC=	${WRKSRC}/utils
 CONFIGURE_ARGS+=--disable-utils
 .endif
 
-.else
+.else # ! SLAVE options below
 CONFIGURE_ARGS+=--disable-poppler-glib \
 		--disable-poppler-qt4 \
+		--disable-poppler-qt5 \
 		--disable-utils
 
 .if ${PORT_OPTIONS:MCAIRO}
@@ -104,14 +105,11 @@ LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
 .else
 CONFIGURE_ARGS+=--disable-libopenjpeg
 .endif
-.endif
+.endif # end of options
 
 post-patch:
-.if ${CXX:M*clang*} && ${CXXFLAGS:M-stdlib=libc++}
 	@${REINPLACE_CMD} '/CXXFLAGS.*-ansi/d' ${WRKSRC}/configure
-.endif
-#	@${REINPLACE_CMD} -e 's|-version-info 35:0:0|-version-info 34:0:0|g' \
-#		${WRKSRC}/poppler/Makefile.in
+	@${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure
 .if defined(SLAVEPORT) && ${SLAVEPORT}==qt4
 	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
 		${WRKSRC}/configure
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 3e4cbf05e8a4..f9205d7462b0 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.24.4.tar.xz) = c8a3509a17e6f0bbb07eeb1b58276b485974a8bff3f5eef1bc8e150ccd7c01e2
-SIZE (poppler-0.24.4.tar.xz) = 1511248
+SHA256 (poppler-0.24.5.tar.xz) = a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84
+SIZE (poppler-0.24.5.tar.xz) = 1512476
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 735fb3b3807c..735c224944f5 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -5,7 +5,7 @@
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
 -pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfdetach_DEPENDENCIES = 
++pdfdetach_DEPENDENCIES =
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
@@ -14,19 +14,19 @@
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
 -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES = 
++pdffonts_DEPENDENCIES =
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
 -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES = 
++pdfimages_DEPENDENCIES =
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
  	$(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES = 
++pdfinfo_DEPENDENCIES =
  am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
  pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
  pdfseparate_LDADD = $(LDADD)
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 225b97a7f5d3..bbf394ff7ef7 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -130,10 +130,12 @@ lib/libpoppler-cpp.a
 lib/libpoppler-cpp.la
 lib/libpoppler-cpp.so
 lib/libpoppler-cpp.so.0
+lib/libpoppler-cpp.so.0.2.0
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
 lib/libpoppler.so.44
+lib/libpoppler.so.44.0.0
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc