[BACK]Return to patch-ac CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / editors / elvis / patches

File: [cvs.NetBSD.org] / pkgsrc / editors / elvis / patches / patch-ac (download)

Revision 1.4, Tue Dec 29 04:22:33 2015 UTC (4 years, 11 months ago) by dholland
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, HEAD
Changes since 1.3: +3 -1 lines

Add patch comments.

$NetBSD: patch-ac,v 1.4 2015/12/29 04:22:33 dholland Exp $

Configure for pkgsrc.

--- Makefile.in.orig	2003-10-20 22:32:25.000000000 -0400
+++ Makefile.in
@@ -89,6 +89,11 @@ DATADIR=$(PREFIX)/share/elvis
 DOCDIR= $(PREFIX)/share/elvis/doc
 
 ################################################################################
+# This is the directory where "make install" will place the customized elvis
+# configuration files.
+SYSCONFDIR=/etc/elvis
+
+################################################################################
 # This is the shell command for copying one file to another
 CP=cp
 
@@ -440,23 +445,16 @@ install.unix: $(ALL) doc/elvtags.man
 	(cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
 	-(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
 	chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
-	sh instman.sh -p$(PREFIX) $(ALL)
-	-[ -d /etc/elvis ] || mkdir /etc/elvis
-	-chmod 0755 /etc/elvis/
-	-@ : >/etc/elvis/README && ( \
-	  echo "This directory contains system-dependent versions of elvis' configuration" \
-	  echo "files.  The standard versions are available in $(DATADIR)"  \
-	  echo "To customize any of these configuration files for this system,"  \
-	  echo "first copy the standard version of the file into /etc/elvis and" \
-	  echo "then edit the copy.  Leave the standard version unchanged." \
-	) >>/etc/elvis/README
-	-chmod 0644 /etc/elvis/README
+	${BSD_INSTALL_MAN} doc/elvfmt.man $(PREFIX)/${PKGMANDIR}/man1/elvfmt.1
+	${BSD_INSTALL_MAN} doc/elvis.man $(PREFIX)/${PKGMANDIR}/man1/elvis.1
+	${BSD_INSTALL_MAN} doc/elvtags.man $(PREFIX)/${PKGMANDIR}/man1/elvtags.1
+	${BSD_INSTALL_MAN} doc/ref.man $(PREFIX)/${PKGMANDIR}/man1/ref.1
 	@echo "This directory contains the standard versions of elvis' configuration" >$(DATADIR)/README
 	@echo "files.  DO NOT MODIFY THESE FILES!  To perform host-specific customization," >>$(DATADIR)/README
-	@echo "copy files from this directory into /etc/elvis/, and then modify the copies." >>$(DATADIR)/README
+	@echo "copy files from this directory into $(SYSCONFDIR)/, and then modify the copies." >>$(DATADIR)/README
 	@echo "To make user-specific changes, create a ~/.elvis/ directory (if it doesn't" >>$(DATADIR)/README
 	@echo "exist already) and copy files from this directory into ~/.elvis/ and then" >>$(DATADIR)/README
-	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or /etc/elvis/" >>$(DATADIR)/README
+	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or $(SYSCONFDIR)/" >>$(DATADIR)/README
 	@echo "overrides the similarly named file in this directory." >>$(DATADIR)/README
 	chmod 0644 $(DATADIR)/README