CVS commit: pkgsrc/emulators/dosbox

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 30 11:16:17 UTC 2019

Modified Files:
        pkgsrc/emulators/dosbox: Makefile

Log Message:
dosbox: convert imagemagick to icotool


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/emulators/dosbox/Makefile

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

Modified files:

Index: pkgsrc/emulators/dosbox/Makefile
diff -u pkgsrc/emulators/dosbox/Makefile:1.48 pkgsrc/emulators/dosbox/Makefile:1.49
--- pkgsrc/emulators/dosbox/Makefile:1.48       Wed Jul  3 09:06:37 2019
+++ pkgsrc/emulators/dosbox/Makefile    Sat Nov 30 11:16:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/07/03 09:06:37 nia Exp $
+# $NetBSD: Makefile,v 1.49 2019/11/30 11:16:17 nia Exp $
 
 DISTNAME=      dosbox-0.74-3
 PKGNAME=       dosbox-0.74.3
@@ -11,6 +11,8 @@ HOMEPAGE=     https://www.dosbox.com/
 COMMENT=       Multi-platform DOS emulator using SDL
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
+
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS.Darwin+=        --disable-dynrec
@@ -29,30 +31,23 @@ SUBST_SED.fixme=    -e s,/usr/share/,${PREF
 # dynamic recompiler enabled by default
 NOT_PAX_MPROTECT_SAFE+=        bin/dosbox
 
-ICON_SIZES=    256 48 32 24 16
-ICON_DIR=      share/icons/hicolor
-
-TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
-
 INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/doc/dosbox
-.for size in ${ICON_SIZES}
-INSTALLATION_DIRS+=    ${ICON_DIR}/${size}x${size}/apps
-.endfor
 
 post-extract:
-       convert ${WRKSRC}/src/dosbox.ico[0] ${WRKDIR}/dosbox-256.png
-       convert ${WRKSRC}/src/dosbox.ico[1] ${WRKDIR}/dosbox-48.png
-       convert ${WRKSRC}/src/dosbox.ico[2] ${WRKDIR}/dosbox-32.png
-       convert ${WRKSRC}/src/dosbox.ico[3] ${WRKDIR}/dosbox-24.png
-       convert ${WRKSRC}/src/dosbox.ico[4] ${WRKDIR}/dosbox-16.png
+       ${PREFIX}/bin/icotool -x -i 1 ${WRKSRC}/src/dosbox.ico -o ${WRKDIR}/256.png
+       ${PREFIX}/bin/icotool -x -i 2 ${WRKSRC}/src/dosbox.ico -o ${WRKDIR}/48.png
+       ${PREFIX}/bin/icotool -x -i 3 ${WRKSRC}/src/dosbox.ico -o ${WRKDIR}/32.png
+       ${PREFIX}/bin/icotool -x -i 4 ${WRKSRC}/src/dosbox.ico -o ${WRKDIR}/24.png
+       ${PREFIX}/bin/icotool -x -i 5 ${WRKSRC}/src/dosbox.ico -o ${WRKDIR}/16.png
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dosbox
        ${INSTALL_DATA} ${FILESDIR}/dosbox.desktop ${DESTDIR}${PREFIX}/share/applications
-.for size in ${ICON_SIZES}
-       ${INSTALL_DATA} ${WRKDIR}/dosbox-${size}.png \
-           ${DESTDIR}${PREFIX}/${ICON_DIR}/${size}x${size}/apps/dosbox.png
+.for s in 256 48 32 24 16
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
+       ${INSTALL_DATA} ${WRKDIR}/${s}.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/dosbox.png
 .endfor
 
 .include "options.mk"
@@ -61,4 +56,5 @@ post-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"