Do not install .la library wrappers.

6 files changed, 30 insertions, 14 deletions

diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 755f51442c99..bf840a5e4338 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libogg
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
@@ -18,7 +19,7 @@ MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
 
 MAINTAINER=	naddy@FreeBSD.org
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 .if defined(NOPORTDOCS)
diff --git a/audio/libogg/files/patch-configure b/audio/libogg/files/patch-configure
index 81c57023e8d0..93237bff479d 100644
--- a/audio/libogg/files/patch-configure
+++ b/audio/libogg/files/patch-configure
@@ -1,7 +1,17 @@
+
 $FreeBSD$
---- configure.orig	Mon Jun 18 18:08:30 2001
-+++ configure	Tue Jul 17 03:07:30 2001
-@@ -1492,7 +1492,7 @@ if test -z "$GCC"; then
+
+--- configure.orig	Fri Jul 19 16:13:10 2002
++++ configure	Sat Oct  5 17:51:53 2002
+@@ -5363,6 +5363,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'
+@@ -5388,7 +5389,7 @@
  		;;
          *)
                  DEBUG="-g"
@@ -10,7 +20,7 @@ $FreeBSD$
                  PROFILE="-g -p" 
  		;;
          esac
-@@ -1514,9 +1514,9 @@ else
+@@ -5410,9 +5411,9 @@
  		PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
  		;;
          *)
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index 4d846316fd8b..b14a48fcc760 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -3,7 +3,6 @@ include/ogg/config_types.h
 include/ogg/ogg.h
 include/ogg/os_types.h
 lib/libogg.a
-lib/libogg.la
 lib/libogg.so
 lib/libogg.so.4
 share/aclocal/ogg.m4
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 48c7345e8b9a..78c9b29ed892 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
@@ -20,7 +21,7 @@ MAINTAINER=	naddy@FreeBSD.org
 
 LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libvorbis/files/patch-configure b/audio/libvorbis/files/patch-configure
index 39b3be55e8a4..84a4b4365a89 100644
--- a/audio/libvorbis/files/patch-configure
+++ b/audio/libvorbis/files/patch-configure
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Jan  1 22:47:11 2002
-+++ configure	Tue Jan  1 22:54:27 2002
-@@ -5337,7 +5337,7 @@
+--- configure.orig	Fri Jul 19 16:12:17 2002
++++ configure	Sat Oct  5 17:57:37 2002
+@@ -5386,6 +5386,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'
+@@ -5441,7 +5442,7 @@
  		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
  	*)
  		DEBUG="-g"
@@ -12,7 +20,7 @@ $FreeBSD$
  		PROFILE="-g -p" ;;
          esac
  else
-@@ -5428,9 +5428,9 @@
+@@ -5536,9 +5537,9 @@
  		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
  		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
  	*)
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 062fb396c971..fdeb223fe3ac 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -3,15 +3,12 @@ include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
 lib/libvorbis.a
-lib/libvorbis.la
 lib/libvorbis.so
 lib/libvorbis.so.2
 lib/libvorbisenc.a
-lib/libvorbisenc.la
 lib/libvorbisenc.so
 lib/libvorbisenc.so.2
 lib/libvorbisfile.a
-lib/libvorbisfile.la
 lib/libvorbisfile.so
 lib/libvorbisfile.so.3
 share/aclocal/vorbis.m4