diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2012-05-12 03:32:08 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2012-05-12 03:32:08 +0000 |
| commit | f20b01d968c435db523655f1ec8844cbf538f876 (patch) | |
| tree | c5f9f82039dc494174602a009c1c05a3d7f63177 | |
| parent | - Update to version 0.88 (diff) | |
Allow graphics/xpdf and graphics/poppler-utils to co-exist.
Approved by: araujo (xpdf) and kwm (poppler-utils)
Notes
Notes:
svn path=/head/; revision=296465
| -rw-r--r-- | graphics/poppler-utils/Makefile | 2 | ||||
| -rw-r--r-- | graphics/xpdf/Makefile | 8 | ||||
| -rw-r--r-- | graphics/xpdf/pkg-plist | 16 |
3 files changed, 14 insertions, 12 deletions
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index a7a92bdaa02b..263fca70ea32 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -16,6 +16,4 @@ MASTERDIR= ${.CURDIR}/../../graphics/poppler SLAVEPORT= utils PLIST= ${.CURDIR}/pkg-plist -CONFLICTS= xpdf-3.* - .include "${MASTERDIR}/Makefile" diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index 34bb2339bf1a..b5daa36a6bd7 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -18,15 +18,14 @@ COMMENT= Display PDF files, and convert them to other formats BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 -CONFLICTS= poppler-utils-[0-9]* - GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-opi \ --with-freetype2-library="${LOCALBASE}/lib" \ - --with-freetype2-includes="${LOCALBASE}/include/freetype2/" + --with-freetype2-includes="${LOCALBASE}/include/freetype2/" \ + --bindir="${LOCALBASE}/lib/xpdf" OPTIONS= LIBPAPER "Enable libpaper" off \ TYPE1 "Ghostscript type1 fonts" on \ @@ -81,5 +80,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif +.if !defined(WITHOUT_X11) + ${LN} -sf ${LOCALBASE}/lib/xpdf/xpdf ${LOCALBASE}/bin/xpdf +.endif .include <bsd.port.mk> diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist index c02b6b64358e..675fe2aa587f 100644 --- a/graphics/xpdf/pkg-plist +++ b/graphics/xpdf/pkg-plist @@ -1,10 +1,11 @@ -bin/pdffonts -bin/pdfimages -bin/pdfinfo -bin/pdfdetach -bin/pdftoppm -bin/pdftops -bin/pdftotext +lib/xpdf/pdffonts +lib/xpdf/pdfimages +lib/xpdf/pdfinfo +lib/xpdf/pdfdetach +lib/xpdf/pdftoppm +lib/xpdf/pdftops +lib/xpdf/pdftotext +%%X11%%lib/xpdf/xpdf %%X11%%bin/xpdf etc/xpdfrc %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE @@ -12,3 +13,4 @@ etc/xpdfrc %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/hello.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/xpdf |