Fix typo introduced in last revision s/Mesa/Meta/

Libtoolize build and install, in order to fix build on i386 Mac OS X 10.4.7.

4 files changed, 35 insertions, 10 deletions

diff --git a/audio/xmms-meta-input/Makefile b/audio/xmms-meta-input/Makefile
index 462c9d0acc7..d80e552e9de 100644
--- a/audio/xmms-meta-input/Makefile
+++ b/audio/xmms-meta-input/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/06/19 23:16:34 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/08/29 05:35:27 ben Exp $
 #
 
 DISTNAME=		xmms-meta-input-0.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://www.corbac.com/Data/Sources/
 
@@ -11,10 +11,13 @@ HOMEPAGE=		http://www.corbac.com/page3.html
 COMMENT=		XMMS plugin wrapper for shell scripts
 
 INSTALLATION_DIRS=	lib/xmms/Input
-REQD_DIRS+=		lib/xmms/Input/Mesa
+REQD_DIRS+=		lib/xmms/Input/Meta
+
+USE_LIBTOOL=		yes
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libmetainput.so ${PREFIX}/lib/xmms/Input
+	${LIBTOOL} --mode=install ${INSTALL_DATA} \
+		${WRKSRC}/libmetainput.la ${PREFIX}/lib/xmms/Input
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/xmms/Input/Meta
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmms-input
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmms-input
diff --git a/audio/xmms-meta-input/PLIST b/audio/xmms-meta-input/PLIST
index 0cda4986ce1..cdb82f8c1f7 100644
--- a/audio/xmms-meta-input/PLIST
+++ b/audio/xmms-meta-input/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/19 23:16:34 jlam Exp $
-lib/xmms/Input/libmetainput.so
+@comment $NetBSD: PLIST,v 1.4 2006/08/29 05:35:27 ben Exp $
+lib/xmms/Input/libmetainput.la
 share/doc/xmms-input/README
 share/examples/xmms-meta-input/dsp_input
 share/examples/xmms-meta-input/esound_link
diff --git a/audio/xmms-meta-input/distinfo b/audio/xmms-meta-input/distinfo
index 7d52957f7f0..2b4a036ac3e 100644
--- a/audio/xmms-meta-input/distinfo
+++ b/audio/xmms-meta-input/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:55 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/08/29 05:35:27 ben Exp $
 
 SHA1 (xmms-meta-input-0.4.tar.gz) = 46d3644ca51b21b6756b305068aeb54125c44768
 RMD160 (xmms-meta-input-0.4.tar.gz) = bb4623cd28d8f0946a922b4bfa100855a913f8d3
 Size (xmms-meta-input-0.4.tar.gz) = 14653 bytes
-SHA1 (patch-aa) = 25f9a00942c7b8bb4056d5aafeecc903a931b357
+SHA1 (patch-aa) = 01cc72cb9f9efff119fddcb2aad0852133a190e1
 SHA1 (patch-ab) = b9b926d7be76a41139281ab7e52dbe8e60cb33ae
diff --git a/audio/xmms-meta-input/patches/patch-aa b/audio/xmms-meta-input/patches/patch-aa
index e41c8c10383..9a59e4234bf 100644
--- a/audio/xmms-meta-input/patches/patch-aa
+++ b/audio/xmms-meta-input/patches/patch-aa
@@ -1,10 +1,32 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/24 00:09:55 ben Exp $
+$NetBSD: patch-aa,v 1.2 2006/08/29 05:35:27 ben Exp $
 
 --- Makefile.orig	2002-05-02 08:34:52.000000000 -0700
 +++ Makefile
 @@ -1,4 +1,4 @@
 -CCOPT = -O6
-+CCOPT = -fPIC
++CCOPT = #-O6
  
  # Global XMMS directory
  PLAYER_DIR = "\"`xmms-config --input-plugin-dir`/Meta\""
+@@ -11,10 +11,10 @@ PLUGIN_DIR = "`xmms-config --input-plugi
+ all: libmetainput.so
+ 
+ install: all
+-	cp -f libmetainput.so ${PLUGIN_DIR}
++	${LIBTOOL} --mode=install cp libmetainput.la ${PLUGIN_DIR}
+ 
+-libmetainput.so: meta-input.c
+-	gcc ${CCOPT} -shared `xmms-config --cflags` `xmms-config --libs` -DPLAYER_DIR=${PLAYER_DIR} -o libmetainput.so meta-input.c
++libmetainput.so: meta-input.lo
++	${LIBTOOL} --mode=link ${CC} `xmms-config --libs` -o libmetainput.la meta-input.lo -rpath ${PREFIX}/lib -module -avoid-version
+ 	@echo
+ 	@echo ======================================
+ 	@echo "The meta-input players directory is:"
+@@ -24,5 +24,7 @@ libmetainput.so: meta-input.c
+ 	@echo "recompile...)"
+ 	@echo ======================================
+ 	@echo
++meta-input.lo:	meta-input.c
++	${LIBTOOL} --mode=compile ${CC} ${CCOPT} `xmms-config --cflags` -DPLAYER_DIR=${PLAYER_DIR} -c meta-input.c
+ clean:
+ 	rm -f *.o libmetainput.so