CVS commit: pkgsrc/games/icebreaker

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Oct 29 18:04:44 UTC 2019

Modified Files:
        pkgsrc/games/icebreaker: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/icebreaker/patches: patch-Makefile
            patch-icebreaker.desktop
Removed Files:
        pkgsrc/games/icebreaker/patches: patch-aa

Log Message:
icebreaker: Update to 1.9.8.

The changelog says "um, yeah. Enough slacking; this release works."
This release is from 2003.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/games/icebreaker/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/icebreaker/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/icebreaker/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/icebreaker/patches/patch-Makefile \
    pkgsrc/games/icebreaker/patches/patch-icebreaker.desktop
cvs rdiff -u -r1.3 -r0 pkgsrc/games/icebreaker/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/icebreaker/Makefile
diff -u pkgsrc/games/icebreaker/Makefile:1.33 pkgsrc/games/icebreaker/Makefile:1.34
--- pkgsrc/games/icebreaker/Makefile:1.33       Sun Jan 14 15:26:47 2018
+++ pkgsrc/games/icebreaker/Makefile    Tue Oct 29 18:04:44 2019
@@ -1,37 +1,57 @@
-# $NetBSD: Makefile,v 1.33 2018/01/14 15:26:47 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.34 2019/10/29 18:04:44 nia Exp $
 
-DISTNAME=      icebreaker-1.9.7
-PKGREVISION=   12
+DISTNAME=      icebreaker-1.9.8
 CATEGORIES=    games
 MASTER_SITES=  https://mattdm.org/icebreaker/1.9.x/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://mattdm.org/icebreaker/
-COMMENT=       Penguin capturing simulation
+COMMENT=       Action-puzzle game involving bouncing penguins
+LICENSE=       gnu-gpl-v2
+
+TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
 
 USE_TOOLS+=    gmake
-MAKE_ENV+=     mandir="${PREFIX}/man" highscoredir="/var/games"
+
+BUILD_DEFS+=   VARBASE
+
+MAKE_ENV+=     mandir="${PREFIX}/man"
+MAKE_ENV+=     highscoredir="${VARBASE}/games"
 MAKE_ENV+=     prefix=${PREFIX}
 
-SETGIDGAME=    yes
+USE_GAMESGROUP=        yes
 SPECIAL_PERMS= bin/icebreaker ${SETGID_GAMES_PERMS}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man6
+INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/doc/icebreaker
+INSTALLATION_DIRS+=    share/icebreaker
+INSTALLATION_DIRS+=    share/icons/hicolor/32x32/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/48x48/apps
+
+post-build:
+       cd ${WRKSRC} && ${PREFIX}/bin/icotool -i 1 -x -o 32.png ${WRKSRC}/icebreaker_32.ico
+       cd ${WRKSRC} && ${PREFIX}/bin/icotool -i 2 -x -o 48.png ${WRKSRC}/icebreaker_32.ico
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/icebreaker
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icebreaker
        cd ${WRKSRC} && ${INSTALL_DATA} *.ibt *.wav *.bmp \
                ${DESTDIR}${PREFIX}/share/icebreaker
        ${INSTALL_PROGRAM} ${WRKSRC}/icebreaker ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/icebreaker.6 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
-       ${INSTALL_DATA} ${WRKSRC}/README \
-               ${DESTDIR}${PREFIX}/share/doc/icebreaker
+       ${INSTALL_DATA} ${WRKSRC}/icebreaker.desktop \
+               ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/32.png \
+               ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/icebreaker.png
+       ${INSTALL_DATA} ${WRKSRC}/48.png \
+               ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/icebreaker.png
+.for file in ChangeLog README LICENSE
+       ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/doc/icebreaker
+.endfor
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
-
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/icebreaker/PLIST
diff -u pkgsrc/games/icebreaker/PLIST:1.4 pkgsrc/games/icebreaker/PLIST:1.5
--- pkgsrc/games/icebreaker/PLIST:1.4   Sun Jun 14 17:56:48 2009
+++ pkgsrc/games/icebreaker/PLIST       Tue Oct 29 18:04:44 2019
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/10/29 18:04:44 nia Exp $
 bin/icebreaker
 man/man6/icebreaker.6
+share/applications/icebreaker.desktop
+share/doc/icebreaker/ChangeLog
+share/doc/icebreaker/LICENSE
 share/doc/icebreaker/README
 share/icebreaker/atom.bmp
 share/icebreaker/bgeveryone.wav
@@ -30,6 +33,7 @@ share/icebreaker/penguinicon_32.bmp
 share/icebreaker/phase.wav
 share/icebreaker/pop.wav
 share/icebreaker/scrunch.wav
