pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emwm: revert previous changes and rather patch the Linux Makefile



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Wed Jun 22 11:00:21 2022 +0200
Changeset:	0e82b196e39c0c3aca2c1d1924897d92aaccaddb

Modified Files:
	emwm/Makefile
	emwm/distinfo
Added Files:
	emwm/patches/patch-mf_Makefile.Linux

Log Message:
emwm: revert previous changes and rather patch the Linux Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0e82b196e39c0c3aca2c1d1924897d92aaccaddb

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

diffstat:
 emwm/Makefile                        |  6 ------
 emwm/distinfo                        |  1 +
 emwm/patches/patch-mf_Makefile.Linux | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs:
diff --git a/emwm/Makefile b/emwm/Makefile
index 6c47093044..acfc221c38 100644
--- a/emwm/Makefile
+++ b/emwm/Makefile
@@ -16,12 +16,6 @@ LICENSE=	gnu-lgpl-v2.1
 
 MAKEFLAGS+=	PREFIX=${PREFIX}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-USE_TOOLS+=	gmake
-.endif
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/examples/${DISTNAME:S,-src,,}
 INSTALLATION_DIRS+=	lib/X11/app-defaults
diff --git a/emwm/distinfo b/emwm/distinfo
index 157e296110..cb9f11ba05 100644
--- a/emwm/distinfo
+++ b/emwm/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (emwm-1.0a/emwm-src.tar.xz) = 7b9b357b4339fddaffd1f37c249f6ee1b6923dca4812d8c3323317569dd51d1d
 SHA512 (emwm-1.0a/emwm-src.tar.xz) = 64128186a70e0d4d4814fab951c9cc8cfec3faf61bab4885dd5d0059b7cec6b5e45710084954f72205e473ce015e59d5cd8aa4ca93258c0f4da22bc27ba5dcfb
 Size (emwm-1.0a/emwm-src.tar.xz) = 329364 bytes
+SHA1 (patch-mf_Makefile.Linux) = 4acb1d32c241cc89c89c5d14451433e62d8ad7a8
diff --git a/emwm/patches/patch-mf_Makefile.Linux b/emwm/patches/patch-mf_Makefile.Linux
new file mode 100644
index 0000000000..b544b10dee
--- /dev/null
+++ b/emwm/patches/patch-mf_Makefile.Linux
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Portability fixes fox bmake, due to a substitution reference in
+src/common.mf. Imported from mf/Makefile.NetBSD. 
+
+--- mf/Makefile.Linux.orig	2022-04-12 15:34:31.000000000 +0000
++++ mf/Makefile.Linux
+@@ -12,6 +12,7 @@ CFLAGS = -O2 -Wall $(INCDIRS)
+ 
+ include common.mf
+ 
+-install: common_install
++.c.o:
++	$(CC) $(CFLAGS) $(DEFINES) $(INCDIRS) -c -o $(<:.c=.o) $>
+ 
+--include .depend
++install: common_install


Home | Main Index | Thread Index | Old Index