6 files changed, 49 insertions, 103 deletions

diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 006dfe539c5b..745cbc9b708a 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -3,10 +3,9 @@
 # Whom:				Tilman Linneweh <freebsdports@arved.de>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	blop
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,15 +15,16 @@ MAINTAINER=	freebsdports@arved.de
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
-PLUGINS=	sawtooth.so \
-		square.so \
-		pulse.so \
-		triangle.so
-PLUGIN_DIR=	${LOCALBASE}/lib/ladspa
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
+USE_AUTOCONF=	yes
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+MAKE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+AUTOMAKE_ARGS=	--add-missing
 
-do-install:
-.for file in ${PLUGINS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PLUGIN_DIR}
-.endfor
+pre-build:
+	cd ${WRKSRC}/src; ${GMAKE} sawtooth_data.h square_data.h parabola_data.h
 
 .include <bsd.port.mk>
diff --git a/audio/blop/distinfo b/audio/blop/distinfo
index c84d8e25f0fe..6cdc2e03370e 100644
--- a/audio/blop/distinfo
+++ b/audio/blop/distinfo
@@ -1 +1 @@
-MD5 (blop-0.1.0.tar.gz) = ff8a2220ea354e74ef83c2068b8c5c1d
+MD5 (blop-0.2.5.tar.gz) = fcd29f463c666bc22f0360ea299c62f2
diff --git a/audio/blop/files/patch-Makefile b/audio/blop/files/patch-Makefile
deleted file mode 100644
index bc1166ccb83f..000000000000
--- a/audio/blop/files/patch-Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
---- Makefile.orig      Wed May 15 18:24:08 2002
-+++ Makefile   Wed May 15 18:47:27 2002
-@@ -16,12 +16,8 @@
-           square.so \
-           pulse.so \
-           triangle.so
--LD = ld
--CC = cc
--CFLAGS = -Iinclude -Wall -fomit-frame-pointer -fstrength-reduce \
--         -funroll-loops -fmove-all-movables -ffast-math -fPIC -DPIC \
--          -O6 -mcpu=i586 -march=i586 -c
--LDFLAGS = -shared -lm
-+CFLAGS += -I/usr/local/include -Iinclude -Wall -DPIC
-+LDFLAGS += -L/usr/local/lib -lm -lgnugetopt
-
- all: $(PLUGINS)
-
-@@ -39,45 +35,45 @@
-
-
- sawtooth.so: sawtooth.o avltree.o sawtooth.so.o
--      $(LD) $(LDFLAGS) sawtooth.o avltree.o sawtooth.so.o -o sawtooth.so
-+      $(LD) $(LDFLAGS) -shared sawtooth.o avltree.o sawtooth.so.o -o sawtooth.so
-
- square.so: square.o avltree.o square.so.o
--      $(LD) $(LDFLAGS) square.o avltree.o square.so.o -o square.so
-+      $(LD) $(LDFLAGS) -shared square.o avltree.o square.so.o -o square.so
-
- triangle.so: parabola.o avltree.o triangle.so.o
--      $(LD) $(LDFLAGS) parabola.o avltree.o triangle.so.o -o triangle.so
-+      $(LD) $(LDFLAGS) -shared parabola.o avltree.o triangle.so.o -o triangle.so
-
- pulse.so: sawtooth.o avltree.o pulse.so.o
--      $(LD) $(LDFLAGS) sawtooth.o avltree.o pulse.so.o -o pulse.so
-+      $(LD) $(LDFLAGS) -shared sawtooth.o avltree.o pulse.so.o -o pulse.so
-
-
- avltree.o: avltree.h common.h avltree.c
--      $(CC) $(CFLAGS) avltree.c
-+      $(CC) $(CFLAGS) -c avltree.c
-
- sawtooth.o: sawtooth_data.h wavedata.h wavedata.c
--      $(CC) $(CFLAGS) -DWAVETYPE_SAWTOOTH wavedata.c
-+      $(CC) $(CFLAGS) -DWAVETYPE_SAWTOOTH -c wavedata.c
-       mv wavedata.o sawtooth.o
-
- square.o: square_data.h wavedata.h wavedata.c
--      $(CC) $(CFLAGS) -DWAVETYPE_SQUARE wavedata.c
-+      $(CC) $(CFLAGS) -DWAVETYPE_SQUARE -c wavedata.c
-       mv wavedata.o square.o
-
- parabola.o: parabola_data.h wavedata.h wavedata.c
--      $(CC) $(CFLAGS) -DWAVETYPE_PARABOLA wavedata.c
-+      $(CC) $(CFLAGS) -DWAVETYPE_PARABOLA -c wavedata.c
-       mv wavedata.o parabola.o
-
-
- sawtooth.so.o: ladspa.h avltree.h wavedata.h sawtooth.so.c
--      $(CC) $(CFLAGS) sawtooth.so.c
-+      $(CC) $(CFLAGS) -c sawtooth.so.c
-
- square.so.o: ladspa.h avltree.h wavedata.h square.so.c
--      $(CC) $(CFLAGS) square.so.c
-+      $(CC) $(CFLAGS) -c square.so.c
-
- triangle.so.o: ladspa.h avltree.h wavedata.h triangle.so.c
--      $(CC) $(CFLAGS) triangle.so.c
-+      $(CC) $(CFLAGS) -c triangle.so.c
-
- pulse.so.o: ladspa.h avltree.h wavedata.h pulse.so.c
--      $(CC) $(CFLAGS) pulse.so.c
-+      $(CC) $(CFLAGS) -c pulse.so.c
-
-
- sawtooth_data.h: wavegen
-@@ -91,4 +87,4 @@
-
-
- wavegen: wdatutil.h wdatutil.c wavegen.c
--      $(CC) -Iinclude wdatutil.c wavegen.c -lm -o wavegen
-+      $(CC) ${CFLAGS} ${LDFLAGS} wdatutil.c wavegen.c -o wavegen
diff --git a/audio/blop/files/patch-configure.in b/audio/blop/files/patch-configure.in
new file mode 100644
index 000000000000..2ecc0484b6f0
--- /dev/null
+++ b/audio/blop/files/patch-configure.in
@@ -0,0 +1,29 @@
+--- 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/files/patch-wdatutil.c b/audio/blop/files/patch-wdatutil.c
deleted file mode 100644
index c1afda193033..000000000000
--- a/audio/blop/files/patch-wdatutil.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- wdatutil.c.orig    Wed May 15 18:50:21 2002
-+++ wdatutil.c Wed May 15 18:51:20 2002
-@@ -2,6 +2,7 @@
- #include <math.h>
- #include "common.h"
- #include "wdatutil.h"
-+#include <stdlib.h>
-
- #ifdef __cplusplus
- extern "C" {
diff --git a/audio/blop/pkg-plist b/audio/blop/pkg-plist
index 88cd81839cf7..ff690d14d24d 100644
--- a/audio/blop/pkg-plist
+++ b/audio/blop/pkg-plist
@@ -1,4 +1,12 @@
+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