From df90b071b515596cee467692a6bc4ee6c2acf88a Mon Sep 17 00:00:00 2001
From: Christoph Moench-Tegeder <cmt@FreeBSD.org>
Date: Sat, 24 Mar 2018 15:31:40 +0000
Subject: [PATCH] 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
---
 print/gutenprint/Makefile                       | 5 ++++-
 print/gutenprint/files/patch-src_xml_papers.xml | 8 ++++----
 print/gutenprint/pkg-plist                      | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index a208fec39e83..bc8ebc006e85 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -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}
 
@@ -53,5 +53,8 @@ post-install:
 	@(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>
diff --git a/print/gutenprint/files/patch-src_xml_papers.xml b/print/gutenprint/files/patch-src_xml_papers.xml
index c86f5b66d20f..977f6a5fa772 100644
--- a/print/gutenprint/files/patch-src_xml_papers.xml
+++ b/print/gutenprint/files/patch-src_xml_papers.xml
@@ -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"/>
diff --git a/print/gutenprint/pkg-plist b/print/gutenprint/pkg-plist
index 4be1db6ac04f..d168c4a8380b 100644
--- a/print/gutenprint/pkg-plist
+++ b/print/gutenprint/pkg-plist
@@ -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