diff options
Diffstat (limited to 'editors/elvis/patches/patch-ac')
| -rw-r--r-- | editors/elvis/patches/patch-ac | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/editors/elvis/patches/patch-ac b/editors/elvis/patches/patch-ac index b98d2a9f55f..8eba97c5bee 100644 --- a/editors/elvis/patches/patch-ac +++ b/editors/elvis/patches/patch-ac @@ -1,8 +1,20 @@ -$NetBSD: patch-ac,v 1.2 2006/05/15 16:29:19 joerg Exp $ +$NetBSD: patch-ac,v 1.3 2008/04/22 16:23:57 jlam Exp $ ---- Makefile.in.orig 2003-10-21 02:32:25.000000000 +0000 +--- Makefile.in.orig 2003-10-20 22:32:25.000000000 -0400 +++ Makefile.in -@@ -440,23 +440,24 @@ install.unix: $(ALL) doc/elvtags.man +@@ -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) @@ -10,29 +22,25 @@ $NetBSD: patch-ac,v 1.2 2006/05/15 16:29:19 joerg Exp $ - -[ -d /etc/elvis ] || mkdir /etc/elvis - -chmod 0755 /etc/elvis/ - -@ : >/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 -+ -@ : >$(DATADIR)/README.etc && ( \ - 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 "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 "first copy the standard version of the file into @PKG_SYSCONFDIR@ and" \ - echo "then edit the copy. Leave the standard version unchanged." \ +- echo "then edit the copy. Leave the standard version unchanged." \ - ) >>/etc/elvis/README - -chmod 0644 /etc/elvis/README -+ ) >>$(DATADIR)/README.etc -+ -chmod 0644 $(DATADIR)/README.etc ++ ${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 @PKG_SYSCONFDIR@/, 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 @PKG_SYSCONFDIR@/" >>$(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 |