Sun Apr 15 04:19:21 2012 UTC ()
Update to 0.7.6

KDE4 version.


(markd)
diff -r1.17 -r1.18 pkgsrc/graphics/koverartist/Makefile
diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/PLIST
diff -r1.3 -r1.4 pkgsrc/graphics/koverartist/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/patches/patch-ac
diff -r1.1 -r0 pkgsrc/graphics/koverartist/patches/patch-ad
diff -r0 -r1.1 pkgsrc/graphics/koverartist/patches/patch-po_koverartist_nl.po
cvs diff -r1.17 -r1.18 pkgsrc/graphics/koverartist/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/koverartist/Makefile 2012/03/03 00:13:16 1.17
+++ pkgsrc/graphics/koverartist/Makefile 2012/04/15 04:19:20 1.18
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.17 2012/03/03 00:13:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2012/04/15 04:19:20 markd Exp $
2 2
3DISTNAME= koverartist-0.5 3PKGNAME= koverartist-0.7.6
4PKGREVISION= 14 4DISTNAME= 38195-koverartist_0.7.6.orig
5CATEGORIES= graphics kde 5CATEGORIES= graphics kde
6MASTER_SITES= # empty 6MASTER_SITES= http://kde-apps.org/CONTENT/content-files/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://www.kde-apps.org/content/show.php?content=38195 10HOMEPAGE= http://www.kde-apps.org/content/show.php?content=38195
11COMMENT= CD/DVD case designer 11COMMENT= CD/DVD case designer
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_TOOLS+= gmake msgfmt perl 15BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
 16
 17USE_TOOLS+= msgfmt perl
16USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 
18GNU_CONFIGURE= yes 
19 19
20WRKSRC= ${WRKDIR}/koverartist 20WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
21 21
22.include "../../meta-pkgs/kde3/kde3.mk" 22.include "../../meta-pkgs/kde4/kde4.mk"
23.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 23.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
24.include "../../x11/kdelibs3/buildlink3.mk" 24.include "../../x11/kdelibs4/buildlink3.mk"
25 25
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/koverartist/PLIST 2009/06/14 17:59:19 1.2
+++ pkgsrc/graphics/koverartist/PLIST 2012/04/15 04:19:20 1.3
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:19 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/04/15 04:19:20 markd Exp $
2bin/koverartist 2bin/koverartist
3share/doc/kde/HTML/en/koverartist/common 3share/applications/kde4/koverartist.desktop
4share/doc/kde/HTML/en/koverartist/index.cache.bz2 
5share/doc/kde/HTML/en/koverartist/index.docbook 
6share/icons/hicolor/128x128/apps/koverartist.png 4share/icons/hicolor/128x128/apps/koverartist.png
7share/icons/hicolor/16x16/apps/koverartist.png 5share/icons/hicolor/16x16/apps/koverartist.png
8share/icons/hicolor/22x22/apps/koverartist.png 6share/icons/hicolor/22x22/apps/koverartist.png
9share/icons/hicolor/32x32/apps/koverartist.png 7share/icons/hicolor/32x32/apps/koverartist.png
10share/icons/hicolor/48x48/apps/koverartist.png 8share/icons/hicolor/48x48/apps/koverartist.png
11share/icons/hicolor/64x64/apps/koverartist.png 9share/icons/hicolor/64x64/apps/koverartist.png
12share/kde/applnk/Multimedia/koverartist.desktop 10share/icons/hicolor/72x72/apps/koverartist.png
13share/kde/apps/koverartist/cases/cd-multiple.koac 11share/kde/apps/koverartist/cases/cd-multiple.koac
14share/kde/apps/koverartist/cases/cd-slim-contents.koac 12share/kde/apps/koverartist/cases/cd-slim-contents.koac
15share/kde/apps/koverartist/cases/cd-slim-simple.koac 13share/kde/apps/koverartist/cases/cd-slim-simple.koac
16share/kde/apps/koverartist/cases/cd-standard.koac 14share/kde/apps/koverartist/cases/cd-standard.koac
17share/kde/apps/koverartist/cases/cd-wideslim-contents.koac 15share/kde/apps/koverartist/cases/cd-wideslim-contents.koac
18share/kde/apps/koverartist/cases/cd-wideslim-simple.koac 16share/kde/apps/koverartist/cases/cd-wideslim-simple.koac
19share/kde/apps/koverartist/cases/dvd-slim.koac 17share/kde/apps/koverartist/cases/dvd-slim.koac
20share/kde/apps/koverartist/cases/dvd-standard.koac 18share/kde/apps/koverartist/cases/dvd-standard.koac
21share/kde/apps/koverartist/koverartistui.rc 19share/locale/cs/LC_MESSAGES/koverartist.mo
22share/kde/mimelnk/application/x-koverartist.desktop 
23share/locale/de/LC_MESSAGES/koverartist.mo 20share/locale/de/LC_MESSAGES/koverartist.mo
24share/locale/es/LC_MESSAGES/koverartist.mo 21share/locale/es/LC_MESSAGES/koverartist.mo
25share/locale/fr/LC_MESSAGES/koverartist.mo 22share/locale/fr/LC_MESSAGES/koverartist.mo
26share/locale/it/LC_MESSAGES/koverartist.mo 23share/locale/it/LC_MESSAGES/koverartist.mo
 24share/locale/nl/LC_MESSAGES/koverartist.mo
