Attachment 39158 Details for Bug 61807 – file.diff

[patch] file.diff

file.diff (text/plain), 10.93 KB, created by edwin on 2004-01-23 22:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: edwin

Created: 2004-01-23 22:40:08 UTC

Size: 10.93 KB

patch

obsolete

>diff -u -r1.5 Makefile
>--- devel/directfb/Makefile	13 Nov 2003 14:45:00 -0000	1.5
>+++ devel/directfb/Makefile	23 Jan 2004 22:25:00 -0000
>@@ -16,14 +16,11 @@
> COMMENT=	Graphic development lightweight API
> 
> LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
>-		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
> 		png.5:${PORTSDIR}/graphics/png
> 
>-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
>-
>-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
>-	    	CPPFLAGS="${PTHREAD_CFLAGS}" \
>+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
> 		LDFLAGS="${PTHREAD_LIBS}"
>+USE_SDL=	sdl
> USE_LIBTOOL=	yes
> USE_GMAKE=	yes
> INSTALLS_SHLIB=	yes
>Index: devel/libuta/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/libuta/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- devel/libuta/Makefile	20 Jan 2004 21:44:20 -0000	1.17
>+++ devel/libuta/Makefile	23 Jan 2004 22:25:00 -0000
>@@ -19,7 +19,7 @@
> 
> USE_FREETYPE=	yes
> USE_LIBTOOL=	yes
>-USE_SDL=	yes
>+USE_SDL=	sdl
> GNU_CONFIGURE=	yes
> USE_REINPLACE=	yes
> INSTALLS_SHLIB=	yes
>@@ -38,7 +38,7 @@
> .endif
> 
> .if defined(WITH_SDL_MIXER)
>-USE_SDL=	mixer sdl
>+USE_SDL+=	mixer
> .endif
> 
> pre-everything::
>Index: devel/p5-SDL/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/p5-SDL/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- devel/p5-SDL/Makefile	20 Jan 2004 21:44:21 -0000	1.10
>+++ devel/p5-SDL/Makefile	23 Jan 2004 22:25:00 -0000
>@@ -16,28 +16,28 @@
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg
> 
>-USE_SDL=	yes
>+USE_SDL=	sdl
> 
> .include <bsd.port.pre.mk>
> 
> .if !defined(WITHOUT_SDL_TTF)
>-USE_SDL=	ttf sdl
>+USE_SDL+=	ttf
> .endif
> 
> .if !defined(WITHOUT_SDL_NET)
>-USE_SDL=	net sdl
>+USE_SDL+=	net
> .endif
> 
> .if !defined(WITHOUT_SDL_GFX)
>-USE_SDL=	gfx sdl
>+USE_SDL+=	gfx
> .endif
> 
> .if !defined(WITHOUT_SDL_IMAGE)
>-USE_SDL=	image sdl
>+USE_SDL+=	image
> .endif
> 
> .if !defined(WITHOUT_SDL_MIXER)
>-USE_SDL=	mixer sdl
>+USE_SDL+=	mixer
> .endif
> 
> .if ${PERL_LEVEL} < 500600
>Index: emulators/dosbox/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/emulators/dosbox/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- emulators/dosbox/Makefile	1 Nov 2003 14:28:19 -0000	1.5
>+++ emulators/dosbox/Makefile	23 Jan 2004 22:25:00 -0000
>@@ -14,12 +14,11 @@
> MAINTAINER=	knyghtmare@knyghtmare.com
> COMMENT=	An emulator of a PC with DOS
> 
>-LIB_DEPENDS=	SDL_net.0:${PORTSDIR}/net/sdl_net \
>-		png.5:${PORTSDIR}/graphics/png
>+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
> 
> GNU_CONFIGURE=	yes
> USE_REINPLACE=	yes
>-USE_SDL=	yes
>+USE_SDL=	sdl net
> 
> MAN1=		dosbox.1
> PKGMESSAGE=	${WRKDIR}/pkg-message
>Index: emulators/xmame/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/emulators/xmame/Makefile,v
>retrieving revision 1.63
>diff -u -r1.63 Makefile
>--- emulators/xmame/Makefile	12 Jan 2004 12:14:49 -0000	1.63
>+++ emulators/xmame/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -195,8 +195,7 @@
> 	@${ECHO_MSG} "'make options' for more information."
> 	@exit 1
> .endif
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
>+USE_SDL=	sdl
> DISPLAY_METHOD=	SDL
> SDLSOUNDCOMMENT=
> .endif
>Index: emulators/yape/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/emulators/yape/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- emulators/yape/Makefile	31 Mar 2003 09:35:13 -0000	1.5
>+++ emulators/yape/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -14,11 +14,9 @@
> MAINTAINER=	janos.mohacsi@bsd.hu
> COMMENT=	Yet Another Commodore +4 Emulator
> 
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
>-
>+USE_SDL=	sdl
> NO_WRKSUBDIR=	yes
> USE_REINPLACE=	yes
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
> USE_GMAKE=	yes
> ALL_TARGET=	yape
> 
>Index: emulators/zsnes/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/emulators/zsnes/Makefile,v
>retrieving revision 1.15
>diff -u -r1.15 Makefile
>--- emulators/zsnes/Makefile	6 Nov 2003 23:09:20 -0000	1.15
>+++ emulators/zsnes/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -18,9 +18,9 @@
> 
> # This must be >= 0.98!
> BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
>-		png.5:${PORTSDIR}/graphics/png
>+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
> 
>+USE_SDL=	sdl
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
> 
>@@ -28,9 +28,6 @@
> 
> # non-portable, for a portable version see emulators/snes9x
> ONLY_FOR_ARCHS=	i386
>-
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
>-CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
> 
>Index: graphics/synaesthesia/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/synaesthesia/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- graphics/synaesthesia/Makefile	7 Jan 2004 03:38:01 -0000	1.6
>+++ graphics/synaesthesia/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -13,17 +13,13 @@
> MAINTAINER=	petef@FreeBSD.org
> COMMENT=	Graphically represents sound in real time
> 
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
>-
>-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
>-
>+USE_SDL=	yes
> USE_GMAKE=	Yes
> USE_REINPLACE=	Yes
> USE_X_PREFIX=	Yes
> 
> GNU_CONFIGURE=	Yes
> CONFIGURE_ARGS=	--with-sdl-prefix=${LOCALBASE}
>-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,stdint.h,inttypes.h,' `${FIND} ${WRKSRC} -name \*.cc -or -name \*.c`
>Index: graphics/vp/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/vp/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- graphics/vp/Makefile	14 Jul 2003 02:52:59 -0000	1.9
>+++ graphics/vp/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -14,15 +14,13 @@
> MAINTAINER=	markp@FreeBSD.org
> COMMENT=	An image viewer for X
> 
>-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
>+USE_SDL=	image
> 
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
> USE_GETOPT_LONG=yes
> USE_LIBTOOL=	yes
> CPPFLAGS=	-I${LOCALBASE}/include
> LDFLAGS=	-L${LOCALBASE}/lib
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
>-		SDL_CONFIG="${SDL_CONFIG}" \
> 		ac_cv_func_getopt_long=yes
> USE_REINPLACE=	yes
> MAN1=		vp.1
>Index: graphics/xmms-infinity/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/xmms-infinity/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- graphics/xmms-infinity/Makefile	8 Sep 2003 00:10:16 -0000	1.9
>+++ graphics/xmms-infinity/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -14,14 +14,10 @@
> MAINTAINER=	dyeske@yahoo.com
> COMMENT=	A XMMS plug-in which generate full-screen interactive light effects
> 
>-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
>-		SDL-1.1.5:${PORTSDIR}/devel/sdl12
>+LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
> RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
> 
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
>-
>-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
>-
>+USE_SDL=	sdl
> GNU_CONFIGURE=	yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>Index: graphics/xmms-jess/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/xmms-jess/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- graphics/xmms-jess/Makefile	20 Apr 2003 19:21:59 -0000	1.7
>+++ graphics/xmms-jess/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -15,12 +15,9 @@
> COMMENT=	A XMMS visualization plugin that uses SDL
> 
> BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
> RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
> 
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
>-
>-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
>+USE_SDL=	sdl
> GNU_CONFIGURE=	yes
> USE_GNOME=	glib12
> USE_X_PREFIX=	yes
>Index: graphics/xmms-nebulus/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/xmms-nebulus/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- graphics/xmms-nebulus/Makefile	1 Oct 2003 15:10:03 -0000	1.7
>+++ graphics/xmms-nebulus/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -14,9 +14,9 @@
> COMMENT=	A XMMS visualization plugin that uses SDL and OpenGL
> 
> BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
> RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
> 
>+USE_SDL=	sdl
> USE_X_PREFIX=	yes
> USE_MESA=	yes
> USE_GNOME=	gtk12
>@@ -25,10 +25,6 @@
> USE_REINPLACE=	yes
> 
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
>-
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
>-CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
>-MAKE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
> 
> post-patch:
> 	@${REINPLACE_CMD} -E -e \
>Index: graphics/xmms-paranormal/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/xmms-paranormal/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- graphics/xmms-paranormal/Makefile	20 Apr 2003 19:21:59 -0000	1.8
>+++ graphics/xmms-paranormal/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -15,14 +15,13 @@
> MAINTAINER=	dyeske@yahoo.com
> COMMENT=	An adaptation of the "OpenGL Spectrum Analyzer" from XMMS
> 
>-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
>-		SDL-1.1.5:${PORTSDIR}/devel/sdl12
>+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
> BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
> RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
> 
>-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
>-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include/libxml2/libxml" SDL_CONFIG="${SDL_CONFIG}"
>+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include/libxml2/libxml"
> 
>+USE_SDL=	sdl
> GNU_CONFIGURE=	yes
> INSTALLS_SHLIB=	yes
> USE_GNOME=	gtk12
>Index: lang/lush/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/lang/lush/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- lang/lush/Makefile	23 Jan 2004 18:12:00 -0000	1.2
>+++ lang/lush/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -13,12 +13,11 @@
> MAINTAINER=	dyeske@yahoo.com
> COMMENT=	A high level object-oriented programming language
> 
>-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
>-		intl.5:${PORTSDIR}/devel/gettext-old
>+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
> 
> USE_X_PREFIX=	yes
> USE_GL=		yes
>-USE_SDL=	yes
>+USE_SDL=	sdl image
> GNU_CONFIGURE=	yes
> USE_REINPLACE=	yes
> 
>Index: misc/explosions/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/misc/explosions/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- misc/explosions/Makefile	20 Nov 2003 15:06:06 -0000	1.8
>+++ misc/explosions/Makefile	23 Jan 2004 22:25:03 -0000
>@@ -14,14 +14,10 @@
> MAINTAINER=	petef@FreeBSD.org
> COMMENT=	3D objects flying around resembling explosions with various effects
> 
>-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
>-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
>-
>+USE_SDL=	sdl image
> USE_GMAKE=	yes
> USE_PERL5_BUILD=yes
> USE_X_PREFIX=	yes
>-
>-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
> 
> post-patch:
> 	@${PERL} -pi -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \

Actions: View | Diff

Attachments on bug 61807: 39158