Attachment 88688 Details for Bug 125517 – blobwars.patch

[patch] blobwars.patch

blobwars.patch (text/plain), 7.32 KB, created by Dmitry Marakasov on 2008-07-11 20:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2008-07-11 20:30:09 UTC

Size: 7.32 KB

patch

obsolete

>? .Makefile.swp
>? blobwars.patch
>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/games/blobwars/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- Makefile	21 Mar 2008 23:55:10 -0000	1.9
>+++ Makefile	11 Jul 2008 19:25:42 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	blobwars
>-DISTVERSION=	1.04-1
>-PORTREVISION=	3
>+DISTVERSION=	1.08-1
> CATEGORIES=	games
> MASTER_SITES=	${MASTER_SITE_GENTOO}
> MASTER_SITE_SUBDIR=distfiles
>@@ -18,9 +17,10 @@
> MAKEFILE=	makefile
> MAKE_ENV=	CXX="${CXX}"
> 
>+USE_GETTEXT=	yes
> USE_SDL=	sdl image mixer ttf
> USE_GMAKE=	yes
>-WRKSRC=		${WRKDIR}/blobwars-1.04
>+WRKSRC=		${WRKDIR}/blobwars-${DISTVERSION:C/-[0-9]$//}
> 
> .if !defined(NOPORTDOCS)
> PORTDOCS=	*
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/games/blobwars/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	22 Jan 2006 11:18:01 -0000	1.2
>+++ distinfo	11 Jul 2008 19:25:42 -0000
>@@ -1,3 +1,3 @@
>-MD5 (blobwars-1.04-1.tar.gz) = fccb31ed097b8db95b58ed9512d98b63
>-SHA256 (blobwars-1.04-1.tar.gz) = 84f62f364e5dc5dad138ee73a200827da987a840a092ead0a0e6d9cde551050f
>-SIZE (blobwars-1.04-1.tar.gz) = 7682669
>+MD5 (blobwars-1.08-1.tar.gz) = 16462e3ee394b05432fab820a7de8389
>+SHA256 (blobwars-1.08-1.tar.gz) = 58b5a7ef1889385c1783b457a2d16eaf7946db9883e5c11c3564147032d2214d
>+SIZE (blobwars-1.08-1.tar.gz) = 7810311
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/games/blobwars/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	22 Jan 2006 02:10:59 -0000	1.2
>+++ pkg-plist	11 Jul 2008 19:25:42 -0000
>@@ -1,6 +1,11 @@
> bin/blobwars
> %%DATADIR%%/blobwars.pak
> share/applications/blobwars.desktop
>+share/locale/ca/LC_MESSAGES/blobwars.mo
>+share/locale/da/LC_MESSAGES/blobwars.mo
>+share/locale/de/LC_MESSAGES/blobwars.mo
>+share/locale/es/LC_MESSAGES/blobwars.mo
>+share/locale/nl/LC_MESSAGES/blobwars.mo
> share/pixmaps/blobwars.png
> @dirrm %%DATADIR%%
> @dirrmtry share/applications
>Index: files/patch-makefile
>===================================================================
>RCS file: /home/pcvs/ports/games/blobwars/files/patch-makefile,v
>retrieving revision 1.1
>diff -u -r1.1 patch-makefile
>--- files/patch-makefile	18 Jun 2005 00:07:01 -0000	1.1
>+++ files/patch-makefile	11 Jul 2008 19:25:42 -0000
>@@ -1,43 +1,36 @@
>---- makefile.orig	Mon Apr 25 20:25:37 2005
>-+++ makefile	Sat Jun 18 01:55:54 2005
>+--- makefile.orig	2008-01-21 23:17:53.000000000 +0300
>++++ makefile	2008-07-11 22:35:03.000000000 +0400
> @@ -7,9 +7,8 @@
>  RELEASE = 1
>  USEPAK = 1
>  
> -PREFIX=$(DESTDIR)/usr
> -BINDIR = $(PREFIX)/games/
>--DATADIR = $(PREFIX)/share/games/parallelrealities/
>+-DATADIR = $(PREFIX)/share/games/blobwars/
> +BINDIR = $(PREFIX)/bin/
> +DATADIR = $(PREFIX)/share/$(PROG)/
>  DOCDIR = $(PREFIX)/share/doc/$(PROG)/
>- ICONDIR = $(PREFIX)/share/icons/
>- KDE = $(PREFIX)/share/applnk/Games/Arcade/
>-@@ -35,7 +34,7 @@
>- PAKOBJS = CFileData.o pak.o
>+ ICONDIR = $(PREFIX)/share/icons/hicolor/
>+ DESKTOPDIR = $(PREFIX)/share/applications/
>+@@ -19,7 +18,7 @@
>+ CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
>+ CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
>+ CXXFLAGS += $(CFLAGS)
>+-LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
>++LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz -lintl
>+ 
>+ OBJS += aquaBoss.o bosses.o bullets.o cutscene.o
>+ OBJS += CAudio.o CBoss.o CCollision.o CCutscene.o CData.o CEffect.o CEngine.o CEntity.o CFileData.o CGame.o 
>+@@ -38,7 +37,7 @@
>+ LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
>  
>  # top-level rule to create the program.
>--all: $(PROG) pak
>-+all: $(PROG) pak buildpak
>+-all: $(PROG) pak $(LOCALE_MO)
>++all: $(PROG) pak buildpak $(LOCALE_MO)
>  
>  # compiling other source files.
>  %.o: src/%.cpp src/%.h src/defs.h src/defines.h src/headers.h
>-@@ -44,7 +43,7 @@
>- # linking the program.
>- $(PROG): $(GAMEOBJS)
>- 	$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
>--	
>-+
>- pak: $(PAKOBJS)
>- 	$(CXX) $(LIBS) $(PAKOBJS) -o pak
>- 
>-@@ -55,33 +54,20 @@
>- # cleaning everything that can be automatically recreated with "make".
>- clean:
>- 	$(RM) $(GAMEOBJS) mapEditor.o pak.o
>--	
>-+
>- buildpak:
>- 	./pak data gfx music sound $(PAKNAME)
>+@@ -66,30 +65,20 @@
>  
>  # install
>  install:
>@@ -47,21 +40,18 @@
> -	mkdir -p $(BINDIR)
>  	mkdir -p $(DATADIR)
> -	mkdir -p $(DOCDIR)
>--	mkdir -p $(ICONDIR)
>--	mkdir -p $(ICONDIR)mini
>--	mkdir -p $(ICONDIR)large
>--	mkdir -p $(KDE)
>--	mkdir -p $(GNOME)
>+-	mkdir -p $(ICONDIR)16x16/apps
>+-	mkdir -p $(ICONDIR)32x32/apps
>+-	mkdir -p $(ICONDIR)64x64/apps
>+-	mkdir -p $(DESKTOPDIR)
> -
>--	strip $(PROG)
> -	install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
> -	install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
> -	install -o root -g games -m 644 $(DOCS) $(DOCDIR)
>--	cp $(ICONS)$(PROG).png $(ICONDIR)
>--	cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png
>--	cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png
>--	cp $(ICONS)$(PROG).desktop $(KDE)
>--	cp $(ICONS)$(PROG).desktop $(GNOME)
>+-	cp $(ICONS)$(PROG).png $(ICONDIR)32x32/apps/
>+-	cp $(ICONS)$(PROG)-mini.png $(ICONDIR)16x16/apps/$(PROG).png
>+-	cp $(ICONS)$(PROG)-large.png $(ICONDIR)64x64/apps/$(PROG).png
>+-	cp $(ICONS)$(PROG).desktop $(DESKTOPDIR)
> +	mkdir -p $(PREFIX)/share/applications
> +	mkdir -p $(PREFIX)/share/pixmaps
> +
>@@ -70,11 +60,13 @@
> +	$(BSD_INSTALL_DATA) $(ICONS)$(PROG).desktop $(PREFIX)/share/applications
> +	$(BSD_INSTALL_DATA) $(ICONS)$(PROG).png $(PREFIX)/share/pixmaps
>  
>+ 	@for f in $(LOCALE_MO); do \
>+ 		lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \
>+ 		mkdir -p $(LOCALEDIR)$$lang/LC_MESSAGES; \
>+-		echo "cp $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo"; \
>+-		cp $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
>++		echo "$(BSD_INSTALL_DATA) $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo"; \
>++		$(BSD_INSTALL_DATA) $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
>+ 	done
>+ 
>  uninstall:
>- 	$(RM) $(BINDIR)$(PROG)
>-@@ -92,4 +78,3 @@
>- 	$(RM) $(ICONDIR)large/$(PROG).png
>- 	$(RM) $(KDE)$(ICONS)$(PROG).desktop
>- 	$(RM) $(GNOME)$(ICONS)$(PROG).desktop
>--	
>-\ No newline at end of file
>Index: files/patch-src-CFileData.h
>===================================================================
>RCS file: files/patch-src-CFileData.h
>diff -N files/patch-src-CFileData.h
>--- files/patch-src-CFileData.h	31 Oct 2007 13:27:18 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,9 +0,0 @@
>---- src/CFileData.h.orig	2005-04-25 18:25:38.000000000 +0000
>-+++ src/CFileData.h	2007-10-31 02:26:03.000000000 +0000
>-@@ -30,5 +30,5 @@
>- 	FileData();
>- 	
>- 	void swapEndians();
>--	void FileData::set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
>-+	void set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
>- };
>Index: files/patch-src-CKeyboard.h
>===================================================================
>RCS file: files/patch-src-CKeyboard.h
>diff -N files/patch-src-CKeyboard.h
>--- files/patch-src-CKeyboard.h	31 Oct 2007 13:27:18 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,10 +0,0 @@
>---- src/CKeyboard.h.orig	2005-04-25 18:25:38.000000000 +0000
>-+++ src/CKeyboard.h	2007-10-31 02:29:26.000000000 +0000
>-@@ -8,6 +8,6 @@
>- 	
>- 		Keyboard();
>- 		void setDefaultKeys();
>--		static char *Keyboard::translateKey(int value);
>-+		static char *translateKey(int value);
>- 
>- };

Actions: View | Diff

Attachments on bug 125517: 88688