From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 11 19:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 92C848D6 for ; Sun, 11 May 2014 19:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F0BA2BCE for ; Sun, 11 May 2014 19:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BJA0DR066538 for ; Sun, 11 May 2014 19:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4BJA0lR066537; Sun, 11 May 2014 19:10:00 GMT (envelope-from gnats) Resent-Date: Sun, 11 May 2014 19:10:00 GMT Resent-Message-Id: <201405111910.s4BJA0lR066537@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthieu Volat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 945048BE for ; Sun, 11 May 2014 19:07:46 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 66C2B2BC1 for ; Sun, 11 May 2014 19:07:46 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BJ7kag006474 for ; Sun, 11 May 2014 19:07:46 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4BJ7kpr006473; Sun, 11 May 2014 19:07:46 GMT (envelope-from nobody) Message-Id: <201405111907.s4BJ7kpr006473@cgiserv.freebsd.org> Date: Sun, 11 May 2014 19:07:46 GMT From: Matthieu Volat To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189682: [patch] add support for staging/options to print/cups-pdf X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2014 19:10:00 -0000 >Number: 189682 >Category: ports >Synopsis: [patch] add support for staging/options to print/cups-pdf >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 11 19:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Matthieu Volat >Release: 10.0-RELEASE-p3 >Organization: - >Environment: >Description: As of now, print/cups-pdf do not have a maintainer and lacks staging and relies on NOPORTDOCS for optional documentation installation. >How-To-Repeat: - >Fix: Attached patch provides staging and DOCS option support. Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 353034) +++ Makefile (working copy) @@ -21,6 +21,11 @@ USE_GHOSTSCRIPT_RUN= yes +OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT= DOCS + +.include + SUBST_CMD= -e "s,\#GhostScript /usr/bin/gs,GhostScript ${LOCALBASE}/bin/gs," \ -e 's,\#GSTmp /var/tmp,GSTmp /tmp,' \ -e 's,\#Grp lp,Grp daemon,' \ @@ -49,7 +54,6 @@ SUBST_CMD+= -e "s,\#Log /var/log/cups,Log ${LOG_DIRECTORY}," .endif -NO_STAGE= yes pre-everything:: .if !defined(PDF_VERSION) || !defined(HOME_SUBDIR) || \ !defined(OUTPUT_DIRECTORY) || !defined(LOG_DIRECTORY) @@ -82,23 +86,23 @@ cd ${WRKSRC}/src; ${CC} ${CFLAGS} -o cups-pdf cups-pdf.c do-install: - ${MKDIR} ${PREFIX}/libexec/cups/backend - ${INSTALL} -o root -g wheel -m 0700 ${WRKSRC}/src/cups-pdf ${PREFIX}/libexec/cups/backend - ${MKDIR} ${PREFIX}/share/cups/model + ${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/cups/backend + ${INSTALL} -o root -g wheel -m 0700 ${WRKSRC}/src/cups-pdf ${STAGEDIR}${LOCALBASE}/libexec/cups/backend + ${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model ${INSTALL_DATA} ${WRKSRC}/extra/CUPS-PDF.ppd \ - ${PREFIX}/share/cups/model/CUPS-PDF.ppd - ${MKDIR} ${PREFIX}/etc/cups + ${STAGEDIR}${LOCALBASE}/share/cups/model/CUPS-PDF.ppd + ${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/cups ${INSTALL_DATA} ${WRKSRC}/extra/cups-pdf.conf \ - ${PREFIX}/etc/cups/cups-pdf.conf.sample -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${STAGEDIR}${LOCALBASE}/etc/cups/cups-pdf.conf.sample +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif post-install: @if [ ! -f ${PREFIX}/etc/cups/cups-pdf.conf ]; then \ - ${CP} -p ${PREFIX}/etc/cups/cups-pdf.conf.sample \ - ${PREFIX}/etc/cups/cups-pdf.conf ; \ - fi + ${CP} -p ${PREFIX}/etc/cups/cups-pdf.conf.sample \ + ${PREFIX}/etc/cups/cups-pdf.conf ; \ + fi .include Index: pkg-descr =================================================================== --- pkg-descr (revision 353034) +++ pkg-descr (working copy) @@ -5,4 +5,4 @@ be placed in the specified directory. Author: Dr. Volker Christian Behr -WWW: http://www.cups-pdf.de +WWW: http://www.cups-pdf.de >Release-Note: >Audit-Trail: >Unformatted: