- print/gutenprint-cups build prompts unprivileged user [1]

- Upgrade related porrs to 5.2.8 [2]
- Convert to OptionsNG [2]
- Add GPL license information [2]
- pet portlint (minor re-arrancement of COMMENT/LICENSE to shut portlint up)

PR:		ports/169026 [1]
Submitted by:	dougb@ [1]
Submitted by:	Christoph Moench-Tegeder <cmt@burggraben.net> (maintainer) [2]

6 files changed, 28 insertions, 26 deletions

diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index f8863b3ebe19..9d6b1a839075 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME?=	gutenprint
-PORTVERSION=	5.2.7
-PORTREVISION=	1
+PORTVERSION=	5.2.8
 CATEGORIES=	print
 MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
 PKGNAMESUFFIX?=	-base
@@ -16,6 +15,8 @@ PKGNAMESUFFIX?=	-base
 MAINTAINER=	cmt@burggraben.net
 COMMENT=	GutenPrint Printer Driver
 
+LICENSE=	GPLv2
+
 CONFLICTS=	gimp-print-[0-9]*
 
 USE_BZIP2=	yes
@@ -41,7 +42,7 @@ MAN1+=		escputil.1
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
 LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp-app \
-		gutenprint.2:${PORTSDIR}/print/gutenprint-base
+		gutenprint.3:${PORTSDIR}/print/gutenprint-base
 CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
 BUILD_WRKSRC=	${WRKSRC}/src/gimp2
 INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
diff --git a/print/gutenprint-base/distinfo b/print/gutenprint-base/distinfo
index 9dcfef243805..78b3d9766b42 100644
--- a/print/gutenprint-base/distinfo
+++ b/print/gutenprint-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gutenprint-5.2.7.tar.bz2) = 114c899227e3ebb0753c1db503e6a5c1afaa4b1f1235fdfe02fb6bbd533beed1
-SIZE (gutenprint-5.2.7.tar.bz2) = 5498414
+SHA256 (gutenprint-5.2.8.tar.bz2) = 8cb9d2b4dda2d33b221f21c8e1453aead5e37966a194c5a473735d12cdc1c8e0
+SIZE (gutenprint-5.2.8.tar.bz2) = 5691472
diff --git a/print/gutenprint-base/files/patch-src_cups_Makefile.in b/print/gutenprint-base/files/patch-src_cups_Makefile.in
new file mode 100644
index 000000000000..202c9921de59
--- /dev/null
+++ b/print/gutenprint-base/files/patch-src_cups_Makefile.in
@@ -0,0 +1,15 @@
+--- src/cups/Makefile.in.orig	2012-06-17 19:30:42.000000000 +0200
++++ src/cups/Makefile.in	2012-06-17 19:29:16.000000000 +0200
+@@ -1242,10 +1242,10 @@
+ ppd-stamp-phony: $(PPD)
+ 
+ ppd-catalog-clean:
+-	-$(RM) -r catalog
++	-$(RM) -rf catalog
+ 
+ ppd-clean:
+-	-$(RM) -r ppd
++	-$(RM) -rf ppd
+ 
+ ppd-stamp-pre: ppd-catalog-clean ppd-clean
+ 
diff --git a/print/gutenprint-base/files/patch-src_cups_commandtocanon.c b/print/gutenprint-base/files/patch-src_cups_commandtocanon.c
deleted file mode 100644
index a19eb11a5f70..000000000000
--- a/print/gutenprint-base/files/patch-src_cups_commandtocanon.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cups/commandtocanon.c.orig	2011-10-15 13:27:57.000000000 +0200
-+++ src/cups/commandtocanon.c	2011-10-15 13:28:22.000000000 +0200
-@@ -13,6 +13,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- 
- 
diff --git a/print/gutenprint-base/files/patch-src_cups_commandtoepson.c b/print/gutenprint-base/files/patch-src_cups_commandtoepson.c
deleted file mode 100644
index c691f0f8bb75..000000000000
--- a/print/gutenprint-base/files/patch-src_cups_commandtoepson.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cups/commandtoepson.c.orig	2011-10-15 13:20:46.000000000 +0200
-+++ src/cups/commandtoepson.c	2011-10-15 13:20:57.000000000 +0200
-@@ -30,6 +30,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- 
diff --git a/print/gutenprint-base/pkg-plist b/print/gutenprint-base/pkg-plist
index b977ccdfae76..6b4328bf3de3 100644
--- a/print/gutenprint-base/pkg-plist
+++ b/print/gutenprint-base/pkg-plist
@@ -30,7 +30,7 @@ include/gutenprintui2/typebuiltins.h
 lib/libgutenprint.a
 lib/libgutenprint.la
 lib/libgutenprint.so
-lib/libgutenprint.so.2
+lib/libgutenprint.so.3
 lib/libgutenprintui2.a
 lib/libgutenprintui2.la
 lib/libgutenprintui2.so
@@ -162,6 +162,8 @@ libdata/pkgconfig/gutenprintui2.pc
 %%DATADIR%%/5.2/xml/escp2/model/model_113.xml
 %%DATADIR%%/5.2/xml/escp2/model/model_114.xml
 %%DATADIR%%/5.2/xml/escp2/model/model_115.xml
+%%DATADIR%%/5.2/xml/escp2/model/model_116.xml
+%%DATADIR%%/5.2/xml/escp2/model/model_117.xml
 %%DATADIR%%/5.2/xml/escp2/model/model_12.xml
 %%DATADIR%%/5.2/xml/escp2/model/model_13.xml
 %%DATADIR%%/5.2/xml/escp2/model/model_14.xml
@@ -260,6 +262,7 @@ libdata/pkgconfig/gutenprintui2.pc
 %%DATADIR%%/5.2/xml/escp2/model/model_99.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/p1_5.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/picturemate.xml
+%%DATADIR%%/5.2/xml/escp2/qualitypresets/prox900.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/standard.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/v2880.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/wf40.xml
@@ -310,6 +313,7 @@ share/locale/en_GB/LC_MESSAGES/gutenprint.mo
 share/locale/es/LC_MESSAGES/gutenprint.mo
 share/locale/fi/LC_MESSAGES/gutenprint.mo
 share/locale/fr/LC_MESSAGES/gutenprint.mo
+share/locale/gl/LC_MESSAGES/gutenprint.mo
 share/locale/hu/LC_MESSAGES/gutenprint.mo
 share/locale/it/LC_MESSAGES/gutenprint.mo
 share/locale/ja/LC_MESSAGES/gutenprint.mo
@@ -321,6 +325,8 @@ share/locale/ru/LC_MESSAGES/gutenprint.mo
 share/locale/sk/LC_MESSAGES/gutenprint.mo
 share/locale/sl/LC_MESSAGES/gutenprint.mo
 share/locale/sv/LC_MESSAGES/gutenprint.mo
+share/locale/uk/LC_MESSAGES/gutenprint.mo
+share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/doc/reference-html