[pkgsrc/trunk]: pkgsrc/editors/mined mined: reduce workarounds, fix two insta...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a08dc2c610f
branches:  trunk
changeset: 390742:5a08dc2c610f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Dec 28 15:20:02 2022 +0000

description:
mined: reduce workarounds, fix two installation paths

Bump PKGREVISION.

diffstat:

 editors/mined/Makefile                       |   9 +++------
 editors/mined/PLIST                          |   6 +++---
 editors/mined/distinfo                       |   3 ++-
 editors/mined/patches/patch-src_mkinclud.mak |  18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 10 deletions(-)

diffs (91 lines):

diff -r 23d6e0e132c1 -r 5a08dc2c610f editors/mined/Makefile
--- a/editors/mined/Makefile    Wed Dec 28 13:57:22 2022 +0000
+++ b/editors/mined/Makefile    Wed Dec 28 15:20:02 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2022/12/28 12:20:20 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/12/28 15:20:02 wiz Exp $
 
 DISTNAME=              mined-2022.27
+PKGREVISION=           1
 CATEGORIES=            editors
 MASTER_SITES=          http://towo.net/mined/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} UCD.zip Unihan.zip BIG5.TXT
@@ -17,17 +18,13 @@
 MAKE_FILE=     makefile
 USE_TOOLS+=    gmake
 MAKE_FLAGS+=   OPT=${CFLAGS:Q}
-MAKE_FLAGS+=   root=${DESTDIR}
 MAKE_FLAGS+=   prefix=${PREFIX}
+MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
 
 post-extract:
 .for f in UCD.zip Unihan.zip BIG5.TXT
        ${CP} ${_DISTDIR}/${f} ${WRKSRC}/src
 .endfor
 
-post-install:
-       ${MV} ${DESTDIR}${DESTDIR}/usr/share ${DESTDIR}${PREFIX}/share
-       ${MV} ${DESTDIR}${PREFIX}/share/man ${DESTDIR}${PREFIX}/${PKGMANDIR}
-
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 23d6e0e132c1 -r 5a08dc2c610f editors/mined/PLIST
--- a/editors/mined/PLIST       Wed Dec 28 13:57:22 2022 +0000
+++ b/editors/mined/PLIST       Wed Dec 28 15:20:02 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/12/28 12:18:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/12/28 15:20:02 wiz Exp $
 bin/mined
 bin/minmacs
 bin/mpico
@@ -13,6 +13,7 @@
 man/man1/umined.1
 man/man1/uterm.1
 man/man1/xmined.1
+share/applications/mined.desktop
 share/mined/bin/mterm
 share/mined/bin/umined
 share/mined/bin/uprint
@@ -136,5 +137,4 @@
 share/mined/setup_install/win/deleteall.bat
 share/mined/setup_install/win/install.sh
 share/mined/setup_install/win/uninstall.sh
-share/share/applications/mined.desktop
-share/share/pixmaps/mined.xpm
+share/pixmaps/mined.xpm
diff -r 23d6e0e132c1 -r 5a08dc2c610f editors/mined/distinfo
--- a/editors/mined/distinfo    Wed Dec 28 13:57:22 2022 +0000
+++ b/editors/mined/distinfo    Wed Dec 28 15:20:02 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2022/12/28 12:18:45 wiz Exp $
+$NetBSD: distinfo,v 1.14 2022/12/28 15:20:02 wiz Exp $
 
 BLAKE2s (BIG5.TXT) = 08325303fee2aeb477ffdfd5b9d5ffdf3df0fcf5ec5fec5ee2db3450491d4535
 SHA512 (BIG5.TXT) = 4a3fe7932028ef1397e15ec655481dfa3b326510796433c7a5b5c966eb1aead34b9831164b73df6e26f36dd6c6022a1f7899a66f65dfce263950b4c31bae4769
@@ -13,3 +13,4 @@
 SHA512 (mined-2022.27.tar.gz) = 87c9b73215ef5ab00ff85f552365dd0321044055d78692d46e0e83085cfb0ef1f5aff11607636a0e017106f0ed03ddf577b30946533f2a540da00f51134cea59
 Size (mined-2022.27.tar.gz) = 7252534 bytes
 SHA1 (patch-makemined) = edd3f9d03acd29a5c32aa8aee23d006c49dd7e9a
+SHA1 (patch-src_mkinclud.mak) = 7764ff9e8cdffa2f474d3b52cd66b01642021c95
diff -r 23d6e0e132c1 -r 5a08dc2c610f editors/mined/patches/patch-src_mkinclud.mak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/mined/patches/patch-src_mkinclud.mak      Wed Dec 28 15:20:02 2022 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_mkinclud.mak,v 1.1 2022/12/28 15:20:03 wiz Exp $
+
+Fix installation for icon and desktop file.
+Sent upstream via email.
+
+--- src/mkinclud.mak.orig      2022-12-21 03:55:22.000000000 +0000
++++ src/mkinclud.mak
+@@ -693,8 +693,8 @@ installscript=$(INSTALLBIN)
+ installdesktop=$(INSTALL)
+ desktop=../usrshare/setup_install/mined.desktop
+ icon=../usrshare/setup_install/mined.xpm
+-rootmenudir=$(DESTDIR)$(root)/usr/share/applications
+-rooticondir=$(DESTDIR)$(root)/usr/share/pixmaps
++rootmenudir=$(DESTDIR)$(root)$(prefix)/share/applications
++rooticondir=$(DESTDIR)$(root)$(prefix)/share/pixmaps
+ localmenudir=$(DESTDIR)$(root)/usr/local/share/applications
+ localicondir=$(DESTDIR)$(root)/usr/local/share/pixmaps
+ usermenudir=${HOME}/.local/share/applications