CVS commit: pkgsrc/games

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May 21 11:14:29 UTC 2020

Modified Files:
        pkgsrc/games/freeciv-client: Makefile
        pkgsrc/games/freeciv-share: suppress_installation.mk

Log Message:
freeciv: sprinkle SUBST_NOOP_OK

being extremely unopinionated about whether autoconf files are pregenerated
or not, especially when the subst is transcluded


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/games/freeciv-client/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/freeciv-share/suppress_installation.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/freeciv-client/Makefile
diff -u pkgsrc/games/freeciv-client/Makefile:1.110 pkgsrc/games/freeciv-client/Makefile:1.111
--- pkgsrc/games/freeciv-client/Makefile:1.110  Wed May  6 14:04:32 2020
+++ pkgsrc/games/freeciv-client/Makefile        Thu May 21 11:14:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2020/05/06 14:04:32 adam Exp $
+# $NetBSD: Makefile,v 1.111 2020/05/21 11:14:29 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
 PKGREVISION=   1
@@ -20,6 +20,7 @@ SUBST_SED.themesonly+=                -e 's|SUBDIRS = 
 SUBST_SED.themesonly+=         -e 's|^ isotrident trident|DONT_SUBDIRS =|'
 SUBST_SED.themesonly+=         -e 's|install-data-am: install-data-local|install-data-am: \# install-data-local|'
 SUBST_MESSAGE.themesonly=      Suppressing installation of non-gui-relevant data
+SUBST_NOOP_OK.themesonly=      yes
 
 SUBST_CLASSES+=                        themesonly2
 SUBST_STAGE.themesonly2=       post-configure
@@ -27,6 +28,7 @@ SUBST_FILES.themesonly2=      data/Makefile
 SUBST_SED.themesonly2+=                -e 's|SUBDIRS = icons.*|SUBDIRS = themes|'
 SUBST_SED.themesonly2+=                -e 's|^ isotrident trident|DONT_SUBDIRS =|'
 SUBST_MESSAGE.themesonly2=     Suppressing installation of non-gui-relevant data
+SUBST_NOOP_OK.themesonly2=     yes
 
 # conflicts with freeciv-share
 post-install:

Index: pkgsrc/games/freeciv-share/suppress_installation.mk
diff -u pkgsrc/games/freeciv-share/suppress_installation.mk:1.4 pkgsrc/games/freeciv-share/suppress_installation.mk:1.5
--- pkgsrc/games/freeciv-share/suppress_installation.mk:1.4     Sun Apr 24 06:52:44 2016
+++ pkgsrc/games/freeciv-share/suppress_installation.mk Thu May 21 11:14:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: suppress_installation.mk,v 1.4 2016/04/24 06:52:44 prlw1 Exp $
+# $NetBSD: suppress_installation.mk,v 1.5 2020/05/21 11:14:29 nia Exp $
 
 # Makefile snippet to be included by freeciv-client and freeciv-server to
 # prevent files installed by freeciv-share from being installed again.
@@ -28,15 +28,18 @@ SUBST_STAGE.installmanfix3= post-configu
 SUBST_FILES.installmanfix3=    Makefile
 SUBST_SED.installmanfix3+=     -e 's|translations doc ||g'
 SUBST_MESSAGE.installmanfix3=  Suppressing installation of man pages and localization files already in freeciv-share.
+SUBST_NOOP_OK.installmanfix3=  yes 
 
 SUBST_CLASSES+=                        installmanfix4
 SUBST_STAGE.installmanfix4=    post-configure
 SUBST_FILES.installmanfix4=    Makefile
 SUBST_SED.installmanfix4+=     -e 's|install-data-am: install-docDATA|install-data-am: \# install-docDATA|'
 SUBST_MESSAGE.installmanfix4=  Suppressing installation of doc files already in freeciv-share
+SUBST_NOOP_OK.installmanfix4=  yes 
 
 SUBST_CLASSES+=                        installfix2
 SUBST_STAGE.installfix2=       post-configure
 SUBST_FILES.installfix2=       common/Makefile
 SUBST_SED.installfix2+=                -e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|'
 SUBST_MESSAGE.installfix2=     Suppressing installation of libs already in freeciv-share.
+SUBST_NOOP_OK.installfix2=     yes