Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Mar 2018 15:31:40 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465457 - in head/print/gutenprint: . files
Message-ID:  <201803241531.w2OFVeSW097126@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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 @@
 +      <height value="576"/>
 +      <unit value="english-extended"/>
 +    </paper>
-+    <paper name="6.25x9TopFoldCard">
++    <paper name="6_25x9TopFoldCard">
 +      <description translate="value" value="4.5x6.25 Top Fold Card (6.25x9)"/>
 +      <comment value="4.5in x 6.25in Top Fold Card (6.25x9 paper)"/>
 +      <width value="450"/>
 +      <height value="648"/>
 +      <unit value="english-extended"/>
 +    </paper>
-+    <paper name="5.5x8.5TopFoldCard">
++    <paper name="5_5x8_5TopFoldCard">
 +      <description translate="value" value="4.25x5.5 Top Fold Card (5.5x8.5)"/>
 +      <comment value="4.25in x 5.5in Top Fold Card (5.5x8.5 paper)"/>
 +      <width value="396"/>
@@ -40,14 +40,14 @@
 +      <height value="576"/>
 +      <unit value="english-extended"/>
 +    </paper>
-+    <paper name="8.5x11TopFoldCard">
++    <paper name="8_5x11TopFoldCard">
 +      <description translate="value" value="5.5x8.5 Top Fold Card (8.5x11)"/>
 +      <comment value="5.5in x 8.5in Top Fold Card (8.5x11 paper)"/>
 +      <width value="612"/>
 +      <height value="792"/>
 +      <unit value="english-extended"/>
 +    </paper>
-+    <paper name="5.25x10.5TopFoldCard">
++    <paper name="5_25x10_5TopFoldCard">
 +      <description translate="value" value="5.25x5.25 Top Fold Card (5.25x10.5)"/>
 +      <comment value="5.25in x 5.25in Top Fold Card (5.25x10.5 paper)"/>
 +      <width value="378"/>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803241531.w2OFVeSW097126>