CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 15 07:22:40 UTC 2021

Modified Files:
        pkgsrc/www/htmldoc: Makefile Makefile.common PLIST distinfo
        pkgsrc/www/htmldoc-x11: Makefile
Added Files:
        pkgsrc/www/htmldoc/patches: patch-desktop_Makefile

Log Message:
htmldoc: don't just install desktop files on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/www/htmldoc/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/htmldoc/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/htmldoc/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/htmldoc/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/htmldoc-x11/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/htmldoc/patches/patch-desktop_Makefile

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

Modified files:

Index: pkgsrc/www/htmldoc/Makefile
diff -u pkgsrc/www/htmldoc/Makefile:1.50 pkgsrc/www/htmldoc/Makefile:1.51
--- pkgsrc/www/htmldoc/Makefile:1.50    Wed Apr 21 13:25:29 2021
+++ pkgsrc/www/htmldoc/Makefile Sat May 15 07:22:39 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2021/04/21 13:25:29 adam Exp $
+# $NetBSD: Makefile,v 1.51 2021/05/15 07:22:39 nia Exp $
 
 CONFIGURE_ARGS+=       --without-gui
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "${.CURDIR}/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/htmldoc/Makefile.common
diff -u pkgsrc/www/htmldoc/Makefile.common:1.18 pkgsrc/www/htmldoc/Makefile.common:1.19
--- pkgsrc/www/htmldoc/Makefile.common:1.18     Mon Feb  1 09:33:12 2021
+++ pkgsrc/www/htmldoc/Makefile.common  Sat May 15 07:22:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2021/02/01 09:33:12 fcambus Exp $
+# $NetBSD: Makefile.common,v 1.19 2021/05/15 07:22:39 nia Exp $
 #
 # used by www/htmldoc/Makefile
 # used by www/htmldoc-x11/Makefile
@@ -31,5 +31,7 @@ GNU_CONFIGURE=                yes
 USE_LANGUAGES=         c c++
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/www/htmldoc/PLIST
diff -u pkgsrc/www/htmldoc/PLIST:1.5 pkgsrc/www/htmldoc/PLIST:1.6
--- pkgsrc/www/htmldoc/PLIST:1.5        Sun Jun 14 22:00:23 2009
+++ pkgsrc/www/htmldoc/PLIST    Sat May 15 07:22:39 2021
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:00:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/05/15 07:22:39 nia Exp $
 bin/htmldoc
 man/man1/htmldoc.1
+share/applications/htmldoc.desktop
 share/doc/htmldoc/help.html
 share/doc/htmldoc/htmldoc.pdf
 share/htmldoc/data/cp-1250
@@ -79,3 +80,7 @@ share/htmldoc/fonts/Times-Italic.afm
 share/htmldoc/fonts/Times-Italic.pfa
 share/htmldoc/fonts/Times-Roman.afm
 share/htmldoc/fonts/Times-Roman.pfa
+share/icons/hicolor/128x128/apps/htmldoc.png
+share/icons/hicolor/256x256/apps/htmldoc.png
+share/mime/packages/htmldoc.xml
+share/pixmaps/htmldoc.xpm

Index: pkgsrc/www/htmldoc/distinfo
diff -u pkgsrc/www/htmldoc/distinfo:1.16 pkgsrc/www/htmldoc/distinfo:1.17
--- pkgsrc/www/htmldoc/distinfo:1.16    Mon Feb  1 09:33:12 2021
+++ pkgsrc/www/htmldoc/distinfo Sat May 15 07:22:39 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2021/02/01 09:33:12 fcambus Exp $
+$NetBSD: distinfo,v 1.17 2021/05/15 07:22:39 nia Exp $
 
 SHA1 (htmldoc/v1.9.11.tar.gz) = 6366646f9d548e1bb1d17f36f07f212ffdac7600
 RMD160 (htmldoc/v1.9.11.tar.gz) = 4bb448518ca2957df8c16600c8b77e9e3e85bdc7
 SHA512 (htmldoc/v1.9.11.tar.gz) = 008e0af36a05c1f358ddc344643e75e85dafc0b5213ffa693a3958a00082a935a957caf8f9790f4c2f0631436048f70e6c2ff2bb320977a9ba2c6d26d59ff0ed
 Size (htmldoc/v1.9.11.tar.gz) = 4505305 bytes
+SHA1 (patch-desktop_Makefile) = 687b416d6b4189aa4b0242b23858daabd54a76ed
 SHA1 (patch-htmldoc_http-addrlist.c) = 5c36f78655838e633f805b6529a2a3183e10288a

Index: pkgsrc/www/htmldoc-x11/Makefile
diff -u pkgsrc/www/htmldoc-x11/Makefile:1.23 pkgsrc/www/htmldoc-x11/Makefile:1.24
--- pkgsrc/www/htmldoc-x11/Makefile:1.23        Mon Feb  1 09:35:11 2021
+++ pkgsrc/www/htmldoc-x11/Makefile     Sat May 15 07:22:39 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2021/02/01 09:35:11 fcambus Exp $
+# $NetBSD: Makefile,v 1.24 2021/05/15 07:22:39 nia Exp $
 
 PKGNAME=       htmldoc-x11-${VERSION}
+PKGREVISION=   1
 
 CONFIGURE_ARGS+=       --with-gui
 

Added files:

Index: pkgsrc/www/htmldoc/patches/patch-desktop_Makefile
diff -u /dev/null pkgsrc/www/htmldoc/patches/patch-desktop_Makefile:1.1
--- /dev/null   Sat May 15 07:22:40 2021
+++ pkgsrc/www/htmldoc/patches/patch-desktop_Makefile   Sat May 15 07:22:39 2021
@@ -0,0 +1,22 @@
+$NetBSD: patch-desktop_Makefile,v 1.1 2021/05/15 07:22:39 nia Exp $
+
+Ensure desktop files are always installed, not just on Linux.
+
+--- desktop/Makefile.orig      2020-12-24 21:58:42.000000000 +0000
++++ desktop/Makefile
+@@ -27,7 +27,6 @@ all:
+ #
+ 
+ install:
+-      if test `uname` = Linux; then \
+               $(INSTALL_DIR) $(BUILDROOT)$(datadir)/applications; \
+               $(INSTALL_DATA) htmldoc.desktop $(BUILDROOT)$(datadir)/applications; \
+               $(INSTALL_DIR) $(BUILDROOT)$(datadir)/mime/packages; \
+@@ -38,7 +37,6 @@ install:
+               $(INSTALL_DATA) htmldoc-128.png $(BUILDROOT)$(datadir)/icons/hicolor/128x128/apps/htmldoc.png; \
+               $(INSTALL_DIR) $(BUILDROOT)$(datadir)/icons/hicolor/256x256/apps; \
+               $(INSTALL_DATA) htmldoc-256.png $(BUILDROOT)$(datadir)/icons/hicolor/256x256/apps/htmldoc.png; \
+-      fi
+ 
+ 
+ #