From owner-svn-ports-head@freebsd.org Sat Mar 24 15:31:41 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FDFDF542DD; Sat, 24 Mar 2018 15:31:41 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 21A0E71AB2; Sat, 24 Mar 2018 15:31:41 +0000 (UTC) (envelope-from cmt@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 1C952110CA; Sat, 24 Mar 2018 15:31:41 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2OFVehm097129; Sat, 24 Mar 2018 15:31:40 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2OFVeSW097126; Sat, 24 Mar 2018 15:31:40 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201803241531.w2OFVeSW097126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Sat, 24 Mar 2018 15:31:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465457 - in head/print/gutenprint: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in head/print/gutenprint: . files X-SVN-Commit-Revision: 465457 X-SVN-Commit-Repository: ports 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.25 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: Sat, 24 Mar 2018 15:31:41 -0000 Author: cmt Date: Sat Mar 24 15:31:40 2018 New Revision: 465457 URL: https://svnweb.freebsd.org/changeset/ports/465457 Log: gutenprint: fixes around genppd * in papers.xml, rename "Greeting Card" paper format names to not contain decimal points ("."), as gutenprint's internal list handling rejects points in element names. I guess these paper formats never really worked, but I can't really test this for lack of a supported printer. * create symlink cups-genppd to cups.genppd.5.2 to match documentation. PR: 226863 226865 Reported by: freebsd dreamchaser org Modified: head/print/gutenprint/Makefile head/print/gutenprint/files/patch-src_xml_papers.xml head/print/gutenprint/pkg-plist Modified: head/print/gutenprint/Makefile ============================================================================== --- head/print/gutenprint/Makefile Sat Mar 24 15:28:59 2018 (r465456) +++ head/print/gutenprint/Makefile Sat Mar 24 15:31:40 2018 (r465457) @@ -4,7 +4,7 @@ PORTNAME= gutenprint PORTVERSION= 5.2.13 -PORTREVISION?= 1 # also print/gimp-gutenprint +PORTREVISION?= 2 # also print/gimp-gutenprint CATEGORIES= print MASTER_SITES= SF/gimp-print/gutenprint-5.2/${PORTVERSION} @@ -52,6 +52,9 @@ post-install: .if defined(GUT_SLAVE) && ${GUT_SLAVE} == "gimp" @(cd ${WRKSRC}/src/gutenprintui2 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) +.endif +.if !defined(GUT_SLAVE) + @${LN} -s cups-genppd.5.2 ${STAGEDIR}${LOCALBASE}/sbin/cups-genppd .endif .include Modified: head/print/gutenprint/files/patch-src_xml_papers.xml ============================================================================== --- head/print/gutenprint/files/patch-src_xml_papers.xml Sat Mar 24 15:28:59 2018 (r465456) +++ head/print/gutenprint/files/patch-src_xml_papers.xml Sat Mar 24 15:31:40 2018 (r465457) @@ -19,14 +19,14 @@ + + + -+ ++ + + + + + + -+ ++ + + + @@ -40,14 +40,14 @@ + + + -+ ++ + + + + + + -+ ++ + + + Modified: head/print/gutenprint/pkg-plist ============================================================================== --- head/print/gutenprint/pkg-plist Sat Mar 24 15:28:59 2018 (r465456) +++ head/print/gutenprint/pkg-plist Sat Mar 24 15:31:40 2018 (r465457) @@ -47,6 +47,7 @@ man/man1/escputil.1.gz man/man8/cups-calibrate.8.gz man/man8/cups-genppd.8.gz man/man8/cups-genppdupdate.8.gz +sbin/cups-genppd sbin/cups-genppd.5.2 sbin/cups-genppdupdate share/cups/calibrate.ppm