-Update to final 5.0.0.

-Fix plist for cups.
-Do not create empty directories of gimp.
-Remove locale dir that aren't in mtree.

Approved by:	ahze

3 files changed, 48 insertions, 76 deletions

diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index 6b50001..82f3f0a 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -4,9 +4,10 @@
 #
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint/Makefile,v 1.3 2006/02/25 00:13:44 marcus Exp $
+#
 
 PORTNAME=	gutenprint
-DISTVERSION=	5.0.0-rc3
+PORTVERSION=	5.0.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gimp-print
@@ -66,4 +67,8 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_IJS=yes 	build without IJS-based Ghostscript driver"
 	@${ECHO_MSG}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$libdir/gimp/1.2/plug-ins||g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/print/gutenprint/distinfo b/print/gutenprint/distinfo
index 0188cf4..2b584de 100644
--- a/print/gutenprint/distinfo
+++ b/print/gutenprint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gutenprint-5.0.0-rc3.tar.bz2) = e364c3752f21ee74344c290b92cb0564
-SHA256 (gutenprint-5.0.0-rc3.tar.bz2) = 3ef4ca66c58f1f3043efd9781f6930aec157847225a706bb46f3501a1f681f39
-SIZE (gutenprint-5.0.0-rc3.tar.bz2) = 4337134
+MD5 (gutenprint-5.0.0.tar.bz2) = ede8acbd1e94c9d4fd366fb37e335bfb
+SHA256 (gutenprint-5.0.0.tar.bz2) = 78a5326341f95a584e4d98b7dad7a56fb763211ecfc07f603af6336fa94d07a3
+SIZE (gutenprint-5.0.0.tar.bz2) = 4612717
diff --git a/print/gutenprint/pkg-plist b/print/gutenprint/pkg-plist
index 8b35ca3..bc646ec 100644
--- a/print/gutenprint/pkg-plist
+++ b/print/gutenprint/pkg-plist
@@ -12715,63 +12715,15 @@ libdata/pkgconfig/gutenprintui2.pc
 %%CUPS%%share/cups/model/gutenprint/5.0/zh_TW/stp-xerox-dp_p12.5.0.ppd.gz
 %%CUPS%%share/cups/model/gutenprint/5.0/zh_TW/stp-xerox-dp_p1202.5.0.ppd.gz
 %%CUPS%%share/cups/model/gutenprint/5.0/zh_TW/stp-xerox-dp_p8e.5.0.ppd.gz
-%%DATADIR%%/5.0.0-rc3/xml/dither-matrix-1x1.xml
-%%DATADIR%%/5.0.0-rc3/xml/dither-matrix-2x1.xml
-%%DATADIR%%/5.0.0-rc3/xml/dither-matrix-4x1.xml
-%%DATADIR%%/5.0.0-rc3/xml/papers.xml
-%%DATADIR%%/5.0.0-rc3/xml/printers.xml
+%%DATADIR%%/5.0.0/xml/dither-matrix-1x1.xml
+%%DATADIR%%/5.0.0/xml/dither-matrix-2x1.xml
+%%DATADIR%%/5.0.0/xml/dither-matrix-4x1.xml
+%%DATADIR%%/5.0.0/xml/papers.xml
+%%DATADIR%%/5.0.0/xml/printers.xml
+%%DATADIR%%/doc/FAQ.html
+%%DATADIR%%/doc/gutenprint-users-manual.odt
+%%DATADIR%%/doc/gutenprint-users-manual.pdf
 %%DATADIR%%/doc/gutenprint.pdf
