svn commit: r541994 - in head/audio/libvorbis: . files

[Christian Weisgerber]

Author: naddy
Date: Sat Jul 11 17:10:02 2020
New Revision: 541994
URL: https://svnweb.freebsd.org/changeset/ports/541994

Log:
  Explicitly link libvorbisfile with -lm.
  The bundled libtool is broken and loses the -lm dependency_lib, but
  it is also bad practice to rely on the dependencies of a dependency.
  
  Submitted by:	tijl

Added:
  head/audio/libvorbis/files/patch-lib_Makefile.in   (contents, props changed)
Modified:
  head/audio/libvorbis/Makefile

Modified: head/audio/libvorbis/Makefile
==============================================================================
--- head/audio/libvorbis/Makefile	Sat Jul 11 17:04:50 2020	(r541993)
+++ head/audio/libvorbis/Makefile	Sat Jul 11 17:10:02 2020	(r541994)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/vorbis/ \
@@ -17,13 +17,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:audio/libogg
 
-# The included libtool is broken and loses the -lm dependency_lib.
-USES=		libtool:build pathfix tar:xz
+USES=		libtool pathfix tar:xz
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
-MAKE_ARGS=	LIBTOOL=${PREFIX}/bin/libtool
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 

Added: head/audio/libvorbis/files/patch-lib_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libvorbis/files/patch-lib_Makefile.in	Sat Jul 11 17:10:02 2020	(r541994)
@@ -0,0 +1,13 @@
+The included libtool is broken and loses the -lm dependency_lib.
+
+--- lib/Makefile.in.orig	2020-07-11 16:57:29 UTC
++++ lib/Makefile.in
+@@ -461,7 +461,7 @@ libvorbis_la_LDFLAGS = -no-undefined -version-info @V_
+ libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@
+ libvorbisfile_la_SOURCES = vorbisfile.c
+ libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+-libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@
++libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm
+ libvorbisenc_la_SOURCES = vorbisenc.c 
+ libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+ libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@