Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games freeciv: sprinkle SUBST_NOOP_OK
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c08cac03745
branches: trunk
changeset: 432337:7c08cac03745
user: nia <nia%pkgsrc.org@localhost>
date: Thu May 21 11:14:29 2020 +0000
description:
freeciv: sprinkle SUBST_NOOP_OK
being extremely unopinionated about whether autoconf files are pregenerated
or not, especially when the subst is transcluded
diffstat:
games/freeciv-client/Makefile | 4 +++-
games/freeciv-share/suppress_installation.mk | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diffs (53 lines):
diff -r 017742a55293 -r 7c08cac03745 games/freeciv-client/Makefile
--- a/games/freeciv-client/Makefile Thu May 21 10:41:36 2020 +0000
+++ b/games/freeciv-client/Makefile Thu May 21 11:14:29 2020 +0000
@@ -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|^ 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_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:
diff -r 017742a55293 -r 7c08cac03745 games/freeciv-share/suppress_installation.mk
--- a/games/freeciv-share/suppress_installation.mk Thu May 21 10:41:36 2020 +0000
+++ b/games/freeciv-share/suppress_installation.mk Thu May 21 11:14:29 2020 +0000
@@ -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_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
Home |
Main Index |
Thread Index |
Old Index