Update audio/yammi to version 1.2-rc

PR:		75079
Submitted by:	Arjan van Leeuwen (maintainer)

6 files changed, 110 insertions, 127 deletions

diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index 50331f690270..9992dca9de69 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	yammi
-PORTVERSION=	1.0.r1
-PORTREVISION=	3
+PORTVERSION=	1.2.rc
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.0.r/.0-rc/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2.r/.2-r/}
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A QT-based music manager with fuzzy search
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
-		id3-3.8.3:${PORTSDIR}/audio/id3lib \
-		xmms.4:${PORTSDIR}/multimedia/xmms
+		id3-3.8.3:${PORTSDIR}/audio/id3lib
+
+OPTIONS=	ARTS "Arts backend support" on \
+		XMMS "XMMS backend support" off \
+		NOATUN "Noatun backend support" on
 
 USE_QT_VER=	3
 USE_GMAKE=	yes
@@ -27,34 +29,35 @@ CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--program-prefix='' --enable-threading=yes --enable-mt=yes
 USE_REINPLACE=	yes
+USE_KDELIBS_VER=3
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/noatun)
-WITH_NOATUN=yes
-.endif # exists(${LOCALBASE}/bin/noatun)
-
-.if defined(WITH_NOATUN)
-BUILD_DEPENDS+=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
-WITH_KDE=yes
+.if defined(WITHOUT_ARTS)
+.if defined(WITHOUT_XMMS)
+.if defined(WITHOUT_NOATUN)
+IGNORE=	You must define at least one backend for yammi
+.endif
+.endif
+.endif
+
+.if !defined(WITHOUT_ARTS)
+CONFIGURE_ARGS+=--with-arts
+LIB_DEPENDS+=	artsgui:${PORTSDIR}/multimedia/kdemultimedia3
 .else
-CONFIGURE_ARGS+=	--disable-noatun
-.endif # defined(WITH_NOATUN)
+CONFIGURE_ARGS+=--without-arts
+.endif
 
-.if exists(${LOCALBASE}/lib/libkdecore.so)
-WITH_KDE=yes
-.endif # exists(${LOCALBASE}/lib/libkdecore.so)
+.if !defined(WITHOUT_NOATUN)
+RUN_DEPENDS+=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
+.endif
 
-.if defined(WITH_KDE)
-USE_KDELIBS_VER=3
+.if !defined(WITHOUT_XMMS)
+CONFIGURE_ARGS+=--enable-xmms
+BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=   xmms.4:${PORTSDIR}/multimedia/xmms
 .else
