Attachment #88688 for bug #125517

View | Details | Raw Unified | Return to bug 125517
Collapse All | Expand All




#

PORTNAME=	blobwars
DISTVERSION=	1.08-1
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR=distfiles

MAKEFILE=	makefile
MAKE_ENV=	CXX="${CXX}"

USE_GETTEXT=	yes
USE_SDL=	sdl image mixer ttf
USE_GMAKE=	yes
WRKSRC=		${WRKDIR}/blobwars-${DISTVERSION:C/-[0-9]$//}

.if !defined(NOPORTDOCS)
PORTDOCS=	*

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (blobwars-1.04-1.tar.gz) = fccb31ed097b8db95b58ed9512d98b63	1	MD5 (blobwars-1.08-1.tar.gz) = 16462e3ee394b05432fab820a7de8389
2	SHA256 (blobwars-1.04-1.tar.gz) = 84f62f364e5dc5dad138ee73a200827da987a840a092ead0a0e6d9cde551050f	2	SHA256 (blobwars-1.08-1.tar.gz) = 58b5a7ef1889385c1783b457a2d16eaf7946db9883e5c11c3564147032d2214d
3	SIZE (blobwars-1.04-1.tar.gz) = 7682669	3	SIZE (blobwars-1.08-1.tar.gz) = 7810311

Lines 1-6 Link Here

(-)pkg-plist (+5 lines)
1	bin/blobwars	1	bin/blobwars
2	%%DATADIR%%/blobwars.pak	2	%%DATADIR%%/blobwars.pak
3	share/applications/blobwars.desktop	3	share/applications/blobwars.desktop
		4	share/locale/ca/LC_MESSAGES/blobwars.mo
		5	share/locale/da/LC_MESSAGES/blobwars.mo
		6	share/locale/de/LC_MESSAGES/blobwars.mo
		7	share/locale/es/LC_MESSAGES/blobwars.mo
		8	share/locale/nl/LC_MESSAGES/blobwars.mo
4	share/pixmaps/blobwars.png	9	share/pixmaps/blobwars.png
5	@dirrm %%DATADIR%%	10	@dirrm %%DATADIR%%
6	@dirrmtry share/applications	11	@dirrmtry share/applications




--- 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/blobwars/
+BINDIR = $(PREFIX)/bin/
+DATADIR = $(PREFIX)/share/$(PROG)/
 DOCDIR = $(PREFIX)/share/doc/$(PROG)/
 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 $(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
@@ -66,30 +65,20 @@
 # 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)
 
 # install
 install:

-	mkdir -p $(BINDIR)
 	mkdir -p $(DATADIR)
-	mkdir -p $(DOCDIR)
-	mkdir -p $(ICONDIR)16x16/apps
-	mkdir -p $(ICONDIR)32x32/apps
-	mkdir -p $(ICONDIR)64x64/apps
-	mkdir -p $(DESKTOPDIR)
-	mkdir -p $(GNOME)
-
-	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)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)
-	cp $(ICONS)$(PROG).desktop $(GNOME)
+	mkdir -p $(PREFIX)/share/applications
+	mkdir -p $(PREFIX)/share/pixmaps
+

+	$(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

Removed Link Here

(-)files/patch-src-CFileData.h (-9 lines)
1	--- src/CFileData.h.orig 2005-04-25 18:25:38.000000000 +0000
2	+++ src/CFileData.h 2007-10-31 02:26:03.000000000 +0000
3	@@ -30,5 +30,5 @@
4	FileData();
5
6	void swapEndians();
7	- void FileData::set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
8	+ void set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
9	};

Removed Link Here

(-)files/patch-src-CKeyboard.h (-10 lines)
1	--- src/CKeyboard.h.orig 2005-04-25 18:25:38.000000000 +0000
2	+++ src/CKeyboard.h 2007-10-31 02:29:26.000000000 +0000
3	@@ -8,6 +8,6 @@
4
5	Keyboard();
6	void setDefaultKeys();
7	- static char *Keyboard::translateKey(int value);
8	+ static char *translateKey(int value);
9
10	};

