Index: head/audio/herrie/Makefile =================================================================== --- head/audio/herrie/Makefile (revision 229627) +++ head/audio/herrie/Makefile (revision 229628) @@ -1,90 +1,90 @@ # New ports collection makefile for: herrie # Date created: 01 August 2006 # Whom: Ed Schouten # # $FreeBSD$ # PORTNAME= herrie PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://herrie.info/distfiles/ \ http://www.stack.nl/~ed/projects/herrie/distfiles/ MAINTAINER= ed@FreeBSD.org COMMENT= A small command line interface music player HAS_CONFIGURE= yes CONFIGURE_ARGS+=verbose CONFIGURE_ENV+= PREFIX=${PREFIX} USE_BZIP2= yes USE_GNOME= glib20 OPTIONS= MAD "MAD MP3 support" on \ VORBIS "Ogg Vorbis support" on \ SNDFILE "libsndfile support" off \ MODPLUG "libmodplug support" off \ HTTP "HTTP streams and AudioScrobbler support" on \ LIBAO "LibAO support (breaks chroot)" off \ XCURSES "Build XCurses version" off \ XSPF "Support for XSPF playlists" on MAN1= herrie.1 MANCOMPRESSED= yes .include .if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033) CONFIGURE_ARGS+=ncurses .endif .if !defined(WITHOUT_MAD) LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad \ id3tag.0:${PORTSDIR}/audio/libid3tag .else CONFIGURE_ARGS+=no_mp3 .endif .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+=no_vorbis .endif .if !defined(WITHOUT_SNDFILE) LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile .else CONFIGURE_ARGS+=no_sndfile .endif .if !defined(WITHOUT_MODPLUG) LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug .else CONFIGURE_ARGS+=no_modplug .endif .if !defined(WITHOUT_HTTP) LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+=no_http no_scrobbler .endif .if !defined(WITHOUT_LIBAO) LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao CONFIGURE_ARGS+=ao .endif .if !defined(WITHOUT_XCURSES) LIB_DEPENDS+= XCurses.2:${PORTSDIR}/devel/pdcurses CONFIGURE_ARGS+=xcurses .endif .if !defined(WITHOUT_XSPF) -LIB_DEPENDS+= spiff.4:${PORTSDIR}/multimedia/libspiff +LIB_DEPENDS+= xspf.4:${PORTSDIR}/multimedia/libxspf .else CONFIGURE_ARGS+=no_xspf .endif .if !defined(WITHOUT_NLS) PLIST_SUB+= NLS="" USE_GETTEXT= yes .else PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+=no_nls .endif .include Property changes on: head/audio/herrie/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property Index: head/audio/herrie/files/patch-libxspf =================================================================== --- head/audio/herrie/files/patch-libxspf (nonexistent) +++ head/audio/herrie/files/patch-libxspf (revision 229628) @@ -0,0 +1,122 @@ +--- configure ++++ configure +@@ -301,7 +301,7 @@ fi + if [ "$CFG_XSPF" != "" ] + then + CFLAGS="$CFLAGS -DBUILD_XSPF" +- LDFLAGS="$LDFLAGS -lspiff" ++ test_pkgconfig "libxspf" "xspf" "_vfs_xspf" + SRCS="$SRCS util vfs_xspf" + PLAYQ_DUMPFILE="autosave.xspf" + else +--- src/conftest.c ++++ src/conftest.c +@@ -56,16 +56,10 @@ + #include + #include + #endif /* BUILD_VORBIS */ +-#ifdef BUILD_XSPF +-#include +-#endif /* BUILD_XSPF */ + + int + main(int argc, char *argv[]) + { +-#ifdef BUILD_XSPF +- spiff_write(NULL, NULL, NULL); +-#endif /* BUILD_XSPF */ + + return (0); + } +--- src/vfs_xspf.c ++++ src/vfs_xspf.c +@@ -30,7 +30,7 @@ + + #include "stdinc.h" + +-#include ++#include + + #include "util.h" + #include "vfs.h" +@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir) + int + vfs_xspf_populate(struct vfsent *ve) + { +- struct spiff_list *slist; +- struct spiff_track *strack; +- struct spiff_mvalue *sloc; ++ struct xspf_list *slist; ++ struct xspf_track *strack; ++ struct xspf_mvalue *sloc; + char *dirname, *baseuri, *filename; + struct vfsref *vr; + + baseuri = url_escape(ve->filename); +- slist = spiff_parse(ve->filename, baseuri); ++ slist = xspf_parse(ve->filename, baseuri); + g_free(baseuri); + if (slist == NULL) + return (-1); + + dirname = g_path_get_dirname(ve->filename); + +- SPIFF_LIST_FOREACH_TRACK(slist, strack) { +- SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) { ++ XSPF_LIST_FOREACH_TRACK(slist, strack) { ++ XSPF_TRACK_FOREACH_LOCATION(strack, sloc) { + /* Skip file:// part */ + filename = url_unescape(sloc->value); + +@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve) + } + + g_free(dirname); +- spiff_free(slist); ++ xspf_free(slist); + return (0); + } + + int + vfs_xspf_write(const struct vfslist *vl, const char *filename) + { +- struct spiff_list *list; +- struct spiff_track *track; +- struct spiff_mvalue *location; ++ struct xspf_list *list; ++ struct xspf_track *track; ++ struct xspf_mvalue *location; + char *fn, *baseuri; + struct vfsref *vr; + int ret; + +- list = spiff_new(); ++ list = xspf_new(); + + VFS_LIST_FOREACH_REVERSE(vl, vr) { + /* Add a new track to the beginning of the list */ +- track = spiff_new_track_before(&list->tracks); ++ track = xspf_new_track_before(&list->tracks); + + /* Make sure we don't write non-UTF-8 titles to disk */ + if (g_utf8_validate(vfs_name(vr), -1, NULL)) +- spiff_setvalue(&track->title, vfs_name(vr)); ++ xspf_setvalue(&track->title, vfs_name(vr)); + +- location = spiff_new_mvalue_before(&track->locations); ++ location = xspf_new_mvalue_before(&track->locations); + fn = url_escape(vfs_filename(vr)); +- spiff_setvalue(&location->value, fn); ++ xspf_setvalue(&location->value, fn); + g_free(fn); + } + + baseuri = url_escape(filename); +- ret = spiff_write(list, filename, baseuri); ++ ret = xspf_write(list, filename, baseuri); + g_free(baseuri); +- spiff_free(list); ++ xspf_free(list); + + return (ret); + } Property changes on: head/audio/herrie/files/patch-libxspf ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property