-%%DATADIR%%/doc/html/book1.html
-%%DATADIR%%/doc/html/c29.html
-%%DATADIR%%/doc/html/c443.html
-%%DATADIR%%/doc/html/c568.html
-%%DATADIR%%/doc/html/ch-gimp-and-gimp-print.html
-%%DATADIR%%/doc/html/docbook.css
-%%DATADIR%%/doc/html/figures/cups_admin.png
-%%DATADIR%%/doc/html/figures/cups_admin_device.png
-%%DATADIR%%/doc/html/figures/cups_admin_make.png
-%%DATADIR%%/doc/html/figures/cups_admin_model.png
-%%DATADIR%%/doc/html/figures/cups_admin_success.png
-%%DATADIR%%/doc/html/figures/cups_config_printer.png
-%%DATADIR%%/doc/html/figures/cups_my_printer.png
-%%DATADIR%%/doc/html/figures/cups_printers.png
-%%DATADIR%%/doc/html/figures/cups_startup.png
-%%DATADIR%%/doc/html/figures/gimp-print-gui-1.png
-%%DATADIR%%/doc/html/figures/gimp-print-gui.png
-%%DATADIR%%/doc/html/figures/gimp-print-new-printer.png
-%%DATADIR%%/doc/html/figures/gimp-print-print-color-adjust.png
-%%DATADIR%%/doc/html/figures/gimp-print-setup.png
-%%DATADIR%%/doc/html/figures/gimp_image.png
-%%DATADIR%%/doc/html/figures/gimp_startup.png
-%%DATADIR%%/doc/html/gfdl.html
-%%DATADIR%%/doc/html/ln12.html
-%%DATADIR%%/doc/html/stylesheet-images/caution.gif
-%%DATADIR%%/doc/html/stylesheet-images/home.gif
-%%DATADIR%%/doc/html/stylesheet-images/important.gif
-%%DATADIR%%/doc/html/stylesheet-images/next.gif
-%%DATADIR%%/doc/html/stylesheet-images/note.gif
-%%DATADIR%%/doc/html/stylesheet-images/prev.gif
-%%DATADIR%%/doc/html/stylesheet-images/tip.gif
-%%DATADIR%%/doc/html/stylesheet-images/toc-blank.gif
-%%DATADIR%%/doc/html/stylesheet-images/toc-minus.gif
-%%DATADIR%%/doc/html/stylesheet-images/toc-plus.gif
-%%DATADIR%%/doc/html/stylesheet-images/up.gif
-%%DATADIR%%/doc/html/stylesheet-images/warning.gif
-%%DATADIR%%/doc/html/x452.html
-%%DATADIR%%/doc/html/x544.html
-%%DATADIR%%/doc/html/x559.html
-%%DATADIR%%/doc/html/x640.html
-%%DATADIR%%/doc/html/x650.html
-%%DATADIR%%/doc/html/x654.html
-%%DATADIR%%/doc/html/x660.html
-%%DATADIR%%/doc/html/x696.html
-%%DATADIR%%/doc/html/x701.html
-%%DATADIR%%/doc/html/x705.html
-%%DATADIR%%/doc/html/x709.html
-%%DATADIR%%/doc/html/x712.html
-%%DATADIR%%/doc/html/x715.html
-%%DATADIR%%/doc/html/x720.html
-%%DATADIR%%/doc/html/x85.html
 %%DATADIR%%/doc/reference-html/book1.html
 %%DATADIR%%/doc/reference-html/c1717.html
 %%DATADIR%%/doc/reference-html/c194.html
@@ -12791,7 +12743,6 @@ libdata/pkgconfig/gutenprintui2.pc
 %%DATADIR%%/doc/reference-html/x67.html
 %%DATADIR%%/doc/reference-html/x79.html
 %%DATADIR%%/doc/reference-html/x955.html
-%%DATADIR%%/doc/users-guide.pdf
 %%DATADIR%%/samples/colorbars4.png
 %%DATADIR%%/samples/colorsweep.png
 %%DATADIR%%/samples/extended.sample
@@ -12813,30 +12764,46 @@ share/locale/pt/LC_MESSAGES/gutenprint.mo
 share/locale/sk/LC_MESSAGES/gutenprint.mo
 share/locale/sv/LC_MESSAGES/gutenprint.mo
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/doc/reference-html
-@dirrm %%DATADIR%%/doc/html/stylesheet-images
-@dirrm %%DATADIR%%/doc/html/figures
-@dirrm %%DATADIR%%/doc/html
 @dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/5.0.0-rc3/xml
-@dirrm %%DATADIR%%/5.0.0-rc3
-@dirrm share/gutenprint
-%%CUPS%%@dirrm %%CUPS%%share/cups/model/gutenprint/5.0/zh_TW
-%%CUPS%%@dirrm %%CUPS%%share/cups/model/gutenprint/5.0/sv
-%%CUPS%%@dirrm %%CUPS%%share/cups/model/gutenprint/5.0/sk
-%%CUPS%%@dirrm %%CUPS%%share/cups/model/gutenprint/5.0/pt
+@dirrm %%DATADIR%%/5.0.0/xml
+@dirrm %%DATADIR%%/5.0.0
+@dirrm %%DATADIR%%
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/zh_TW
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/sv
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/sk
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/pt
 %%CUPS%%@dirrm share/cups/model/gutenprint/5.0/pl
 %%CUPS%%@dirrm share/cups/model/gutenprint/5.0/nl
 %%CUPS%%@dirrm share/cups/model/gutenprint/5.0/nb
 %%CUPS%%@dirrm share/cups/model/gutenprint/5.0/ja
 %%CUPS%%@dirrm share/cups/model/gutenprint/5.0/hu
-@dirrm lib/gutenprint/5.0.0-rc3/modules
-@dirrm lib/gutenprint/5.0.0-rc3
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/fr
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/es
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/en_GB
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/el
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/de
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/da
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/cs
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0/C
+%%CUPS%%@dirrm share/cups/model/gutenprint/5.0
+%%CUPS%%@dirrm share/cups/model/gutenprint
+@dirrm lib/gutenprint/5.0.0/modules
+@dirrm lib/gutenprint/5.0.0
 @dirrm lib/gutenprint
-@dirrmtry lib/gimp/1.2/plug-ins
-@dirrmtry lib/gimp/1.2
-@dirrmtry lib/gimp
 @dirrm include/gutenprintui2
 @dirrm include/gutenprintui
 @dirrm include/gutenprint