Index: avifile/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/avifile/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- avifile/Makefile 20 Dec 2003 16:37:55 -0000 1.46 +++ avifile/Makefile 23 Jan 2004 21:59:59 -0000 @@ -28,8 +28,7 @@ INSTALLS_SHLIB= yes LIBTOOLFILES= acinclude.m4 -CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \ @@ -48,7 +47,6 @@ LIB_VERSION= 3 VERSION= 0.7 -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config DIFF?= /usr/bin/diff FMT?= /usr/bin/fmt @@ -121,8 +119,7 @@ # sdl .if !defined(WITHOUT_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 - +USE_SDL= sdl CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} .else Index: dumpmpeg/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/dumpmpeg/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- dumpmpeg/Makefile 4 Apr 2003 01:38:36 -0000 1.5 +++ dumpmpeg/Makefile 23 Jan 2004 21:59:59 -0000 @@ -15,12 +15,10 @@ MAINTAINER= ijliao@FreeBSD.org COMMENT= Dump frames from mpeg movies -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ - smpeg:${PORTSDIR}/multimedia/smpeg +LIB_DEPENDS= smpeg:${PORTSDIR}/multimedia/smpeg -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ENV= SDL_CONFIG=${SDL_CONFIG} MAN1= dumpmpeg.1 Index: enjoympeg/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/enjoympeg/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- enjoympeg/Makefile 4 Apr 2003 01:38:37 -0000 1.5 +++ enjoympeg/Makefile 23 Jan 2004 22:00:00 -0000 @@ -14,11 +14,9 @@ MAINTAINER= ijliao@FreeBSD.org COMMENT= An MPEG-1 video player -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ - smpeg:${PORTSDIR}/multimedia/smpeg +LIB_DEPENDS= smpeg:${PORTSDIR}/multimedia/smpeg -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ENV= SDL_CONFIG=${SDL_CONFIG} .include Index: ffmpeg/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/ffmpeg/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- ffmpeg/Makefile 27 Dec 2003 23:02:44 -0000 1.25 +++ ffmpeg/Makefile 23 Jan 2004 22:00:00 -0000 @@ -112,7 +112,7 @@ .endif ## SDL .ifdef(WITH_SDL) -USE_SDL= yes +USE_SDL= sdl PLIST_SUB+= SDL="" .else Index: gstreamer-plugins/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/gstreamer-plugins/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- gstreamer-plugins/Makefile 20 Dec 2003 16:37:56 -0000 1.37 +++ gstreamer-plugins/Makefile 23 Jan 2004 22:00:01 -0000 @@ -55,7 +55,6 @@ MAN1= gst-launch-ext.1 gst-visualise.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config" # library minor number @@ -581,11 +580,10 @@ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +USE_SLD= sdl CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} -CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} PLIST_SUB+= SDL="" .endif Index: libdv/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libdv/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- libdv/Makefile 20 Apr 2003 19:35:00 -0000 1.16 +++ libdv/Makefile 23 Jan 2004 22:00:04 -0000 @@ -35,12 +35,8 @@ .include .ifndef(WITHOUT_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 - -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config - +USE_SDL= sdl CONFIGURE_ARGS+= --enable-sdl -CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" .endif pre-everything:: Index: libmovtar/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libmovtar/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- libmovtar/Makefile 14 May 2003 16:15:34 -0000 1.10 +++ libmovtar/Makefile 23 Jan 2004 22:00:04 -0000 @@ -14,20 +14,17 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Supports reading/writing of MJPEG video in YUV 4:2:2 JPEG -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ - jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +USE_SDL= sdl USE_GNOME= gtk12 USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-m4data-prefix=${PREFIX}/share -CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ - LOCALBASE="${LOCALBASE}" +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS=${PTHREAD_LIBS} - -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config .include Index: libmpeg2/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libmpeg2/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- libmpeg2/Makefile 8 Sep 2003 00:54:07 -0000 1.13 +++ libmpeg2/Makefile 23 Jan 2004 22:00:04 -0000 @@ -30,12 +30,10 @@ .endif .ifdef(WITH_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +USE_SDL= sdl EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libvo::configure.incl -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config -CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" CONFIGURE_ARGS+= --enable-sdl .else CONFIGURE_ARGS+= --disable-sdl Index: libxine/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/Makefile,v retrieving revision 1.53 diff -u -r1.53 Makefile --- libxine/Makefile 23 Jan 2004 18:12:13 -0000 1.53 +++ libxine/Makefile 23 Jan 2004 22:00:04 -0000 @@ -35,7 +35,7 @@ USE_GNOME= gnomehack gnometarget USE_GMAKE= yes USE_GL= yes -USE_SDL= yes +USE_SDL= sdl USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ Index: mjpegtools/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/mjpegtools/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- mjpegtools/Makefile 28 Jun 2003 21:55:28 -0000 1.24 +++ mjpegtools/Makefile 23 Jan 2004 22:00:04 -0000 @@ -36,8 +36,6 @@ yuvplay.1 yuvscaler.1 yuvycsnoise.1 MAN5= yuv4mpeg.5 -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config - DOC_FILES= AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \ PLANS README README.DV README.avilib README.glav \ README.lavpipe README.transist TODO @@ -106,10 +104,9 @@ .endif # .ifdef(WITH_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +USE_SDL= sdl CONFIGURE_ARGS+= --with-sdl -CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" .endif # .ifdef(WITH_QUICKTIME) Index: mpeg4ip/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/mpeg4ip/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- mpeg4ip/Makefile 4 Dec 2003 05:33:42 -0000 1.27 +++ mpeg4ip/Makefile 23 Jan 2004 22:00:07 -0000 @@ -19,7 +19,7 @@ USE_GNOME= gtk20 USE_GMAKE= yes -USE_SDL= yes +USE_SDL= sdl USE_LIBTOOL= yes USE_REINPLACE= yes CONFIGURE_ARGS= --datadir=${DATADIR} \ Index: mplayer/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/mplayer/Makefile,v retrieving revision 1.79 diff -u -r1.79 Makefile --- mplayer/Makefile 23 Dec 2003 21:48:51 -0000 1.79 +++ mplayer/Makefile 23 Jan 2004 22:00:07 -0000 @@ -416,7 +416,7 @@ .endif .if defined(WITH_SDL) -USE_SDL= yes +USE_SDL= sdl .endif .if defined(WITH_ESOUND) Index: mplayerxp/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/mplayerxp/Makefile,v retrieving revision 1.45 diff -u -r1.45 Makefile --- mplayerxp/Makefile 12 Aug 2003 22:27:30 -0000 1.45 +++ mplayerxp/Makefile 23 Jan 2004 22:00:07 -0000 @@ -31,7 +31,6 @@ MAN1= mplayerxp.1 -SDL_CONFIG?= "${LOCALBASE}/bin/sdl11-config" WIN32_CODEC_PREFIX= ${LOCALBASE}/lib/win32 # dirs to create before installation @@ -138,16 +137,15 @@ .endif # sdl .ifdef(WITH_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +USE_SDL= sdl CONFIGURE_ARGS+= --enable-sdl -CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} .else CONFIGURE_ARGS+= --disable-sdl .endif # sdl_image .ifdef(WITH_SDL_IMAGE) -LIB_DEPENDS+= SDL_image.10:${PORTSDIR}/graphics/sdl_image +USE_SDL+= image CONFIGURE_ARGS+= --enable-sdl-image .else Index: oqtencoder/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/oqtencoder/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- oqtencoder/Makefile 20 Nov 2003 15:06:07 -0000 1.5 +++ oqtencoder/Makefile 23 Jan 2004 22:00:08 -0000 @@ -1,4 +1,4 @@ -# New ports collection makefile for: oqtplayer +# New ports collection makefile for: oqtencoder # Date created: Mon Sep 24 16:26:33 BRT 2001 # Whom: Mario Sergio Fujikawa Ferreira # @@ -18,10 +18,8 @@ LIB_DEPENDS= openquicktime.0:${PORTSDIR}/multimedia/openquicktime -MAKE_ENV= SDL_CONFIG=${SDL_CONFIG} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config USE_PERL5_BUILD=yes post-patch: Index: oqtplayer/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/oqtplayer/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- oqtplayer/Makefile 23 Feb 2003 19:58:28 -0000 1.6 +++ oqtplayer/Makefile 23 Jan 2004 22:00:08 -0000 @@ -16,13 +16,11 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= A very very small, not functionnal, video OpenQuicktime (TM) player -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ - openquicktime.0:${PORTSDIR}/multimedia/openquicktime +LIB_DEPENDS= openquicktime.0:${PORTSDIR}/multimedia/openquicktime +USE_SDL= sdl MAKE_ENV= SDL_CONFIG=${SDL_CONFIG} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config CFLAGS+= -I${LOCALBASE}/include Index: slideshow/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/slideshow/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- slideshow/Makefile 3 Oct 2003 11:04:57 -0000 1.7 +++ slideshow/Makefile 23 Jan 2004 22:00:08 -0000 @@ -15,20 +15,18 @@ MAINTAINER= stefan@fafoe.narf.at COMMENT= A slideshow presentation tool to write slides in Python or XML -LIB_DEPENDS= SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \ - SDL_image.10:${PORTSDIR}/graphics/sdl_image \ - xml2.5:${PORTSDIR}/textproc/libxml2 \ +LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ smpeg.1:${PORTSDIR}/multimedia/smpeg WRKSRC= ${WRKDIR}/${DISTNAME:C/-pre.*//} -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL= yes USE_PYTHON= yes USE_REINPLACE= yes +USE_SDL= image ttf CONFIGURE_ARGS+= --disable-gtk-gui -CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" LDFLAGS="-lstdc++" +CONFIGURE_ENV+= LDFLAGS="-lstdc++" .include Index: transcode/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/transcode/Makefile,v retrieving revision 1.34 diff -u -r1.34 Makefile --- transcode/Makefile 20 Dec 2003 16:37:57 -0000 1.34 +++ transcode/Makefile 23 Jan 2004 22:00:09 -0000 @@ -23,8 +23,7 @@ GNU_CONFIGURE= yes LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --program-transform-name="" USE_REINPLACE= yes INSTALLS_SHLIB= yes @@ -132,7 +131,7 @@ .endif .if defined(WITH_SDL) -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +USE_SDL= sdl WITH_LIBDV= yes PLIST_SUB+= WITH_SDL="" .else Index: vlc/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- vlc/Makefile 23 Jan 2004 18:12:13 -0000 1.35 +++ vlc/Makefile 23 Jan 2004 22:00:09 -0000 @@ -36,7 +36,7 @@ USE_GMAKE= yes USE_GNOME= gtk12 USE_REINPLACE= yes -USE_SDL= yes +USE_SDL= sdl USE_XLIB= yes USE_GCC= 3.2