pkgsrc-WIP-changes archive

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

ircd-hybrid: Adjust patch-doc_Makefile.in to not install in $(sysconfdir)



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Jan 27 21:58:24 2019 +0100
Changeset:	c9bb45192a6e8a866527ad9b0b3e733ee83afb78

Modified Files:
	ircd-hybrid/distinfo
	ircd-hybrid/patches/patch-doc_Makefile.in

Log Message:
ircd-hybrid: Adjust patch-doc_Makefile.in to not install in $(sysconfdir)

doc/reference.txt is already installed via post-install: target in
the package Makefile. Patch doc/Makefile.in to completely avoid
target that creates $(sysconfdir) directories and install files
under them.
At the moment the former are handled via INSTALL script and the
latter should be handled via CONF_FILES* if configuration files
will be provided.

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

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

diffstat:
 ircd-hybrid/distinfo                      |  2 +-
 ircd-hybrid/patches/patch-doc_Makefile.in | 58 ++++++++++++++-----------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diffs:
diff --git a/ircd-hybrid/distinfo b/ircd-hybrid/distinfo
index 151986863b..1421ea328f 100644
--- a/ircd-hybrid/distinfo
+++ b/ircd-hybrid/distinfo
@@ -4,4 +4,4 @@ SHA1 (ircd-hybrid-8.2.24.tgz) = 756df9c5b37f6a888cdc20c93df5969f5e57ba67
 RMD160 (ircd-hybrid-8.2.24.tgz) = a3021dd95927f7d162de95f47944ec15b1aa6614
 SHA512 (ircd-hybrid-8.2.24.tgz) = 48f68bf1fdb50b446387a310ff45d3cdf2a068d7eca97afa1e30c2486f1ae94fdf2af1db28b1627754ad94b3052edfc9d37255082d7bbdc46893518f2bad6b8c
 Size (ircd-hybrid-8.2.24.tgz) = 1210753 bytes
-SHA1 (patch-doc_Makefile.in) = 40e2854dc3283f77e24ecc9a2dd4dd64ca2325da
+SHA1 (patch-doc_Makefile.in) = 787cb151da51cd947a384e33ae35c58df1d17e19
diff --git a/ircd-hybrid/patches/patch-doc_Makefile.in b/ircd-hybrid/patches/patch-doc_Makefile.in
index f13785dac7..9e2d0dc297 100644
--- a/ircd-hybrid/patches/patch-doc_Makefile.in
+++ b/ircd-hybrid/patches/patch-doc_Makefile.in
@@ -1,40 +1,34 @@
 $NetBSD$
 
-Replaced sysconfdir with egdir so that the conf files are not
-overwritten when the package is being upgraded.
+Do not install files in $(sysconfdir), configuration files are
+handled via CONF_FILES*.
 
 --- doc/Makefile.in.orig	2018-04-04 22:33:34.000000000 +0000
 +++ doc/Makefile.in
-@@ -398,25 +398,25 @@ uninstall-man8:
- 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
- install-dist_sysconfDATA: $(dist_sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	@list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+	@list='$(dist_sysconf_DATA)'; test -n "$(egdir)" || list=; \
- 	if test -n "$$list"; then \
--	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \
- 	fi; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
- 	done | $(am__base_list) | \
- 	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
+@@ -458,7 +458,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(MANS) $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(sysconfdir)"; do \
++	for dir in "$(DESTDIR)$(man8dir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
+ install: install-am
+@@ -517,7 +517,7 @@ install-dvi: install-dvi-am
  
- uninstall-dist_sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+	@list='$(dist_sysconf_DATA)'; test -n "$(egdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
-+	dir='$(DESTDIR)$(egdir)'; $(am__uninstall_files_from_dir)
- tags TAGS:
+ install-dvi-am:
  
- ctags CTAGS:
+-install-exec-am: install-dist_sysconfDATA
++install-exec-am:
+ 
+ install-html: install-html-am
+ 
+@@ -565,7 +565,7 @@ uninstall-man: uninstall-man8
+ 	cscopelist-am ctags-am distclean distclean-generic \
+ 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-dist_sysconfDATA install-dvi install-dvi-am \
++	install-dvi install-dvi-am \
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man install-man8 \
+ 	install-pdf install-pdf-am install-ps install-ps-am \


Home | Main Index | Thread Index | Old Index