diff options
author | Koop Mast <kwm@FreeBSD.org> | 2009-12-20 10:43:14 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2009-12-20 10:43:14 +0000 |
commit | dbb7ae456f7a909149863bb7a98d48d11688224a (patch) | |
tree | f6468af874629920cf91cf795b0eaa8fba3e8430 /graphics | |
parent | Update to 2.8.2. (diff) |
Fix usage of USE_QT* macros. So depends are detected correctly.
PR: ports/141347
Submitted by: Dima Panov <fluffy@FreeBSD.org> (based on patch by makc@)
Notes
Notes:
svn path=/head/; revision=246284
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/poppler/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index d3758582c102..559d07a53b59 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -27,8 +27,10 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ --with-html-dir=${DOCSDIR} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS} +LDFLAGS=-L${LOCALBASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" .if !defined(SLAVEPORT) OPTIONS= CAIRO "Enable cairo output backend" on \ @@ -70,6 +72,7 @@ QT_COMPONENTS= gui corelib xml qtestlib moc_build # can read more PDF files than without, tested with demos's poppler_qt4viewer. #BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 +.include "${PORTSDIR}/Mk/bsd.qt.mk" .else CONFIGURE_ARGS+=--disable-poppler-qt4 .endif |