svn commit: r342633 - in head/print: cups-base cups-client cups-image
Martin Wilke
miwi at FreeBSD.org
Wed Feb 5 05:41:03 UTC 2014
Author: miwi
Date: Wed Feb 5 05:41:01 2014
New Revision: 342633
URL: http://svnweb.freebsd.org/changeset/ports/342633
QAT: https://qat.redports.org/buildarchive/r342633/
Log:
- Stage support part1 for client and image
Submitted by: antoine
Modified:
head/print/cups-base/Makefile
head/print/cups-base/pkg-plist.client
head/print/cups-client/Makefile
head/print/cups-image/Makefile
Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile Wed Feb 5 05:23:30 2014 (r342632)
+++ head/print/cups-base/Makefile Wed Feb 5 05:41:01 2014 (r342633)
@@ -81,7 +81,12 @@ GHOSTSCRIPT_DESC= Build pdftops with GHO
XPDF_DESC= Build pdftops with XPDF
XDG_OPEN_DESC= Build with XDG_OPEN as browser
+.if defined(CUPS_CLIENT) || defined(CUPS_IMAGE)
+USES+= desthack
+.else
NO_STAGE= yes
+.endif
+
.include <bsd.port.options.mk>
.if defined(CUPS_CLIENT)
@@ -231,10 +236,7 @@ CONFIGURE_ARGS+= --disable-libusb
.endif
CONFIGURE_ARGS+= LIBS="-lssp_nonshared"
-.if defined(CUPS_CLIENT)
-MAN1= cups-config.1
-.elif defined(CUPS_IMAGE)
-.else
+.if ! defined(CUPS_CLIENT) && ! defined(CUPS_IMAGE)
MAN1+= cancel.1 \
cupstestdsc.1 \
cupstestppd.1 \
@@ -382,11 +384,11 @@ pre-su-install:
post-install:
.if defined(CUPS_CLIENT)
- ${INSTALL_SCRIPT} ${WRKSRC}/cups-config ${PREFIX}/bin/
- ${INSTALL_DATA} ${WRKSRC}/cups/libcups.a ${PREFIX}/lib/
- ${INSTALL_MAN} ${WRKSRC}/man/cups-config.man ${PREFIX}/man/man1/cups-config.1
+ ${INSTALL_SCRIPT} ${WRKSRC}/cups-config ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/cups/libcups.a ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_MAN} ${WRKSRC}/man/cups-config.man ${STAGEDIR}${PREFIX}/man/man1/cups-config.1
.elif defined(CUPS_IMAGE)
- ${INSTALL_DATA} ${WRKSRC}/cups/raster.h ${PREFIX}/include/cups/
+ ${INSTALL_DATA} ${WRKSRC}/cups/raster.h ${STAGEDIR}${PREFIX}/include/cups
.else
.if ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF}
${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/
Modified: head/print/cups-base/pkg-plist.client
==============================================================================
--- head/print/cups-base/pkg-plist.client Wed Feb 5 05:23:30 2014 (r342632)
+++ head/print/cups-base/pkg-plist.client Wed Feb 5 05:41:01 2014 (r342633)
@@ -15,4 +15,5 @@ include/cups/versioning.h
lib/libcups.a
lib/libcups.so
lib/libcups.so.2
+man/man1/cups-config.1.gz
@dirrm include/cups
Modified: head/print/cups-client/Makefile
==============================================================================
--- head/print/cups-client/Makefile Wed Feb 5 05:23:30 2014 (r342632)
+++ head/print/cups-client/Makefile Wed Feb 5 05:41:01 2014 (r342633)
@@ -8,7 +8,5 @@ MASTERDIR?= ${.CURDIR}/../cups-base
CUPS_CLIENT= yes
-NO_STAGE= yes
-
.sinclude "${.CURDIR}/Makefile.local"
.include "${MASTERDIR}/Makefile"
Modified: head/print/cups-image/Makefile
==============================================================================
--- head/print/cups-image/Makefile Wed Feb 5 05:23:30 2014 (r342632)
+++ head/print/cups-image/Makefile Wed Feb 5 05:41:01 2014 (r342633)
@@ -5,10 +5,8 @@ CATEGORIES= print
MAINTAINER= bsam at FreeBSD.org
MASTERDIR?= ${.CURDIR}/../cups-base
-
-CUPS_IMAGE= yes
-NO_STAGE= yes
+CUPS_IMAGE= yes
.sinclude "${.CURDIR}/Makefile.local"
.include "${MASTERDIR}/Makefile"
More information about the svn-ports-all
mailing list