4 files changed, 26 insertions, 50 deletions

diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 40464d601d85..85d791f2b197 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -5,24 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	blop
-PORTVERSION=	0.2.5
+PORTVERSION=	0.2.6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	arved@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+.if !exists(/usr/include/getopt.h)
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+.endif
 
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-USE_AUTOCONF=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-MAKE_ENV=	LIBS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-AUTOMAKE_ARGS=	--add-missing
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
+		--with-ladspa-prefix="${LOCALBASE}"
 
 pre-build:
 	cd ${WRKSRC}/src; ${GMAKE} sawtooth_data.h square_data.h parabola_data.h
diff --git a/audio/blop/distinfo b/audio/blop/distinfo
index 6cdc2e03370e..efd81d05cb0c 100644
--- a/audio/blop/distinfo
+++ b/audio/blop/distinfo
@@ -1 +1 @@
-MD5 (blop-0.2.5.tar.gz) = fcd29f463c666bc22f0360ea299c62f2
+MD5 (blop-0.2.6.tar.gz) = 09af3065164045d7792eb9f159b24d12
diff --git a/audio/blop/files/patch-configure.in b/audio/blop/files/patch-configure.in
deleted file mode 100644
index 2ecc0484b6f0..000000000000
--- a/audio/blop/files/patch-configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.orig	Sun Jul 14 20:42:42 2002
-+++ configure.in	Mon Sep 23 17:55:28 2002
-@@ -23,13 +23,6 @@
- 
- dnl Supported --enable and --with options
- 
--AC_ARG_ENABLE(
--   debug,
--   [  --enable-debug          Enable debugging [no]],
--   [CFLAGS="-pipe -Wall -O0 -g"],
--   [CPU=$(uname -m)
--    CFLAGS="-pipe -Wall -O3 -DNO_DEBUG -Wno-unused -mcpu=$CPU -march=$CPU -ffast-math -fomit-frame-pointer -fstrength-reduce -funroll-loops -fmove-all-movables -fPIC -DPIC"]
--)
- 
- AC_ARG_WITH(
-   ladspa-prefix,
-@@ -80,7 +73,12 @@
- AC_CHECK_FUNC(cos, [], [AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR( ** No cos function found)])])
- AC_CHECK_FUNC(floorf, [], [AC_CHECK_LIB(m, floorf, [], [AC_MSG_ERROR( ** No floorf function found)])])
- AC_CHECK_FUNC(powf, [], [AC_CHECK_LIB(m, powf, [], [AC_MSG_ERROR( ** No powf function found)])])
-+AC_CHECK_FUNC(getopt_long,[], [AC_CHECK_LIB(gnugetopt, getopt_long, [], [AC_MSG_ERROR( ** No getopt_long function found)])])
- 
-+if test "$HAVE_LIBGNUGETOPT" != ""; then
-+	ac_save_LIBS="$LIBS"
-+	LIBS= "$ac_save_LIBS -lgnugetopt"
-+fi
- 
- dnl Makefiles generated
- AC_OUTPUT(Makefile \
diff --git a/audio/blop/pkg-plist b/audio/blop/pkg-plist
index ff690d14d24d..8989970e697b 100644
--- a/audio/blop/pkg-plist
+++ b/audio/blop/pkg-plist
@@ -1,12 +1,18 @@
-lib/ladspa/adsr.so
-lib/ladspa/amp.so
-lib/ladspa/fmod.so
-lib/ladspa/interpolator.so
-lib/ladspa/lp4pole.so
-lib/ladspa/product.so
-lib/ladspa/pulse.so
-lib/ladspa/random.so
-lib/ladspa/sawtooth.so
-lib/ladspa/square.so
-lib/ladspa/sum.so
-lib/ladspa/triangle.so
+lib/ladspa/adsr_1653.so
+lib/ladspa/adsr_1680.so
+lib/ladspa/amp_1654.so
+lib/ladspa/branch_1673.so
+lib/ladspa/fmod_1656.so
+lib/ladspa/interpolator_1660.so
+lib/ladspa/lp4pole_1671.so
+lib/ladspa/product_1668.so
+lib/ladspa/pulse_1645.so
+lib/ladspa/random_1661.so
+lib/ladspa/sawtooth_1641.so
+lib/ladspa/sequencer16_1677.so
+lib/ladspa/sequencer32_1676.so
+lib/ladspa/sequencer64_1675.so
+lib/ladspa/square_1643.so
+lib/ladspa/sum_1665.so
+lib/ladspa/sync_square_1678.so
+lib/ladspa/triangle_1649.so