CVS commit: pkgsrc/wm

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Jul  5 14:30:18 UTC 2023

Modified Files:
        pkgsrc/wm/emwm: Makefile distinfo
        pkgsrc/wm/emwm-utils: Makefile distinfo

Log Message:
*: point to correct tarball

Due to distfile naming changes upstream, the package was still pointing
to an outdated tarball. Fixed.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/emwm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/emwm/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/emwm-utils/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/emwm-utils/distinfo

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

Modified files:

Index: pkgsrc/wm/emwm/Makefile
diff -u pkgsrc/wm/emwm/Makefile:1.4 pkgsrc/wm/emwm/Makefile:1.5
--- pkgsrc/wm/emwm/Makefile:1.4 Sun Jul  2 20:01:29 2023
+++ pkgsrc/wm/emwm/Makefile     Wed Jul  5 14:30:18 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2023/07/02 20:01:29 vins Exp $
+# $NetBSD: Makefile,v 1.5 2023/07/05 14:30:18 vins Exp $
 
-DISTNAME=      emwm-src
-PKGVER=                1.1
-PKGNAME=       ${DISTNAME:S,-src,,}-${PKGVER}
+DISTNAME=      emwm-src-1.1
+PKGNAME=       ${DISTNAME:S,-src,,}
+PKGREVISION=   1
 CATEGORIES=    wm
-DIST_SUBDIR=   ${PKGNAME_NOREV}
 MASTER_SITES=  https://fastestcode.org/dl/
 EXTRACT_SUFX=  .tar.xz
 
@@ -22,11 +21,9 @@ USE_TOOLS+=  gmake
 .endif
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=    share/examples/${DISTNAME:S,-src,,}
+INSTALLATION_DIRS+=    share/examples/${PKGBASE}
 INSTALLATION_DIRS+=    lib/X11/app-defaults
 
-WRKSRC=        ${WRKDIR}/emwm
-
 pre-install:
 .for f in system.emwmrc
        ${INSTALL_DATA} ${WRKSRC}/src/${f} ${DESTDIR}${PREFIX}/share/examples/emwm/

Index: pkgsrc/wm/emwm/distinfo
diff -u pkgsrc/wm/emwm/distinfo:1.3 pkgsrc/wm/emwm/distinfo:1.4
--- pkgsrc/wm/emwm/distinfo:1.3 Sun Jul  2 20:01:29 2023
+++ pkgsrc/wm/emwm/distinfo     Wed Jul  5 14:30:18 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2023/07/02 20:01:29 vins Exp $
+$NetBSD: distinfo,v 1.4 2023/07/05 14:30:18 vins Exp $
 
-BLAKE2s (emwm-1.1/emwm-src.tar.xz) = 16eba91424b8a86e8aa24af231a7248c123334183613b1f9da333e18f4a06743
-SHA512 (emwm-1.1/emwm-src.tar.xz) = 07d2eb1d4a14035291d6939a8c56c1c051aa4b8681d73096b7a806acb5a3f89d295e5f45a9788ad63d0f19b4e8ef458bb8f7fc41d372e54557aebe17f4984444
-Size (emwm-1.1/emwm-src.tar.xz) = 330596 bytes
+BLAKE2s (emwm-src-1.1.tar.xz) = 4acb90a4143a011543d2869a3dde3e64811a5895edf33b4ec5cd75ba10c8d285
+SHA512 (emwm-src-1.1.tar.xz) = 1abf6b874943d6afd74d8ab41012dd7157ce86ae2700c67b079ec1f4eab076523cfa1e12ba12277164bfa4c025038c43b32827d15562538fa7bd56ca639e1831
+Size (emwm-src-1.1.tar.xz) = 330452 bytes

