From owner-svn-ports-head@FreeBSD.ORG Wed Feb 5 05:41:03 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1EC754CF; Wed, 5 Feb 2014 05:41:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 05AEE106B; Wed, 5 Feb 2014 05:41:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s155f2Mn062933; Wed, 5 Feb 2014 05:41:02 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s155f2T5062923; Wed, 5 Feb 2014 05:41:02 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402050541.s155f2T5062923@svn.freebsd.org> From: Martin Wilke Date: Wed, 5 Feb 2014 05:41:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342633 - in head/print: cups-base cups-client cups-image X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Feb 2014 05:41:03 -0000 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 .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@FreeBSD.org MASTERDIR?= ${.CURDIR}/../cups-base - -CUPS_IMAGE= yes -NO_STAGE= yes +CUPS_IMAGE= yes .sinclude "${.CURDIR}/Makefile.local" .include "${MASTERDIR}/Makefile"