head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.82 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.80 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.78 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.76 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.74 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.72 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.70 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.68 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.66 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.64 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.62 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.60 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.58 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.56 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.54 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.52 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.50 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.48 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.46 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.44 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.42 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.40 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.38 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.34 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.14 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.36 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.32 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.30 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.28 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.26 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.24 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.22 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.20 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.18 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.16 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.12 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.10 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.8 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.6 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.4 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.2 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.3.0.66 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.64 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.62 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.60 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.58 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.56 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.54 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.52 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.50 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.48 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.46 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.44 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.42 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.40 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.38 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.36 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.34 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.32 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.30 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.28 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.26 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.24 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.22 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.20 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.18 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.16 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.14 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.12 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.10 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.8 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.6 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.4 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.2 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.0.18 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.16 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.14 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.12 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2015.12.29.04.22.33; author dholland; state Exp; branches; next 1.3; commitid T9QYuwfj8SHjvNOy; 1.3 date 2008.04.22.16.23.57; author jlam; state Exp; branches; next 1.2; 1.2 date 2006.05.15.16.29.19; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.01.21.10.11.19; author recht; state Exp; branches; next ; desc @@ 1.4 log @Add patch comments. @ text @$NetBSD: patch-ac,v 1.3 2008/04/22 16:23:57 jlam 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 @ 1.3 log @Restructure the following packages: editors/elvis editors/elvis-x11 The latter is now just editors/elvis built with a specific set of options. Changes include: + Add options.mk that supports a new "x11" option. + Remove Makefile.common and move all logic into elvis/Makefile and elvis/options.mk. + Rename PLIST.common to PLIST as there are no PLIST differences between elvis and elvis-x11. + Modify patch-ab to add a --sysconfdir option to the configure script and fix the parsing of --with-x* options so that --with-xft isn't ignored. + Modify patch-ac to handle SYSCONFDIR in Makefile.in passed in from the configure script. + Remove the unnecessary substitution for PKG_SYSCONFDIR now that the configure script and Makefile.in directly support --sysconfdir. + Include termcap.buildlink3.mk to properly deal with termcap/curses issues (elvis needs termcap). + Add full DESTDIR support. + Set HOMEPAGE to the correct URL. + Bump the PKGREVISION for elvis and elvis-x11 to 6. Both packages now track and use the same PKGREVISION number. @ text @d1 3 a3 1 $NetBSD$ @ 1.2 log @Install man pages into man1, not manl and no formated version. Bump revisions of elvis and elvis-x11. Should fix PR 33468. @ text @d3 1 a3 1 --- Makefile.in.orig 2003-10-21 02:32:25.000000000 +0000 d5 13 a17 1 @@@@ -440,23 +440,24 @@@@ install.unix: $(ALL) doc/elvtags.man d25 3 a27 8 + ${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," \ d29 1 a29 2 + echo "first copy the standard version of the file into @@PKG_SYSCONFDIR@@ and" \ echo "then edit the copy. Leave the standard version unchanged." \ d32 4 a35 2 + ) >>$(DATADIR)/README.etc + -chmod 0644 $(DATADIR)/README.etc d39 1 a39 1 + @@echo "copy files from this directory into @@PKG_SYSCONFDIR@@/, and then modify the copies." >>$(DATADIR)/README d43 1 a43 1 + @@echo "modify the copies. Any file that elvis finds in ~/.elvis/ or @@PKG_SYSCONFDIR@@/" >>$(DATADIR)/README @ 1.1 log @Add patches which I forgot in the previous commit. @ text @d3 4 a6 3 --- Makefile.in.orig 2003-10-21 04:32:25.000000000 +0200 +++ Makefile.in 2004-01-20 23:42:20.000000000 +0100 @@@@ -441,22 +441,20 @@@@ d9 1 a9 1 sh instman.sh -p$(PREFIX) $(ALL) d13 4 @