Hi,
the newest poppler uses --std=c++11 even for the base libpoppler,
so I tried to set MODULES+=gcc4 and MODGCC_LANGS=c++ (see diff
below). However, it still just uses c++, and lang/gcc/4.9 doesn't
even show up in make show=BUILD_DEPENDS or make dump-vars.
Probably a stupid PEBKAC.
Any ideas?
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile 19 Feb 2017 20:53:26 -0000 1.119
+++ Makefile 22 Mar 2017 21:46:37 -0000
@@ -6,7 +6,7 @@ COMMENT-qt4= qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.52.0
+V= 0.53.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -16,11 +16,11 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 43.1 # 66.0
+SHARED_LIBS += poppler 44.0 # 67.0
SHARED_LIBS += poppler-glib 16.0 # 16.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 20.1 # 15.0
-SHARED_LIBS += poppler-qt5 3.1 # 10.0
+SHARED_LIBS += poppler-qt5 4.0 # 11.0
SHARED_LIBS += poppler-cpp 8.0 # 3.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
@@ -47,6 +47,9 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -util
cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z
+MODULES+= gcc4
+MODGCC4_LANGS= c++
+
.if ${BUILD_PACKAGES:M-qt}
MODULES+= x11/qt3
.else
@@ -135,13 +138,6 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
USE_GMAKE= Yes
-MAIN_CC= /usr/bin/cc
-MAIN_CXX= /usr/bin/c++
-.if "${USE_CCACHE:L}" == "yes"
-MAIN_CC:= ccache ${MAIN_CC}
-MAIN_CXX:= ccache ${MAIN_CXX}
-.endif
-
post-extract:
cd ${WRKDIST} && \
for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
@@ -150,12 +146,5 @@ post-extract:
done; \
ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
-
-post-configure:
- find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
- perl -pi -e 's,^CC = \S+,override CC = ${MAIN_CC},;' \
- -e 's,^CPP = \S+,override CPP = ${MAIN_CC},;' \
- -e 's,^CXX = \S+,override CXX = ${MAIN_CXX},;' \
- -e 's,^CXXCPP = \S+,override CXXCPP = ${MAIN_CXX},;'
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.62
diff -u -p -r1.62 distinfo
--- distinfo 19 Feb 2017 20:53:26 -0000 1.62
+++ distinfo 20 Mar 2017 19:18:10 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.52.0.tar.xz) = UotmFziDn5ol9uWA/NLV2wB+ChlIWAxkifAGJ5jKGZI=
+SHA256 (poppler-0.53.0.tar.xz) = WSv3KWDGtZSLZ2V1lLBectmieNr3YTyfPN/5pbcwlqg=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.52.0.tar.xz) = 1692144
+SIZE (poppler-0.53.0.tar.xz) = 1696212