-CONFIGURE_ARGS+=	--disable-KDE
-.endif # defined(WITH_KDE)
-
-pre-configure:
-	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
-
-post-configure:
-	@${REINPLACE_CMD} -e 's@$$(DESTDIR)$$(KDEDIR)@$$(prefix)@g' ${WRKSRC}/yammi/docs/en/Makefile
+CONFIGURE_ARGS+=--disable-xmms
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/yammi/distinfo b/audio/yammi/distinfo
index 148d06ca830d..738a9dacd858 100644
--- a/audio/yammi/distinfo
+++ b/audio/yammi/distinfo
@@ -1,2 +1,2 @@
-MD5 (yammi-1.0-rc1.tar.gz) = 7cbc79fbd2fa80b00f4451b7ed3f8f2f
-SIZE (yammi-1.0-rc1.tar.gz) = 847291
+MD5 (yammi-1.2-rc.tar.gz) = ab7bdd3fdf0ae671bac02b2f1c960fb7
+SIZE (yammi-1.2-rc.tar.gz) = 1170490
diff --git a/audio/yammi/files/patch-configure b/audio/yammi/files/patch-configure
index a6da87734f4e..1691409e5a2f 100644
--- a/audio/yammi/files/patch-configure
+++ b/audio/yammi/files/patch-configure
@@ -1,92 +1,19 @@
---- configure.orig	Sun Aug 31 23:25:52 2003
-+++ configure	Thu Oct 16 00:24:50 2003
-@@ -19343,7 +19343,7 @@
- EOF
- fi
- 
--echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+echo "#if ! (1)" >> conftest.$ac_ext
- cat >> conftest.$ac_ext <<EOF
- #error 1
- #endif
-@@ -19949,6 +19949,8 @@
- echo "$as_me:19949: result: $USE_RPATH" >&5
- echo "${ECHO_T}$USE_RPATH" >&6
- 
-+if test "x$configure_enable_KDE" = "xyes"; then
-+
- echo "$as_me:19952: checking for KDE" >&5
- echo $ECHO_N "checking for KDE... $ECHO_C" >&6
- 
-@@ -21156,6 +21158,8 @@
- 
- fi
- 
-+fi
-+
- if test "x$configure_enable_KDE" = "xyes"; then
- 
- DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-@@ -21260,7 +21264,7 @@
+--- configure.orig	Tue Dec 14 21:30:57 2004
++++ configure	Tue Dec 14 21:30:42 2004
+@@ -25860,13 +25860,13 @@
+ 	;;
+      esac
+      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-logg  $LIBS"
-+LIBS="-logg  $LIBS $USER_LDFLAGS"
+-LIBS="-l$PTHREAD_LIBS  $LIBS"
++LIBS="$PTHREAD_LIBS  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 21265 "configure"
- #include "confdefs.h"
-@@ -21322,7 +21326,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lvorbis  $LIBS"
-+LIBS="-lvorbis  $LIBS $USER_LDFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 21327 "configure"
- #include "confdefs.h"
-@@ -21386,7 +21390,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lvorbisfile  $LIBS"
-+LIBS="-lvorbisfile  $LIBS $USER_LDFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 21391 "configure"
- #include "confdefs.h"
-@@ -21450,7 +21454,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgdk  $LIBS"
-+LIBS="-lgdk12  $LIBS $USER_LDFLAGS $X_LDFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 21455 "configure"
- #include "confdefs.h"
-@@ -21498,7 +21502,7 @@
- #define HAVE_LIBGDK 1
- EOF
- 
--  LIBS="-lgdk $LIBS"
-+  LIBS="-lgdk12 $LIBS"
- 
- else
-   configure_enable_ogglibs=no
-@@ -21527,7 +21531,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lz  $LIBS"
-+LIBS="-lz  $LIBS $USER_LDFLAGS $X_LDFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 21532 "configure"
- #include "confdefs.h"
-@@ -21589,7 +21593,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lid3  $LIBS"
-+LIBS="-lid3  $LIBS $USER_LDFLAGS $X_LDFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 21594 "configure"
- #include "confdefs.h"
+ /* #line $LINENO "configure" */
+ /* confdefs.h.  */
diff --git a/audio/yammi/files/patch-src::icons::Makefile.in b/audio/yammi/files/patch-src::icons::Makefile.in
new file mode 100644
index 000000000000..5f23b7a37a13
--- /dev/null
+++ b/audio/yammi/files/patch-src::icons::Makefile.in
@@ -0,0 +1,22 @@
+--- src/icons/Makefile.in.orig	Tue Dec 14 22:54:21 2004
++++ src/icons/Makefile.in	Tue Dec 14 22:56:39 2004
+@@ -465,9 +465,17 @@
+ #>+ 1
+ 	$(INSTALL_DATA) $(srcdir)/toggle_playlist.png $(DESTDIR)$(kde_datadir)/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png
+ 
+-#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
++#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/16x16/apps/
++#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/22x22/apps/
++#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/32x32/apps/
++#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
++#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/64x64/apps/
+ #>+ 1
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/
+ 
+ #>- 	$(INSTALL_DATA) $(srcdir)/yammi16x16.png $(kde_icondir)/crystalsvg/16x16/apps/yammi.png
+ #>+ 1
diff --git a/audio/yammi/files/patch-src::main.cpp b/audio/yammi/files/patch-src::main.cpp
new file mode 100644
index 000000000000..f6227b27ac4a
--- /dev/null
+++ b/audio/yammi/files/patch-src::main.cpp
@@ -0,0 +1,12 @@
+ --- src/main.cpp.orig	Fri Dec 17 19:44:35 2004
+ +++ src/main.cpp	Fri Dec 17 19:44:59 2004
+ @@ -17,7 +17,7 @@
+  
+  #include "yammigui.h"
+  
+ -
+ +#include <time.h>
+  
+  static KCmdLineOptions options[] = { 
+  			{ "d", 0, 0 },
+ 
diff --git a/audio/yammi/pkg-plist b/audio/yammi/pkg-plist
index fd1962274941..be23dd7fd5c8 100644
--- a/audio/yammi/pkg-plist
+++ b/audio/yammi/pkg-plist
@@ -1,12 +1,31 @@
 bin/yammi
 bin/yammiGrabAndEncode
-share/doc/HTML/en/yammi/index-1.html
-share/doc/HTML/en/yammi/index-2.html
-share/doc/HTML/en/yammi/index-3.html
-share/doc/HTML/en/yammi/index-4.html
-share/doc/HTML/en/yammi/index-5.html
-share/doc/HTML/en/yammi/index-6.html
-share/doc/HTML/en/yammi/index.html
-@dirrm share/doc/HTML/en/yammi
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
+share/doc/HTML/en/yammi/common
+share/doc/HTML/en/yammi/screenshot.png
+share/doc/HTML/en/yammi/index.docbook
+share/doc/HTML/en/yammi/index.cache
+share/doc/HTML/en/yammi/index.cache.bz2
+share/locale/de/LC_MESSAGES/yammi.mo
+share/locale/es/LC_MESSAGES/yammi.mo
+share/locale/it/LC_MESSAGES/yammi.mo
+share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue_asnext.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/play_now.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/stop_prelisten.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_start.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_middle.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_end.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png
+share/apps/yammi/yammiui.rc
+share/icons/crystalsvg/16x16/apps/yammi.png
+share/icons/crystalsvg/22x22/apps/yammi.png
+share/icons/crystalsvg/32x32/apps/yammi.png
+share/icons/crystalsvg/48x48/apps/yammi.png
+share/icons/crystalsvg/64x64/apps/yammi.png
+share/applnk/Multimedia/yammi.desktop
+@dirrm share/apps/yammi/icons/crystalsvg/22x22/actions
+@dirrm share/apps/yammi/icons/crystalsvg/22x22
+@dirrm share/apps/yammi/icons/crystalsvg
+@dirrm share/apps/yammi/icons
+@dirrm share/apps/yammi
+