From owner-svn-ports-all@freebsd.org Wed Feb 26 20:37:27 2020 Return-Path: Delivered-To: svn-ports-all@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 B66B8244116; Wed, 26 Feb 2020 20:37:27 +0000 (UTC) (envelope-from 0mp@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 48SSKL49n2z4Fk8; Wed, 26 Feb 2020 20:37:26 +0000 (UTC) (envelope-from 0mp@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 7CE27560C; Wed, 26 Feb 2020 20:37:26 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01QKbQn7001427; Wed, 26 Feb 2020 20:37:26 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01QKbPnc001425; Wed, 26 Feb 2020 20:37:25 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202002262037.01QKbPnc001425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 26 Feb 2020 20:37:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527186 - head/print/cups-pdf X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/print/cups-pdf X-SVN-Commit-Revision: 527186 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2020 20:37:27 -0000 Author: 0mp Date: Wed Feb 26 20:37:25 2020 New Revision: 527186 URL: https://svnweb.freebsd.org/changeset/ports/527186 Log: print/cups-pdf: Update to 3.0.1 Changelog: https://www.cups-pdf.de/changelog.shtml - Sort variables & improve style. - Prefix some local variables with an underscore. - Change the way PDF versions are handled (although the whole mechanism of changing a configuration file via custom port variables should probably be deprecated). Modified: head/print/cups-pdf/Makefile head/print/cups-pdf/distinfo head/print/cups-pdf/pkg-plist Modified: head/print/cups-pdf/Makefile ============================================================================== --- head/print/cups-pdf/Makefile Wed Feb 26 19:54:17 2020 (r527185) +++ head/print/cups-pdf/Makefile Wed Feb 26 20:37:25 2020 (r527186) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cups-pdf -PORTVERSION= 2.6.1 -PORTREVISION= 4 +DISTVERSION= 3.0.1 CATEGORIES= print MASTER_SITES= http://www.cups-pdf.de/src/ \ http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/ @@ -15,42 +14,43 @@ COMMENT= Virtual printer for CUPS to produce PDF files LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libcups.so:print/cups RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:print/cups -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= ghostscript:run localbase -USES= ghostscript:run +LIBS+= -lcups +ETCDIR= ${PREFIX}/etc/cups + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + OPTIONS_DEFINE= DOCS -SUBST_CMD= -e "s,\#GhostScript /usr/bin/gs,GhostScript ${LOCALBASE}/bin/gs," \ +_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,' +_PDF_VERSIONS= 1.2 1.3 1.4 1.5 + .include .ifdef(PDF_VERSION) -.if ${PDF_VERSION} == 1.2 -.elif ${PDF_VERSION} == 1.3 -.elif ${PDF_VERSION} == 1.4 -.elif ${PDF_VERSION} == 1.5 -.else +.if "${_PDF_VERSIONS:M${PDF_VERSION}}" == "" BROKEN= Unsupported PDF-Version selected: ${PDF_VERSION} .endif -SUBST_CMD+= -e "s,\#PDFVer 1.4,PDFVer ${PDF_VERSION}," +_SUBST_CMD+= -e "s,\#PDFVer 1.4,PDFVer ${PDF_VERSION}," .endif .ifdef(HOME_SUBDIR) -SUBST_CMD+= -e 's,\#Out /var/spool/cups-pdf/$${USER},Out $${HOME}/${HOME_SUBDIR},' -.else -.ifdef(OUTPUT_DIRECTORY) -SUBST_CMD+= -e 's,\#Out /var/spool/cups-pdf/$${USER},Out ${OUTPUT_DIRECTORY},' +_SUBST_CMD+= -e 's,\#Out /var/spool/cups-pdf/$${USER},Out $${HOME}/${HOME_SUBDIR},' +.elifdef(OUTPUT_DIRECTORY) +_SUBST_CMD+= -e 's,\#Out /var/spool/cups-pdf/$${USER},Out ${OUTPUT_DIRECTORY},' .endif -.endif .ifdef(LOG_DIRECTORY) -SUBST_CMD+= -e "s,\#Log /var/log/cups,Log ${LOG_DIRECTORY}," +_SUBST_CMD+= -e "s,\#Log /var/log/cups,Log ${LOG_DIRECTORY}," .endif pre-everything:: @@ -61,7 +61,7 @@ pre-everything:: @${ECHO_MSG} "" .endif .if !defined(PDF_VERSION) - @${ECHO_MSG} "PDF_VERSION=1.2|1.3|1.4|1.5 PDF-version of PDF-files produced" + @${ECHO_MSG} "PDF_VERSION=${_PDF_VERSIONS:S/ /|/Wg} PDF-version of PDF-files produced" .endif .if !defined(HOME_SUBDIR) @${ECHO_MSG} "HOME_SUBDIR= Place produced PDF-files in the" @@ -76,25 +76,28 @@ pre-everything:: .endif post-configure: - @${REINPLACE_CMD} ${SUBST_CMD} ${WRKSRC}/extra/cups-pdf.conf + @${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",' \ + 's,CPCONFIG "/etc/cups/cups-pdf.conf",CPCONFIG "${ETCDIR}/cups-pdf.conf",' \ ${WRKSRC}/src/cups-pdf.h do-build: - cd ${WRKSRC}/src && ${CC} ${CFLAGS} ${LDFLAGS} -o cups-pdf cups-pdf.c + (cd ${WRKSRC}/src && \ + ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -o cups-pdf cups-pdf.c) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cups/backend - ${INSTALL_PROGRAM} ${WRKSRC}/src/cups-pdf ${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 + ${INSTALL_DATA} ${WRKSRC}/extra/CUPS-PDF_opt.ppd \ + ${WRKSRC}/extra/CUPS-PDF_noopt.ppd \ + ${STAGEDIR}${PREFIX}/share/cups/model/ + @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/extra/cups-pdf.conf \ - ${STAGEDIR}${PREFIX}/etc/cups/cups-pdf.conf.sample + ${STAGEDIR}${ETCDIR}/cups-pdf.conf.sample -do-install-DOCS-on: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ Modified: head/print/cups-pdf/distinfo ============================================================================== --- head/print/cups-pdf/distinfo Wed Feb 26 19:54:17 2020 (r527185) +++ head/print/cups-pdf/distinfo Wed Feb 26 20:37:25 2020 (r527186) @@ -1,2 +1,3 @@ -SHA256 (cups-pdf_2.6.1.tar.gz) = 04e17eb563dceea048e1a435edcbcf52faa5288f85e8390cd64d702edb6745f1 -SIZE (cups-pdf_2.6.1.tar.gz) = 33315 +TIMESTAMP = 1582725313 +SHA256 (cups-pdf_3.0.1.tar.gz) = 738669edff7f1469fe5e411202d87f93ba25b45f332a623fb607d49c59aa9531 +SIZE (cups-pdf_3.0.1.tar.gz) = 29754 Modified: head/print/cups-pdf/pkg-plist ============================================================================== --- head/print/cups-pdf/pkg-plist Wed Feb 26 19:54:17 2020 (r527185) +++ head/print/cups-pdf/pkg-plist Wed Feb 26 20:37:25 2020 (r527186) @@ -1,6 +1,7 @@ +@sample %%ETCDIR%%/cups-pdf.conf.sample @mode 0700 libexec/cups/backend/cups-pdf @mode -share/cups/model/CUPS-PDF.ppd -@sample etc/cups/cups-pdf.conf.sample +share/cups/model/CUPS-PDF_opt.ppd +share/cups/model/CUPS-PDF_noopt.ppd %%PORTDOCS%%%%DOCSDIR%%/README