7 files changed, 90 insertions, 92 deletions

diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index 1543501a325d..633f75fec42f 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -6,58 +6,47 @@
 #
 
 PORTNAME=	yammi
-PORTVERSION=	1.2.rc
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2.r/.2-r/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A QT-based music manager with fuzzy search
 
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
-		id3-3.8.3:${PORTSDIR}/audio/id3lib
+		tag.5:${PORTSDIR}/audio/taglib
 
-OPTIONS=	ARTS "Arts backend support" on \
-		XMMS "XMMS backend support" off \
-		NOATUN "Noatun backend support" on
+OPTIONS=	XMMS "XMMS backend support" off
 
-USE_QT_VER=	3
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=	--program-prefix='' --enable-threading=yes --enable-mt=yes
-USE_KDELIBS_VER=3
+USE_AUTOTOOLS=	autoconf:259:env automake:19:env libtool:15:env
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-gstreamer
 
 .include <bsd.port.pre.mk>
 
-.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+=--without-arts
-.endif
-
-.if !defined(WITHOUT_NOATUN)
-RUN_DEPENDS+=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
-.endif
-
-.if !defined(WITHOUT_XMMS)
+.if defined(WITH_XMMS)
 CONFIGURE_ARGS+=--enable-xmms
-BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=   xmms.4:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 .else
 CONFIGURE_ARGS+=--disable-xmms
 .endif
 
+post-patch:
+	@cd ${WRKSRC}/admin && ${REINPLACE_CMD} -e \
+		's|="autoconf"|="${AUTOCONF:T}"|g ; \
+		 s|="autoheader"|="${AUTOHEADER:T}"|g ; \
+		 s|="autom4te"|="${AUTOM4TE:T}"|g ; \
+		 s|="automake"|="${AUTOMAKE:T}"|g ; \
+		 s|="aclocal"|="${ACLOCAL:T}"|g' detect-autoconf.sh
+
+pre-configure:
+	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
+	@cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common
+
 .include <bsd.port.post.mk>
