CVS commit: pkgsrc/games/redeclipse16

["Charlotte Koch" <charlotte%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   charlotte
Date:           Fri Sep 15 22:59:46 UTC 2023

Modified Files:
        pkgsrc/games/redeclipse16: Makefile distinfo
Added Files:
        pkgsrc/games/redeclipse16/patches: patch-src_system-install.mk

Log Message:
games/redeclipse16: Explicitly depend on GNU ed(1)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/redeclipse16/Makefile \
    pkgsrc/games/redeclipse16/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/redeclipse16/patches/patch-src_system-install.mk

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

Modified files:

Index: pkgsrc/games/redeclipse16/Makefile
diff -u pkgsrc/games/redeclipse16/Makefile:1.1 pkgsrc/games/redeclipse16/Makefile:1.2
--- pkgsrc/games/redeclipse16/Makefile:1.1      Fri Jul  7 01:59:34 2023
+++ pkgsrc/games/redeclipse16/Makefile  Fri Sep 15 22:59:46 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2023/07/07 01:59:34 charlotte Exp $
+# $NetBSD: Makefile,v 1.2 2023/09/15 22:59:46 charlotte Exp $
 
 DISTNAME=      redeclipse_1.6.0_nix
 PKGNAME=       redeclipse16-1.6.0
+PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=redeclipse/}
 GITHUB_PROJECT=        base
@@ -15,6 +16,8 @@ LICENSE=      zlib AND cc-by-sa-v3.0
 
 WRKSRC=                ${WRKDIR}/redeclipse-${PKGVERSION_NOREV}
 
+TOOL_DEPENDS+= ed>0:../../editors/ed
+
 NO_CONFIGURE=  yes
 USE_TOOLS+=    gmake pkg-config
 USE_LANGUAGES+=        c c++
@@ -26,6 +29,7 @@ MAKE_FLAGS+=  APPNAME=${PKGBASE}
 MAKE_FLAGS+=   appsrcname=redeclipse
 MAKE_FLAGS+=   prefix=${PREFIX}
 MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=   ED=ged
 
 # GCC precompiled headers...
 RELRO_SUPPORTED=       no
Index: pkgsrc/games/redeclipse16/distinfo
diff -u pkgsrc/games/redeclipse16/distinfo:1.1 pkgsrc/games/redeclipse16/distinfo:1.2
--- pkgsrc/games/redeclipse16/distinfo:1.1      Fri Jul  7 01:59:34 2023
+++ pkgsrc/games/redeclipse16/distinfo  Fri Sep 15 22:59:46 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2023/07/07 01:59:34 charlotte Exp $
+$NetBSD: distinfo,v 1.2 2023/09/15 22:59:46 charlotte Exp $
 
 BLAKE2s (redeclipse_1.6.0_nix.tar.bz2) = 97f8a406527ef13b0b2b5c31ffa0f02966cdd392f799375dbb93bb953b6709b6
 SHA512 (redeclipse_1.6.0_nix.tar.bz2) = e944aed8155b5e89e8df000516d4a019a63d38d7ad9c3982b2e111f8a20bc848a98e30c1b60f4fdaf006c2ff9e2cb04647c07778eb2562eaf7db733dbce11233
 Size (redeclipse_1.6.0_nix.tar.bz2) = 898467399 bytes
+SHA1 (patch-src_system-install.mk) = 126d5f089e6d230597d97594621ec7e406987034

Added files:

Index: pkgsrc/games/redeclipse16/patches/patch-src_system-install.mk
diff -u /dev/null pkgsrc/games/redeclipse16/patches/patch-src_system-install.mk:1.1
--- /dev/null   Fri Sep 15 22:59:46 2023
+++ pkgsrc/games/redeclipse16/patches/patch-src_system-install.mk       Fri Sep 15 22:59:46 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_system-install.mk,v 1.1 2023/09/15 22:59:46 charlotte Exp $
+
+Parameterize ed(1).
+
+--- src/system-install.mk.orig 2019-12-19 18:00:28.000000000 -0800
++++ src/system-install.mk      2023-09-15 15:24:25.538177725 -0700
+@@ -19,6 +19,8 @@
+ pixmapdir=$(DESTDIR)$(prefix)/share/pixmaps
+ appdatadir=$(DESTDIR)$(prefix)/share/appdata
+ 
++ED?=  ed
++
+ ICONS= \
+       install/nix/$(appsrcname)_x16.png \
+       install/nix/$(appsrcname)_x32.png \
+@@ -69,7 +71,7 @@
+       s,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g\n\
+       g,@APPNAME@,\
+       s,@APPNAME@,$(appname),g\n\
+-      w\n" | ed -s $(gamesbindir)/$(appname)
++      w\n" | $(ED) -s $(gamesbindir)/$(appname)
+ 
+ system-install-server: server
+       $(MKDIR) $(libexecdir)/$(appname)
+@@ -88,7 +90,7 @@
+       s,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g\n\
+       g,@APPNAME@,\
+       s,@APPNAME@,$(appname),g\n\
+-      w\n" | ed -s $(gamesbindir)/$(appname)-server
++      w\n" | $(ED) -s $(gamesbindir)/$(appname)-server
+ 
+ system-install-common:
+       $(MKDIR) $(libexecdir)/$(appname)