CVS commit: pkgsrc/games/7kaa

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 30 11:47:15 UTC 2019

Modified Files:
        pkgsrc/games/7kaa: Makefile PLIST

Log Message:
7kaa: convert imagemagick usage to icotool


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/7kaa/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/7kaa/PLIST

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

Modified files:

Index: pkgsrc/games/7kaa/Makefile
diff -u pkgsrc/games/7kaa/Makefile:1.5 pkgsrc/games/7kaa/Makefile:1.6
--- pkgsrc/games/7kaa/Makefile:1.5      Thu Aug 22 12:23:06 2019
+++ pkgsrc/games/7kaa/Makefile  Sat Nov 30 11:47:15 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/08/22 12:23:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/30 11:47:15 nia Exp $
 
 DISTNAME=      7kaa-2.15.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=the3dfxdude/}
 EXTRACT_SUFX=  .tar.xz
@@ -12,6 +12,8 @@ HOMEPAGE=     https://7kfans.com/
 COMMENT=       Seven Kingdoms: Ancient Adversaries
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
+
 USE_LANGUAGES+=        c c++11
 GNU_CONFIGURE= yes
 USE_TOOLS+=    msgfmt msgmerge xgettext
@@ -20,26 +22,26 @@ USE_TOOLS+= pkg-config
 # C++11
 GCC_REQD+=     4.6
 
-LDFLAGS.SunOS+=        -lintl -liconv
+LDFLAGS+=      ${BUILDLINK_LDADD.iconv}
 
-TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
+CONFIGURE_ARGS+=       --disable-sdltest
 
 INSTALLATION_DIRS+=    share/applications
-INSTALLATION_DIRS+=    share/icons/hicolor/32x32/apps
+INSTALLATION_DIRS+=    share/pixmaps
 
 post-extract:
-       ${PREFIX}/bin/convert ${WRKSRC}/src/7k.ico ${WRKDIR}/7kaa.png
+       ${PREFIX}/bin/icotool -x -i 1 ${WRKSRC}/src/7k.ico -o ${WRKDIR}/7kaa.png
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/7kaa.desktop \
            ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_DATA} ${WRKDIR}/7kaa.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps
+           ${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/enet/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/7kaa/PLIST
diff -u pkgsrc/games/7kaa/PLIST:1.1 pkgsrc/games/7kaa/PLIST:1.2
--- pkgsrc/games/7kaa/PLIST:1.1 Sun Jun 30 21:49:41 2019
+++ pkgsrc/games/7kaa/PLIST     Sat Nov 30 11:47:15 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/06/30 21:49:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/11/30 11:47:15 nia Exp $
 bin/7kaa
 share/7kaa/ENCYC/FIRM/FACTORY.COL
 share/7kaa/ENCYC/FIRM/FACTORY.ICN
@@ -497,8 +497,8 @@ share/7kaa/TUTORIAL/SPYING.TUT
 share/applications/7kaa.desktop
 share/doc/7kaa/COPYING
 share/doc/7kaa/README
-share/icons/hicolor/32x32/apps/7kaa.png
 share/locale/de/LC_MESSAGES/7kaa.mo
 share/locale/es/LC_MESSAGES/7kaa.mo
 share/locale/pt_BR/LC_MESSAGES/7kaa.mo
 share/locale/ru/LC_MESSAGES/7kaa.mo
+share/pixmaps/7kaa.png