4 files changed, 18 insertions, 34 deletions

diff --git a/audio/caps-plugins/Makefile b/audio/caps-plugins/Makefile
index fcb0f6f66d87..bed007b2e214 100644
--- a/audio/caps-plugins/Makefile
+++ b/audio/caps-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	caps-plugins
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.5
 CATEGORIES=	audio
 MASTER_SITES=	http://quitte.de/dsp/
 DISTNAME=	caps_${PORTVERSION}
@@ -15,14 +15,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The C* Audio Plugin Suite
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
 WRKSRC=		${WRKDIR}/caps-${PORTVERSION}
+
 USE_GMAKE=	yes
-CFLAGS+=	-fPIC
+MAKE_ARGS=	CC="${CXX}" CFLAGS="${CXXFLAGS} -fPIC -DPIC"
+
+PLIST_FILES=	lib/ladspa/caps.so share/ladspa/rdf/caps.rdf
+PLIST_DIRSTRY=	share/ladspa/rdf share/ladspa
 
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O2 -ffast-math -funroll-loops
 .endif
 
+do-install:
+	@${MKDIR} ${PREFIX}/lib/ladspa
+	${INSTALL_DATA} ${WRKSRC}/caps.so ${PREFIX}/lib/ladspa
+	@${MKDIR} ${PREFIX}/share/ladspa/rdf
+	${INSTALL_DATA} ${WRKSRC}/caps.rdf ${PREFIX}/share/ladspa/rdf
+
 .include <bsd.port.mk>
diff --git a/audio/caps-plugins/distinfo b/audio/caps-plugins/distinfo
index 2f5954c564d6..0639ee6cf7fa 100644
--- a/audio/caps-plugins/distinfo
+++ b/audio/caps-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (caps_0.4.4.tar.gz) = 18f0339ce129cfbb506072687390928fea23f2b11673e43c7ccb1747709a1c8e
-SIZE (caps_0.4.4.tar.gz) = 789281
+SHA256 (caps_0.4.5.tar.gz) = cba5a7785ab5b1c596250fded999215906bc7eda7c8a688f677de15698e31616
+SIZE (caps_0.4.5.tar.gz) = 790187
diff --git a/audio/caps-plugins/files/patch-Makefile b/audio/caps-plugins/files/patch-Makefile
deleted file mode 100644
index bac4360d7d15..000000000000
--- a/audio/caps-plugins/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	2009-07-31 15:12:45.000000000 +0200
-+++ Makefile	2009-08-26 18:39:34.000000000 +0200
-@@ -1,9 +1,8 @@
--PREFIX = /usr/local
- 
--CC = g++
-+CC = $(CXX)
- 
- # only use -ffast-math if you're feeling mighty adventurous.  (g++ issues)
--OPTS = -O2 -funroll-loops -Wall -fPIC -DPIC
-+OPTS = -Wall -fPIC -DPIC
- #OPTS = -g -DDEBUG 
- 
- _LDFLAGS = -nostartfiles -shared 
-@@ -13,8 +12,8 @@
- 
- -include defines.make
- 
--CFLAGS = $(OPTS) $(_CFLAGS)
--LDFLAGS = $(_LDFLAGS) $(CFLAGS)
-+CFLAGS += $(OPTS) $(_CFLAGS)
-+LDFLAGS += $(_LDFLAGS) $(CFLAGS)
- 
- PLUG = caps
- VERSION = 0.4.3
diff --git a/audio/caps-plugins/pkg-plist b/audio/caps-plugins/pkg-plist
deleted file mode 100644
index b2bb88c031d5..000000000000
--- a/audio/caps-plugins/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/ladspa/caps.so
-share/ladspa/rdf/caps.rdf
-@dirrmtry share/ladspa/rdf
-@dirrmtry share/ladspa