1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

- Update to 2.00, announce message:

* Changed to SDL 2.0. This also allows the window to be scaled to an arbitrary
  size, and doesn't change the desktop resolution anymore when going to
  fullscreen.
* The joystick/gamepad can now also be used in the menus and on the hub.
* Updated credits and copyright notices.
* Added stereo to the sound effects.
* Cleaned up some graphics.
* Fixed the machinegun sound.
* Fixed the behaviour of grenades.
* Many small fixes.

- Take maintainership
- Change USE_SDL, changed by Upstream for SDL2
- Change sed, use Makefile instead of makefile, changed by Upstream
- Correct Permission
- Change DOCS Option, not installation when is disabled
- Change symlink to use size 48x48
- Add files/patch-Makefile and use instead of REINPLACE
- Add patches files/patch-icons-blobwars.desktop and files/patch-src-headers.h
- Remove obsolete patches files/patch-src__CReplayData.cpp and
  files/patch-src__pak.cpp, changed by upstream
This commit is contained in:
Rusmir Dusko 2015-12-01 18:44:25 +00:00
parent 3e25b3a2da
commit 4101d23e7c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=402776
8 changed files with 88 additions and 54 deletions

View File

@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= blobwars
PORTVERSION= 1.19
PORTREVISION= 3
PORTVERSION= 2.00
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Mission and Objective based 2D Platform Game
LICENSE= GPLv2 CCbyNCSA3 # GPLv2 or later
@ -18,13 +17,12 @@ LICENSE_TEXT_CCbyNCSA3=CC-BY 3.0
LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
USES= gmake
USE_SDL= image mixer net sdl ttf
USE_SDL= image2 mixer2 net2 sdl2 ttf2
WITH_ZLIB= yes
MAKEFILE= makefile
INSTALLS_ICONS= yes
PORTDOCS= *.gif *.png *.html changes hacking porting readme samples
PORTDOCS= *
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
@ -35,27 +33,27 @@ NLS_USES= gettext
post-patch:
@${REINPLACE_CMD} \
-e 's|mkdir -p $$(DESTDIR)$$(DOCDIR)|| ; \
s|cp -p $$(DOCS) $$(DESTDIR)$$(DOCDIR)|| ; \
s|USEPAK ?= 0|USEPAK ?= 1| ; \
s|/usr|${LOCALBASE}| ; \
s|$$(PREFIX)/games/|$$(PREFIX)/bin/| ; \
s|/share/games/blobwars/|/share/blobwars/| ; \
s| -Werror||' \
-e '/LIBS =/s/-lz/-lz -lintl/' \
${WRKSRC}/makefile
-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/Makefile
# Correct Permissions
${CHMOD} 664 ${WRKSRC}/icons/*
.if ! ${PORT_OPTIONS:MDOCS}
@${REINPLACE_CMD} \
-e 's|mkdir -p $$(DESTDIR)$$(DOCDIR)|| ; \
s|cp -p $$(DOCS) $$(DESTDIR)$$(DOCDIR)||' \
${WRKSRC}/Makefile
.endif
.if ! ${PORT_OPTIONS:MNLS}
@${REINPLACE_CMD} -i '' -e '/LOCALE_MO =/d' \
${WRKSRC}/makefile
${WRKSRC}/Makefile
.endif
post-install:
${LN} -sf ${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png \
${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
${STAGEDIR}${PREFIX}/share/pixmaps/
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (blobwars-1.19.tar.gz) = f9bafe59ead9e370ceaba4aae3d280241bf05fa06c8ae006eec0322c2fe9e2ed
SIZE (blobwars-1.19.tar.gz) = 67019647
SHA256 (blobwars-2.00.tar.gz) = c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99
SIZE (blobwars-2.00.tar.gz) = 66982603

View File

@ -0,0 +1,37 @@
--- Makefile.orig 2015-11-21 23:18:19.000000000 +0100
+++ Makefile 2015-12-01 18:02:56.589310006 +0100
@@ -6,11 +6,11 @@
VERSION = 2.00
RELEASE ?= 0
-USEPAK ?= 0
+USEPAK ?= 1
-PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/games/
-DATADIR ?= $(PREFIX)/share/games/blobwars/
+PREFIX ?= %%LOCALBASE%%
+BINDIR ?= $(PREFIX)/bin/
+DATADIR ?= $(PREFIX)/share/blobwars/
DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
ICONDIR ?= $(PREFIX)/share/icons/hicolor/
DESKTOPDIR ?= $(PREFIX)/share/applications/
@@ -21,8 +21,8 @@
CXXFLAGS += `pkg-config --cflags sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
-CXXFLAGS += $(CFLAGS) -Werror
-LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz
+CXXFLAGS += $(CFLAGS)
+LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz -lintl
PAKLIBS = -lz
OBJS += CAudio.o
@@ -141,6 +141,7 @@
$(RM) $(ICONDIR)$(ICONS)$(PROG).png
$(RM) $(ICONDIR)16x16/apps/$(PROG).png
$(RM) $(ICONDIR)32x32/apps/$(PROG).png
+ $(RM) $(ICONDIR)48x48/apps/$(PROG).png
$(RM) $(ICONDIR)64x64/apps/$(PROG).png
$(RM) $(DESKTOPDIR)$(PROG).desktop

View File

@ -0,0 +1,16 @@
--- icons/blobwars.desktop.orig 2015-11-21 23:18:19.000000000 +0100
+++ icons/blobwars.desktop 2015-12-01 19:01:43.549184133 +0100
@@ -1,9 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
-Categories=Game;ActionGame;
Name=Blob Wars : Metal Blob Solid
+GenericName=Blob Wars
Comment=Mission and Objective based 2D Platform Game
Icon=blobwars
Exec=blobwars
-Terminal=false
Type=Application
+Categories=Game;ArcadeGame;
+Terminal=false
+StartupNotify=false

View File

@ -0,0 +1,14 @@
--- src/headers.h.orig 2015-11-21 23:18:19.000000000 +0100
+++ src/headers.h 2015-12-01 17:38:16.209096616 +0100
@@ -56,11 +56,6 @@
#define textdomain(x) while(false)
#endif
-#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__)
-static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); }
-static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; }
-#endif
-
#include "defs.h"
#include "CMath.h"

View File

@ -1,12 +0,0 @@
--- ./src/CReplayData.cpp.orig 2011-04-17 16:56:56.000000000 +0200
+++ ./src/CReplayData.cpp 2013-12-08 23:21:23.000000000 +0100
@@ -38,7 +38,8 @@
void ReplayData::printReplayInformation()
{
- tm *timeinfo = localtime(&header.randomSeed);
+ time_t t = header.randomSeed;
+ tm *timeinfo = localtime(&t);
printf("Recorded on : %s", asctime(timeinfo));
printf("Map : %s\n", header.map);
printf("Score : %d\n", header.score);

View File

@ -1,20 +0,0 @@
--- ./src/pak.cpp.orig 2011-04-17 16:56:56.000000000 +0200
+++ ./src/pak.cpp 2013-12-08 23:09:51.000000000 +0100
@@ -119,7 +119,7 @@
{
printf("Couldn't open %s for reading!\n", filename);
closedir(dirp);
- gzclose(pak);
+ gzclose((gzFile)pak);
exit(1);
}
@@ -141,7 +141,7 @@
{
printf("Couldn't open %s for reading!\n", filename);
closedir(dirp);
- gzclose(pak);
+ gzclose((gzFile)pak);
exit(1);
}
else

View File

@ -3,6 +3,7 @@ share/applications/blobwars.desktop
%%DATADIR%%/blobwars.pak
share/icons/hicolor/16x16/apps/blobwars.png
share/icons/hicolor/32x32/apps/blobwars.png
share/icons/hicolor/48x48/apps/blobwars.png
share/icons/hicolor/64x64/apps/blobwars.png
%%NLS%%share/locale/ca/LC_MESSAGES/blobwars.mo
%%NLS%%share/locale/da/LC_MESSAGES/blobwars.mo