7 files changed, 44 insertions, 84 deletions

diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 57dea306deae..0cd47464253f 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -5,33 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xmms-crossfade
-PORTVERSION=	0.3.8
-PORTREVISION=	1
+PORTNAME=	crossfade
+PORTVERSION=	0.3.10
 CATEGORIES=	audio
-MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/
+MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/ \
+		http://bsd1.csme.ru/myports/ \
+		http://bsd2.csme.ru/myports/ \
+		http://bsd3.csme.ru/myports/
+PKGNAMEPREFIX=	${APP}-
+DISTNAME=	xmms-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XMMS Output plugin for crossfading between songs
+MAINTAINER=	infofarmer@gmail.com
+COMMENT=	A Crossfading/Gapless Plugin
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS?=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
-INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
+HAS_CONFIGURE=	yes
+APP?=		xmms
+PLUGDIR?=	lib/${APP}/Output
+PORTDOCS=	README
+PLIST_FILES=	${PLUGDIR}/libcrossfade.so
+DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
+CONFIGURE_ARGS+=	--enable-player=${APP}
 
-pre-patch:
-	${REINPLACE_CMD} "s|@libdir@|${PREFIX}/lib/xmms/Output|" \
-		${WRKSRC}/Makefile.in
+.ifndef WITHOUT_SAMPLERATE
+LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+=--enable-samplerate
+.endif
 
-post-install:
-.ifndef(NOPORTDOCS)
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}
-.endif # !NOPORTDOCS
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/.libs/libcrossfade.so ${PREFIX}/${PLUGDIR}
+.ifndef NOPORTDOCS
+	${INSTALL_DATA} -d -m 555 ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-crossfade/distinfo b/audio/xmms-crossfade/distinfo
index f7c8a4286d4f..4aa19a91f508 100644
--- a/audio/xmms-crossfade/distinfo
+++ b/audio/xmms-crossfade/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms-crossfade-0.3.8.tar.gz) = fbfff1bff29118309b0a02c713b13d50
-SHA256 (xmms-crossfade-0.3.8.tar.gz) = ffc1126315ef1de53b8a846432ccc7bea69209b48a8925cbe8ce9d4d3a0d6b75
-SIZE (xmms-crossfade-0.3.8.tar.gz) = 435761
+MD5 (xmms-crossfade-0.3.10.tar.gz) = 43c53b522545253e2bfeee7a0c0dfde3
+SHA256 (xmms-crossfade-0.3.10.tar.gz) = 47bf100674a179799e80030bf0da68bce1b10b5427a62e0a9de108d40bac2aaf
+SIZE (xmms-crossfade-0.3.10.tar.gz) = 476290
diff --git a/audio/xmms-crossfade/files/patch-ltmain.sh b/audio/xmms-crossfade/files/patch-ltmain.sh
deleted file mode 100644
index 3d6e7e4cf4c2..000000000000
--- a/audio/xmms-crossfade/files/patch-ltmain.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- ltmain.sh.orig	Fri Apr 12 08:48:14 2002
-+++ ltmain.sh	Fri Apr 25 16:34:45 2003
-@@ -4224,11 +4224,13 @@
- 	  IFS="$save_ifs"
- 	fi
- 
-+	if /usr/bin/false; then
- 	# Install the pseudo-library for information purposes.
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/xmms-crossfade/files/patch-rate.c b/audio/xmms-crossfade/files/patch-rate.c
deleted file mode 100644
index 8fa7846b5ef2..000000000000
--- a/audio/xmms-crossfade/files/patch-rate.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- rate.c.orig	Fri Sep 24 11:02:14 2004
-+++ rate.c	Mon Nov 22 09:44:42 2004
-@@ -157,6 +157,10 @@
-   struct timeval tv;
-   glong dt;
- 
-+  gpointer data;
-+  gint isamp, emitted = 0;
-+  gint16 *out, *in;
-+
-   /* print clipping warnings at most once every second : */
-   gettimeofday(&tv, NULL);
-   dt = (tv.tv_sec - rc->vc.tv_last.tv_sec)  * 1000
-@@ -254,9 +258,7 @@
- 
- #else /* rustic resampling */
- 
--  gpointer data;
--  gint isamp, emitted = 0;
--  gint16 *out, *in = *buffer;
-+  in = *buffer;
- 
-   /* some sanity checks */
-   if(length & 3) {
diff --git a/audio/xmms-crossfade/files/patch-volume.c b/audio/xmms-crossfade/files/patch-volume.c
deleted file mode 100644
index 3653ceaa3138..000000000000
--- a/audio/xmms-crossfade/files/patch-volume.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- volume.c.orig	Tue Sep 14 18:38:00 2004
-+++ volume.c	Mon Nov 22 09:46:55 2004
-@@ -81,11 +81,12 @@
- 
- gfloat volume_compute_factor(gint percent, gint dB_range)
- {
-+  gfloat dB;
-   if(percent>=100)
-     return 1;
-   if(percent<=0)
-     return 0;
--  gfloat dB  = (percent-100)/100.0*dB_range; 
-+  dB  = (percent-100)/100.0*dB_range; 
-   return pow(10, dB/20);
- }
- 
diff --git a/audio/xmms-crossfade/pkg-descr b/audio/xmms-crossfade/pkg-descr
index 4ed0409e51c1..9613257610fa 100644
--- a/audio/xmms-crossfade/pkg-descr
+++ b/audio/xmms-crossfade/pkg-descr
@@ -1,4 +1,13 @@
-An XMMS Output plugin that allows you to crossfade between different tunes.
+A Crossfading/Gapless Output Plugin featuring:
+
+    * Crossfading
+    * Fadein/Fadeout
+    * Continuous output
+    * Gap-Killer
+    * Automatic detection of live albums
+    * High quality
+    * Secondary effect plugin
+    * Compatibility with bmp and audacious
 
 WWW: http://www.eisenlohr.org/xmms-crossfade/index.html
 Author: Peter Eisenlohr <p.eisenlohr@gmx.net>
diff --git a/audio/xmms-crossfade/pkg-plist b/audio/xmms-crossfade/pkg-plist
deleted file mode 100644
index cf950f0e4a5e..000000000000
--- a/audio/xmms-crossfade/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/xmms/Output/libcrossfade.so
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%