4 files changed, 82 insertions, 19 deletions

diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index db618cf82cf3..a5b16e5c82df 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	libdsp
-PORTVERSION=	4.1.1
+PORTVERSION=	4.2.0
 CATEGORIES=	devel audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	libdsp-src-${PORTVERSION}
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -19,13 +19,13 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
 WRKSRC=		${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
-MAKEFILE=	Makefile.FreeBSD
-INLINE_VER=	1.2.3
+
 USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
+		INLINE_VER="${INLINE_VER}"
+MAKEFILE=	Makefile.FreeBSD
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${PERL} -pi -e "s|%%INLINE_VER%%|${INLINE_VER}|g ; \
-		s|install -m 644|${INSTALL_DATA}|g" ${WRKSRC}/${MAKEFILE}
+INLINE_VER=	1.2.4
 
 .include <bsd.port.mk>
diff --git a/devel/libdsp/distinfo b/devel/libdsp/distinfo
index c247910f410a..5f2867b5e808 100644
--- a/devel/libdsp/distinfo
+++ b/devel/libdsp/distinfo
@@ -1 +1 @@
-MD5 (libdsp-src-4.1.1.tar.gz) = 8c4dbba87b622319e652a8f42bbe4787
+MD5 (libdsp-src-4.2.0.tar.gz) = 985dada301ea0e7b3204c65d3e673a47
diff --git a/devel/libdsp/files/patch-Makefile.FreeBSD b/devel/libdsp/files/patch-Makefile.FreeBSD
index b65f5c1c9721..a61dc01abe49 100644
--- a/devel/libdsp/files/patch-Makefile.FreeBSD
+++ b/devel/libdsp/files/patch-Makefile.FreeBSD
@@ -1,19 +1,81 @@
---- Makefile.FreeBSD.orig	Sun Sep  9 19:52:53 2001
-+++ Makefile.FreeBSD	Sun Sep  9 19:54:01 2001
-@@ -17,14 +17,12 @@
+--- Makefile.FreeBSD.orig	Sat Oct 20 09:17:16 2001
++++ Makefile.FreeBSD	Tue Dec 11 03:01:44 2001
+@@ -17,15 +17,8 @@
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
  
+-CC = gcc
 -CXX = g++
--CXXFLAGS = -mcpu=pentium -march=pentium -O6 -fomit-frame-pointer -ffast-math -funroll-loops -malign-loops=5 -malign-jumps=5 -malign-functions=5 -mpreferred-stack-boundary=5 -mfancy-math-387 -Wall -Werror #-g
-+CXXFLAGS += -O6 -fomit-frame-pointer -ffast-math -funroll-loops -malign-loops=5 -malign-jumps=5 -malign-functions=5 -mpreferred-stack-boundary=5 -mfancy-math-387 -Wall -Werror #-g
- DEFS = -D_REENTRANT -D_THREAD_SAFE -DBSDSYS -DX86 -DUSE_MEMMOVE
+-
+-CFLAGS = -mcpu=i586 -march=i586 -O6 -fomit-frame-pointer -ffast-math -funroll-loops -malign-loops=5 -malign-jumps=5 -malign-functions=5 -mpreferred-stack-boundary=5 -mfancy-math-387 -Wall -Werror -pthread #-g
+-OPTFLAGS = -march=i686 -O3 -ffast-math -funroll-loops -malign-loops=5 -malign-jumps=5 -malign-functions=5 -mpreferred-stack-boundary=5 -mfancy-math-387 -Wall -Werror #-g
+-CXXFLAGS = $(CFLAGS)
+-
+ # thread safety
+-DEFS = -D_REENTRANT -D_THREAD_SAFE
++#DEFS = -D_REENTRANT -D_THREAD_SAFE
+ # BSD system
+ DEFS += -DBSDSYS
+ # define if your compiler/c-library is ISO C 9x standard compliant
+@@ -37,15 +30,15 @@
+ # x86 architecture specific optimizations
+ #DEFS += -DDSP_X86
+ 
 -INCS = -I. -I/usr/local/include
-+INCS = -I. -I../Inlines-%%INLINE_VER%%
- LDFLAGS = #-g
++INCS = -I. -I../Inlines-${INLINE_VER}
+ 
+-LDFLAGS = -pthread #-g
++#LDFLAGS = -pthread #-g
+ 
  LIBS = -lm #-ldrfftw -ldfftw
+ 
  LIBTOOL = libtool
+ 
 -PREFIX = /usr/local
++PREFIX ?= /usr/local
+ 
+ VERSION = 1:4:0
+ 
+@@ -113,24 +106,24 @@
+ 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION) -o libdsp.la $(LOBJS) $(LIBS)
  
- VERSION = 1:1:0
+ install: libdsp.la
+-	install -m 755 -d $(PREFIX)/include/dsp
+-	install -m 644 dsp/DSPConfig.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/DSPOp.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/DSPVector.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/Decimator.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/FFTDecimator.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/Filter.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/Filter2.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/FIRDecimator.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/Hankel.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/ReBuffer.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/ReBuffer2.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/ReBuffer3.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/RecDecimator.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/Transform4.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/Transform8.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/TransformS.hh $(PREFIX)/include/dsp
+-	install -m 644 dsp/X86.h $(PREFIX)/include/dsp
++	${MKDIR} $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/DSPConfig.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/DSPOp.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/DSPVector.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/Decimator.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/FFTDecimator.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/Filter.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/Filter2.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/FIRDecimator.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/Hankel.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/ReBuffer.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/ReBuffer2.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/ReBuffer3.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/RecDecimator.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/Transform4.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/Transform8.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/TransformS.hh $(PREFIX)/include/dsp
++	${BSD_INSTALL_DATA} dsp/X86.h $(PREFIX)/include/dsp
+ 	$(LIBTOOL) --mode=install install libdsp.la $(PREFIX)/lib
  
+ libdsp.dep: $(SRCS)
diff --git a/devel/libdsp/pkg-plist b/devel/libdsp/pkg-plist
index 5133da375325..cfda2486dd81 100644
--- a/devel/libdsp/pkg-plist
+++ b/devel/libdsp/pkg-plist
@@ -3,9 +3,9 @@ include/dsp/DSPOp.hh
 include/dsp/DSPVector.hh
 include/dsp/Decimator.hh
 include/dsp/FFTDecimator.hh
+include/dsp/FIRDecimator.hh
 include/dsp/Filter.hh
 include/dsp/Filter2.hh
-include/dsp/FIRDecimator.hh
 include/dsp/Hankel.hh
 include/dsp/ReBuffer.hh
 include/dsp/ReBuffer2.hh
@@ -14,8 +14,9 @@ include/dsp/RecDecimator.hh
 include/dsp/Transform4.hh
 include/dsp/Transform8.hh
 include/dsp/TransformS.hh
-@dirrm include/dsp
+include/dsp/X86.h
 lib/libdsp.a
 lib/libdsp.la
 lib/libdsp.so
 lib/libdsp.so.1
+@dirrm include/dsp