diff --git a/games/legend-of-edgar/Makefile b/games/legend-of-edgar/Makefile index 0d07e3cc7b5f..bc2d61d55b15 100644 --- a/games/legend-of-edgar/Makefile +++ b/games/legend-of-edgar/Makefile @@ -1,39 +1,38 @@ PORTNAME= edgar -DISTVERSION= 1.35 +DISTVERSION= 1.36 CATEGORIES= games MASTER_SITES= https://github.com/riksweeney/edgar/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= legend-of- DISTFILES= edgar-${DISTVERSION}-1${EXTRACT_SUFX} MAINTAINER= makc@FreeBSD.org COMMENT= 2D platform game with a persistent world WWW= https://www.parallelrealities.co.uk/games/edgar/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/license LIB_DEPENDS= libpng.so:graphics/png USES= gmake sdl USE_SDL= image2 mixer2 sdl2 ttf2 MAKEFILE= makefile MAKE_ARGS= BIN_DIR=${PREFIX}/bin/ \ DATA_DIR=${DATADIR}/ \ - MAN_DIR=${PREFIX}/man/man6/ \ PREFIX=${PREFIX} OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext-tools NLS_MAKE_ARGS_OFF= LOCALE_MO="" post-patch: ${REINPLACE_CMD} -e 's|Categories=Game;|Categories=Game;ArcadeGame;|' \ ${WRKSRC}/icons/${PORTNAME}.desktop post-install: - ${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png \ + ${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .include diff --git a/games/legend-of-edgar/distinfo b/games/legend-of-edgar/distinfo index 2a4f6510d6ee..d08d490e428c 100644 --- a/games/legend-of-edgar/distinfo +++ b/games/legend-of-edgar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641296718 -SHA256 (edgar-1.35-1.tar.gz) = 0793815208f64ba396bd10ab56e325a9e2d65c7f1baea840ff138448e3389743 -SIZE (edgar-1.35-1.tar.gz) = 91887320 +TIMESTAMP = 1672662786 +SHA256 (edgar-1.36-1.tar.gz) = 41d98dc1e15a6d7ef7898ebfef438a82598b67485cc686cd2e57f1e638af9a39 +SIZE (edgar-1.36-1.tar.gz) = 91908211 diff --git a/games/legend-of-edgar/files/patch-makefile b/games/legend-of-edgar/files/patch-makefile index 15e1c175a7ee..f6e07973fee1 100644 --- a/games/legend-of-edgar/files/patch-makefile +++ b/games/legend-of-edgar/files/patch-makefile @@ -1,100 +1,95 @@ -- Make sure the build can find SDL's headers - Properly stage things to make sure the binary does not refer to the stage directory and that the game can actually find its assets at runtime ---- makefile.orig 2019-03-16 12:57:53 UTC +--- makefile.orig 2023-01-01 07:44:56 UTC +++ makefile @@ -22,7 +22,7 @@ PO_PROG = po_creator TILE_PROG = tile_creator endif -PREFIX = $(DESTDIR)/usr +PREFIX = /usr BIN_DIR = $(PREFIX)/games/ DOC_DIR = $(PREFIX)/share/doc/$(PROG)/ ICON_DIR = $(PREFIX)/share/icons/hicolor/ -@@ -42,6 +42,7 @@ CFLAGS += -Wall -pedantic - ifeq ($(DEV),1) - CFLAGS += -Werror -g - endif -+CFLAGS += $(shell sdl2-config --cflags) - - DEFINES = -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DUNIX=$(UNIX) - ifndef NO_PAK -@@ -104,11 +105,11 @@ endif +@@ -104,11 +104,11 @@ endif all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG) makefile.dep : src/*/*.h src/*.h - for i in src/*.c src/*/*.c; do $(CC) -MM "$${i}"; done > $@ + for i in src/*.c src/*/*.c; do $(CC) $(CFLAGS) -MM "$${i}"; done > $@ # compiling other source files. $(MAIN_OBJS) $(CORE_OBJS) $(EDIT_OBJS) $(TITLE_OBJS) $(PAK_OBJS) $(PO_OBJS) $(TILE_OBJS): - $(CC) $(CFLAGS) $(DEFINES) -c -s $< + $(CC) $(CFLAGS) $(DEFINES) -c $< %.mo: %.po msgfmt -c -o $@ $< -@@ -148,37 +149,37 @@ install: all buildpak +@@ -148,39 +148,39 @@ install: all buildpak ifeq ($(DEV),1) echo Cannot install if DEV is set to 1! else - mkdir -p $(BIN_DIR) - mkdir -p $(DATA_DIR) - mkdir -p $(DOC_DIR) - mkdir -p $(ICON_DIR)16x16/apps - mkdir -p $(ICON_DIR)32x32/apps - mkdir -p $(ICON_DIR)48x48/apps - mkdir -p $(ICON_DIR)64x64/apps +- mkdir -p $(ICON_DIR)128x128/apps - mkdir -p $(DESKTOP_DIR) - mkdir -p $(APPDATA_DIR) - mkdir -p $(MAN_DIR) + mkdir -p $(DESTDIR)$(BIN_DIR) + mkdir -p $(DESTDIR)$(DATA_DIR) + mkdir -p $(DESTDIR)$(DOC_DIR) + mkdir -p $(DESTDIR)$(ICON_DIR)16x16/apps + mkdir -p $(DESTDIR)$(ICON_DIR)32x32/apps + mkdir -p $(DESTDIR)$(ICON_DIR)48x48/apps + mkdir -p $(DESTDIR)$(ICON_DIR)64x64/apps ++ mkdir -p $(DESTDIR)$(ICON_DIR)128x128/apps + mkdir -p $(DESTDIR)$(DESKTOP_DIR) + mkdir -p $(DESTDIR)$(APPDATA_DIR) + mkdir -p $(DESTDIR)$(MAN_DIR) - cp $(PROG) $(BIN_DIR)$(PROG) + $(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BIN_DIR)$(PROG) ifndef NO_PAK - cp $(PAK_FILE) $(DATA_DIR)$(PAK_FILE) + $(BSD_INSTALL_DATA) $(PAK_FILE) $(DESTDIR)$(DATA_DIR)$(PAK_FILE) else - cp -a data gfx music sound font $(DATA_DIR) + cp -a data gfx music sound font $(DESTDIR)$(DATA_DIR) endif - cp $(DOCS) $(DOC_DIR) - cp $(ICONS)16x16.png $(ICON_DIR)16x16/apps/$(PROG).png - cp $(ICONS)32x32.png $(ICON_DIR)32x32/apps/$(PROG).png - cp $(ICONS)48x48.png $(ICON_DIR)48x48/apps/$(PROG).png - cp $(ICONS)64x64.png $(ICON_DIR)64x64/apps/$(PROG).png +- cp $(ICONS)128x128.png $(ICON_DIR)128x128/apps/$(PROG).png - cp $(ICONS)$(PROG).desktop $(DESKTOP_DIR) - cp $(ICONS)$(PROG).appdata.xml $(APPDATA_DIR) - install -m 0644 $(MAN)$(PROG).6 $(MAN_DIR) + $(BSD_INSTALL_DATA) $(DOCS) $(DESTDIR)$(DOC_DIR) + $(BSD_INSTALL_DATA) $(ICONS)16x16.png $(DESTDIR)$(ICON_DIR)16x16/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)32x32.png $(DESTDIR)$(ICON_DIR)32x32/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)48x48.png $(DESTDIR)$(ICON_DIR)48x48/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)64x64.png $(DESTDIR)$(ICON_DIR)64x64/apps/$(PROG).png ++ $(BSD_INSTALL_DATA) $(ICONS)128x128.png $(DESTDIR)$(ICON_DIR)128x128/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOP_DIR) + $(BSD_INSTALL_DATA) $(ICONS)$(PROG).appdata.xml $(DESTDIR)$(APPDATA_DIR) + $(BSD_INSTALL_MAN) $(MAN)$(PROG).6 $(DESTDIR)$(MAN_DIR) @for f in $(LOCALE_MO); do \ lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \ - mkdir -p $(LOCALE_DIR)$$lang/LC_MESSAGES; \ - echo "cp $$f $(LOCALE_DIR)$$lang/LC_MESSAGES/$(PROG).mo"; \ - cp $$f $(LOCALE_DIR)$$lang/LC_MESSAGES/$(PROG).mo; \ + mkdir -p $(DESTDIR)$(LOCALE_DIR)$$lang/LC_MESSAGES; \ + echo "cp $$f $(DESTDIR)$(LOCALE_DIR)$$lang/LC_MESSAGES/$(PROG).mo"; \ + cp $$f $(DESTDIR)$(LOCALE_DIR)$$lang/LC_MESSAGES/$(PROG).mo; \ done endif diff --git a/games/legend-of-edgar/pkg-plist b/games/legend-of-edgar/pkg-plist index d7bda5c73bed..a82eb706cde6 100644 --- a/games/legend-of-edgar/pkg-plist +++ b/games/legend-of-edgar/pkg-plist @@ -1,62 +1,63 @@ bin/edgar -man/man6/edgar.6.gz share/appdata/edgar.appdata.xml share/applications/edgar.desktop %%PORTDOCS%%%%DOCSDIR%%/alienDevice.gif %%PORTDOCS%%%%DOCSDIR%%/bomb.gif %%PORTDOCS%%%%DOCSDIR%%/changes %%PORTDOCS%%%%DOCSDIR%%/contents.html %%PORTDOCS%%%%DOCSDIR%%/edgar.gif %%PORTDOCS%%%%DOCSDIR%%/frog.gif %%PORTDOCS%%%%DOCSDIR%%/gazer.gif %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/license %%PORTDOCS%%%%DOCSDIR%%/logo.png %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/music_and_sound_licences %%PORTDOCS%%%%DOCSDIR%%/porting %%PORTDOCS%%%%DOCSDIR%%/purple_jumping_slime.gif %%PORTDOCS%%%%DOCSDIR%%/readme %%PORTDOCS%%%%DOCSDIR%%/spitting_plant.gif %%PORTDOCS%%%%DOCSDIR%%/tortoise.gif %%PORTDOCS%%%%DOCSDIR%%/translating %%DATADIR%%/edgar.pak +share/icons/hicolor/128x128/apps/edgar.png share/icons/hicolor/16x16/apps/edgar.png share/icons/hicolor/32x32/apps/edgar.png share/icons/hicolor/48x48/apps/edgar.png share/icons/hicolor/64x64/apps/edgar.png %%NLS%%share/locale/ar/LC_MESSAGES/edgar.mo %%NLS%%share/locale/cs/LC_MESSAGES/edgar.mo %%NLS%%share/locale/da/LC_MESSAGES/edgar.mo %%NLS%%share/locale/de/LC_MESSAGES/edgar.mo %%NLS%%share/locale/el/LC_MESSAGES/edgar.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/edgar.mo %%NLS%%share/locale/en_US/LC_MESSAGES/edgar.mo %%NLS%%share/locale/eo/LC_MESSAGES/edgar.mo %%NLS%%share/locale/es/LC_MESSAGES/edgar.mo %%NLS%%share/locale/fa/LC_MESSAGES/edgar.mo %%NLS%%share/locale/fr/LC_MESSAGES/edgar.mo %%NLS%%share/locale/hi/LC_MESSAGES/edgar.mo %%NLS%%share/locale/id/LC_MESSAGES/edgar.mo %%NLS%%share/locale/it/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ja/LC_MESSAGES/edgar.mo %%NLS%%share/locale/jv/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ko/LC_MESSAGES/edgar.mo %%NLS%%share/locale/lv/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ms/LC_MESSAGES/edgar.mo %%NLS%%share/locale/nl/LC_MESSAGES/edgar.mo %%NLS%%share/locale/pl/LC_MESSAGES/edgar.mo %%NLS%%share/locale/pt/LC_MESSAGES/edgar.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ro/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ru/LC_MESSAGES/edgar.mo %%NLS%%share/locale/sk/LC_MESSAGES/edgar.mo %%NLS%%share/locale/sr/LC_MESSAGES/edgar.mo %%NLS%%share/locale/sv/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ta/LC_MESSAGES/edgar.mo %%NLS%%share/locale/tr/LC_MESSAGES/edgar.mo %%NLS%%share/locale/uk/LC_MESSAGES/edgar.mo %%NLS%%share/locale/ur/LC_MESSAGES/edgar.mo %%NLS%%share/locale/vi/LC_MESSAGES/edgar.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/edgar.mo +share/man/man6/edgar.6.gz share/pixmaps/edgar.png