diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-04-13 01:10:20 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-04-13 01:10:20 +0800 |
| commit | 8427e8108f1828baf866c5c0873b3045d245531d (patch) | |
| tree | 5afd2eea75017704cee6c08cb3f1188d5f5e7e06 /graphics | |
| parent | 3a1223b720a8dd0a51fe51bffd4f1cb48d472a8a (diff) | |
| download | marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.tar marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.tar.gz marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.tar.bz2 marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.tar.lz marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.tar.xz marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.tar.zst marcuscom-ports-8427e8108f1828baf866c5c0873b3045d245531d.zip | |
- Unbreak poppler-qt
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6059 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/poppler-qt/Makefile | 3 | ||||
| -rw-r--r-- | graphics/poppler-qt/pkg-plist | 1 | ||||
| -rw-r--r-- | graphics/poppler/Makefile | 8 | ||||
| -rw-r--r-- | graphics/poppler/files/patch-configure | 11 |
4 files changed, 17 insertions, 6 deletions
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile index d5f87e063..03f6aa732 100644 --- a/graphics/poppler-qt/Makefile +++ b/graphics/poppler-qt/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt/Makefile,v 1.4 2006/02/24 18:50:35 marcus Exp $ +# $MCom: ports/graphics/poppler-qt/Makefile,v 1.5 2006/03/09 01:49:50 marcus Exp $ PORTREVISION= 0 PKGNAMESUFFIX= -qt @@ -15,5 +15,4 @@ MASTERDIR= ${.CURDIR}/../../graphics/poppler SLAVEPORT= qt PLIST= ${.CURDIR}/pkg-plist -BROKEN=Configure script is busted .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist index f3a1f05a5..bc152aa05 100644 --- a/graphics/poppler-qt/pkg-plist +++ b/graphics/poppler-qt/pkg-plist @@ -1,3 +1,4 @@ +include/poppler/poppler-page-transition.h include/poppler/poppler-qt.h lib/libpoppler-qt.a lib/libpoppler-qt.la diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index c9939fcd0..d914fa244 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,7 +3,7 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.21 2006/02/25 09:58:48 marcus Exp $ +# $MCom: ports/graphics/poppler/Makefile,v 1.22 2006/03/09 01:49:49 marcus Exp $ # PORTNAME= poppler @@ -55,9 +55,9 @@ MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \ post-patch: .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt" -# @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \ -# s|/usr/local/qt/lib|${X11BASE}/lib|' \ -# ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \ + s|/usr/local/qt/lib|${X11BASE}/lib|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$QTDIR|${X11BASE}|' ${WRKSRC}/configure .endif diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure new file mode 100644 index 000000000..72b0d9459 --- /dev/null +++ b/graphics/poppler/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Apr 12 12:53:56 2006 ++++ configure Wed Apr 12 13:06:36 2006 +@@ -24849,7 +24849,7 @@ + fi + fi + +-if test "x$have_qt" == "xyes"; then ++if test "x$have_qt" = "xyes"; then + POPPLER_QT_CXXFLAGS="-I$qt_incdir" + POPPLER_QT_LIBS="$qt_libdir/$qt_test_library" + : |