4 files changed, 18 insertions, 52 deletions

diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 63e49feb2617..737e295b21e9 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -4,14 +4,10 @@
 #
 # $FreeBSD$
 
-PORTNAME=	jack
-PORTVERSION=	0.17
-PORTREVISION=	3
+PORTNAME=	xmms-jack
+PORTVERSION=	0.19
 CATEGORIES=	audio
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	xmms-jack
-PKGNAMEPREFIX=	xmms-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS plugin for jack
@@ -20,30 +16,26 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 		jack.0:${PORTSDIR}/audio/jack \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 
-WRKSRC=		${WRKDIR}/xmms-jack
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GNOME=	gtk12 gnometarget
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	lib/xmms/Output/libjackout.a \
-		lib/xmms/Output/libjackout.la \
-		lib/xmms/Output/libjackout.so
+PLIST_FILES=	lib/xmms/Output/libjackout.so
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/.libs
-	@${RM} -rf ${WRKSRC}/autom4te.cache
-	@${RM} -rf ${WRKSRC}/libjackout.la
-
-	${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS}|g; \
-		s|-ldl||' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|-ldl||g' ${WRKSRC}/configure
+
+do-install:
+	cd ${WRKSRC}/.libs \
+		&& ${INSTALL_DATA} libjackout.so ${PREFIX}/lib/xmms/Output
 
 .include <bsd.port.post.mk>
diff --git a/audio/xmms-jack/distinfo b/audio/xmms-jack/distinfo
index fc434e627540..67cf5eb6b7e9 100644
--- a/audio/xmms-jack/distinfo
+++ b/audio/xmms-jack/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms-jack-0.17.tar.gz) = 6e4ba99afaf675bbc667755f3a741c92
-SHA256 (xmms-jack-0.17.tar.gz) = 2fbf6205fdfe08d01e57cd31c11efb677acb43e0fb50a8ffe2f2430720c5c176
-SIZE (xmms-jack-0.17.tar.gz) = 527149
+MD5 (xmms-jack-0.19.tar.gz) = 3e3ed2e3ca4a4ca558b43e1b8e3a83d5
+SHA256 (xmms-jack-0.19.tar.gz) = 5a7a0814e0edbfb4b84dbbce35b146f15c2f86089c3a5ac083613d5948bc822b
+SIZE (xmms-jack-0.19.tar.gz) = 916459
diff --git a/audio/xmms-jack/files/patch-bio2jack.c b/audio/xmms-jack/files/patch-bio2jack.c
deleted file mode 100644
index 30bde94be237..000000000000
--- a/audio/xmms-jack/files/patch-bio2jack.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- bio2jack.c.orig	Sat Jun 17 18:58:16 2006
-+++ bio2jack.c	Thu Dec  7 12:51:17 2006
-@@ -2512,11 +2512,12 @@
-   {
-     drv = &outDev[x];
- 
-+    memset(drv, 0, sizeof(jack_driver_t));
-+
-     pthread_mutex_init(&drv->mutex, NULL);
- 
-     getDriver(x);
- 
--    memset(drv, 0, sizeof(jack_driver_t));
-     drv->volumeEffectType = linear;
-     drv->deviceID = x;
- 
diff --git a/audio/xmms-jack/files/patch-configure b/audio/xmms-jack/files/patch-configure
deleted file mode 100644
index 614f7a77b36c..000000000000
--- a/audio/xmms-jack/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri Jun 27 20:07:06 2003
-+++ configure	Fri Jun 27 20:07:21 2003
-@@ -8169,6 +8169,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'