27share/locale/pl/LC_MESSAGES/koverartist.mo 25share/locale/pl/LC_MESSAGES/koverartist.mo
28share/locale/pt/LC_MESSAGES/koverartist.mo 26share/locale/pt/LC_MESSAGES/koverartist.mo
29share/locale/ru/LC_MESSAGES/koverartist.mo 27share/locale/ru/LC_MESSAGES/koverartist.mo
 28share/mime/packages/mime-types/x-koac.xml
 29share/mime/packages/mime-types/x-koad.xml
 30share/mime/packages/mime-types/x-koap.xml
cvs diff -r1.3 -r1.4 pkgsrc/graphics/koverartist/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/koverartist/distinfo 2011/01/29 21:52:51 1.3
+++ pkgsrc/graphics/koverartist/distinfo 2012/04/15 04:19:20 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2011/01/29 21:52:51 markd Exp $ 1$NetBSD: distinfo,v 1.4 2012/04/15 04:19:20 markd Exp $
2 2
3SHA1 (koverartist-0.5.tar.bz2) = 2fff3824c7b72a769dd2960bdc38d4dd5ff9e263 3SHA1 (38195-koverartist_0.7.6.orig.tar.bz2) = 62692498f05d07b25914189f6f9f0ad226b707b6
4RMD160 (koverartist-0.5.tar.bz2) = 63ee6623b04dabdf8661e2f7eea162b1f15e9802 4RMD160 (38195-koverartist_0.7.6.orig.tar.bz2) = e3fcd0f50dbf93fd0d2ec8abc4405b7173d0a79b
5Size (koverartist-0.5.tar.bz2) = 748401 bytes 5Size (38195-koverartist_0.7.6.orig.tar.bz2) = 131626 bytes
6SHA1 (patch-aa) = 11873caa4b0bea8a58bc8f336b29550af1ff0058 6SHA1 (patch-aa) = 8b16c6732421138a9719018148ffcb77e6cce0dd
7SHA1 (patch-ab) = 96600feb023b1adaa6ad0001c8c657c25bb9a9c8 7SHA1 (patch-ab) = 7d7f5685f06a4d897dc514519d1e263f67e2ba24
8SHA1 (patch-ac) = fafcbbe0a9373dc0782345bf47fb81c4c7afe23f 8SHA1 (patch-ac) = b3f5e3355e0da996f24594051864dc6f892ab55f
9SHA1 (patch-ad) = f21fa915130c7c2e0765f87456c824e483a4f2c4 9SHA1 (patch-po_koverartist_nl.po) = e274ace8c0d899120d2ebfac7fa5e94458abb642
cvs diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/koverartist/patches/patch-aa 2007/06/30 18:42:24 1.2
+++ pkgsrc/graphics/koverartist/patches/patch-aa 2012/04/15 04:19:20 1.3
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-aa,v 1.2 2007/06/30 18:42:24 joerg Exp $ 1$NetBSD: patch-aa,v 1.3 2012/04/15 04:19:20 markd Exp $
2 2
3--- src/cdinfo.cpp.orig 2006-04-28 07:18:54.000000000 +0000 3--- cdinfo.cpp.orig 2006-04-28 07:18:54.000000000 +0000
4+++ src/cdinfo.cpp 4+++ cdinfo.cpp
5@@ -32,8 +32,9 @@ 5@@ -32,8 +32,9 @@
6 #include <sys/ioctl.h> 6 #include <sys/ioctl.h>
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9+#include <unistd.h> 9+#include <unistd.h>
10  10
11-#ifdef __FreeBSD__ 11-#ifdef __FreeBSD__
12+#if defined(HAVE_SYS_CDIO_H) 12+#if defined(CDIO_H)
13 # include <sys/cdio.h> 13 # include <sys/cdio.h>
14 # define CDROM_LEADOUT 0xAA 14 # define CDROM_LEADOUT 0xAA
15 #else 15 #else
16@@ -91,8 +92,10 @@ bool CdInfo::open() 16@@ -91,8 +92,10 @@ bool CdInfo::open()
17 mErrorCode = errno; 17 mErrorCode = errno;
18 if (mErrorCode==EACCES) 18 if (mErrorCode==EACCES)
19 mErrorText = i18n("You do not have permission to read from %1").arg(mDevice); 19 mErrorText = i18n("You do not have permission to read from %1").arg(mDevice);
20+#ifdef ENOMEDIUM 20+#ifdef ENOMEDIUM
21 else if (mErrorCode==ENOMEDIUM) 21 else if (mErrorCode==ENOMEDIUM)
22 mErrorText = i18n("Please insert a disc into %1 and try again").arg(mDevice); 22 mErrorText = i18n("Please insert a disc into %1 and try again").arg(mDevice);
23+#endif 23+#endif
24 else if (mErrorCode==EBUSY) 24 else if (mErrorCode==EBUSY)
25 mErrorText = i18n("%1 is busy").arg(mDevice); 25 mErrorText = i18n("%1 is busy").arg(mDevice);
@@ -28,43 +28,43 @@ $NetBSD: patch-aa,v 1.2 2007/06/30 18:42 @@ -28,43 +28,43 @@ $NetBSD: patch-aa,v 1.2 2007/06/30 18:42
28 return false; 28 return false;
29 } 29 }
30  30
31-#ifndef __FreeBSD__ 31-#ifndef __FreeBSD__
32+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)) 32+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
33 int st = ioctl(mFd, CDROM_DISC_STATUS); 33 int st = ioctl(mFd, CDROM_DISC_STATUS);
34 if (st!=CDS_AUDIO && st!=CDS_MIXED && st!=CDS_NO_INFO) 34 if (st!=CDS_AUDIO && st!=CDS_MIXED && st!=CDS_NO_INFO)
35 { 35 {
36@@ -194,7 +197,7 @@ int CdInfo::cddbSum(int n) 36@@ -194,7 +197,7 @@ int CdInfo::cddbSum(int n)
37  37
38 int CdInfo::readTocHeader() 38 int CdInfo::readTocHeader()
39 { 39 {
40-#ifdef __FreeBSD__ 40-#ifdef __FreeBSD__
41+#ifdef HAVE_SYS_CDIO_H 41+#ifdef CDIO_H
42 ioc_toc_header hdr; 42 ioc_toc_header hdr;
43 if (ioctl(mFd, CDIOREADTOCHEADER, &hdr)<0) return -1; 43 if (ioctl(mFd, CDIOREADTOCHEADER, &hdr)<0) return -1;
44 return hdr.ending_track; 44 return hdr.ending_track;
45@@ -212,14 +215,17 @@ bool CdInfo::readTocEntry(int aEntryTrac 45@@ -212,14 +215,17 @@ bool CdInfo::readTocEntry(int aEntryTrac
46 { 46 {
47 int frame = 0; 47 int frame = 0;
48  48
49-#ifdef __FreeBSD__ 49-#ifdef __FreeBSD__
50- ioc_read_toc_single_entry entry; 50- ioc_read_toc_single_entry entry;
51- entry.track = aEntryTrack; 51- entry.track = aEntryTrack;
52- entry.format = CD_MSF_FORMAT; 52- entry.format = CD_MSF_FORMAT;
53- if (ioctl(mFd, CDIOREADTOCENTRY, &entry)) return false; 53- if (ioctl(mFd, CDIOREADTOCENTRY, &entry)) return false;
54- aTrack.min = entry.entry.addr.msf.minute; 54- aTrack.min = entry.entry.addr.msf.minute;
55- aTrack.sec = entry.entry.addr.msf.second; 55- aTrack.sec = entry.entry.addr.msf.second;
56- frame = entry.entry.addr.msf.frame; 56- frame = entry.entry.addr.msf.frame;
57+#ifdef HAVE_SYS_CDIO_H 57+#ifdef CDIO_H
58+ struct cd_toc_entry toc_buffer; 58+ struct cd_toc_entry toc_buffer;
59+ ioc_read_toc_entry entry; 59+ ioc_read_toc_entry entry;
60+ entry.starting_track = aEntryTrack; 60+ entry.starting_track = aEntryTrack;
61+ entry.address_format = CD_MSF_FORMAT; 61+ entry.address_format = CD_MSF_FORMAT;
62+ entry.data = &toc_buffer; 62+ entry.data = &toc_buffer;
63+ entry.data_len = sizeof(toc_buffer); 63+ entry.data_len = sizeof(toc_buffer);
64+ if (ioctl(mFd, CDIOREADTOCENTRYS, &entry)) return false; 64+ if (ioctl(mFd, CDIOREADTOCENTRYS, &entry)) return false;
65+ aTrack.min = toc_buffer.addr.msf.minute; 65+ aTrack.min = toc_buffer.addr.msf.minute;
66+ aTrack.sec = toc_buffer.addr.msf.second; 66+ aTrack.sec = toc_buffer.addr.msf.second;
67+ frame = toc_buffer.addr.msf.frame; 67+ frame = toc_buffer.addr.msf.frame;
68  68
69 #else /* not __FreeBSD__*/ 69 #else /* not __FreeBSD__*/
70  70
cvs diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/koverartist/patches/patch-ab 2007/06/30 18:42:24 1.2
+++ pkgsrc/graphics/koverartist/patches/patch-ab 2012/04/15 04:19:20 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.2 2007/06/30 18:42:24 joerg Exp $ 1$NetBSD: patch-ab,v 1.3 2012/04/15 04:19:20 markd Exp $
2 2
3--- src/renderer.cpp.orig 2006-06-21 19:10:03.000000000 +1200 3--- renderer.cpp.orig 2011-06-05 14:23:26.000000000 +0000
4+++ src/renderer.cpp 4+++ renderer.cpp
5@@ -35,6 +35,9 @@ 5@@ -32,6 +32,9 @@
6  6 #include <math.h>
7 #include <iostream> 7 #include <iostream>
8  8
9+#if defined(__NetBSD__) || defined(__DragonFly__) 9+#if defined(__NetBSD__) || defined(__DragonFly__)
10+#define fmin(a,b) ((a)<(b)?(a):(b)) 10+#define fmin(a,b) ((a)<(b)?(a):(b))
11+#endif 11+#endif
12  12
13 namespace KoverArtist 13 namespace KoverArtist
14 { 14 {
cvs diff -r1.2 -r1.3 pkgsrc/graphics/koverartist/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/koverartist/patches/patch-ac 2007/06/30 18:42:24 1.2
+++ pkgsrc/graphics/koverartist/patches/patch-ac 2012/04/15 04:19:20 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.2 2007/06/30 18:42:24 joerg Exp $ 1$NetBSD: patch-ac,v 1.3 2012/04/15 04:19:20 markd Exp $
2 2
3--- src/rendererbase.cpp.orig 2006-04-28 00:52:30.000000000 +1200 3--- rendererbase.cpp.orig 2011-06-04 17:13:58.000000000 +0000
4+++ src/rendererbase.cpp 4+++ rendererbase.cpp
5@@ -35,6 +35,10 @@ 5@@ -32,6 +32,10 @@
6  6 #include <math.h>
7 #include <iostream> 7 #include <iostream>
8  8
9+#if defined(__NetBSD__) || defined(__DragonFly__) 9+#if defined(__NetBSD__) || defined(__DragonFly__)
10+#define fmin(a,b) ((a)<(b)?(a):(b)) 10+#define fmin(a,b) ((a)<(b)?(a):(b))
11+#define fmax(a,b) ((a)>(b)?(a):(b)) 11+#define fmax(a,b) ((a)>(b)?(a):(b))
12+#endif 12+#endif
13  13
14 namespace KoverArtist 14 namespace KoverArtist
15 { 15 {
File Deleted: pkgsrc/graphics/koverartist/patches/Attic/patch-ad
File Added: pkgsrc/graphics/koverartist/patches/patch-po_koverartist_nl.po
$NetBSD: patch-po_koverartist_nl.po,v 1.1 2012/04/15 04:19:20 markd Exp $

--- po/koverartist_nl.po.orig	2011-07-06 20:18:42.000000000 +0000
+++ po/koverartist_nl.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2006-07-26 15:29+0200\n"
 "PO-Revision-Date: 2008-07-04 12.30+0200\n"
 "Last-Translator: Roger Gabriels <covernl@pcfreesoft.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"