Install some poppler utils (pdftoabw and pdftohtml, but not the

other tools that would conflict with xpdf-utils).

From Alexis Fouilhe, with some minor tweaks (missing bump, additions
to WANTLIB-main) from me.
This commit is contained in:
kili 2011-03-20 20:52:01 +00:00
parent 36fe2515ca
commit 6692610359
2 changed files with 25 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2011/03/03 21:25:38 stsp Exp $
# $OpenBSD: Makefile,v 1.46 2011/03/20 20:52:01 kili Exp $
.include <bsd.own.mk>
COMMENT-main= PDF rendering library
@ -9,7 +9,7 @@ V= 0.14.5
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
REVISION-main= 1
REVISION-main= 2
FULLPKGNAME-qt= poppler-qt-$V
FULLPKGNAME-qt4=poppler-qt4-$V
@ -40,7 +40,7 @@ cWANTLIB= expat freetype fontconfig jpeg m z stdc++
.if empty(FLAVOR:L:Mno_qt)
MULTI_PACKAGES+=-qt
MODULES+= x11/qt3 converters/libiconv
MODULES+= x11/qt3
.else
CONFIGURE_ARGS+= --disable-poppler-qt
.endif
@ -51,14 +51,15 @@ MULTI_PACKAGES+=-qt4
.endif
.if ${MULTI_PACKAGES:L:M-qt4} && ${MACHINE_ARCH} != "arm"
MODULES+= x11/qt4 converters/libiconv
MODULES+= x11/qt4
.else
CONFIGURE_ARGS+= --disable-poppler-qt4
.endif
MODULES+= devel/gettext
MODULES+= devel/gettext converters/libiconv
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
x11/gtk+2 \
graphics/lcms \
graphics/openjpeg \
@ -70,11 +71,11 @@ LIB_DEPENDS-qt4=x11/qt4 \
${MODGETTEXT_LIB_DEPENDS} \
print/poppler
WANTLIB-main= ${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
WANTLIB-main= ${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr c gio-2.0 \
glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 xml2 \
pangocairo-1.0 pangoft2-1.0 pixman-1 gdk_pixbuf-2.0 openjpeg \
X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo pcre png \
pthread-stubs xcb xcb-render gdk-x11-2.0 lcms GL Xxf86vm \
pthread pthread-stubs xcb xcb-render gdk-x11-2.0 lcms GL Xxf86vm \
drm xcb-shm ${MODGETTEXT_WANTLIB}
WANTLIB-qt= ${cWANTLIB} lcms openjpeg xml2 poppler png ${MODQT3_WANTLIB} \
${MODLIBICONV_WANTLIB}
@ -87,7 +88,7 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+= --enable-xpdf-headers \
--disable-poppler-cpp \
--disable-silent-rules \
--disable-utils \
--enable-utils \
--enable-zlib
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \

View File

@ -1,7 +1,15 @@
@comment $OpenBSD: PLIST-main,v 1.7 2010/10/09 08:05:30 kili Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2011/03/20 20:52:01 kili Exp $
@conflict poppler-qt-<0.5.4p0
@pkgpath print/poppler
%%SHARED%%
@comment @bin bin/pdffonts
@comment @bin bin/pdfimages
@comment @bin bin/pdfinfo
@bin bin/pdftoabw
@bin bin/pdftohtml
@comment @bin bin/pdftoppm
@comment @bin bin/pdftops
@comment @bin bin/pdftotext
include/poppler/
include/poppler/Annot.h
include/poppler/Array.h
@ -139,6 +147,13 @@ lib/pkgconfig/poppler-cairo.pc
lib/pkgconfig/poppler-glib.pc
lib/pkgconfig/poppler-splash.pc
lib/pkgconfig/poppler.pc
@comment @man man/man1/pdffonts.1
@comment @man man/man1/pdfimages.1
@comment @man man/man1/pdfinfo.1
@man man/man1/pdftohtml.1
@comment @man man/man1/pdftoppm.1
@comment @man man/man1/pdftops.1
@comment @man man/man1/pdftotext.1
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/poppler/