- Update to 6

PR:		175586
Submitted by:	Ports Fury

4 files changed, 74 insertions, 10 deletions

diff --git a/print/kover/Makefile b/print/kover/Makefile
index 6d8532f6e802..a064f4d869c0 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	kover
-# Date created:			Mon Dec 29 05:07:17 CET 2003
-# Whom:				Markus Brueffer <brueffer@phoenix-systems.de>
-#
+# Created by: Markus Brueffer <brueffer@phoenix-systems.de>
 # $FreeBSD$
 
 PORTNAME=	kover
-PORTVERSION=	4
-PORTREVISION=	1
+PORTVERSION=	6
 CATEGORIES=	print kde
 MASTER_SITES=	http://lisas.de/kover/
 
@@ -15,17 +11,25 @@ COMMENT=	WYSIWYG CD cover printer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	cddb.4:${PORTSDIR}/audio/libcddb \
-		cdio.13:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS=	cddb:${PORTSDIR}/audio/libcddb \
+		cdio:${PORTSDIR}/sysutils/libcdio
 
 USE_BZIP2=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
 USE_QT4=	corelib dbus gui network svg xml \
 		qmake_build uic_build rcc_build
 USE_PERL5_BUILD=yes
+USE_GETTEXT=	yes
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		kover.1
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/libcdio/s|>=.*)|)|' ${WRKSRC}/src/CMakeLists.txt
+
+post-install:
+	-update-mime-database ${PREFIX}/share/mime
+
 .include <bsd.port.mk>
diff --git a/print/kover/distinfo b/print/kover/distinfo
index d0329a8dc791..6c8f6bc7bc8d 100644
--- a/print/kover/distinfo
+++ b/print/kover/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kover-4.tar.bz2) = dd73d80eca21a23cc4206b9cbe3bf19071bf02e3dbbb0b808b719e84309c5a6f
-SIZE (kover-4.tar.bz2) = 87141
+SHA256 (kover-6.tar.bz2) = 87494299d5dd7a51bbf3a1739f372da680744f14271c43d8495eca15f1f2480a
+SIZE (kover-6.tar.bz2) = 87898
diff --git a/print/kover/files/patch-cddb_fill.cc b/print/kover/files/patch-cddb_fill.cc
new file mode 100644
index 000000000000..fd27415ae693
--- /dev/null
+++ b/print/kover/files/patch-cddb_fill.cc
@@ -0,0 +1,52 @@
+--- src/cddb_fill.cc.orig
++++ src/cddb_fill.cc
+@@ -30,6 +30,9 @@
+ #include <string>
+ #include <algorithm>
+ #include <cdio/cdio.h>
++#if LIBCDIO_VERSION_NUM < 90
++#include <cdio/cdda.h>
++#endif
+ #include <cdio/cdtext.h>
+ 
+ using namespace std;
+@@ -93,17 +96,39 @@
+ 	kprintf("device %p\n", cdio);
+ 
+ 	/* get disc artist and title */
++#if LIBCDIO_VERSION_NUM < 90
++	cdtext_t *cdtext = cdio_get_cdtext(cdio, 0);
++#else
+ 	cdtext_t *cdtext = cdio_get_cdtext(cdio);
++#endif
+ 	if (cdtext) {
++#if LIBCDIO_VERSION_NUM < 90
++		if (cdtext->field[CDTEXT_PERFORMER])
++			cd_info.artist = cdtext->field[CDTEXT_PERFORMER];
++		if (cdtext->field[CDTEXT_TITLE])
++			cd_info.cdname = cdtext->field[CDTEXT_TITLE];
++		if (cdtext->field[CDTEXT_DISCID])
++			cd_info.cddb_id =
++				strtoul(cdtext->field[CDTEXT_DISCID], NULL, 16);
++#else
+ 		cd_info.artist = cdtext_get(cdtext, CDTEXT_FIELD_PERFORMER, 0);
+ 		cd_info.cdname = cdtext_get(cdtext, CDTEXT_FIELD_TITLE, 0);
+ 		cd_info.cddb_id = strtoul(cdtext_get(cdtext, CDTEXT_FIELD_DISCID, 0), NULL, 16);
++#endif
+ 	}
+ 
+ 	for (int i = 1; i <= cd_info.ntracks; i++) {
++#if LIBCDIO_VERSION_NUM < 90
++		cdtext_t *cdtext = cdio_get_cdtext(cdio, i);
++#endif
+ 		trackinfo *blub = new trackinfo();
+ 		blub->track = i;
++#if LIBCDIO_VERSION_NUM < 90
++		if (cdtext->field[CDTEXT_TITLE])
++			blub->name = cdtext->field[CDTEXT_TITLE];
++#else
+ 		blub->name = cdtext_get(cdtext, CDTEXT_FIELD_TITLE, i);
++#endif
+ 		cd_info.tracks.push_back(blub);
+ 
+ 	}
diff --git a/print/kover/pkg-plist b/print/kover/pkg-plist
index f7b213703a51..b48d51fabc2d 100644
--- a/print/kover/pkg-plist
+++ b/print/kover/pkg-plist
@@ -13,6 +13,12 @@ share/icons/kover_front_title_only.png
 share/icons/kover_one_page.png
 share/icons/locolor/16x16/apps/kover.png
 share/icons/locolor/32x32/apps/kover.png
+share/locale/de/LC_MESSAGES/kover.mo
+share/locale/es/LC_MESSAGES/kover.mo
+share/locale/fr/LC_MESSAGES/kover.mo
+share/locale/it/LC_MESSAGES/kover.mo
+share/locale/nb/LC_MESSAGES/kover.mo
+share/locale/pl/LC_MESSAGES/kover.mo
 share/mime/packages/kover.xml
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
@@ -20,3 +26,5 @@ share/mime/packages/kover.xml
 @dirrmtry share/icons/locolor/16x16
 @dirrmtry share/icons/locolor
 @dirrm share/apps/kover
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime