Attachment 32575 Details for Bug 53768 – file.diff

[patch] file.diff

file.diff (text/plain), 11.43 KB, created by tkato on 2003-06-26 14:40:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-06-26 14:40:24 UTC

Size: 11.43 KB

patch

obsolete

>diff -urN /usr/ports/games/madbomber/Makefile games/madbomber/Makefile
>--- /usr/ports/games/madbomber/Makefile	Sat Apr 12 22:47:04 2003
>+++ games/madbomber/Makefile	Thu Jun 26 10:10:55 2003
>@@ -6,25 +6,31 @@
> #
> 
> PORTNAME=	madbomber
>-PORTVERSION=	0.2.4
>+PORTVERSION=	0.2.5
> CATEGORIES=	games
>-MASTER_SITES=	http://www.nbswebfx.com/downloads/
>+MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/madbomber/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A clone of Activision's classic Atari 2600 console game "Kaboom!"
> 
>-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
>-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
>+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
>+		SDL_image.10:${PORTSDIR}/graphics/sdl_image
> 
> SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
> 
>-USE_GMAKE=	yes
>-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
>+CPPFLAGS=	`${SDL_CONFIG} --cflags` -DDATA_PREFIX=\"${DATADIR}/\"
>+LDFLAGS=	`${SDL_CONFIG} --libs`
>+
>+do-build:
>+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} \
>+		${PORTNAME}.c ${LDFLAGS} -lSDL_mixer -lSDL_image
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/madbomber ${PREFIX}/bin
>-	@${MKDIR} ${PREFIX}/share/madbomber
>-	@cd ${WRKSRC}/data; tar cf - . | \
>-		(cd ${PREFIX}/share/madbomber; ${TAR} --unlink -xf - )
>+	${INSTALL_PROGRAM} ${WRKSRC}/madbomber ${PREFIX}/bin
>+	@${MKDIR} ${DATADIR}
>+	${TAR} -C ${WRKSRC}/data  --exclude embedded -cf - . | \
>+		${TAR} -C ${DATADIR} --unlink -xf -
>+	@${FIND} ${DATADIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
>+	@${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/madbomber/distinfo games/madbomber/distinfo
>--- /usr/ports/games/madbomber/distinfo	Tue Sep 10 20:11:08 2002
>+++ games/madbomber/distinfo	Thu Jun 26 09:25:44 2003
>@@ -1 +1 @@
>-MD5 (madbomber-0.2.4.tar.gz) = 4160087540d4eeebcb5e376cd7f36b1b
>+MD5 (madbomber-0.2.5.tar.gz) = 90772baaec90a10f6d9467bc4d3963a6
>diff -urN /usr/ports/games/madbomber/files/Makeflags games/madbomber/files/Makeflags
>--- /usr/ports/games/madbomber/files/Makeflags	Thu Sep 28 17:07:19 2000
>+++ games/madbomber/files/Makeflags	Thu Jan  1 09:00:00 1970
>@@ -1,37 +0,0 @@
>-# This file contains the template for Makeflags
>-
>-SYSTEM = FreeBSD
>-FEATURES =  -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -DUNSIGNED_AUDIO_DATA -DFORCE_XSHM -DNETPLAY
>-
>-LOGIC = netlogic
>-
>-XPMINCLUDE = 
>-XPMLINKDIR = 
>-
>-BINDIR = ${PREFIX}/bin
>-LIBDIR = ${PREFIX}/share/Maelstrom
>-DATAFILES = Images/*.icon Images/*.cicn "Maelstrom Fonts" \
>-            "Maelstrom Sounds" "Maelstrom Sprites"
>-
>-OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \
>-       dga_framebuf.o fontserv.o sound.o Mac_Resource.o imagedump.o \
>-       init.o $(LOGIC)/$(LOGIC).o \
>-       controls.o scores.o dialog.o fastrand.o netscore.o checksum.o \
>-       Utils.o shared.o myerror.o
>-SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o
>-
>-X11INCLUDE = -I${X11BASE}/include
>-INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE)
>-CFLAGS += $(INCLUDES) $(FEATURES) \
>-                       -pedantic -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\"
>-EXTRALIBS = 
>-X11LINKDIR = -L${X11BASE}/lib
>-X11LIBS = -lXpm $(XPMLINKDIR) -lX11 -lXext $(X11LINKDIR)
>-CSUMLIB = 
>-LIBS = $(EXTRALIBS) $(X11LIBS) $(CSUMLIB)
>-SOUNDLIBS = 
>-
>-INSTALL = install
>-
>-all: $(MAELSTROM)
>-
>diff -urN /usr/ports/games/madbomber/files/patch-aa games/madbomber/files/patch-aa
>--- /usr/ports/games/madbomber/files/patch-aa	Wed Feb 28 20:22:45 2001
>+++ games/madbomber/files/patch-aa	Thu Jan  1 09:00:00 1970
>@@ -1,49 +0,0 @@
>---- Makefile.orig	Fri Jun 30 10:27:37 2000
>-+++ Makefile	Thu Sep 28 10:43:24 2000
>-@@ -9,30 +9,30 @@
>- 
>- # User-definable stuff:
>- 
>--BIN_PREFIX=/usr/local/bin/
>--DATA_PREFIX=/usr/share/madbomber/
>-+BIN_PREFIX=$(PREFIX)/bin/
>-+DATA_PREFIX=$(PREFIX)/share/madbomber/
>- 
>- 
>- # Defaults for Linux:
>- 
>- TARGET=madbomber
>- TARGET_DEF=LINUX
>--SDL_CFLAGS := $(shell sdl-config --cflags)
>--SDL_LDFLAGS := $(shell sdl-config --libs)
>-+SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
>-+SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
>- 
>- 
>- # Sound-related definitions:
>- 
>--MIXER=-lSDL_mixer
>-+MIXER=-lSDL_mixer -lsmpeg
>- IMAGE=-lSDL_image
>- NOSOUNDFLAG=__SOUND
>- 
>- 
>- # Stuff we pass to the compiler:
>- 
>--CFLAGS=-Wall $(SDL_CFLAGS) \
>-+CFLAGS+=-Wall $(SDL_CFLAGS) \
>- 	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(TARGET_DEF)
>--SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS)
>-+SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS)
>- 
>- 
>- # Make commands:
>-@@ -67,7 +67,7 @@
>- # Main executable:
>- 
>- $(TARGET):	madbomber.o
>--	$(CC) $(CFLAGS) madbomber.o -o $(TARGET) $(SDL_LIB) -lm
>-+	$(CXX) $(CFLAGS) madbomber.o -o $(TARGET) $(SDL_LIB) -lm
>- 
>- 
>- # Main object:
>diff -urN /usr/ports/games/madbomber/pkg-plist games/madbomber/pkg-plist
>--- /usr/ports/games/madbomber/pkg-plist	Tue Sep 10 20:11:08 2002
>+++ games/madbomber/pkg-plist	Thu Jun 26 10:10:33 2003
>@@ -1,110 +1,4 @@
> bin/madbomber
>-share/madbomber/embedded/images/.xvpics/spray-black.png
>-share/madbomber/embedded/images/bar.png
>-share/madbomber/embedded/images/game/background.png
>-share/madbomber/embedded/images/game/bomb/bomb0.png
>-share/madbomber/embedded/images/game/bomb/bomb1.png
>-share/madbomber/embedded/images/game/bomb/bomb2.png
>-share/madbomber/embedded/images/game/bomb/bomb3.png
>-share/madbomber/embedded/images/game/bomb/explosion1.png
>-share/madbomber/embedded/images/game/bomb/explosion2.png
>-share/madbomber/embedded/images/game/bomber/bomber-amazed.png
>-share/madbomber/embedded/images/game/bomber/bomber-happy.png
>-share/madbomber/embedded/images/game/bomber/bomber-sad.png
>-share/madbomber/embedded/images/game/bucket/bucket1.png
>-share/madbomber/embedded/images/game/bucket/bucket1red.png
>-share/madbomber/embedded/images/game/bucket/bucket2.png
>-share/madbomber/embedded/images/game/bucket/bucket2red.png
>-share/madbomber/embedded/images/game/bucket/bucket3.png
>-share/madbomber/embedded/images/game/bucket/bucket3red.png
>-share/madbomber/embedded/images/game/bucket/small-bucket1.png
>-share/madbomber/embedded/images/game/bucket/small-bucket1red.png
>-share/madbomber/embedded/images/game/bucket/small-bucket2.png
>-share/madbomber/embedded/images/game/bucket/small-bucket2red.png
>-share/madbomber/embedded/images/game/bucket/small-bucket3.png
>-share/madbomber/embedded/images/game/bucket/small-bucket3red.png
>-share/madbomber/embedded/images/game/drop/drop-down.png
>-share/madbomber/embedded/images/game/drop/drop-left-down.png
>-share/madbomber/embedded/images/game/drop/drop-left-up.png
>-share/madbomber/embedded/images/game/drop/drop-left.png
>-share/madbomber/embedded/images/game/drop/drop-right-down.png
>-share/madbomber/embedded/images/game/drop/drop-right-up.png
>-share/madbomber/embedded/images/game/drop/drop-right.png
>-share/madbomber/embedded/images/game/drop/drop-up.png
>-share/madbomber/embedded/images/game/game-over.png
>-share/madbomber/embedded/images/game/highscore.png
>-share/madbomber/embedded/images/game/numbers/0.png
>-share/madbomber/embedded/images/game/numbers/0red.png
>-share/madbomber/embedded/images/game/numbers/1.png
>-share/madbomber/embedded/images/game/numbers/1red.png
>-share/madbomber/embedded/images/game/numbers/2.png
>-share/madbomber/embedded/images/game/numbers/2red.png
>-share/madbomber/embedded/images/game/numbers/3.png
>-share/madbomber/embedded/images/game/numbers/3red.png
>-share/madbomber/embedded/images/game/numbers/4.png
>-share/madbomber/embedded/images/game/numbers/4red.png
>-share/madbomber/embedded/images/game/numbers/5.png
>-share/madbomber/embedded/images/game/numbers/5red.png
>-share/madbomber/embedded/images/game/numbers/6.png
>-share/madbomber/embedded/images/game/numbers/6red.png
>-share/madbomber/embedded/images/game/numbers/7.png
>-share/madbomber/embedded/images/game/numbers/7red.png
>-share/madbomber/embedded/images/game/numbers/8.png
>-share/madbomber/embedded/images/game/numbers/8red.png
>-share/madbomber/embedded/images/game/numbers/9.png
>-share/madbomber/embedded/images/game/numbers/9red.png
>-share/madbomber/embedded/images/game/paused.png
>-share/madbomber/embedded/images/game/press-escape.png
>-share/madbomber/embedded/images/game/press-fire.png
>-share/madbomber/embedded/images/highscore/highscore.png
>-share/madbomber/embedded/images/highscore/letters.png
>-share/madbomber/embedded/images/icon.png
>-share/madbomber/embedded/images/loading.png
>-share/madbomber/embedded/images/make-offs.sh
>-share/madbomber/embedded/images/options/0percent-off.png
>-share/madbomber/embedded/images/options/0percent.png
>-share/madbomber/embedded/images/options/100percent-off.png
>-share/madbomber/embedded/images/options/100percent.png
>-share/madbomber/embedded/images/options/25percent-off.png
>-share/madbomber/embedded/images/options/25percent.png
>-share/madbomber/embedded/images/options/50percent-off.png
>-share/madbomber/embedded/images/options/50percent.png
>-share/madbomber/embedded/images/options/75percent-off.png
>-share/madbomber/embedded/images/options/75percent.png
>-share/madbomber/embedded/images/options/detail.png
>-share/madbomber/embedded/images/options/difficulty.png
>-share/madbomber/embedded/images/options/effects.png
>-share/madbomber/embedded/images/options/hard-off.png
>-share/madbomber/embedded/images/options/hard.png
>-share/madbomber/embedded/images/options/normal-off.png
>-share/madbomber/embedded/images/options/normal.png
>-share/madbomber/embedded/images/options/ok-off.png
>-share/madbomber/embedded/images/options/ok.png
>-share/madbomber/embedded/images/options/options.png
>-share/madbomber/embedded/images/options/player-one.png
>-share/madbomber/embedded/images/options/player-two.png
>-share/madbomber/embedded/images/options/zen-off.png
>-share/madbomber/embedded/images/options/zen.png
>-share/madbomber/embedded/images/spray-black.png
>-share/madbomber/embedded/images/spray-blue.png
>-share/madbomber/embedded/images/spray-cyan.png
>-share/madbomber/embedded/images/title/.xvpics/continue-off.png
>-share/madbomber/embedded/images/title/.xvpics/continue.png
>-share/madbomber/embedded/images/title/continue-off.png
>-share/madbomber/embedded/images/title/continue.png
>-share/madbomber/embedded/images/title/exit-off.png
>-share/madbomber/embedded/images/title/exit.png
>-share/madbomber/embedded/images/title/highscore-off.png
>-share/madbomber/embedded/images/title/highscore.png
>-share/madbomber/embedded/images/title/one-player-off.png
>-share/madbomber/embedded/images/title/one-player.png
>-share/madbomber/embedded/images/title/options-off.png
>-share/madbomber/embedded/images/title/options.png
>-share/madbomber/embedded/images/title/title.png
>-share/madbomber/embedded/images/title/two-players-off.png
>-share/madbomber/embedded/images/title/two-players.png
>-share/madbomber/embedded/music/fdn-arab.s3m
>-share/madbomber/embedded/music/winterwi.mod
> share/madbomber/images/bar.png
> share/madbomber/images/game/background.png
> share/madbomber/images/game/bomb/bomb0.png
>@@ -243,18 +137,4 @@
> @dirrm share/madbomber/images/game/bomb
> @dirrm share/madbomber/images/game
> @dirrm share/madbomber/images
>-@dirrm share/madbomber/embedded/music
>-@dirrm share/madbomber/embedded/images/title/.xvpics
>-@dirrm share/madbomber/embedded/images/title
>-@dirrm share/madbomber/embedded/images/options
>-@dirrm share/madbomber/embedded/images/highscore
>-@dirrm share/madbomber/embedded/images/game/numbers
>-@dirrm share/madbomber/embedded/images/game/drop
>-@dirrm share/madbomber/embedded/images/game/bucket
>-@dirrm share/madbomber/embedded/images/game/bomber
>-@dirrm share/madbomber/embedded/images/game/bomb
>-@dirrm share/madbomber/embedded/images/game
>-@dirrm share/madbomber/embedded/images/.xvpics
>-@dirrm share/madbomber/embedded/images
>-@dirrm share/madbomber/embedded
> @dirrm share/madbomber

Actions: View | Diff

Attachments on bug 53768: 32575