Index: pkgsrc/wm/emwm-utils/Makefile
diff -u pkgsrc/wm/emwm-utils/Makefile:1.4 pkgsrc/wm/emwm-utils/Makefile:1.5
--- pkgsrc/wm/emwm-utils/Makefile:1.4   Sun Jul  2 19:25:50 2023
+++ pkgsrc/wm/emwm-utils/Makefile       Wed Jul  5 14:30:18 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2023/07/02 19:25:50 vins Exp $
+# $NetBSD: Makefile,v 1.5 2023/07/05 14:30:18 vins Exp $
 
-DISTNAME=      emwm-utils-src
-PKGVER=                1.1
-PKGNAME=       ${DISTNAME:S,-src,,}-${PKGVER}
+DISTNAME=      emwm-utils-src-1.1
+PKGNAME=       ${DISTNAME:S,-src,,}
+PKGREVISION=   1
 CATEGORIES=    wm x11
-DIST_SUBDIR=   ${PKGNAME_NOREV}
 MASTER_SITES=  https://fastestcode.org/dl/
 EXTRACT_SUFX=  .tar.xz
 
@@ -22,14 +21,12 @@ USE_TOOLS+= gmake
 .endif
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=    share/examples/${DISTNAME:S,-src,,}
+INSTALLATION_DIRS+=    share/examples/${PKGBASE}
 INSTALLATION_DIRS+=    lib/X11/app-defaults
 
 SETUID_ROOT_PERMS?=    ${REAL_ROOT_USER} ${BINGRP} 4755
 SPECIAL_PERMS+=                bin/xmsm ${SETUID_ROOT_PERMS}
 
-WRKSRC=        ${WRKDIR}/utils
-
 do-install:
 .for p in xmtoolbox xmsm
        ${INSTALL_PROGRAM} ${WRKSRC}/src/${p} \
@@ -47,7 +44,7 @@ post-install:
        ${DESTDIR}${PREFIX}/lib/X11/app-defaults/${f}
 .endfor
        ${INSTALL_DATA} ${WRKSRC}/src/toolboxrc \
-       ${DESTDIR}${PREFIX}/share/examples/${DISTNAME:S,-src,,}
+       ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
 
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"

Index: pkgsrc/wm/emwm-utils/distinfo
diff -u pkgsrc/wm/emwm-utils/distinfo:1.2 pkgsrc/wm/emwm-utils/distinfo:1.3
--- pkgsrc/wm/emwm-utils/distinfo:1.2   Sun Jul  2 19:25:50 2023
+++ pkgsrc/wm/emwm-utils/distinfo       Wed Jul  5 14:30:18 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2023/07/02 19:25:50 vins Exp $
+$NetBSD: distinfo,v 1.3 2023/07/05 14:30:18 vins Exp $
 
-BLAKE2s (emwm-utils-1.1/emwm-utils-src.tar.xz) = b77adcaf9ec8bd5d4b4467671ca1990bbd62aec147af974c4524d6f4eba6a688
-SHA512 (emwm-utils-1.1/emwm-utils-src.tar.xz) = 4df2b9270d233affaa77251525409fd16cedd5f0b13acfd96de8bdce60f5be85e3d1fc59c243f5df5f89e08d03bde6ebabf4b597744581a78b3c6b7d3278bb60
-Size (emwm-utils-1.1/emwm-utils-src.tar.xz) = 25708 bytes
+BLAKE2s (emwm-utils-src-1.1.tar.xz) = d837f352a000ffa159a1f79a488ffc6cb72af49b5c0fdcc336a747332ea62e22
+SHA512 (emwm-utils-src-1.1.tar.xz) = 170682336e73a8a825fadebc1c37d2e5db380ed3e1d5a5bc94c7e4bbf3e0e19577b30e7663b0b6b48d235b5989bdd20f63c48fe59113b2a6999ba56aed56d325
+Size (emwm-utils-src-1.1.tar.xz) = 25496 bytes
 SHA1 (patch-src_smconf.h) = 73536d4c118cf112b9df7108b25734f69a49358a