Cleanup:

- Use PLIST_FILES
- Don't patch Makefile if a do-build:-target would be smaller than the diff ;)
- CFLAGS handling did not work as intended anyway

6 files changed, 14 insertions, 72 deletions

diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index d65f2a8..08195eb 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -22,12 +22,18 @@ RUN_DEPENDS=	${X11BASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
+CFLAGS+=	`xmms-config --cflags` -L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "amd64"
 CFLAGS=	-fPIC
 .endif
 
+PLSIT_FILES=	lib/xmms/Input/liba52dec.so
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -shared -o liba52dec.so xmms-a52dec.c -la52
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/liba52dec.so ${PREFIX}/lib/xmms/Input/
 
diff --git a/audio/xmms-a52dec/files/patch-Makefile b/audio/xmms-a52dec/files/patch-Makefile
deleted file mode 100644
index 8c8b1a5..0000000
--- a/audio/xmms-a52dec/files/patch-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Thu Aug  1 19:30:39 2002
-+++ Makefile	Thu Aug  1 19:30:24 2002
-@@ -1,9 +1,9 @@
--CFLAGS = `gtk-config --cflags`
-+CFLAGS += `xmms-config --cflags` -L${LOCALBASE}/lib
- 
- all: liba52dec.so
- 
- liba52dec.so: xmms-a52dec.c xmms-a52dec.h
--	gcc -Wall ${CFLAGS} -shared -o liba52dec.so xmms-a52dec.c -la52
-+	${CC} ${CFLAGS} -shared -o liba52dec.so xmms-a52dec.c -la52
- 
- clean:
- 	rm -f liba52dec.so
diff --git a/audio/xmms-a52dec/pkg-plist b/audio/xmms-a52dec/pkg-plist
deleted file mode 100644
index 5380956..0000000
--- a/audio/xmms-a52dec/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-lib/xmms/Input/liba52dec.so
diff --git a/audio/xmms-osssurround/Makefile b/audio/xmms-osssurround/Makefile
index f6d7044..83c08da 100644
--- a/audio/xmms-osssurround/Makefile
+++ b/audio/xmms-osssurround/Makefile
@@ -20,10 +20,17 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-CFLAGS+=	-fPIC
+CFLAGS+=	-fPIC `xmms-config --cflags`
 
 BUILD_WRKSRC=	${WRKSRC}/OSSSurround-${PORTVERSION}
 
+PLIST_FILES=	lib/xmms/Output/libOSSSurround.so
+
+do-build:
+	cd ${BUILD_WRKSRC} && \
+	 ${CC} ${CFLAGS} -c *.c && \
+	 ${CC} -shared -olibOSSSurround.so about.o audio.o configure.o convert.o init.o mixer.o OSS.o
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/OSSSurround-0.1/libOSSSurround.so \
 		${PREFIX}/lib/xmms/Output/
diff --git a/audio/xmms-osssurround/files/patch-OSSSurround-0.1_Makefile b/audio/xmms-osssurround/files/patch-OSSSurround-0.1_Makefile
deleted file mode 100644
index 4d9b4a0..0000000
--- a/audio/xmms-osssurround/files/patch-OSSSurround-0.1_Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-
-$FreeBSD$
-
---- OSSSurround-0.1/Makefile.orig	Sun Mar 31 10:26:30 2002
-+++ OSSSurround-0.1/Makefile	Thu Aug  1 19:16:46 2002
-@@ -1,34 +1,34 @@
--CFLAGS = `gtk-config --cflags`
-+CFLAGS += `xmms-config --cflags`
- 
- all: libOSSSurround.so
- 
- libOSSSurround.so: about.o audio.o configure.o convert.o init.o mixer.o OSS.o
--	gcc -shared -olibOSSSurround.so about.o audio.o configure.o convert.o init.o mixer.o OSS.o
-+	${CC} -shared -olibOSSSurround.so about.o audio.o configure.o convert.o init.o mixer.o OSS.o
- 
- about.o: about.c config.h i18n.h OSS.h
--	gcc -c -oabout.o about.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -oabout.o about.c
- 
- audio.o: audio.c config.h i18n.h OSS.h
--	gcc -c -oaudio.o audio.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -oaudio.o audio.c
- 
- configure.o: configure.c config.h i18n.h OSS.h
--	gcc -c -oconfigure.o configure.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -oconfigure.o configure.c
- 
- convert.o: convert.c config.h i18n.h OSS.h
--	gcc -c -oconvert.o convert.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -oconvert.o convert.c
- 
- init.o: init.c config.h i18n.h OSS.h
--	gcc -c -oinit.o init.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -oinit.o init.c
- 
- mixer.o: mixer.c config.h i18n.h OSS.h
--	gcc -c -omixer.o mixer.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -omixer.o mixer.c
- 
- OSS.o: OSS.c config.h i18n.h OSS.h
--	gcc -c -oOSS.o OSS.c ${CFLAGS}
-+	${CC} ${CFLAGS} -c -oOSS.o OSS.c
- 
- clean:
- 	rm -f *.o libOSSSurround.so
- 
- install: libOSSSurround.so
- 	install -s -o root -g root -m 755 libOSSSurround.so "`xmms-config --output-plugin-dir`"
--	echo `xmms-config --output-plugin-dir`/libOSSSurround.so >> ../installed.files
-+	echo `xmms-config --output-plugin-dir`/libOSSSurround.so >> ../installed.files
diff --git a/audio/xmms-osssurround/pkg-plist b/audio/xmms-osssurround/pkg-plist
deleted file mode 100644
index 416d723..0000000
--- a/audio/xmms-osssurround/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-lib/xmms/Output/libOSSSurround.so