aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-05-31 13:28:23 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-05-31 13:28:23 +0000
commite45a0eff45c0ff572b07ef93727d06f97f1771d3 (patch)
tree50e89072fc312456af6a59a311bb7ce1b9fe938f /audio
parent8ed1883310901f884b208bdb60436fb60e7e46a9 (diff)
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/libshout2/Makefile12
-rw-r--r--audio/libshout2/files/patch-configure10
-rw-r--r--audio/libshout2/pkg-plist1
3 files changed, 11 insertions, 12 deletions
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 1152aeed3e9c..bfe43171c9a7 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -27,16 +27,6 @@ USE_LIBTOOL_VER=13
CONFLICTS= libshout-1.0.7
USE_REINPLACE= yes
-.include <bsd.port.pre.mk>
-
-## Megacrude hack to make the shared lib link against libc_r on -STABLE.
-## If anybody finds a way to do it with -pthread, let me know.
-
-.if ${OSVERSION} < 500016
-CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-lc_r -L${LOCALBASE}/lib"
-.endif
-
pre-configure:
@ ${REINPLACE_CMD} -e "s|-ffast-math||g" ${WRKSRC}/configure
@@ -44,4 +34,4 @@ post-configure:
@ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
${WRKSRC}/Makefile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/libshout2/files/patch-configure b/audio/libshout2/files/patch-configure
new file mode 100644
index 000000000000..086b3d4b1a77
--- /dev/null
+++ b/audio/libshout2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Mon May 31 05:09:07 2004
++++ configure Mon May 31 05:09:16 2004
+@@ -7681,6 +7681,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 8b06a1deff1b..35bf1faeee96 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -1,6 +1,5 @@
include/shout/shout.h
lib/libshout.a
-lib/libshout.la
lib/libshout.so
lib/libshout.so.3
libdata/pkgconfig/shout.pc