diff --git a/audio/yammi/distinfo b/audio/yammi/distinfo
index a0a34cd3bf23..d8ba4190e3c9 100644
--- a/audio/yammi/distinfo
+++ b/audio/yammi/distinfo
@@ -1,3 +1,3 @@
-MD5 (yammi-1.2-rc.tar.gz) = ab7bdd3fdf0ae671bac02b2f1c960fb7
-SHA256 (yammi-1.2-rc.tar.gz) = fcbca477b9b7c6f4fd19a68edbdeaa6ed1d125ad56758b6770db078241cd0eff
-SIZE (yammi-1.2-rc.tar.gz) = 1170490
+MD5 (yammi-1.2.2.tar.gz) = 3da9fda532d2b5de2b3e20a55b81104b
+SHA256 (yammi-1.2.2.tar.gz) = db91a6d5e8f8bffe4f2254964633eadd3b7793ca600fa14c33e20f1ed5d0ca5d
+SIZE (yammi-1.2.2.tar.gz) = 1072843
diff --git a/audio/yammi/files/patch-configure b/audio/yammi/files/patch-configure
deleted file mode 100644
index 1691409e5a2f..000000000000
--- a/audio/yammi/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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="-l$PTHREAD_LIBS  $LIBS"
-+LIBS="$PTHREAD_LIBS  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* #line $LINENO "configure" */
- /* confdefs.h.  */
diff --git a/audio/yammi/files/patch-configure.in.in b/audio/yammi/files/patch-configure.in.in
new file mode 100644
index 000000000000..2954d235322a
--- /dev/null
+++ b/audio/yammi/files/patch-configure.in.in
@@ -0,0 +1,28 @@
+--- configure.in.in.orig	Sun Jul 31 07:28:26 2005
++++ configure.in.in	Fri Mar 16 03:36:57 2007
+@@ -70,11 +70,21 @@
+ dnl XMMS support (new version)
+ dnl --------------------------
+ if test "x$configure_enable_xmms" = "xyes"; then
+-    AM_PATH_XMMS(1.2.6, ,AC_MSG_ERROR([*** XMMS >= 1.2.6 not found - please install it or run configure script with --disable-xmms ***] ))
+-    LIBS="$XMMS_LIBS $LIBS"
+-    CFLAGS="$XMMS_CFLAGS $CFLAGS"
+-    AC_DEFINE( [ENABLE_XMMS], [1] )
++    AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
++
++    if test "x$XMMS_CONFIG" = "xno" ; then
++        AC_MSG_ERROR([*** XMMS not found! ***] )
++    else
++        AC_DEFINE( [ENABLE_XMMS], [1] )
++        xmms_includes=[`$XMMS_CONFIG --cflags`]
++        xmms_libs=[`$XMMS_CONFIG --libs`]
++    fi
+ fi
++
++AC_SUBST(xmms_includes)
++AC_SUBST(xmms_libs)
++LIBS="$xmms_libs $LIBS"
++CFLAGS="$xmms_cflags $CFLAGS"
+ 
+ 
+ 
diff --git a/audio/yammi/files/patch-src::icons::Makefile.in b/audio/yammi/files/patch-src::icons::Makefile.in
deleted file mode 100644
index 5f23b7a37a13..000000000000
--- a/audio/yammi/files/patch-src::icons::Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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__icons__Makefile.am b/audio/yammi/files/patch-src__icons__Makefile.am
new file mode 100644
index 000000000000..6a9e13bf7f52
--- /dev/null
+++ b/audio/yammi/files/patch-src__icons__Makefile.am
@@ -0,0 +1,20 @@
+--- src/icons/Makefile.am.orig	Mon Aug  1 04:27:20 2005
++++ src/icons/Makefile.am	Sat Mar 17 13:45:18 2007
+@@ -24,12 +24,15 @@
+ 	$(INSTALL_DATA) $(srcdir)/nowplaying.png $(kde_datadir)/yammi/pics/nowplaying.png
+ 	$(INSTALL_DATA) $(srcdir)/playlistbackground.jpg $(kde_datadir)/yammi/pics/playlistbackground.jpg
+ 
+-	$(mkinstalldirs) $(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
+-
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/16x16/apps/
+ 	$(INSTALL_DATA) $(srcdir)/yammi16x16.png $(kde_icondir)/crystalsvg/16x16/apps/yammi.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/22x22/apps/
+ 	$(INSTALL_DATA) $(srcdir)/yammi22x22.png $(kde_icondir)/crystalsvg/22x22/apps/yammi.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/32x32/apps/
+ 	$(INSTALL_DATA) $(srcdir)/yammi32x32.png $(kde_icondir)/crystalsvg/32x32/apps/yammi.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
+ 	$(INSTALL_DATA) $(srcdir)/yammi48x48.png $(kde_icondir)/crystalsvg/48x48/apps/yammi.png
++	$(mkinstalldirs) $(kde_icondir)/crystalsvg/64x64/apps/
+ 	$(INSTALL_DATA) $(srcdir)/yammi64x64.png $(kde_icondir)/crystalsvg/64x64/apps/yammi.png
+ 
+ uninstall-local:
diff --git a/audio/yammi/pkg-plist b/audio/yammi/pkg-plist
index 2917aa767794..9fc6de4c4a25 100644
--- a/audio/yammi/pkg-plist
+++ b/audio/yammi/pkg-plist
@@ -1,29 +1,31 @@
 bin/yammi
 bin/yammiGrabAndEncode
-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/applnk/Multimedia/yammi.desktop
 share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue_asnext.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/prelisten_middle.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_start.png
+share/apps/yammi/icons/crystalsvg/22x22/actions/stop_prelisten.png
 share/apps/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png
+share/apps/yammi/pics/nowplaying.png
+share/apps/yammi/pics/playlistbackground.jpg
 share/apps/yammi/yammiui.rc
+share/doc/HTML/en/yammi/common
+share/doc/HTML/en/yammi/index.cache.bz2
+share/doc/HTML/en/yammi/index.docbook
+share/doc/HTML/en/yammi/screenshot.png
 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
+share/locale/de/LC_MESSAGES/yammi.mo
+share/locale/es/LC_MESSAGES/yammi.mo
+share/locale/it/LC_MESSAGES/yammi.mo
 @dirrm share/doc/HTML/en/yammi
+@dirrm share/apps/yammi/pics
 @dirrm share/apps/yammi/icons/crystalsvg/22x22/actions
 @dirrm share/apps/yammi/icons/crystalsvg/22x22
 @dirrm share/apps/yammi/icons/crystalsvg