- Update to version 1.6.0

PR:		60566
Submitted by:	Ports Fury

4 files changed, 20 insertions, 10 deletions

diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 4d2be4621248..6e10efe1c600 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kbarcode
-PORTVERSION=	1.4.1
+PORTVERSION=	1.6.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/kbarcode/distinfo b/graphics/kbarcode/distinfo
index c7d7591e0797..59ab1171a24e 100644
--- a/graphics/kbarcode/distinfo
+++ b/graphics/kbarcode/distinfo
@@ -1 +1 @@
-MD5 (kbarcode-1.4.1.tar.gz) = 3eeec91b2e1bd0fb26adec85c638dada
+MD5 (kbarcode-1.6.0.tar.gz) = 4897343b563f5daf00169d8e051f1b31
diff --git a/graphics/kbarcode/files/patch-kbarcode::zplutils.cpp b/graphics/kbarcode/files/patch-kbarcode::zplutils.cpp
new file mode 100644
index 000000000000..4a2d682cfd40
--- /dev/null
+++ b/graphics/kbarcode/files/patch-kbarcode::zplutils.cpp
@@ -0,0 +1,11 @@
+--- kbarcode/zplutils.cpp.orig	Wed Nov  5 20:26:46 2003
++++ kbarcode/zplutils.cpp	Fri Dec 26 10:22:53 2003
+@@ -307,7 +307,7 @@
+     setField( "<ESC>E3<CAN>" );  // choose format number 3
+ 
+     for( unsigned int i = 0; i < values.count(); i++ )
+-        setField( values[i] + ( i != values.count() - 1 ? "<CR>" : QString::null ) );
++        setField( values[i] + ( i != values.count() - 1 ? QString("<CR>") : QString::null ) );
+     
+     // end actual data
+     setField( "<ETB>" );
diff --git a/graphics/kbarcode/pkg-plist b/graphics/kbarcode/pkg-plist
index 2d9a4999cf58..758387c9877b 100644
--- a/graphics/kbarcode/pkg-plist
+++ b/graphics/kbarcode/pkg-plist
@@ -1,6 +1,7 @@
 bin/kbarcode
 share/applnk/Applications/KBarcode/kbarcode-batch.desktop
 share/applnk/Applications/KBarcode/kbarcode-editor.desktop
+share/applnk/Applications/KBarcode/kbarcode-label.desktop
 share/applnk/Applications/KBarcode/kbarcode-single.desktop
 share/applnk/Applications/KBarcode/kbarcode.desktop
 share/apps/kbarcode/barcodes.html
@@ -8,13 +9,13 @@ share/apps/kbarcode/exampledata.sql
 share/apps/kbarcode/labeldefinitions.sql
 share/apps/kbarcode/logo.png
 share/icons/hicolor/16x16/actions/barcode.png
-share/icons/hicolor/16x16/actions/kbarcode-ellipse.png
-share/icons/hicolor/16x16/actions/kbarcode-grid.png
-share/icons/hicolor/16x16/actions/kbarcode-linetool.png
+share/icons/hicolor/16x16/actions/kbarcodeellipse.png
+share/icons/hicolor/16x16/actions/kbarcodegrid.png
+share/icons/hicolor/16x16/actions/kbarcodelinetool.png
 share/icons/hicolor/16x16/apps/kbarcode.png
-share/icons/hicolor/24x24/actions/barcode.png
+share/icons/hicolor/22x22/actions/barcode.png
 share/icons/hicolor/32x32/actions/barcode.png
-share/icons/hicolor/32x32/actions/kbarcode-rect.png
+share/icons/hicolor/32x32/actions/kbarcoderect.png
 share/icons/hicolor/32x32/apps/kbarcode.png
 share/icons/hicolor/64x64/apps/kbarcode.png
 share/locale/de/LC_MESSAGES/kbarcode.mo
@@ -24,12 +25,10 @@ share/locale/fr/LC_MESSAGES/kbarcode.mo
 share/locale/hu/LC_MESSAGES/kbarcode.mo
 share/locale/it/LC_MESSAGES/kbarcode.mo
 share/locale/sv/LC_MESSAGES/kbarcode.mo
-share/mimelnk/application/kbarcode-label.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/24x24/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true