CVS commit: pkgsrc/wm/emwm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm/emwm
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sun, 8 Dec 2024 13:09:43 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Dec  8 13:09:43 UTC 2024

Modified Files:
        pkgsrc/wm/emwm: Makefile PLIST distinfo
Added Files:
        pkgsrc/wm/emwm/patches: patch-Makefile patch-mf_Makefile.pkgsrc
            patch-src_common.mf
Removed Files:
        pkgsrc/wm/emwm: MESSAGE

Log Message:
wm/emwm: few enhancements

* Switch to a unified makefile, replacing per-platform makefiles.
* Standardise build environment.
* Add emwmrc(4) man page.
* Include sample gtk 2/3 configuration and Xresources files.
* Include project's additional pixmaps.
* Remove MESSAGE and install system-wide configuration at the
  right location.

Revision bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/emwm/MESSAGE
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/emwm/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/emwm/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/emwm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/emwm/patches/patch-Makefile \
    pkgsrc/wm/emwm/patches/patch-mf_Makefile.pkgsrc \
    pkgsrc/wm/emwm/patches/patch-src_common.mf

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.6 pkgsrc/wm/emwm/Makefile:1.7
--- pkgsrc/wm/emwm/Makefile:1.6 Sun Feb 11 11:12:24 2024
+++ pkgsrc/wm/emwm/Makefile     Sun Dec  8 13:09:43 2024
@@ -1,39 +1,45 @@
-# $NetBSD: Makefile,v 1.6 2024/02/11 11:12:24 vins Exp $
+# $NetBSD: Makefile,v 1.7 2024/12/08 13:09:43 vins Exp $
 
 DISTNAME=      emwm-src-1.2
 PKGNAME=       ${DISTNAME:S,-src,,}
+PKGREVISION=   1
 CATEGORIES=    wm
 MASTER_SITES=  https://fastestcode.org/dl/
+DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_SUFX=  .tar.xz
+DISTFILES+=    ${DEFAULT_DISTFILES} app-icons.tar.xz   \
+               gtk-configs.tar.xz Xresources-sample
+SITES.Xresources-sample=       ${MASTER_SITES:S/dl/misc/}
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://fastestcode.org/emwm.html
 COMMENT=       Enhanced Motif Window Manager
-LICENSE=       gnu-lgpl-v2.1
+LICENSE=       gnu-lgpl-v2.1 AND cc-by-sa-v3.0
 
-MAKEFLAGS+=    PREFIX=${PREFIX}
+USE_BSD_MAKEFILE=      yes
 
