From owner-svn-ports-all@FreeBSD.ORG Fri Feb 8 02:00:00 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9199880E; Fri, 8 Feb 2013 02:00:00 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 75749DA3; Fri, 8 Feb 2013 02:00:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r18200W2093040; Fri, 8 Feb 2013 02:00:00 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r181xxZd092977; Fri, 8 Feb 2013 01:59:59 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201302080159.r181xxZd092977@svn.freebsd.org> From: Martin Wilke Date: Fri, 8 Feb 2013 01:59:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311900 - in head/print/kover: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2013 02:00:00 -0000 Author: miwi Date: Fri Feb 8 01:59:59 2013 New Revision: 311900 URL: http://svnweb.freebsd.org/changeset/ports/311900 Log: - Update to 6 PR: 175586 Submitted by: Ports Fury Added: head/print/kover/files/patch-cddb_fill.cc (contents, props changed) Modified: head/print/kover/Makefile (contents, props changed) head/print/kover/distinfo (contents, props changed) head/print/kover/pkg-plist (contents, props changed) Modified: head/print/kover/Makefile ============================================================================== --- head/print/kover/Makefile Fri Feb 8 01:58:49 2013 (r311899) +++ head/print/kover/Makefile Fri Feb 8 01:59:59 2013 (r311900) @@ -1,12 +1,8 @@ -# New ports collection makefile for: kover -# Date created: Mon Dec 29 05:07:17 CET 2003 -# Whom: Markus Brueffer -# +# Created by: Markus Brueffer # $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 Modified: head/print/kover/distinfo ============================================================================== --- head/print/kover/distinfo Fri Feb 8 01:58:49 2013 (r311899) +++ head/print/kover/distinfo Fri Feb 8 01:59:59 2013 (r311900) @@ -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 Added: head/print/kover/files/patch-cddb_fill.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/kover/files/patch-cddb_fill.cc Fri Feb 8 01:59:59 2013 (r311900) @@ -0,0 +1,52 @@ +--- src/cddb_fill.cc.orig ++++ src/cddb_fill.cc +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if LIBCDIO_VERSION_NUM < 90 ++#include ++#endif + #include + + 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); + + } Modified: head/print/kover/pkg-plist ============================================================================== --- head/print/kover/pkg-plist Fri Feb 8 01:58:49 2013 (r311899) +++ head/print/kover/pkg-plist Fri Feb 8 01:59:59 2013 (r311900) @@ -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