cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't run autofuck, just patch the .in files instead (identical diffs).

Browse Source 
this fixes the build with newer libtool

no package change
This commit is contained in:
jasper 2011-06-29 11:30:31 +00:00
parent aec0d1c7f4
commit 08c0e3c4f7
9 changed files with 61 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audio/soundtouch/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2011/06/29 11:02:53 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2011/06/29 11:30:31 jasper Exp $
COMMENT= tempo/pitch audio processing library
@ -20,27 +20,20 @@ MASTER_SITES= ${HOMEPAGE}
WANTLIB= c m stdc++
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
BUILD_DEPENDS= devel/libtool
USE_LIBTOOL= Yes
AUTOCONF_VERSION=2.59
AUTOMAKE_VERSION=1.9
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
MAKE_FLAGS= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
CXXFLAGS="${CXXFLAGS}"
MAKE_FLAGS= CXXFLAGS="${CXXFLAGS}"
pre-configure:
cd ${WRKSRC} && \
touch NEWS README AUTHORS ChangeLog && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i
# Cleanup the symlink mess in config/
post-extract:
.for f in install-sh config.sub config.guess depcomp
cd ${WRKSRC}/config/ && rm $f && \
ln -s ${LOCALBASE}/share/libtool/config/$f
.endfor
.include <bsd.port.mk>

16
audio/soundtouch/patches/patch-Makefile_am
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Makefile_am,v 1.1.1.1 2007/12/08 11:05:58 ajacoutot Exp $
--- Makefile.am.orig Sat Nov 24 14:56:18 2007
+++ Makefile.am Sat Nov 24 14:59:39 2007
@@ -28,10 +28,11 @@ SUBDIRS=include source
# list files that are documentation to be packaged in a release tarball and installed
-pkgdoc_DATA=COPYING.TXT README.html
+pkgdoc_DATA=README.html
# extra data files that are to be pacakged in a release tarball and installed into the data directory
#pkgdata_DATA=
+pkgdocdir=$(datadir)/doc/soundtouch
# sets up for soundtouch.m4 to be installed
m4datadir=$(datadir)/aclocal

16
audio/soundtouch/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $
--- Makefile.in.orig Wed Jun 29 13:21:02 2011
+++ Makefile.in Wed Jun 29 13:21:25 2011
@@ -188,10 +188,11 @@ pkgdocdir = $(prefix)/doc/@PACKAGE@
SUBDIRS = include source
# list files that are documentation to be packaged in a release tarball and installed
-pkgdoc_DATA = COPYING.TXT README.html
+pkgdoc_DATA = README.html
# extra data files that are to be pacakged in a release tarball and installed into the data directory
#pkgdata_DATA=
+pkgdocdir=$(datadir)/doc/soundtouch
# sets up for soundtouch.m4 to be installed
m4datadir = $(datadir)/aclocal

12
audio/soundtouch/patches/patch-source_SoundTouch_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-source_SoundTouch_Makefile_am,v 1.1.1.1 2007/12/08 11:05:58 ajacoutot Exp $
--- source/SoundTouch/Makefile.am.orig Sat Nov 24 13:45:29 2007
+++ source/SoundTouch/Makefile.am Sat Nov 24 13:45:36 2007
@@ -35,7 +35,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FI
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
-AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include
+AM_CXXFLAGS=-fcheck-new -I../../include
# other linking flags to add
#libSoundTouch_la_LIBADD=

12
audio/soundtouch/patches/patch-source_SoundTouch_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_SoundTouch_Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $
--- source/SoundTouch/Makefile.in.orig Wed Jun 29 13:21:43 2011
+++ source/SoundTouch/Makefile.in Wed Jun 29 13:22:01 2011
@@ -191,7 +191,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
-AM_CXXFLAGS = -O3 -msse -fcheck-new -I../../include
+AM_CXXFLAGS = -msse -fcheck-new -I../../include
all: all-am
.SUFFIXES:

12
audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-source_example_SoundStretch_Makefile_am,v 1.1.1.1 2007/12/08 11:05:58 ajacoutot Exp $
--- source/example/SoundStretch/Makefile.am.orig Sat Nov 24 13:45:12 2007
+++ source/example/SoundStretch/Makefile.am Sat Nov 24 13:45:57 2007
@@ -47,7 +47,7 @@ soundstretch_LDADD=../../SoundTouch/libSoundTouch.la .
soundstretch_LDFLAGS=-s
## additional compiler flags
-soundstretch_CXXFLAGS=-O3 -I../bpm
+soundstretch_CXXFLAGS=-I../bpm
#clean-local:
# -rm -f additional-files-to-remove-on-make-clean

12
audio/soundtouch/patches/patch-source_example_SoundStretch_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_example_SoundStretch_Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $
--- source/example/SoundStretch/Makefile.in.orig Wed Jun 29 13:22:35 2011
+++ source/example/SoundStretch/Makefile.in Wed Jun 29 13:22:42 2011
@@ -183,7 +183,7 @@ EXTRA_DIST = soundstretch.dsp soundstretch.dsw
soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp
soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm
soundstretch_LDFLAGS = -s
-soundstretch_CXXFLAGS = -O3 -I../bpm
+soundstretch_CXXFLAGS = -I../bpm
all: all-am
.SUFFIXES:

12
audio/soundtouch/patches/patch-source_example_bpm_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-source_example_bpm_Makefile_am,v 1.1.1.1 2007/12/08 11:05:58 ajacoutot Exp $
--- source/example/bpm/Makefile.am.orig Sat Nov 24 13:45:06 2007
+++ source/example/bpm/Makefile.am Sat Nov 24 13:45:50 2007
@@ -33,7 +33,7 @@ libBPM_la_SOURCES=BPMDetect.cpp PeakFinder.cpp
# other compiler flags to add
-AM_CXXFLAGS=-O3 -I../../../include
+AM_CXXFLAGS=-I../../../include
# other linking flags to add
#libBPM_la_LIBADD=

12
audio/soundtouch/patches/patch-source_example_bpm_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_example_bpm_Makefile_in,v 1.1 2011/06/29 11:30:31 jasper Exp $
--- source/example/bpm/Makefile.in.orig Wed Jun 29 13:22:49 2011
+++ source/example/bpm/Makefile.in Wed Jun 29 13:22:54 2011
@@ -186,7 +186,7 @@ lib_LTLIBRARIES = libBPM.la
libBPM_la_SOURCES = BPMDetect.cpp PeakFinder.cpp
# other compiler flags to add
-AM_CXXFLAGS = -O3 -I../../../include
+AM_CXXFLAGS = -I../../../include
all: all-am
.SUFFIXES: