aboutsummaryrefslogtreecommitdiff
path: root/graphics/poppler
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2006-05-02 00:37:23 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2006-05-02 00:37:23 +0000
commit163eb7b0fd4b47dcaa1cf61622397173680cf74a (patch)
tree63ca0dce39a71952dfed70c4f591687bbd9129b3 /graphics/poppler
parent7183cdca3fe62de6f596b6a1aa6e5e5aa1980324 (diff)
downloadports-163eb7b0fd4b47dcaa1cf61622397173680cf74a.tar.gz
ports-163eb7b0fd4b47dcaa1cf61622397173680cf74a.zip
Remove the commandline utilities in order to make this port not conflict
with xpdf. The utilities can now be found in graphics/poppler-utils.
Notes
Notes: svn path=/head/; revision=161143
Diffstat (limited to 'graphics/poppler')
-rw-r--r--graphics/poppler/Makefile14
-rw-r--r--graphics/poppler/pkg-plist9
2 files changed, 10 insertions, 13 deletions
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index f12fb706614c..38f542528644 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -8,7 +8,7 @@
PORTNAME= poppler
PORTVERSION= 0.5.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -17,7 +17,6 @@ COMMENT?= A PDF rendering library
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-CONFLICTS= xpdf-[0-9]*
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
@@ -45,12 +44,17 @@ BUILD_WRKSRC= ${WRKSRC}/qt
INSTALL_WRKSRC= ${WRKSRC}/qt
# blah.. USE_QT_VER can't be defined after bsd.port.pre.mk
.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.elif ${SLAVEPORT}=="utils"
+CONFIGURE_ARGS+=--enable-utils
+CONFLICTS= xpdf-[0-9]*
+BUILD_WRKSRC= ${WRKSRC}/utils
+INSTALL_WRKSRC= ${WRKSRC}/utils
+MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \
+ pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1
.endif
.else
CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
- --disable-poppler-qt4
-MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \
- pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1
+ --disable-poppler-qt4 --disable-utils
.endif
post-patch:
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index dde9794b6610..a5ae00cfe342 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -1,10 +1,3 @@
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
-bin/pdftohtml
-bin/pdftoppm
-bin/pdftops
-bin/pdftotext
include/poppler/Annot.h
include/poppler/Array.h
include/poppler/BaseFile.h
@@ -49,8 +42,8 @@ include/poppler/SplashOutputDev.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/TextOutputDev.h
-include/poppler/UTF8.h
include/poppler/UGooString.h
+include/poppler/UTF8.h
include/poppler/UnicodeMap.h
include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h