Received: by mail.netbsd.org (Postfix, from userid 605) id EC5CF84E73; Wed, 28 Dec 2022 15:20:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2779984D4C for ; Wed, 28 Dec 2022 15:20:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GdLwzRX7xLTl for ; Wed, 28 Dec 2022 15:20:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 511D084CEE for ; Wed, 28 Dec 2022 15:20:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 44801FA90; Wed, 28 Dec 2022 15:20:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1672240803133660" MIME-Version: 1.0 Date: Wed, 28 Dec 2022 15:20:03 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/editors/mined To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20221228152003.44801FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1672240803133660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Dec 28 15:20:03 UTC 2022 Modified Files: pkgsrc/editors/mined: Makefile PLIST distinfo Added Files: pkgsrc/editors/mined/patches: patch-src_mkinclud.mak Log Message: mined: reduce workarounds, fix two installation paths Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 pkgsrc/editors/mined/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/mined/PLIST cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/mined/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/editors/mined/patches/patch-src_mkinclud.mak Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1672240803133660 Content-Disposition: inline Content-Length: 4073 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/mined/Makefile diff -u pkgsrc/editors/mined/Makefile:1.26 pkgsrc/editors/mined/Makefile:1.27 --- pkgsrc/editors/mined/Makefile:1.26 Wed Dec 28 12:20:20 2022 +++ pkgsrc/editors/mined/Makefile Wed Dec 28 15:20:02 2022 @@ -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 @@ LICENSE= gnu-gpl-v3 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" Index: pkgsrc/editors/mined/PLIST diff -u pkgsrc/editors/mined/PLIST:1.5 pkgsrc/editors/mined/PLIST:1.6 --- pkgsrc/editors/mined/PLIST:1.5 Wed Dec 28 12:18:45 2022 +++ pkgsrc/editors/mined/PLIST Wed Dec 28 15:20:02 2022 @@ -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/mstar.1 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/Uninst-PF. 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 Index: pkgsrc/editors/mined/distinfo diff -u pkgsrc/editors/mined/distinfo:1.13 pkgsrc/editors/mined/distinfo:1.14 --- pkgsrc/editors/mined/distinfo:1.13 Wed Dec 28 12:18:45 2022 +++ pkgsrc/editors/mined/distinfo Wed Dec 28 15:20:02 2022 @@ -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 @@ BLAKE2s (mined-2022.27.tar.gz) = 8a25ca0 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 Added files: Index: pkgsrc/editors/mined/patches/patch-src_mkinclud.mak diff -u /dev/null pkgsrc/editors/mined/patches/patch-src_mkinclud.mak:1.1 --- /dev/null Wed Dec 28 15:20:03 2022 +++ pkgsrc/editors/mined/patches/patch-src_mkinclud.mak Wed Dec 28 15:20:03 2022 @@ -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 --_----------=_1672240803133660--