From owner-svn-ports-head@freebsd.org Mon Jul 15 09:02:15 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CAF65B4C67; Mon, 15 Jul 2019 09:02:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE48486880; Mon, 15 Jul 2019 09:02:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DD411B508; Mon, 15 Jul 2019 09:02:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6F92FId013088; Mon, 15 Jul 2019 09:02:15 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6F92F7X013086; Mon, 15 Jul 2019 09:02:15 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201907150902.x6F92F7X013086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Jul 2019 09:02:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506647 - head/print/cups-pdf X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/print/cups-pdf X-SVN-Commit-Revision: 506647 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AE48486880 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 15 Jul 2019 09:02:15 -0000 Author: amdmi3 Date: Mon Jul 15 09:02:15 2019 New Revision: 506647 URL: https://svnweb.freebsd.org/changeset/ports/506647 Log: - Whitespace and cosmetic fixes - Switch to options helpers - Respect LDFLAGS - Update WWW Modified: head/print/cups-pdf/Makefile head/print/cups-pdf/pkg-descr Modified: head/print/cups-pdf/Makefile ============================================================================== --- head/print/cups-pdf/Makefile Mon Jul 15 08:56:40 2019 (r506646) +++ head/print/cups-pdf/Makefile Mon Jul 15 09:02:15 2019 (r506647) @@ -12,8 +12,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Virtual printer for CUPS to produce PDF files -LICENSE=GPLv2 -LICENSE_FILE=${WRKSRC}/COPYING +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:print/cups @@ -21,15 +21,15 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= ghostscript:run -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS +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,' \ + -e 's,\#Spool /var/spool/cups-pdf/SPOOL,Spool /var/spool/cups-pdf,' + .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,' \ - -e 's,\#Spool /var/spool/cups-pdf/SPOOL,Spool /var/spool/cups-pdf,' - .ifdef(PDF_VERSION) .if ${PDF_VERSION} == 1.2 .elif ${PDF_VERSION} == 1.3 @@ -78,23 +78,24 @@ pre-everything:: post-configure: @${REINPLACE_CMD} ${SUBST_CMD} ${WRKSRC}/extra/cups-pdf.conf @${REINPLACE_CMD} -e \ - 's,CPCONFIG "/etc/cups/cups-pdf.conf",CPCONFIG "${PREFIX}/etc/cups/cups-pdf.conf",' \ - ${WRKSRC}/src/cups-pdf.h + 's,CPCONFIG "/etc/cups/cups-pdf.conf",CPCONFIG "${PREFIX}/etc/cups/cups-pdf.conf",' \ + ${WRKSRC}/src/cups-pdf.h do-build: - cd ${WRKSRC}/src; ${CC} ${CFLAGS} -o cups-pdf cups-pdf.c + cd ${WRKSRC}/src && ${CC} ${CFLAGS} ${LDFLAGS} -o cups-pdf cups-pdf.c do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cups/backend - ${INSTALL} ${WRKSRC}/src/cups-pdf ${STAGEDIR}${PREFIX}/libexec/cups/backend - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cups/backend/cups-pdf - ${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cups/backend + ${INSTALL_PROGRAM} ${WRKSRC}/src/cups-pdf ${STAGEDIR}${PREFIX}/libexec/cups/backend + @${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model ${INSTALL_DATA} ${WRKSRC}/extra/CUPS-PDF.ppd \ ${STAGEDIR}${PREFIX}/share/cups/model/CUPS-PDF.ppd - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/cups - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/cups ${INSTALL_DATA} ${WRKSRC}/extra/cups-pdf.conf \ ${STAGEDIR}${PREFIX}/etc/cups/cups-pdf.conf.sample + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .include Modified: head/print/cups-pdf/pkg-descr ============================================================================== --- head/print/cups-pdf/pkg-descr Mon Jul 15 08:56:40 2019 (r506646) +++ head/print/cups-pdf/pkg-descr Mon Jul 15 09:02:15 2019 (r506647) @@ -4,4 +4,4 @@ will be able to choose "CUPS-PDF (Virtual PDF Printer) printer in CUPS. Once you print to the new device all converted PDF files will be placed in the specified directory. -WWW: http://www.cups-pdf.de/ +WWW: https://www.cups-pdf.de/