+share/icebreaker/splash.wav
 share/icebreaker/splat.wav
 share/icebreaker/squeak.wav
 share/icebreaker/star.bmp
@@ -38,3 +42,5 @@ share/icebreaker/tap.wav
 share/icebreaker/turtle.bmp
 share/icebreaker/turtles.ibt
 share/icebreaker/woodblock.bmp
+share/icons/hicolor/32x32/apps/icebreaker.png
+share/icons/hicolor/48x48/apps/icebreaker.png

Index: pkgsrc/games/icebreaker/distinfo
diff -u pkgsrc/games/icebreaker/distinfo:1.5 pkgsrc/games/icebreaker/distinfo:1.6
--- pkgsrc/games/icebreaker/distinfo:1.5        Tue Nov  3 20:56:53 2015
+++ pkgsrc/games/icebreaker/distinfo    Tue Oct 29 18:04:44 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:56:53 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/10/29 18:04:44 nia Exp $
 
-SHA1 (icebreaker-1.9.7.tgz) = 856ed5e3c8498660b97558acdd10abb6b9472bfa
-RMD160 (icebreaker-1.9.7.tgz) = d3648094ee5d65bccde30f70ad774378e3b5d817
-SHA512 (icebreaker-1.9.7.tgz) = a4f4aacf8fa3a6a4e216f8089c258212fe00affff629407f968d93756f50cbd26a39619f945aaeaa2f4bf3f26ff7f5a3223af02f8d0e0113768aaec4a8047391
-Size (icebreaker-1.9.7.tgz) = 189167 bytes
-SHA1 (patch-aa) = 97accbbf40dec7b3212fcf32efd4b4fce265bb1b
+SHA1 (icebreaker-1.9.8.tgz) = 71ea9209c786f7addd4f5b84dba14f7e069d2084
+RMD160 (icebreaker-1.9.8.tgz) = 830ac7c4f7784b4ceee0cd57c5975f69102c1617
+SHA512 (icebreaker-1.9.8.tgz) = 03fd280c58efe235d8b9a11cf67f4248febef81b58532b7063619b7da08af7b1d71cc20917b959397748a2167a0aec271aa45f9488bcca56518913bde6017183
+Size (icebreaker-1.9.8.tgz) = 177355 bytes
+SHA1 (patch-Makefile) = 78a42778e7cc7a63a32b70e6f3eb31da5d47b6c4
+SHA1 (patch-icebreaker.desktop) = 7a0a34b7b722a4408410631076de22a039f0d608

Added files:

Index: pkgsrc/games/icebreaker/patches/patch-Makefile
diff -u /dev/null pkgsrc/games/icebreaker/patches/patch-Makefile:1.1
--- /dev/null   Tue Oct 29 18:04:44 2019
+++ pkgsrc/games/icebreaker/patches/patch-Makefile      Tue Oct 29 18:04:44 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2019/10/29 18:04:44 nia Exp $
+
+Allow variables to be overriden by pkgsrc.
+
+--- Makefile.orig      2003-02-25 16:31:32.000000000 +0000
++++ Makefile
+@@ -1,6 +1,6 @@
+-CC=gcc
++CC?=gcc
+ 
+-SDLCONFIG=sdl-config
++SDLCONFIG?=sdl-config
+ 
+ ifndef prefix
+   prefix=/usr/local
Index: pkgsrc/games/icebreaker/patches/patch-icebreaker.desktop
diff -u /dev/null pkgsrc/games/icebreaker/patches/patch-icebreaker.desktop:1.1
--- /dev/null   Tue Oct 29 18:04:44 2019
+++ pkgsrc/games/icebreaker/patches/patch-icebreaker.desktop    Tue Oct 29 18:04:44 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-icebreaker.desktop,v 1.1 2019/10/29 18:04:44 nia Exp $
+
+Do not hardcore paths to /usr/share.
+
+--- icebreaker.desktop.orig    2002-05-31 03:15:45.000000000 +0000
++++ icebreaker.desktop
+@@ -1,7 +1,9 @@
+ [Desktop Entry]
+ Name=IceBreaker
+ Type=Application
+-Comment=addictive action-puzzle game involving bouncing penguins
++Encoding=UTF-8
++Comment=Addictive action-puzzle game involving bouncing penguins
+ Exec=icebreaker
+-Icon=/usr/share/icebreaker/icebreaker_48.bmp
+-Terminal=0
++Icon=icebreaker
++Terminal=false
++Categories=Game;ActionGame