summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2003-09-20 14:22:45 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2003-09-20 14:22:45 +0000
commit3a054bbc2a4c19011ab826962406e84575635599 (patch)
tree3421c65f3d70a5d9c1cf00c4f550e0722175a982
parentMark BROKEN because of compilation errors and security problems. (diff)
* Respect PTHREAD_CFLAGS and PTHREAD_LIBS.
* Use our libtool. Reported by: kris (bento)
-rw-r--r--audio/vorbis-tools/Makefile6
-rw-r--r--audio/vorbis-tools/files/patch-configure16
2 files changed, 16 insertions, 6 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index ce7978f67020..132368ec40cc 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -23,9 +23,11 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
intl.5:${PORTSDIR}/devel/gettext \
vorbis.2:${PORTSDIR}/audio/libvorbis
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
MAN1= ogg123.1 oggdec.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1
diff --git a/audio/vorbis-tools/files/patch-configure b/audio/vorbis-tools/files/patch-configure
index 4c28d162f384..da6c3614fc45 100644
--- a/audio/vorbis-tools/files/patch-configure
+++ b/audio/vorbis-tools/files/patch-configure
@@ -1,9 +1,17 @@
$FreeBSD$
---- configure.orig Wed Jan 2 01:35:43 2002
-+++ configure Wed Jan 2 01:35:59 2002
-@@ -5342,7 +5342,7 @@
+--- configure.orig Fri Jul 19 16:18:55 2002
++++ configure Sat Sep 20 16:11:32 2003
+@@ -5410,6 +5410,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'
+@@ -7244,7 +7245,7 @@
;;
*)
DEBUG="-g"
@@ -12,7 +20,7 @@ $FreeBSD$
PROFILE="-g -p"
;;
esac
-@@ -5365,8 +5365,8 @@
+@@ -7267,8 +7268,8 @@
;;
*)
DEBUG="-g -Wall -fsigned-char"