From 7cfdf0a7d2cc163a4a7188e14c042bfae4388c7c Mon Sep 17 00:00:00 2001 From: Rusmir Dusko Date: Mon, 13 Jan 2014 17:03:04 +0000 Subject: [PATCH] - Change Makefile header - Update to 145.1.2010.11.5 - Add PORTEPOCH - Change license GPLv2 to GPLv1 - Remove USE_ZIP=yes - USES gmake instead of USE_GMAKE - Add USE_GCC=yes - Use pkg-plist instead of PLIST_FILES and PORTDATA - Add DOCS Option - Support STAGEDIR - Change Desktop entry file - Symlink the icon instead of copying it - Break lines around 80 characters - Recreate patches with make makepatch --- games/sdl_scavenger/Makefile | 43 ++++++++++------------- games/sdl_scavenger/distinfo | 4 +-- games/sdl_scavenger/files/patch-Makefile | 3 +- games/sdl_scavenger/files/patch-scavsaver | 4 +-- games/sdl_scavenger/pkg-plist | 34 ++++++++++++++++++ 5 files changed, 59 insertions(+), 29 deletions(-) create mode 100644 games/sdl_scavenger/pkg-plist diff --git a/games/sdl_scavenger/Makefile b/games/sdl_scavenger/Makefile index 9022016a79c5..d8be71fcd118 100644 --- a/games/sdl_scavenger/Makefile +++ b/games/sdl_scavenger/Makefile @@ -1,49 +1,44 @@ +# Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= sdl_scavenger -PORTVERSION= 145.1.2010.11.5 -PORTREVISION= 2 +PORTVERSION= 145.2014.01.01 +PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/sdlscavenger/ -DISTNAME= sdlscav-145.1_2010_11_5 +DISTNAME= sdlscav-145_2014_01_01 +EXTRACT_SUFX= .tgz MAINTAINER= nemysis@FreeBSD.org COMMENT= Lode Runner like game -LICENSE= GPLv2 +LICENSE= GPLv1 WRKSRC= ${WRKDIR}/sdlscav-145 -USE_ZIP= yes +USES= gmake USE_SDL= sdl image mixer -USE_GMAKE= yes +USE_GCC= yes ALL_TARGET= -PLIST_FILES= bin/sdlscavenger \ - share/pixmaps/sdlscavenger.png - -PORTDATA= * PORTDOCS= CREDITS DOC NEW_FEATURES README STRATEGY -DESKTOP_ENTRIES="SDL Scavenger" "${COMMENT}" "sdlscavenger" \ - "sdlscavenger" "Game;ArcadeGame;" ${FALSE} +OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include +DESKTOP_ENTRIES="SDL Scavenger" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;LogicGame;" "" post-patch: - @${REINPLACE_CMD} -e 's|data:/usr/local/games/scavenger|data:${DATADIR}/data|' \ - ${WRKSRC}/names.h + @${REINPLACE_CMD} -e 's|/usr/local/games/scavenger|${DATADIR}/data|' \ + ${WRKSRC}/names.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sdlscav ${PREFIX}/bin/sdlscavenger - ${MKDIR} ${DATADIR} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}) - ${INSTALL_DATA} ${WRKSRC}/data/scav.png ${PREFIX}/share/pixmaps/sdlscavenger.png + ${INSTALL_PROGRAM} ${WRKSRC}/sdlscav ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}) + ${LN} -sf ${DATADIR}/data/scav.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/games/sdl_scavenger/distinfo b/games/sdl_scavenger/distinfo index d8c50fa66980..fefb1a637654 100644 --- a/games/sdl_scavenger/distinfo +++ b/games/sdl_scavenger/distinfo @@ -1,2 +1,2 @@ -SHA256 (sdlscav-145.1_2010_11_5.zip) = 6a938dc6ca99bd3911bebfe0d0016eed3acf578da57f1f0a4df36380b1929c49 -SIZE (sdlscav-145.1_2010_11_5.zip) = 565868 +SHA256 (sdlscav-145_2014_01_01.tgz) = 0d46c584b47222369e4a4c2a120eac5166e59e45f6200d5add1413667a1e968b +SIZE (sdlscav-145_2014_01_01.tgz) = 563092 diff --git a/games/sdl_scavenger/files/patch-Makefile b/games/sdl_scavenger/files/patch-Makefile index cc559614e6c5..a912826cb1e7 100644 --- a/games/sdl_scavenger/files/patch-Makefile +++ b/games/sdl_scavenger/files/patch-Makefile @@ -1,4 +1,5 @@ -Index: Makefile +--- ./Makefile.orig 2010-11-04 08:53:00.000000000 +0100 ++++ ./Makefile 2013-12-25 10:25:00.000000000 +0100 @@ -1,12 +1,9 @@ -CC = gcc ###CFLAGS = -Wall -O2 -I/usr/local/include/SDL -I/usr/include/SDL -D_REENTRANT diff --git a/games/sdl_scavenger/files/patch-scavsaver b/games/sdl_scavenger/files/patch-scavsaver index 05737a753d2b..ee8cd250e9d5 100644 --- a/games/sdl_scavenger/files/patch-scavsaver +++ b/games/sdl_scavenger/files/patch-scavsaver @@ -1,5 +1,5 @@ ---- scavsaver.orig 2005-01-23 08:52:00.000000000 +0100 -+++ scavsaver 2012-04-24 01:05:13.000000000 +0200 +--- ./scavsaver.orig 2005-01-23 08:52:22.000000000 +0100 ++++ ./scavsaver 2013-12-25 10:25:00.000000000 +0100 @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/sh diff --git a/games/sdl_scavenger/pkg-plist b/games/sdl_scavenger/pkg-plist new file mode 100644 index 000000000000..4e8c9d53b3fc --- /dev/null +++ b/games/sdl_scavenger/pkg-plist @@ -0,0 +1,34 @@ +bin/sdl_scavenger +share/pixmaps/sdl_scavenger.png +%%DATADIR%%/data/badguy.lbm +%%DATADIR%%/data/brownblue.lbm +%%DATADIR%%/data/death.wav +%%DATADIR%%/data/devil.xpm +%%DATADIR%%/data/dig.wav +%%DATADIR%%/data/fall.wav +%%DATADIR%%/data/highrc +%%DATADIR%%/data/highstreet.lbm +%%DATADIR%%/data/leprechaun.lbm +%%DATADIR%%/data/levels.scl +%%DATADIR%%/data/masters.scl +%%DATADIR%%/data/microman.lbm +%%DATADIR%%/data/microman.xpm +%%DATADIR%%/data/micromanrc +%%DATADIR%%/data/microrc +%%DATADIR%%/data/pop.wav +%%DATADIR%%/data/redbrick.lbm +%%DATADIR%%/data/reddevil.lbm +%%DATADIR%%/data/reddevilrc +%%DATADIR%%/data/regularguy.lbm +%%DATADIR%%/data/scav.bmp +%%DATADIR%%/data/scav.png +%%DATADIR%%/data/scav.xpm +%%DATADIR%%/data/scavrc +%%DATADIR%%/data/shamrc +%%DATADIR%%/data/shamrock.lbm +%%DATADIR%%/data/shamrock.xpm +%%DATADIR%%/data/spiral.lbm +%%DATADIR%%/data/spiralthing.lbm +%%DATADIR%%/data/victory.wav +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%