From d5c5951c59f614569debf9e0667a79b610ca9537 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Fri, 25 May 2012 19:20:48 +0000 Subject: [PATCH] PREFIX/LOCALBASE/plist fixups. Submitted by: "b. f." --- graphics/xpdf/Makefile | 5 ++--- graphics/xpdf/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index 9d3f7c4a7bc4..dc2f148b4b90 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR= support/xpdf MAINTAINER= araujo@FreeBSD.org COMMENT= Display PDF files, and convert them to other formats -BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 GNU_CONFIGURE= yes @@ -26,7 +25,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-opi \ --with-freetype2-library="${LOCALBASE}/lib" \ --with-freetype2-includes="${LOCALBASE}/include/freetype2/" \ - --bindir="${LOCALBASE}/libexec/xpdf" + --bindir="${PREFIX}/libexec/xpdf" OPTIONS= LIBPAPER "Enable libpaper" off \ TYPE1 "Ghostscript type1 fonts" on \ @@ -82,7 +81,7 @@ post-install: .endfor .endif .if !defined(WITHOUT_X11) - ${LN} -sf ${LOCALBASE}/libexec/xpdf/xpdf ${LOCALBASE}/bin/xpdf + ${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${PREFIX}/bin/xpdf .endif .include diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist index 9d8550cd8529..247be64e0b91 100644 --- a/graphics/xpdf/pkg-plist +++ b/graphics/xpdf/pkg-plist @@ -13,4 +13,4 @@ etc/xpdfrc %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/hello.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/xpdf +@dirrm libexec/xpdf