Return to bug 125517

Lines 6-13 Link Here

(-)Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= blobwars	8	PORTNAME= blobwars
9	DISTVERSION= 1.04-1	9	DISTVERSION= 1.08-1
10	PORTREVISION= 3
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_GENTOO}	11	MASTER_SITES= ${MASTER_SITE_GENTOO}
13	MASTER_SITE_SUBDIR=distfiles	12	MASTER_SITE_SUBDIR=distfiles
Lines 18-26 Link Here
18	MAKEFILE= makefile	17	MAKEFILE= makefile
19	MAKE_ENV= CXX="${CXX}"	18	MAKE_ENV= CXX="${CXX}"
20		19
		20	USE_GETTEXT= yes
21	USE_SDL= sdl image mixer ttf	21	USE_SDL= sdl image mixer ttf
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	WRKSRC= ${WRKDIR}/blobwars-1.04	23	WRKSRC= ${WRKDIR}/blobwars-${DISTVERSION:C/-[0-9]$//}
24		24
25	.if !defined(NOPORTDOCS)	25	.if !defined(NOPORTDOCS)
26	PORTDOCS= *	26	PORTDOCS= *

Lines 1-43 Link Here

(-)files/patch-makefile (-44 / +36 lines)
1	--- makefile.orig Mon Apr 25 20:25:37 2005	1	--- makefile.orig 2008-01-21 23:17:53.000000000 +0300
2	+++ makefile Sat Jun 18 01:55:54 2005	2	+++ makefile 2008-07-11 22:35:03.000000000 +0400
3	@@ -7,9 +7,8 @@	3	@@ -7,9 +7,8 @@
4	RELEASE = 1	4	RELEASE = 1
5	USEPAK = 1	5	USEPAK = 1
6		6
7	-PREFIX=$(DESTDIR)/usr	7	-PREFIX=$(DESTDIR)/usr
8	-BINDIR = $(PREFIX)/games/	8	-BINDIR = $(PREFIX)/games/
9	-DATADIR = $(PREFIX)/share/games/parallelrealities/	9	-DATADIR = $(PREFIX)/share/games/blobwars/
10	+BINDIR = $(PREFIX)/bin/	10	+BINDIR = $(PREFIX)/bin/
11	+DATADIR = $(PREFIX)/share/$(PROG)/	11	+DATADIR = $(PREFIX)/share/$(PROG)/
12	DOCDIR = $(PREFIX)/share/doc/$(PROG)/	12	DOCDIR = $(PREFIX)/share/doc/$(PROG)/
13	ICONDIR = $(PREFIX)/share/icons/	13	ICONDIR = $(PREFIX)/share/icons/hicolor/
14	KDE = $(PREFIX)/share/applnk/Games/Arcade/	14	DESKTOPDIR = $(PREFIX)/share/applications/
15	@@ -35,7 +34,7 @@	15	@@ -19,7 +18,7 @@
16	PAKOBJS = CFileData.o pak.o	16	CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
		17	CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
		18	CXXFLAGS += $(CFLAGS)
		19	-LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
		20	+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz -lintl
		21
		22	OBJS += aquaBoss.o bosses.o bullets.o cutscene.o
		23	OBJS += CAudio.o CBoss.o CCollision.o CCutscene.o CData.o CEffect.o CEngine.o CEntity.o CFileData.o CGame.o
		24	@@ -38,7 +37,7 @@
		25	LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
17		26
18	# top-level rule to create the program.	27	# top-level rule to create the program.
19	-all: $(PROG) pak	28	-all: $(PROG) pak $(LOCALE_MO)
20	+all: $(PROG) pak buildpak	29	+all: $(PROG) pak buildpak $(LOCALE_MO)
21		30
22	# compiling other source files.	31	# compiling other source files.
23	%.o: src/%.cpp src/%.h src/defs.h src/defines.h src/headers.h	32	%.o: src/%.cpp src/%.h src/defs.h src/defines.h src/headers.h
24	@@ -44,7 +43,7 @@	33	@@ -66,30 +65,20 @@
25	# linking the program.
26	$(PROG): $(GAMEOBJS)
27	$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
28	-
29	+
30	pak: $(PAKOBJS)
31	$(CXX) $(LIBS) $(PAKOBJS) -o pak
32
33	@@ -55,33 +54,20 @@
34	# cleaning everything that can be automatically recreated with "make".
35	clean:
36	$(RM) $(GAMEOBJS) mapEditor.o pak.o
37	-
38	+
39	buildpak:
40	./pak data gfx music sound $(PAKNAME)
41		34
42	# install	35	# install
43	install:	36	install:
Lines 47-67 Link Here
47	- mkdir -p $(BINDIR)	40	- mkdir -p $(BINDIR)
48	mkdir -p $(DATADIR)	41	mkdir -p $(DATADIR)
49	- mkdir -p $(DOCDIR)	42	- mkdir -p $(DOCDIR)
50	- mkdir -p $(ICONDIR)	43	- mkdir -p $(ICONDIR)16x16/apps
51	- mkdir -p $(ICONDIR)mini	44	- mkdir -p $(ICONDIR)32x32/apps
52	- mkdir -p $(ICONDIR)large	45	- mkdir -p $(ICONDIR)64x64/apps
53	- mkdir -p $(KDE)	46	- mkdir -p $(DESKTOPDIR)
54	- mkdir -p $(GNOME)
55	-	47	-
56	- strip $(PROG)
57	- install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)	48	- install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
58	- install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)	49	- install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
59	- install -o root -g games -m 644 $(DOCS) $(DOCDIR)	50	- install -o root -g games -m 644 $(DOCS) $(DOCDIR)
60	- cp $(ICONS)$(PROG).png $(ICONDIR)	51	- cp $(ICONS)$(PROG).png $(ICONDIR)32x32/apps/
61	- cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png	52	- cp $(ICONS)$(PROG)-mini.png $(ICONDIR)16x16/apps/$(PROG).png
62	- cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png	53	- cp $(ICONS)$(PROG)-large.png $(ICONDIR)64x64/apps/$(PROG).png
63	- cp $(ICONS)$(PROG).desktop $(KDE)	54	- cp $(ICONS)$(PROG).desktop $(DESKTOPDIR)
64	- cp $(ICONS)$(PROG).desktop $(GNOME)
65	+ mkdir -p $(PREFIX)/share/applications	55	+ mkdir -p $(PREFIX)/share/applications
66	+ mkdir -p $(PREFIX)/share/pixmaps	56	+ mkdir -p $(PREFIX)/share/pixmaps
67	+	57	+
Lines 70-80 Link Here
70	+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG).desktop $(PREFIX)/share/applications	60	+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG).desktop $(PREFIX)/share/applications
71	+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG).png $(PREFIX)/share/pixmaps	61	+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG).png $(PREFIX)/share/pixmaps
72		62
		63	@for f in $(LOCALE_MO); do \
		64	lang=`echo $$f \| sed -e 's/^locale\///;s/\.mo$$//'`; \
		65	mkdir -p $(LOCALEDIR)$$lang/LC_MESSAGES; \
		66	- echo "cp $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo"; \
		67	- cp $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
		68	+ echo "$(BSD_INSTALL_DATA) $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo"; \
		69	+ $(BSD_INSTALL_DATA) $$f $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
		70	done
		71
73	uninstall:	72	uninstall:
74	$(RM) $(BINDIR)$(PROG)
75	@@ -92,4 +78,3 @@
76	$(RM) $(ICONDIR)large/$(PROG).png
77	$(RM) $(KDE)$(ICONS)$(PROG).desktop
78	$(RM) $(GNOME)$(ICONS)$(PROG).desktop
79	-
80	\ No newline at end of file