summaryrefslogtreecommitdiff
path: root/audio/ampache
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2009-05-03 14:29:15 +0000
committerabs <abs@pkgsrc.org>2009-05-03 14:29:15 +0000
commitbf0cf00bff45ee3261e41e2271a4943250719550 (patch)
tree12f81ad36331ecd87627cc7c8b90df10c96e4744 /audio/ampache
parent9f2c572bdae50b4d5763198da8da3270a6a538a2 (diff)
downloadpkgsrc-bf0cf00bff45ee3261e41e2271a4943250719550.tar.gz
Updated audio/ampache to 3.5beta2 - updated to beta as fixes some iconv
related issues on NetBSD v.3.5-Beta2 04/07/2009 - Fix ASX playlists so more data shows up in WMP (Thx Jon611) - Fix dynamic playlist items so they work in stream methods again - Fixed Recently played so that it correctly shows unique songs with the correct data - Fix some issues with filenames with Multi-byte characters (Thx Momo-i) - Add WMV/MPG specific parsing functions (Thx Momo-i) - Add text to /test.php for hash() and SHA256() support under PHP section - Fix SHA256 Support so that it references something that exists - Fix incorrect debug_event() on login due to typo - Remove manage democratic playlist as it has no meaning in the current version - Run Dba::reset_db_charset() after upgrade incase people are playing hot potato with their charsets. - Move Server Preferences to Admin menu (Thx geekdawg) - Fixed missing web_path reference on radio creation link - Fixed remote catalog_clean not working - Fixed xmlrpc get image. getEncoding wasn't static -------------------------------------------------------------------------- v.3.5-Beta1 03/15/2009 - Add democratic methods to api, can now vote, devote, get url and the current democratic playlist through the api - Revert to old Random Play method - Added proxy use for xmlrpcclient - Added Configuration 'Wizard' for democratic play - Fixed interface feedback issues with democratic play actions - Add extension to image urls for the API will add to others as needed due to additional query requirement. Needed to fix some DLNA devices - Fixed typo that caused the height of album art not to display - Modified database and added GC for tmp_browse table - Added get lyrics and album art using http proxy server #313 + username, password patch - Added lyricswiki link Ticket #70 - Updated README language - Updated getid3 library 2.0.0b4 to 2.0.0b5 - Make the Democratic playlist be assoicated with the user who sends it to a 'player' - Fixed missing page headers on democratic playlist - Show who voted for the sogns on democratic playlist - Increase default stream length to account for the fact that movies are a good bit longer then songs - Correct Issues with multi-byte characters in Lyrics (Thx Momo-i) - Added caching to Video - Added Video calls to the API - Remove redundent code from Browse class by making it extend nwe Query class - Update Prototype to 1.6.0.3 - Add Time range to advanced search - Add sorting to Video Browse - Changed to new Query backend for Browsing and Dynamic Playlists -------------------------------------------------------------------------- v.3.5-Alpha2 03/08/2009 - Fixed caching of objects with no return value - Fixed updating of songs that should not be updated during catalog verify - Added default_user_level config option that allows you to define the user level when use_auth is false. Also allows manual login of admin users when use_auth is false. - Fix Version checking and Version Error Message on install (Thx Paleo) - Moved Statistics to main menu, split out newest/popular/stats - Fixed bug where saved Thumbnails were almost never used - Fixed Localplay HTTPQ and MPD controls to reconize Live Stream urls. - Added Localplay controls to API - Added Added/Updated filters to API include the ability to specify a date range using ISO 8601 format with [START]/[END] - Changed API Date format to ISO 8601 - Fixed Incorrect Caching of Album records that caused the Name + Year + Disk to not be respected - Added Lyrics Patch (Thx alister55 & momo-i) - Fixed password not updating when editing an HTTPQ localplay instance - Added Video support - Fixed normalize tracks not re-displaying playlist correctly - Fixed now playing now showing currently playing song - Fixed now playing clear all not correctly refreshing screen - Fixed adding object to playlist so that it correctly shows the songs rather then an empty playlist - Added User Agent to IP History information gathering - Added Access Control List Wizards to make API interface setup easier - Added IPv6 support for Access Control, Sessions, IP History - Fixed sorting issue on artist when using search method - Updated flash player to 5.9.5 - Fixed bug where you admins couldn't edit preferences of users due to missing 'key' on form - Added Mime type to Song XML -------------------------------------------------------------------------- v.3.5-Alpha1 12/31/2008 - Fixed sort_files script so that it properly handles variable album art file names in the directories - Fixed issue where small thumbnails were used for larger images if gd based resizing was enabled in the config - Fixed catalog_update.inc so it doesn't produce errors - Made democratic play respect force http play - Make installation error messages more helpful - Added Swedish (sv_SE) translation (Thanks yeager) - Allow Add / Verify of sub directories of existing catalogs - Prevent an fread of 0 bytes if you seek to the end of a file - Added require_localnet_session config that allows you to exclude IP(s) from session checks, see config.dist - Added Nusoap (http://sourceforge.net/projects/nusoap/) library for use with future lyrics feature - Fixed problem with flash player where random urls were not being added correctly - Fixed problem with user creation using old method (Thx Purdyk) - Switched to SHA256() for API and Passwords - Added check for BADTIME error code from Last.FM and correctly return the error rather then a generic one - Fix http auth session issues, where every request blew away the old session information - Many other minor improvements (Thx Dipsol) - Fixed warnings in caching code (Thx Dipsol) - Massive text cleanup (Thx Dipsol) - Fixed tag searching and improved some other search methods to prevent SQL warnings on no results - Improved Test page checks to more accuratly verify putENV support - Make network downsampling a little more sane, don't require access level - Added caching to Playlist dropdown - Fixed double caching on some objects - Added base.css and 4 tag 'font' sizes depending on weight/count - Fixed inline song edit - Updated registration multi-byte mail. - Fixed vainfo.class.php didn't catch exception for first analyze. - Fixed iconv() returns an empty strings (Thx abs0) - Updated getid3 for multi-byte characters, but some wrong id3tags have occurred exception error. - Fixed use_auth = false not correctly re-creating the session if you had just switched from use_auth = true - Add links to RSS feeds and set default to TRUE in config.dist - Fixed Dynamic Random/Related URLs with players that always send a byte offset (MPD) - Added Checkbox to use existing Database - Updated language code and Fixed catalan language code - Added Emulate gettext() from upgradephp-15 (http://freshmeat.net/p/upgradephp) - Fixed Test.php parse error. - Updated multibyte character strings mail. - Fixed To send mail don't remove the last comma from recipient. - Updated More translatable templates. - Removed merge-messages.sh and Add LANGLIST (each languages translation statistics). - Fixed If database name don't named ampache, can't renamed tags to tag. - Fixed count issue on browse Artists (Thx Sylvander) - Fixed prevent_multiple_logins, preventing all logins (Thx hugh) - Fixed Export catalog headers so it corretly prompts you to download the file - Add ability to sort by artist name, album name on song browse - Implemented caching on artist and album browse, added total artist time to the many artist view - Fixed test config page so it bounces you back to the test page if the config starts parsing correctly - Fixed browsing so that you can browse two different types in two windows at the same time - Improved gather script for translations (Thx momo-i) - Added paging to the localplay playlist - Updated German Translation (Thx Laurent) - Fixed issue where Remote songs would never be removed from the democratic playlist - Fixed issue where user preferences weren't set correctly on stream (Thx lorijho) - Added caching of user preferences to avoid a SQL query on load (Thx Protagonist) - Fixed home menu not always displaying the entire contents - Fixed logic error with duplicate login setting which caused it to only work if mysql auth was used - Changed Passwords to SHA1 will prompt to reset password - Corrected some translation strings and added jp_JP (Thx momo-i) - Ignore filenames that start with . (hidden) solves an issue with mac filesystems - Fix tracking of stats for downloaded songs - Fix divide by 0 error during transcode in some configurations - Remove root mysql pw requirement from installer - Added Image Dimensions on Find Album Art page - Added Confirmation Screen to Catalog Deletion - Reorganized Menu System and Added Modules section - Fix an error if you try to add a shoutbox for an invalid object (Thx atrophic) - Fixed issue with art dump on jpeg files (Thx atrophic) - Fixed issue with force http play and port not correctly specifying non-standard http port (Thx Deathcrow) - Remember Starts With value even if you switch tabs - Fixed rating caching so it actually completely works now - Removed redundent UPDATE on session table due to /util.php - Added Batch Download to single Artist view - Added back in the direct links on songs, requires download set to enabled as it's essentially the same thing except with now playing information tied to it - Bumped API Version to 350001 and require that a version is sent with handshake to indicate the application will work - Removed the MyStrands plugin as did not provide good data, and does not appear to have been used - Added Catalog Prefix config option used to determine which prefixes should not be used for sorting - Merged Browse Menu with Home - Added checkbox to single artist view allowing you to enable/disable album art thumbnails on albums of said artist - Added timeout override on update_single_item because the function is a lie - Fix translations so it's not all german - Genre Tag is now used as a 'Tag', Browse Genre removed - Ignore getid3() iconv stuff doesn't seem to work - Improved fix_filenames.inc, tries a translation first then strips invalid characters - Fixed album art not clearing thumbnail correctly on gather - Fixed localplay instance not displaying correctly after change until a page refresh - Fixed endless loop on index if you haven't played a song in over two years - Fixed gather art and parse m3u not working on catalog create also added URL read support to m3u import - Upped Minimum requirements to Mysql 5.x - Add codeunde1load's Web 2.0 style tag patch - Fixed typo in e-mail From: name (Thx Xgizzmo) - Fixed typo in browse auto_init() which could cause ampache to not remember your start point in some situations. (Thx Xgizzmo)
Diffstat (limited to 'audio/ampache')
-rw-r--r--audio/ampache/MESSAGE6
-rw-r--r--audio/ampache/Makefile17
-rw-r--r--audio/ampache/PLIST114
-rw-r--r--audio/ampache/distinfo9
-rw-r--r--audio/ampache/patches/patch-aa21
5 files changed, 94 insertions, 73 deletions
diff --git a/audio/ampache/MESSAGE b/audio/ampache/MESSAGE
index 71bef32dc53..31660f69600 100644
--- a/audio/ampache/MESSAGE
+++ b/audio/ampache/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2008/09/14 09:06:54 abs Exp $
+$NetBSD: MESSAGE,v 1.2 2009/05/03 14:29:15 abs Exp $
Please refer to the following file on how to setup your Ampache
installation.
@@ -14,7 +14,9 @@ lines to httpd.conf:
You will also need to ensure php.ini has the following enabled:
- extension=mysql.so
+ extension=gettext.so
extension=iconv.so
+ extension=mbstring.so
+ extension=mysql.so
===========================================================================
diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile
index 6ac35b1f978..73029376773 100644
--- a/audio/ampache/Makefile
+++ b/audio/ampache/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/14 09:06:54 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/03 14:29:15 abs Exp $
#
-DISTNAME= ampache-3.4.3
+DISTNAME= ampache-3.5-beta2
+PKGNAME= ${DISTNAME:S:-beta:beta:}
CATEGORIES= audio
MASTER_SITES= http://ampache.org/downloads/
MAINTAINER= abs@NetBSD.org
-HOMEPAGE= http://ampache.org/downloads/
+HOMEPAGE= http://ampache.org/
COMMENT= Web-based Audio file manager
-DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=0:../../www/ap-php
-DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=0:../../databases/php-mysql
+DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php
+DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=0:../../devel/php-gettext
DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=0:../../converters/php-iconv
+DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=0:../../misc/php-mbstring
+DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=0:../../databases/php-mysql
NO_BUILD= yes
USE_LANGUAGES= # none
@@ -34,13 +37,13 @@ CONF_FILES= ${EGDIR}/ampache.conf \
${PKG_SYSCONFDIR}/ampache.conf
PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= ${EGDIR}
post-extract:
${CP} ${FILESDIR}/ampache.conf ${WRKSRC}/ampache.conf
do-install:
- ${CHMOD} -x ${WRKSRC}/docs/*
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+ ${CHMOD} -x ${WRKSRC}/docs/[A-Z]*
${INSTALL_DATA} ${WRKSRC}/ampache.conf ${DESTDIR}${EGDIR}/ampache.conf
set -e; cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${INSTDIR}
${RM} -f ${DESTDIR}${INSTDIR}/ampache.conf
diff --git a/audio/ampache/PLIST b/audio/ampache/PLIST
index 4ed4c5a64c7..3abdb30facd 100644
--- a/audio/ampache/PLIST
+++ b/audio/ampache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/14 09:06:54 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/05/03 14:29:15 abs Exp $
share/ampache/admin/access.php
share/ampache/admin/catalog.php
share/ampache/admin/duplicates.php
@@ -34,6 +34,7 @@ share/ampache/docs/GPL-LICENSE
share/ampache/docs/INSTALL
share/ampache/docs/MIGRATION
share/ampache/docs/README
+share/ampache/docs/man/man1/ampache.1
share/ampache/favicon.ico
share/ampache/flag.php
share/ampache/genre.php
@@ -41,13 +42,15 @@ share/ampache/image.php
share/ampache/images/ampache.png
share/ampache/images/blank-pixel.gif
share/ampache/images/blankalbum.gif
+share/ampache/images/blankalbum.jpg
share/ampache/images/icon_add.png
+share/ampache/images/icon_add_key.png
+share/ampache/images/icon_add_tag.png
share/ampache/images/icon_add_user.png
share/ampache/images/icon_admin.png
share/ampache/images/icon_all.png
share/ampache/images/icon_ampache.png
share/ampache/images/icon_batch_download.png
-share/ampache/images/icon_browse.png
share/ampache/images/icon_cog.png
share/ampache/images/icon_comment.png
share/ampache/images/icon_delete.png
@@ -70,6 +73,7 @@ share/ampache/images/icon_pause_hover.png
share/ampache/images/icon_play.png
share/ampache/images/icon_play_hover.png
share/ampache/images/icon_playlist_add.png
+share/ampache/images/icon_plugin.png
share/ampache/images/icon_preferences.png
share/ampache/images/icon_prev.png
share/ampache/images/icon_prev_hover.png
@@ -78,12 +82,12 @@ share/ampache/images/icon_server_lightning.png
share/ampache/images/icon_statistics.png
share/ampache/images/icon_stop.png
share/ampache/images/icon_stop_hover.png
-share/ampache/images/icon_thumb_down.png
-share/ampache/images/icon_thumb_up.png
+share/ampache/images/icon_tick.png
share/ampache/images/icon_view.png
share/ampache/images/icon_volumedn.png
share/ampache/images/icon_volumemute.png
share/ampache/images/icon_volumeup.png
+share/ampache/images/icon_wand.png
share/ampache/images/icon_world_link.png
share/ampache/images/ratings/star_rating.gif
share/ampache/images/ratings/x.gif
@@ -91,45 +95,46 @@ share/ampache/images/ratings/x_off.gif
share/ampache/images/top_bg.jpg
share/ampache/index.php
share/ampache/install.php
-share/ampache/lib/album.lib.php
-share/ampache/lib/artist.lib.php
share/ampache/lib/batch.lib.php
share/ampache/lib/class/access.class.php
share/ampache/lib/class/ajax.class.php
share/ampache/lib/class/album.class.php
share/ampache/lib/class/ampachemail.class.php
+share/ampache/lib/class/ampacherss.class.php
share/ampache/lib/class/api.class.php
share/ampache/lib/class/artist.class.php
share/ampache/lib/class/browse.class.php
share/ampache/lib/class/catalog.class.php
share/ampache/lib/class/config.class.php
+share/ampache/lib/class/core.class.php
+share/ampache/lib/class/database_object.abstract.php
share/ampache/lib/class/dba.class.php
share/ampache/lib/class/democratic.class.php
share/ampache/lib/class/error.class.php
share/ampache/lib/class/flag.class.php
-share/ampache/lib/class/genre.class.php
share/ampache/lib/class/localplay.abstract.php
share/ampache/lib/class/localplay.class.php
-share/ampache/lib/class/metadata.class.php
+share/ampache/lib/class/media.interface.php
share/ampache/lib/class/playlist.class.php
share/ampache/lib/class/plugin.class.php
share/ampache/lib/class/preference.class.php
+share/ampache/lib/class/query.class.php
share/ampache/lib/class/radio.class.php
share/ampache/lib/class/random.class.php
share/ampache/lib/class/rating.class.php
share/ampache/lib/class/registration.class.php
-share/ampache/lib/class/rss.class.php
share/ampache/lib/class/scrobbler.class.php
share/ampache/lib/class/shoutbox.class.php
share/ampache/lib/class/song.class.php
share/ampache/lib/class/stats.class.php
share/ampache/lib/class/stream.class.php
+share/ampache/lib/class/tag.class.php
share/ampache/lib/class/tmpplaylist.class.php
share/ampache/lib/class/update.class.php
share/ampache/lib/class/user.class.php
share/ampache/lib/class/vainfo.class.php
share/ampache/lib/class/vauth.class.php
-share/ampache/lib/class/view.class.php
+share/ampache/lib/class/video.class.php
share/ampache/lib/class/xmldata.class.php
share/ampache/lib/class/xmlrpcclient.class.php
share/ampache/lib/class/xmlrpcserver.class.php
@@ -142,17 +147,17 @@ share/ampache/lib/javascript-base.js
share/ampache/lib/log.lib.php
share/ampache/lib/preferences.php
share/ampache/lib/rating.lib.php
-share/ampache/lib/rss.php
share/ampache/lib/search.php
-share/ampache/lib/stream.lib.php
share/ampache/lib/themes.php
share/ampache/lib/ui.lib.php
share/ampache/lib/xmlrpc.php
+share/ampache/locale/base/LANGLIST
share/ampache/locale/base/TRANSLATIONS
-share/ampache/locale/base/merge-messages.sh
-share/ampache/locale/base/messages.po
-share/ampache/locale/ca_CA/LC_MESSAGES/messages.mo
-share/ampache/locale/ca_CA/LC_MESSAGES/messages.po
+share/ampache/locale/base/gather-messages.sh
+share/ampache/locale/base/messages.pot
+share/ampache/locale/base/translation-words.txt
+share/ampache/locale/ca_ES/LC_MESSAGES/messages.mo
+share/ampache/locale/ca_ES/LC_MESSAGES/messages.po
share/ampache/locale/de_DE/LC_MESSAGES/messages.mo
share/ampache/locale/de_DE/LC_MESSAGES/messages.po
share/ampache/locale/el_GR/LC_MESSAGES/messages.mo
@@ -167,20 +172,21 @@ share/ampache/locale/it_IT/LC_MESSAGES/messages.mo
share/ampache/locale/it_IT/LC_MESSAGES/messages.po
share/ampache/locale/ja_JP/LC_MESSAGES/messages.mo
share/ampache/locale/ja_JP/LC_MESSAGES/messages.po
+share/ampache/locale/nb_NO/LC_MESSAGES/messages.mo
+share/ampache/locale/nb_NO/LC_MESSAGES/messages.po
share/ampache/locale/nl_NL/LC_MESSAGES/messages.mo
share/ampache/locale/nl_NL/LC_MESSAGES/messages.po
share/ampache/locale/ru_RU/LC_MESSAGES/messages.mo
share/ampache/locale/ru_RU/LC_MESSAGES/messages.po
-share/ampache/locale/tr_TR/LC_MESSAGES/messages.mo
-share/ampache/locale/tr_TR/LC_MESSAGES/messages.po
-share/ampache/locale/zh_CN/LC_MESSAGES/messages.mo
-share/ampache/locale/zh_CN/LC_MESSAGES/messages.po
+share/ampache/locale/sv_SE/LC_MESSAGES/messages.mo
+share/ampache/locale/sv_SE/LC_MESSAGES/messages.po
share/ampache/localplay.php
share/ampache/login.php
share/ampache/logout.php
share/ampache/modules/archive/archive.lib.php
share/ampache/modules/captcha/FreeMono-Medium.ttf
share/ampache/modules/captcha/captcha.php
+share/ampache/modules/emulator/gettext.php
share/ampache/modules/flash/LICENSE
share/ampache/modules/flash/Original/skin.xml
share/ampache/modules/flash/crossdomain.xml
@@ -220,7 +226,8 @@ share/ampache/modules/getid3/module.audio.lpac.php
share/ampache/modules/getid3/module.audio.midi.php
share/ampache/modules/getid3/module.audio.monkey.php
share/ampache/modules/getid3/module.audio.mp3.php
-share/ampache/modules/getid3/module.audio.mpc.php
+share/ampache/modules/getid3/module.audio.mpc7.php
+share/ampache/modules/getid3/module.audio.mpc8.php
share/ampache/modules/getid3/module.audio.mpc_old.php
share/ampache/modules/getid3/module.audio.optimfrog.php
share/ampache/modules/getid3/module.audio.rkau.php
@@ -256,7 +263,7 @@ share/ampache/modules/infotools/AmazonSearchEngine.class.php
share/ampache/modules/infotools/Snoopy.class.php
share/ampache/modules/infotools/jamendoSearch.class.php
share/ampache/modules/infotools/lastfm.class.php
-share/ampache/modules/infotools/openstrands.class.php
+share/ampache/modules/infotools/mp3tunes.class.php
share/ampache/modules/kajax/README
share/ampache/modules/kajax/ajax.js
share/ampache/modules/localplay/httpq.controller.php
@@ -266,16 +273,27 @@ share/ampache/modules/mpd/CHANGELOG
share/ampache/modules/mpd/README
share/ampache/modules/mpd/USAGE
share/ampache/modules/mpd/mpd.class.php
+share/ampache/modules/nusoap/changelog
+share/ampache/modules/nusoap/class.nusoap_base.php
+share/ampache/modules/nusoap/class.soap_fault.php
+share/ampache/modules/nusoap/class.soap_parser.php
+share/ampache/modules/nusoap/class.soap_server.php
+share/ampache/modules/nusoap/class.soap_transport_http.php
+share/ampache/modules/nusoap/class.soap_val.php
+share/ampache/modules/nusoap/class.soapclient.php
+share/ampache/modules/nusoap/class.wsdl.php
+share/ampache/modules/nusoap/class.wsdlcache.php
+share/ampache/modules/nusoap/class.xmlschema.php
+share/ampache/modules/nusoap/nusoap.php
+share/ampache/modules/nusoap/nusoapmime.php
+share/ampache/modules/pearxmlrpc/Dump.php
+share/ampache/modules/pearxmlrpc/rpc.php
+share/ampache/modules/pearxmlrpc/server.php
share/ampache/modules/plugins/Lastfm.plugin.php
-share/ampache/modules/plugins/OpenStrands.plugin.php
share/ampache/modules/plugins/RioPlayer.plugin.php
share/ampache/modules/prototype/prototype.js
share/ampache/modules/validatemail/validateEmail.php
share/ampache/modules/validatemail/validateEmailFormat.php
-share/ampache/modules/xmlrpc/ChangeLog
-share/ampache/modules/xmlrpc/README
-share/ampache/modules/xmlrpc/xmlrpc.inc
-share/ampache/modules/xmlrpc/xmlrpcs.inc
share/ampache/play/index.php
share/ampache/playlist.php
share/ampache/preferences.php
@@ -295,6 +313,7 @@ share/ampache/server/random.ajax.php
share/ampache/server/song.ajax.php
share/ampache/server/stats.ajax.php
share/ampache/server/stream.ajax.php
+share/ampache/server/tag.ajax.php
share/ampache/server/xml.server.php
share/ampache/server/xmlrpc.server.php
share/ampache/shout.php
@@ -303,9 +322,9 @@ share/ampache/sql/ampache.sql
share/ampache/sql/ampache40.sql
share/ampache/stats.php
share/ampache/stream.php
+share/ampache/templates/base.css
share/ampache/templates/csshover2.htc
share/ampache/templates/footer.inc.php
-share/ampache/templates/handheld.css
share/ampache/templates/header.inc.php
share/ampache/templates/install.css
share/ampache/templates/javascript_refresh.inc.php
@@ -315,6 +334,9 @@ share/ampache/templates/rightbar.inc.php
share/ampache/templates/show_access_list.inc.php
share/ampache/templates/show_account.inc.php
share/ampache/templates/show_add_access.inc.php
+share/ampache/templates/show_add_access_current.inc.php
+share/ampache/templates/show_add_access_local.inc.php
+share/ampache/templates/show_add_access_rpc.inc.php
share/ampache/templates/show_add_catalog.inc.php
share/ampache/templates/show_add_live_stream.inc.php
share/ampache/templates/show_add_playlist.inc.php
@@ -330,7 +352,6 @@ share/ampache/templates/show_albums.inc.php
share/ampache/templates/show_all_popular.inc.php
share/ampache/templates/show_alphabet_form.inc.php
share/ampache/templates/show_artist.inc.php
-share/ampache/templates/show_artist_box.inc.php
share/ampache/templates/show_artist_row.inc.php
share/ampache/templates/show_artists.inc.php
share/ampache/templates/show_big_art.inc.php
@@ -348,6 +369,7 @@ share/ampache/templates/show_denied.inc.php
share/ampache/templates/show_disabled_songs.inc.php
share/ampache/templates/show_duplicate.inc.php
share/ampache/templates/show_duplicates.inc.php
+share/ampache/templates/show_dynamic.inc.php
share/ampache/templates/show_edit_access.inc.php
share/ampache/templates/show_edit_album.inc.php
share/ampache/templates/show_edit_album_row.inc.php
@@ -374,12 +396,13 @@ share/ampache/templates/show_import_playlist.inc.php
share/ampache/templates/show_index.inc.php
share/ampache/templates/show_install.inc.php
share/ampache/templates/show_install_account.inc.php
+share/ampache/templates/show_install_check.inc.php
share/ampache/templates/show_install_config.inc.php
share/ampache/templates/show_install_lang.inc.php
share/ampache/templates/show_ip_history.inc.php
+share/ampache/templates/show_live_stream.inc.php
share/ampache/templates/show_live_stream_row.inc.php
share/ampache/templates/show_live_streams.inc.php
-share/ampache/templates/show_local_catalog_info.inc.php
share/ampache/templates/show_localplay_add_instance.inc.php
share/ampache/templates/show_localplay_control.inc.php
share/ampache/templates/show_localplay_controllers.inc.php
@@ -388,9 +411,12 @@ share/ampache/templates/show_localplay_instances.inc.php
share/ampache/templates/show_localplay_playlist.inc.php
share/ampache/templates/show_localplay_status.inc.php
share/ampache/templates/show_login_form.inc.php
+share/ampache/templates/show_lyrics.inc.php
share/ampache/templates/show_mail_users.inc.php
+share/ampache/templates/show_manage_catalogs.inc.php
share/ampache/templates/show_manage_democratic.inc.php
share/ampache/templates/show_manage_shoutbox.inc.php
+share/ampache/templates/show_newest.inc.php
share/ampache/templates/show_now_playing.inc.php
share/ampache/templates/show_now_playing_row.inc.php
share/ampache/templates/show_object_rating.inc.php
@@ -406,11 +432,13 @@ share/ampache/templates/show_playlist_songs.inc.php
share/ampache/templates/show_playlists.inc.php
share/ampache/templates/show_playtype_switch.inc.php
share/ampache/templates/show_plugins.inc.php
+share/ampache/templates/show_popular.inc.php
share/ampache/templates/show_preference_admin.inc.php
share/ampache/templates/show_preference_box.inc.php
share/ampache/templates/show_preferences.inc.php
share/ampache/templates/show_random.inc.php
share/ampache/templates/show_random_albums.inc.php
+share/ampache/templates/show_random_rules.inc.php
share/ampache/templates/show_recently_played.inc.php
share/ampache/templates/show_registration_confirmation.inc.php
share/ampache/templates/show_rename_artist.inc.php
@@ -424,24 +452,30 @@ share/ampache/templates/show_similar_artists.inc.php
share/ampache/templates/show_song.inc.php
share/ampache/templates/show_song_row.inc.php
share/ampache/templates/show_songs.inc.php
+share/ampache/templates/show_stats.inc.php
share/ampache/templates/show_stats_newest.inc.php
share/ampache/templates/show_stats_popular.inc.php
+share/ampache/templates/show_tagcloud.inc.php
share/ampache/templates/show_test.inc.php
share/ampache/templates/show_test_config.inc.php
+share/ampache/templates/show_update_items.inc.php
share/ampache/templates/show_user.inc.php
share/ampache/templates/show_user_activate.inc.php
share/ampache/templates/show_user_preferences.inc.php
share/ampache/templates/show_user_recommendations.inc.php
share/ampache/templates/show_user_registration.inc.php
+share/ampache/templates/show_user_row.inc.php
share/ampache/templates/show_user_stats.inc.php
share/ampache/templates/show_users.inc.php
share/ampache/templates/show_verify_catalog.inc.php
+share/ampache/templates/show_video_row.inc.php
+share/ampache/templates/show_videos.inc.php
share/ampache/templates/show_xspf_player.inc.php
share/ampache/templates/sidebar.inc.php
share/ampache/templates/sidebar_admin.inc.php
-share/ampache/templates/sidebar_browse.inc.php
share/ampache/templates/sidebar_home.inc.php
share/ampache/templates/sidebar_localplay.inc.php
+share/ampache/templates/sidebar_modules.inc.php
share/ampache/templates/sidebar_preferences.inc.php
share/ampache/templates/subnavbar.inc.php
share/ampache/test.php
@@ -450,6 +484,7 @@ share/ampache/themes/classic/images/ampache.png
share/ampache/themes/classic/images/bg_login.jpg
share/ampache/themes/classic/images/blank-pixel.gif
share/ampache/themes/classic/images/blankalbum.gif
+share/ampache/themes/classic/images/blankalbum.jpg
share/ampache/themes/classic/images/bottom.gif
share/ampache/themes/classic/images/bottomleft.gif
share/ampache/themes/classic/images/bottomright.gif
@@ -469,6 +504,7 @@ share/ampache/themes/greysme/images/ampache_menu.gif
share/ampache/themes/greysme/images/back-box.gif
share/ampache/themes/greysme/images/background.jpg
share/ampache/themes/greysme/images/blankalbum.gif
+share/ampache/themes/greysme/images/blankalbum.jpg
share/ampache/themes/greysme/images/box_bottom.png
share/ampache/themes/greysme/images/box_top.png
share/ampache/themes/greysme/images/button_back.png
@@ -517,10 +553,11 @@ share/examples/ampache.conf
@dirrm share/ampache/sql
@dirrm share/ampache/server
@dirrm share/ampache/play
-@dirrm share/ampache/modules/xmlrpc
@dirrm share/ampache/modules/validatemail
@dirrm share/ampache/modules/prototype
@dirrm share/ampache/modules/plugins
+@dirrm share/ampache/modules/pearxmlrpc
+@dirrm share/ampache/modules/nusoap
@dirrm share/ampache/modules/mpd
@dirrm share/ampache/modules/localplay
@dirrm share/ampache/modules/kajax
@@ -531,17 +568,18 @@ share/examples/ampache.conf
@dirrm share/ampache/modules/getid3
@dirrm share/ampache/modules/flash/Original
@dirrm share/ampache/modules/flash
+@dirrm share/ampache/modules/emulator
@dirrm share/ampache/modules/captcha
@dirrm share/ampache/modules/archive
@dirrm share/ampache/modules
-@dirrm share/ampache/locale/zh_CN/LC_MESSAGES
-@dirrm share/ampache/locale/zh_CN
-@dirrm share/ampache/locale/tr_TR/LC_MESSAGES
-@dirrm share/ampache/locale/tr_TR
+@dirrm share/ampache/locale/sv_SE/LC_MESSAGES
+@dirrm share/ampache/locale/sv_SE
@dirrm share/ampache/locale/ru_RU/LC_MESSAGES
@dirrm share/ampache/locale/ru_RU
@dirrm share/ampache/locale/nl_NL/LC_MESSAGES
@dirrm share/ampache/locale/nl_NL
+@dirrm share/ampache/locale/ja_JP/LC_MESSAGES
+@dirrm share/ampache/locale/ja_JP
@dirrm share/ampache/locale/it_IT/LC_MESSAGES
@dirrm share/ampache/locale/it_IT
@dirrm share/ampache/locale/fr_FR/LC_MESSAGES
@@ -554,8 +592,8 @@ share/examples/ampache.conf
@dirrm share/ampache/locale/el_GR
@dirrm share/ampache/locale/de_DE/LC_MESSAGES
@dirrm share/ampache/locale/de_DE
-@dirrm share/ampache/locale/ca_CA/LC_MESSAGES
-@dirrm share/ampache/locale/ca_CA
+@dirrm share/ampache/locale/ca_ES/LC_MESSAGES
+@dirrm share/ampache/locale/ca_ES
@dirrm share/ampache/locale/base
@dirrm share/ampache/locale
@dirrm share/ampache/lib/class
diff --git a/audio/ampache/distinfo b/audio/ampache/distinfo
index 5420eb016b8..58f22b5823f 100644
--- a/audio/ampache/distinfo
+++ b/audio/ampache/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/14 09:06:54 abs Exp $
+$NetBSD: distinfo,v 1.2 2009/05/03 14:29:15 abs Exp $
-SHA1 (ampache-3.4.3.tar.gz) = 87fd031f0e424a273f4e4bb7f2405cc72a5e0d00
-RMD160 (ampache-3.4.3.tar.gz) = e11eeac971c1f6e52c5d1ed85fc043244ffb5c59
-Size (ampache-3.4.3.tar.gz) = 1414765 bytes
-SHA1 (patch-aa) = 30c57f3b5e0b8d79af13632745227a81b262f4c8
+SHA1 (ampache-3.5-beta2.tar.gz) = 801a5dd8778b2c758e031332a97c502e853e16ab
+RMD160 (ampache-3.5-beta2.tar.gz) = d4cc895fe9c50c1354eb066f11011f7d45479785
+Size (ampache-3.5-beta2.tar.gz) = 1737144 bytes
diff --git a/audio/ampache/patches/patch-aa b/audio/ampache/patches/patch-aa
deleted file mode 100644
index b51ca9fc0a7..00000000000
--- a/audio/ampache/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/14 09:06:54 abs Exp $
-
---- lib/class/vainfo.class.php.orig 2008-08-31 07:20:41.000000000 +0100
-+++ lib/class/vainfo.class.php
-@@ -498,11 +498,14 @@ class vainfo {
- if ($this->_iconv) {
- /* Guess that it's UTF-8 */
- if (!$encoding) { $encoding = $this->_getID3->encoding; }
-+ /* Try GNU iconv //TRANSLIT extension first */
- $charset = $this->encoding . '//TRANSLIT';
-- $tag = iconv($encoding,$charset,$tag);
-+ $newtag = iconv($encoding,$charset,$tag);
-+ if (strcmp($newtag, "") == 0)
-+ $newtag = iconv($encoding,$this->encoding,$tag);
- }
-
-- return $tag;
-+ return $newtag;
-
-
-