Date: Fri, 25 May 2012 14:02:57 -0400 From: "b. f." <bf1783@googlemail.com> To: Cy Schubert <cy@freebsd.org> Cc: cvs-ports@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/graphics/xpdf Makefile pkg-plist Message-ID: <CAGFTUwMdnA9nrhf1c7WR5QC-3YQbF_qo5zA-=zPshCLHdT=hAw@mail.gmail.com> In-Reply-To: <201205250324.q4P3OKgq028147@repoman.freebsd.org> References: <201205250324.q4P3OKgq028147@repoman.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On 5/24/12, Cy Schubert <cy@freebsd.org> wrote:
> cy 2012-05-25 03:24:19 UTC
>
> FreeBSD ports repository
>
> Modified files:
> graphics/xpdf Makefile pkg-plist
> Log:
> Move binaries to $LOCALBASE/libexec.
>
> Suggested by: eadler
> Approved by: araujo (maintainer)
>
> Revision Changes Path
> 1.103 +3 -2 ports/graphics/xpdf/Makefile
> 1.15 +8 -8 ports/graphics/xpdf/pkg-plist
>
This isn't quite right. We test for dependencies in LOCALBASE, but we
always install into PREFIX. The two are not necessarily the same --
although we still haven't made it possible to use different values of
PREFIX and LOCALBASE routinely for a large number of ports, users
perform some port installations and tests with different values, so
the distinction needs to be maintained. The assumption is also built
into existing tools, like "port test" from ports-mgmt/porttools.
Also, it isn't necessary to add print/freetype2 to BUILD_DEPENDS, if
it is in LIB_DEPENDS; and the pkg-plist needs to be changed to @dirrm
libexec/xpdf rather than lib/xpdf.
b.
[-- Attachment #2 --]
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/xpdf/Makefile,v
retrieving revision 1.103
diff -u -r1.103 Makefile
--- Makefile 25 May 2012 03:24:19 -0000 1.103
+++ Makefile 25 May 2012 17:41:33 -0000
@@ -16,7 +16,6 @@
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 @@
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 @@
.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 <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/xpdf/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist 25 May 2012 03:24:19 -0000 1.15
+++ pkg-plist 25 May 2012 17:46:47 -0000
@@ -13,4 +13,4 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/hello.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/xpdf
+@dirrm libexec/xpdf
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGFTUwMdnA9nrhf1c7WR5QC-3YQbF_qo5zA-=zPshCLHdT=hAw>