From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 31 12:40:07 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90A791065673 for ; Mon, 31 Jan 2011 12:40:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4A3C88FC17 for ; Mon, 31 Jan 2011 12:40:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0VCe71U093806 for ; Mon, 31 Jan 2011 12:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0VCe7p4093805; Mon, 31 Jan 2011 12:40:07 GMT (envelope-from gnats) Resent-Date: Mon, 31 Jan 2011 12:40:07 GMT Resent-Message-Id: <201101311240.p0VCe7p4093805@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3103106564A for ; Mon, 31 Jan 2011 12:38:08 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id 7D81B8FC08 for ; Mon, 31 Jan 2011 12:38:08 +0000 (UTC) Received: by qwj9 with SMTP id 9so5271785qwj.13 for ; Mon, 31 Jan 2011 04:38:07 -0800 (PST) Received: by 10.224.181.140 with SMTP id by12mr5802201qab.39.1296477486662; Mon, 31 Jan 2011 04:38:06 -0800 (PST) Received: from mocha.verizon.net (c-24-3-43-53.hsd1.oh.comcast.net [24.3.43.53]) by mx.google.com with ESMTPS id g32sm14720718qck.34.2011.01.31.04.38.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 31 Jan 2011 04:38:05 -0800 (PST) Message-Id: <4d46ad2d.a04de50a.0315.3eec@mx.google.com> Date: Mon, 31 Jan 2011 04:38:05 -0800 (PST) From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/154416: [MAINTAINER] audio/audex: Update to 0.74.b1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jan 2011 12:40:07 -0000 >Number: 154416 >Category: ports >Synopsis: [MAINTAINER] audio/audex: Update to 0.74.b1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jan 31 12:40:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 8.1-RELEASE-p1 i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0: Wed Oct 6 21:42:52 EDT 2010 root@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386 KDE 4.5.5 >Description: - Update audio/audex to version 0.74.b1 - Add LICENSE (the spelling "LICENCE" in the LICENSE_FILE line is correct, not a typo) - Make NLS optional - Add optional dependency on audio/py-eyed3 which allows Unicode ID3 tagging in mp3s - Update WWW >How-To-Repeat: Use attached diff. Removed patches: files/patch-utils__upload.h (applied upstream) Added patches: files/patch-CMakeLists.txt (makes NLS optional) >Fix: --- 2011-01-30-audex.diff begins here --- diff -ruN audex.orig/Makefile audex/Makefile --- audex.orig/Makefile 2011-01-30 08:48:24.000000000 -0500 +++ audex/Makefile 2011-01-31 06:35:31.000000000 -0500 @@ -6,12 +6,9 @@ # PORTNAME= audex -DISTVERSION= 0.72b1 -PORTREVISION= 5 +DISTVERSION= 0.74b1 CATEGORIES= audio kde -MASTER_SITES= ${MASTER_SITE_GENTOO} \ - http://kde.maniatek.de/${PORTNAME}/files/ -MASTER_SITE_SUBDIR= distfiles +MASTER_SITES= http://kde.maniatek.com/${PORTNAME}/files/ MAINTAINER= bsdkaffee@gmail.com COMMENT= Audio CD ripping utility for KDE4 @@ -19,23 +16,33 @@ LIB_DEPENDS= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \ kcddb.5:${PORTSDIR}/multimedia/kdemultimedia4 -USE_BZIP2= yes -USE_GETTEXT= yes +USE_XZ= yes USE_CMAKE= yes USE_KDE4= automoc4 kdeprefix kdelibs USE_QT_VER= 4 -QT_COMPONENTS= gui dbus network qt3support sql svg xml \ +QT_COMPONENTS= gui dbus network svg xml \ qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes -WRKSRC= ${WRKDIR}/${PORTNAME} +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENCE -OPTIONS= FAAC "Depend on audio/faac for m4a encoding" off \ +OPTIONS= NLS "Native language support" on \ + FAAC "Depend on audio/faac for m4a encoding" off \ FLAC "Depend on audio/flac for flac encoding" on \ LAME "Depend on audio/lame for mp3 encoding" off \ + EYED3 "Depend on audio/py-eyed3 for Unicode mp3 tags" off \ OGG "Depend on audio/vorbis-tools for ogg encoding" on -.include +.include + +.if defined(WITHOUT_NLS) +CMAKE_ARGS+= -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.endif .if defined(WITH_FAAC) RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac @@ -49,8 +56,12 @@ RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .endif +.if defined(WITH_EYED3) +RUN_DEPENDS+= eyeD3:${PORTSDIR}/audio/py-eyed3 +.endif + .if defined(WITH_OGG) RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .endif -.include +.include diff -ruN audex.orig/distinfo audex/distinfo --- audex.orig/distinfo 2011-01-30 08:48:24.000000000 -0500 +++ audex/distinfo 2011-01-30 08:52:56.000000000 -0500 @@ -1,3 +1,2 @@ -MD5 (audex-0.72b1.tar.bz2) = 1953587ebc8e08f5de1eb782ecf92788 -SHA256 (audex-0.72b1.tar.bz2) = 87a31cc95b7b1b587c6f091d8248b76128d249de7d758ae621c8376597ccd757 -SIZE (audex-0.72b1.tar.bz2) = 207987 +SHA256 (audex-0.74b1.tar.xz) = 47e39dbf0fcd600314aa975c5a57f3a2970c4eb9214a8ddccef828598d9c5da5 +SIZE (audex-0.74b1.tar.xz) = 269112 diff -ruN audex.orig/files/patch-CMakeLists.txt audex/files/patch-CMakeLists.txt --- audex.orig/files/patch-CMakeLists.txt 1969-12-31 19:00:00.000000000 -0500 +++ audex/files/patch-CMakeLists.txt 2011-01-31 06:30:45.000000000 -0500 @@ -0,0 +1,10 @@ +--- ./CMakeLists.txt.orig 2011-01-31 06:29:55.000000000 -0500 ++++ ./CMakeLists.txt 2011-01-31 06:30:15.000000000 -0500 +@@ -122,6 +122,6 @@ + + add_subdirectory(icons) + add_subdirectory(images) +-add_subdirectory(po) ++macro_optional_add_subdirectory(po) + + macro_display_feature_log() diff -ruN audex.orig/files/patch-utils__upload.h audex/files/patch-utils__upload.h --- audex.orig/files/patch-utils__upload.h 2011-01-30 08:48:24.000000000 -0500 +++ audex/files/patch-utils__upload.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,10 +0,0 @@ ---- ./utils/upload.h.orig 2010-06-10 17:32:46.000000000 -0400 -+++ ./utils/upload.h 2010-06-10 17:33:01.000000000 -0400 -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff -ruN audex.orig/pkg-descr audex/pkg-descr --- audex.orig/pkg-descr 2011-01-30 08:48:24.000000000 -0500 +++ audex/pkg-descr 2011-01-30 08:51:40.000000000 -0500 @@ -11,5 +11,5 @@ - Creates extraction and encoding protocols. - Transfer files with KDE KIO-Slaves. -WWW: http://kde.maniatek.de/audex/ +WWW: http://kde.maniatek.com/audex/ WWW: http://www.kde-apps.org/content/show.php?content=77125 diff -ruN audex.orig/pkg-plist audex/pkg-plist --- audex.orig/pkg-plist 2011-01-30 08:48:24.000000000 -0500 +++ audex/pkg-plist 2011-01-31 06:34:24.000000000 -0500 @@ -1,7 +1,6 @@ bin/audex share/applications/kde4/audex.desktop share/apps/audex/audexui.rc -share/apps/audex/images/amazon.png share/apps/audex/images/canada.png share/apps/audex/images/france.png share/apps/audex/images/germany.png @@ -21,11 +20,26 @@ share/icons/hicolor/32x32/apps/audex.png share/icons/hicolor/48x48/apps/audex.png share/icons/hicolor/64x64/apps/audex.png -share/locale/cs/LC_MESSAGES/audex.mo -share/locale/de/LC_MESSAGES/audex.mo -share/locale/it/LC_MESSAGES/audex.mo -share/locale/nl/LC_MESSAGES/audex.mo -share/locale/pt_BR/LC_MESSAGES/audex.mo -share/locale/ru/LC_MESSAGES/audex.mo +%%NLS%%share/locale/cs/LC_MESSAGES/audex.mo +%%NLS%%share/locale/da/LC_MESSAGES/audex.mo +%%NLS%%share/locale/de/LC_MESSAGES/audex.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/audex.mo +%%NLS%%share/locale/eo/LC_MESSAGES/audex.mo +%%NLS%%share/locale/es/LC_MESSAGES/audex.mo +%%NLS%%share/locale/fr/LC_MESSAGES/audex.mo +%%NLS%%share/locale/ga/LC_MESSAGES/audex.mo +%%NLS%%share/locale/it/LC_MESSAGES/audex.mo +%%NLS%%share/locale/ja/LC_MESSAGES/audex.mo +%%NLS%%share/locale/km/LC_MESSAGES/audex.mo +%%NLS%%share/locale/lt/LC_MESSAGES/audex.mo +%%NLS%%share/locale/mai/LC_MESSAGES/audex.mo +%%NLS%%share/locale/nds/LC_MESSAGES/audex.mo +%%NLS%%share/locale/nl/LC_MESSAGES/audex.mo +%%NLS%%share/locale/pt/LC_MESSAGES/audex.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/audex.mo +%%NLS%%share/locale/ru/LC_MESSAGES/audex.mo +%%NLS%%share/locale/sv/LC_MESSAGES/audex.mo +%%NLS%%share/locale/tr/LC_MESSAGES/audex.mo +%%NLS%%share/locale/uk/LC_MESSAGES/audex.mo @dirrm share/apps/audex/images @dirrm share/apps/audex --- 2011-01-30-audex.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: