Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-speex/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	8 Apr 2003 00:40:07 -0000	1.5
+++ Makefile	12 Jun 2003 01:52:03 -0000
@@ -16,7 +16,7 @@
 COMMENT=	XMMS input plugin to play speex files
 
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 WRKSRC=		${WRKDIR}/speex-xmms
@@ -26,15 +26,19 @@
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
+MAKE_ENV+=	CC="${CC}"
+
 pre-build:
-	@${REINPLACE_CMD} -e 's|^main|all|; \
-		s|-lgtk|${CFLAGS} `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` |; \
+	@${REINPLACE_CMD} -e \
+		's|^main|all|; \
+		s|-lgtk|`${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` |; \
 		s|-I/usr/include/xmms||; \
+		s|-Wall|${CFLAGS}|; \
 		s|^install: libspeex.o|install:|; \
 		s|-I/usr/lib/glib/include||; \
 		s|-I/usr/include/glib-1.2||; \
 		s|-I/usr/include/gtk-1.2||; \
-		s|/usr/lib/xmms/Input|${X11BASE}/lib/xmms/Input|' \
+		s|/usr/lib/xmms/Input|`xmms-config --input-plugin-dir`|' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>