-.include "../../mk/bsd.prefs.mk"
+RCDIR=         ${PREFIX}/lib/X11
+EGDIR=         share/examples/${PKGBSE}
+EGFILES=       gtk-configs/* Xresources-sample
+
+SUBST_CLASSES+=                pkgsrc
+SUBST_STAGE.pkgsrc=    pre-configure
+SUBST_FILES.pkgsrc=    mf/Makefile.pkgsrc
+SUBST_VARS.pkgsrc=     CC CFLAGS LDFLAGS
+SUBST_VARS.pkgsrc+=    PREFIX PKGMANDIR RCDIR
+SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders
+
+MAKE_FLAGS+=   CC=${CC:Q}
+MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 
-.if ${OPSYS} != "NetBSD"
-USE_TOOLS+=    gmake
-.endif
-
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=    share/examples/${PKGBASE}
-INSTALLATION_DIRS+=    lib/X11/app-defaults
-
-pre-install:
-.for f in system.emwmrc
-       ${INSTALL_DATA} ${WRKSRC}/src/${f} ${DESTDIR}${PREFIX}/share/examples/emwm/
-.endfor
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/emwm ${DESTDIR}${PREFIX}/bin/emwm
-       ${INSTALL_MAN} ${WRKSRC}/src/emwm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/emwm.1
+INSTALLATION_DIRS+=    ${EGDIR} share/pixmaps
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/src/Emwm.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Emwm
+       ${INSTALL_DATA} ${EGFILES:S|^|${WRKDIR}/|}      \
+               ${DESTDIR}${PREFIX}/${EGDIR}
+       ${INSTALL_DATA} ${WRKDIR}/icons/*.xpm           \
+               ${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"

Index: pkgsrc/wm/emwm/PLIST
diff -u pkgsrc/wm/emwm/PLIST:1.1 pkgsrc/wm/emwm/PLIST:1.2
--- pkgsrc/wm/emwm/PLIST:1.1    Mon Jul  4 20:09:05 2022
+++ pkgsrc/wm/emwm/PLIST        Sun Dec  8 13:09:43 2024
@@ -1,5 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1 2022/07/04 20:09:05 pin Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/12/08 13:09:43 vins Exp $
 bin/emwm
 lib/X11/app-defaults/Emwm
+lib/X11/system.emwmrc
 man/man1/emwm.1
-share/examples/emwm/system.emwmrc
+man/man4/emwmrc.4
+share/examples/Xresources-sample
+share/examples/gtk.css
+share/examples/gtkrc-2.0
+share/pixmaps/cdrtool.xpm
+share/pixmaps/emwm.xpm
+share/pixmaps/emwm2.xpm
+share/pixmaps/mailbox.xpm
+share/pixmaps/mplayer.xpm
+share/pixmaps/navigator.xpm
+share/pixmaps/ofwp.xpm
+share/pixmaps/osview.xpm
+share/pixmaps/pdftool.xpm
+share/pixmaps/qemu.xpm
+share/pixmaps/sndmix.xpm
+share/pixmaps/terminal.xpm
+share/pixmaps/textedit.xpm
+share/pixmaps/workstation.xpm

Index: pkgsrc/wm/emwm/distinfo
diff -u pkgsrc/wm/emwm/distinfo:1.5 pkgsrc/wm/emwm/distinfo:1.6
--- pkgsrc/wm/emwm/distinfo:1.5 Sun Feb 11 11:12:24 2024
+++ pkgsrc/wm/emwm/distinfo     Sun Dec  8 13:09:43 2024
@@ -1,5 +1,17 @@
-$NetBSD: distinfo,v 1.5 2024/02/11 11:12:24 vins Exp $
+$NetBSD: distinfo,v 1.6 2024/12/08 13:09:43 vins Exp $
 
-BLAKE2s (emwm-src-1.2.tar.xz) = 228dbbb77c3b8bfafd59db437aff889bc7fdbe3718656198ab45c8fe391ced50
-SHA512 (emwm-src-1.2.tar.xz) = af38a294fca0ec5d5d8a69f39677d78dc9dc49f2b1fe34e5b1ae1dbd269b5f1c9aff5a436c0a61a7dd2210a547eb56523d3fc226f6bead2037800867c7f9652c
-Size (emwm-src-1.2.tar.xz) = 337148 bytes
+BLAKE2s (emwm-1.2/Xresources-sample) = d55ffa4dbbe4dc218583b7eb7a2cdfaea65ad04b8af16fbb6b3185bfa6007f6d
+SHA512 (emwm-1.2/Xresources-sample) = 363020ad64e0253e09009a198aa285fc1bf8c5c1de834b1a1ca7aeaefd655973fd8bd8c52d327fdb17f9617dcfc13c17effafc1efb92b46efdc18a07bde9f8ac
+Size (emwm-1.2/Xresources-sample) = 3265 bytes
+BLAKE2s (emwm-1.2/app-icons.tar.xz) = e086685b5fba5d37f5478c1237166fd9ff55fc284f0975b73f50950051c3cdf0
+SHA512 (emwm-1.2/app-icons.tar.xz) = 573166a99562acc96ac5560d2ecb71854507fe5a88c1bb99b602a713a6e27cfc4112cdb661abd9d209a8ed44ffd9c76faa6acf3a0cbc797f3fd06d31a6b85e98
+Size (emwm-1.2/app-icons.tar.xz) = 4788 bytes
+BLAKE2s (emwm-1.2/emwm-src-1.2.tar.xz) = 228dbbb77c3b8bfafd59db437aff889bc7fdbe3718656198ab45c8fe391ced50
+SHA512 (emwm-1.2/emwm-src-1.2.tar.xz) = af38a294fca0ec5d5d8a69f39677d78dc9dc49f2b1fe34e5b1ae1dbd269b5f1c9aff5a436c0a61a7dd2210a547eb56523d3fc226f6bead2037800867c7f9652c
+Size (emwm-1.2/emwm-src-1.2.tar.xz) = 337148 bytes
+BLAKE2s (emwm-1.2/gtk-configs.tar.xz) = f7e37849431175dde1ef48a4cd0ef44cc92307afeeb73e02a44f7da077f7f2df
+SHA512 (emwm-1.2/gtk-configs.tar.xz) = 868d0103db3d59437a43c2f2c93397a6d6af58fc585ca18618adbf0b6720dd1b36d60e31a7fe74379486db9100b2ca9dc54dc5a43dcebcfacd50b0432534bc69
+Size (emwm-1.2/gtk-configs.tar.xz) = 1828 bytes
+SHA1 (patch-Makefile) = 1316be75730b7823d5f0f00adb243bc5b9100f26
+SHA1 (patch-mf_Makefile.pkgsrc) = dd5fe15f5951dfacec0fc268d675fc4afa058636
+SHA1 (patch-src_common.mf) = 3afc8e3e06632244122c1df3e4400669219bf8a1

Added files:

Index: pkgsrc/wm/emwm/patches/patch-Makefile
diff -u /dev/null pkgsrc/wm/emwm/patches/patch-Makefile:1.1
--- /dev/null   Sun Dec  8 13:09:43 2024
+++ pkgsrc/wm/emwm/patches/patch-Makefile       Sun Dec  8 13:09:43 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile,v 1.1 2024/12/08 13:09:43 vins Exp $
+
+Prefer pkgsrc Makefile.
+
+--- Makefile.orig      2024-12-08 10:46:59.443489899 +0000
++++ Makefile
+@@ -2,7 +2,10 @@ all:
+       @if [ -e src/Makefile ]; then \
+               $(MAKE) -C src $(MAKEFLAGS); \
+       else \
+-              if [ -e mf/Makefile.$$(uname) ]; then \
++               if [ -e mf/Makefile.pkgsrc ]; then \
++                      ln -s ../mf/Makefile.pkgsrc src/Makefile && \
++                      $(MAKE) -C src $(MAKEFLAGS); \
++              elif [ -e mf/Makefile.$$(uname) ]; then \
+                       ln -s ../mf/Makefile.$$(uname) src/Makefile && \
+                       $(MAKE) -C src $(MAKEFLAGS); \
+               else \
Index: pkgsrc/wm/emwm/patches/patch-mf_Makefile.pkgsrc
diff -u /dev/null pkgsrc/wm/emwm/patches/patch-mf_Makefile.pkgsrc:1.1
--- /dev/null   Sun Dec  8 13:09:43 2024
+++ pkgsrc/wm/emwm/patches/patch-mf_Makefile.pkgsrc     Sun Dec  8 13:09:43 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-mf_Makefile.pkgsrc,v 1.1 2024/12/08 13:09:43 vins Exp $
+
+Add custom Makefile for pkgsrc.
+
+--- mf/Makefile.pkgsrc.orig    2024-12-08 10:46:47.852376439 +0000
++++ mf/Makefile.pkgsrc
+@@ -0,0 +1,15 @@
++# EMWM pkgsrc Makefile
++
++PREFIX = @PREFIX@
++BINDIR = @PREFIX@/bin
++MANDIR = @PREFIX@/@PKGMANDIR@
++RCDIR = @RCDIR@
++APPLRESDIR = $(RCDIR)/app-defaults
++
++
++.include "common.mf"
++
++.c.o:
++      $(CC) $(CFLAGS) $(DEFINES) -c -o $(<:.c=.o) $>
++
++install: common_install
Index: pkgsrc/wm/emwm/patches/patch-src_common.mf
diff -u /dev/null pkgsrc/wm/emwm/patches/patch-src_common.mf:1.1
--- /dev/null   Sun Dec  8 13:09:43 2024
+++ pkgsrc/wm/emwm/patches/patch-src_common.mf  Sun Dec  8 13:09:43 2024
@@ -0,0 +1,50 @@
+$NetBSD: patch-src_common.mf,v 1.1 2024/12/08 13:09:43 vins Exp $
+
+* Use standard CFLAGS and LDFLAGS.
+* Provide a pkgsrc-compliant install target.
+
+--- src/common.mf.orig 2024-01-21 18:22:22.000000000 +0000
++++ src/common.mf
+@@ -28,10 +28,10 @@ wsm_objs = \
+       WmWsmLib/util.o WmWsmLib/utm_send.o
+ 
+ emwm: $(mwm_objs) $(wsm_objs)
+-      $(CC) $(LDFLAGS) $(LIBDIRS) -o $@ $(mwm_objs) $(wsm_objs) $(SYSLIBS)
++      $(CC) $(LDFLAGS) -o $@ $(mwm_objs) $(wsm_objs) $(SYSLIBS)
+ 
+ .depend:
+-      $(CC) -MM $(INCDIRS) $(mwm_objs:.o=.c) $(wsm_objs:.o=.c) > $@
++      $(CC) -MM $(CFLAGS) $(mwm_objs:.o=.c) $(wsm_objs:.o=.c) > $@
+ 
+ .PHONY: clean install common_install
+ 
+@@ -40,21 +40,11 @@ clean:
+       -rm .depend
+ 
+ common_install:
+-      install -m 775 emwm $(PREFIX)/bin/emwm
+-      install -m 775 -d $(MANDIR)/man1
+-      install -m 664 emwm.1 $(MANDIR)/man1/emwm.1
+-      install -m 775 -d $(MANDIR)/man4
+-      install -m 664 emwmrc.4 $(MANDIR)/man4/emwmrc.4
+-      install -m 775 -d $(RCDIR)
+-      install -m 664 system.emwmrc $(RCDIR)/system.emwmrc
+-      install -m 775 -d $(APPLRESDIR)
+-      install -m 664 Emwm.ad $(APPLRESDIR)/Emwm
+-
+-uninstall:
+-      rm -f $(PREFIX)/bin/emwm
+-      rm -f $(MANDIR)/man1/emwm.1
+-      rm -f $(MANDIR)/man4/emwmrc.4
+-      rm -f $(RCDIR)/system.emwmrc
+-      rmdir $(RCDIR)
+-      rm -f $(APPLRESDIR)/Emwm
+-
++      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_PROGRAM) emwm $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man4
++      $(BSD_INSTALL_MAN) emwm.1 $(DESTDIR)$(MANDIR)/man1
++      $(BSD_INSTALL_MAN) emwmrc.4 $(DESTDIR)$(MANDIR)/man4
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(RCDIR) $(DESTDIR)$(APPLRESDIR)
++      $(BSD_INSTALL_DATA) system.emwmrc $(DESTDIR)$(RCDIR)/system.emwmrc
++      $(BSD_INSTALL_MAN) Emwm.ad $(DESTDIR)$(APPLRESDIR)/Emwm

Prev by Date: CVS commit: pkgsrc/mk/compiler
Next by Date: CVS commit: pkgsrc/wm/emwm
Previous by Thread: CVS commit: pkgsrc/mk/compiler
Next by Thread: CVS commit: pkgsrc/wm/emwm
Indexes:

Home | Main Index | Thread Index | Old Index