Update to version 1.1

PR: 41821
Submitted by: MAINTAINER

4 files changed, 18 insertions, 82 deletions

diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile
index 3e6f900a80b8..d44d80af3f53 100644
--- a/audio/ladspa/Makefile
+++ b/audio/ladspa/Makefile
@@ -5,31 +5,34 @@
 # $FreeBSD$
 
 PORTNAME=	ladspa
-PORTVERSION=	0
+PORTVERSION=	1.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.ladspa.org/download/
-DISTNAME=	ladspa_sdk
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.arved.de/bsd/src/
 
 MAINTAINER=	freebsdports@arved.de
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-MAKEFILE=	makefile
-ALL_TARGET=	targets
-
+USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
 PROGRAM_FILES=	analyseplugin applyplugin listplugins
 PLUGIN_FILES=	amp.so delay.so filter.so noise.so sine.so
-PLUGIN_DIR=	${PREFIX}/lib/ladspa/
+PLUGIN_DIR?=	${PREFIX}/lib/ladspa/
+
+post-patch:
+	${REINPLACE_CMD} -e 's,-ldl,,' ${WRKSRC}/src/makefile
+
+do-build:
+	cd ${WRKSRC}/src; ${GMAKE} -f makefile targets
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/ladspa.h ${PREFIX}/include
+	@${INSTALL_DATA} ${WRKSRC}/src/ladspa.h ${PREFIX}/include
 .for file in ${PROGRAM_FILES}
-	@${INSTALL_PROGRAM} ${WRKSRC}/../bin/${file} ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin
 .endfor
 	@${MKDIR} ${PLUGIN_DIR}
 .for file in ${PLUGIN_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/../plugins/${file} ${PLUGIN_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/plugins/${file} ${PLUGIN_DIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/audio/ladspa/distinfo b/audio/ladspa/distinfo
index 21fd618bcfee..4e823ef8c1f2 100644
--- a/audio/ladspa/distinfo
+++ b/audio/ladspa/distinfo
@@ -1 +1 @@
-MD5 (ladspa_sdk.tgz) = 00b34b8f9a80a1fe141b643e64ac1681
+MD5 (ladspa-1.1.tar.bz2) = 80dc90052e6a2f11ad9bf24ee98d4496
diff --git a/audio/ladspa/files/patch-applyplugin.c b/audio/ladspa/files/patch-applyplugin.c
index 8829dd2d5c04..583387a2f40d 100644
--- a/audio/ladspa/files/patch-applyplugin.c
+++ b/audio/ladspa/files/patch-applyplugin.c
@@ -1,5 +1,5 @@
---- applyplugin.c.orig	Sat May 11 23:31:00 2002
-+++ applyplugin.c	Sat May 11 23:31:09 2002
+--- src/applyplugin.c.orig	Sat May 11 23:31:00 2002
++++ src/applyplugin.c	Sat May 11 23:31:09 2002
 @@ -6,7 +6,7 @@
  /*****************************************************************************/
  
diff --git a/audio/ladspa/files/patch-makefile b/audio/ladspa/files/patch-makefile
deleted file mode 100644
index 9133a95d7a58..000000000000
--- a/audio/ladspa/files/patch-makefile
+++ /dev/null
@@ -1,67 +0,0 @@
---- makefile.orig	Wed Nov 22 21:34:58 2000
-+++ makefile	Sat May 11 23:29:17 2002
-@@ -5,19 +5,18 @@
- # Change these if you want to install somewhere else. In particularly
- # you may wish to remove the middle "local/" part of each entry.
- 
- INSTALL_PLUGINS_DIR	=	/usr/local/lib/ladspa/
- INSTALL_INCLUDE_DIR	=	/usr/include/
- INSTALL_BINARY_DIR	=	/usr/local/bin/
- 
- ###############################################################################
- #
- # GENERAL
- #
- 
--INCLUDES	=	-I.
--LIBRARIES	=	-ldl -lm
--CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
--CXXFLAGS	=	$(CFLAGS)
-+CFLAGS		+=	-I.
-+CXXFLAGS	+=	-I.
-+LDFLAGS		+=	-lm
- PLUGINS		=	../plugins/amp.so				\
- 			../plugins/delay.so				\
- 			../plugins/filter.so				\
-@@ -26,9 +25,6 @@
- PROGRAMS	=	../bin/analyseplugin				\
- 			../bin/applyplugin 				\
- 			../bin/listplugins
--CC		=	cc
--CPP		=	c++
--
- ###############################################################################
- #
- # RULES TO BUILD PLUGINS FROM C OR C++ CODE
-@@ -39,8 +35,8 @@
- 	$(LD) -o ../plugins/$*.so plugins/$*.o -shared
- 
- ../plugins/%.so:	plugins/%.cpp ladspa.h
--	$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
--	$(CPP) -o ../plugins/$*.so plugins/$*.o -shared
-+	$(CXX) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
-+	$(CXX) -o ../plugins/$*.so plugins/$*.o -shared
- 
- ###############################################################################
- #
-@@ -90,17 +86,17 @@
- #
- 
- ../bin/applyplugin:	applyplugin.o load.o				
--	$(CC) $(CFLAGS) $(LIBRARIES)					\
-+	$(CC) $(CFLAGS) $(LDFLAGS)					\
- 		-o ../bin/applyplugin					\
- 		applyplugin.o load.o
- 
- ../bin/analyseplugin:	analyseplugin.o load.o				
--	$(CC) $(CFLAGS) $(LIBRARIES)					\
-+	$(CC) $(CFLAGS) $(LDFLAGS)					\
- 		-o ../bin/analyseplugin 				\
- 		analyseplugin.o load.o
- 
- ../bin/listplugins:	listplugins.o search.o				
--	$(CC) $(CFLAGS) $(LIBRARIES)					\
-+	$(CC) $(CFLAGS) $(LDFLAGS)					\
- 		-o ../bin/listplugins	 				\
- 		listplugins.o search.o
-