Clean-up, generally to make it build on Mac OS X

2 files changed, 21 insertions, 13 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 05c79b1fcaf..c17f002637b 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2012/06/14 07:45:11 sbd Exp $
+# $NetBSD: Makefile,v 1.75 2012/07/07 15:50:19 adam Exp $
 
 DISTNAME=	transcode-1.1.5
 PKGREVISION=	13
@@ -17,28 +17,33 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		awk:run gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-xio
+CONFIGURE_ARGS+=	--enable-libmpeg2
+CONFIGURE_ARGS+=	--enable-libmpeg2convert
 CONFIGURE_ARGS+=	--enable-libpostproc
-CONFIGURE_ARGS+=	--enable-oss
 CONFIGURE_ARGS+=	--enable-ogg
 CONFIGURE_ARGS+=	--enable-theora
 CONFIGURE_ARGS+=	--enable-vorbis
-CONFIGURE_ARGS+=	--enable-libmpeg2
-CONFIGURE_ARGS+=	--enable-libmpeg2convert
 CONFIGURE_ARGS+=	--enable-xvid
 CONFIGURE_ARGS+=	--with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg}
 CONFIGURE_ENV+=		PATH_TO_AWK=${AWK:Q}
 
 PTHREAD_AUTO_VARS=	yes
 PTHREAD_OPTS=		require
-LIBS+=			${LIBOSSAUDIO}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
-PLIST.i386=	yes
+PLIST.i386=		yes
 .endif
 
-PLIST_VARS+=	i386
+PLIST_VARS+=		i386 oss x11
+
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=	--enable-oss
+PLIST.oss=		yes
+PLIST.x11=		yes
+LIBS+=			${LIBOSSAUDIO}
+.endif
 
 .include "options.mk"
 
@@ -46,18 +51,21 @@ PLIST_VARS+=	i386
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
+.endif
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
index 99b8de81cef..1b6ef015556 100644
--- a/multimedia/transcode/PLIST
+++ b/multimedia/transcode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/06/03 19:33:33 gls Exp $
+@comment $NetBSD: PLIST,v 1.17 2012/07/07 15:50:19 adam Exp $
 bin/avifix
 bin/aviindex
 bin/avimerge
@@ -78,7 +78,7 @@ lib/transcode/filter_normalize.la
 lib/transcode/filter_null.la
 lib/transcode/filter_pp.la
 ${PLIST.dv}lib/transcode/filter_preview.la
-lib/transcode/filter_pv.la
+${PLIST.x11}lib/transcode/filter_pv.la
 lib/transcode/filter_resample.la
 lib/transcode/filter_skip.la
 lib/transcode/filter_slowmo.la
@@ -87,7 +87,7 @@ lib/transcode/filter_smartdeinter.la
 lib/transcode/filter_smartyuv.la
 lib/transcode/filter_smooth.la
 lib/transcode/filter_stabilize.la
-lib/transcode/filter_subtitler.la
+${PLIST.x11}lib/transcode/filter_subtitler.la
 lib/transcode/filter_testframe.la
 ${PLIST.freetype2}lib/transcode/filter_text.la
 ${PLIST.i386}lib/transcode/filter_tomsmocomp.la
@@ -113,7 +113,7 @@ lib/transcode/import_mpeg2.la
 lib/transcode/import_mplayer.la
 lib/transcode/import_null.la
 lib/transcode/import_ogg.la
-lib/transcode/import_oss.la
+${PLIST.oss}lib/transcode/import_oss.la
 lib/transcode/import_pvn.la
 lib/transcode/import_raw.la
 lib/transcode/import_vag.la
@@ -122,7 +122,7 @@ lib/transcode/import_vob.la
 lib/transcode/import_x11.la
 lib/transcode/import_xml.la
 lib/transcode/import_xvid.la
-lib/transcode/import_yuv4mpeg.la
+${PLIST.mjpegtools}lib/transcode/import_yuv4mpeg.la
 lib/transcode/parse_csv.awk
 lib/transcode/xvid4.cfg
 man/man1/avifix.1