diff options
author | joerg <joerg> | 2006-05-15 16:29:19 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-05-15 16:29:19 +0000 |
commit | afbeeef7224891a4e7a73c2e968223527a0cd9d9 (patch) | |
tree | 3c3dc6708ab04c91e596485e8afbeb8a94493a3f /editors/elvis | |
parent | e5709599309178c5b88ed61848ac8280773eea34 (diff) | |
download | pkgsrc-afbeeef7224891a4e7a73c2e968223527a0cd9d9.tar.gz |
Install man pages into man1, not manl and no formated version.
Bump revisions of elvis and elvis-x11. Should fix PR 33468.
Diffstat (limited to 'editors/elvis')
-rw-r--r-- | editors/elvis/Makefile | 4 | ||||
-rw-r--r-- | editors/elvis/PLIST.common | 14 | ||||
-rw-r--r-- | editors/elvis/distinfo | 5 | ||||
-rw-r--r-- | editors/elvis/patches/patch-aa | 27 | ||||
-rw-r--r-- | editors/elvis/patches/patch-ac | 15 |
5 files changed, 19 insertions, 46 deletions
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index 175873e6fb5..62007a1ca9c 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2004/01/20 22:48:07 recht Exp $ +# $NetBSD: Makefile,v 1.3 2006/05/15 16:29:19 joerg Exp $ # .include "./Makefile.common" PKGNAME= elvis-2.2.0 -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Vi clone with regex search, hex editing, HTML and TeX previewing CONFLICTS+= elvis-x11[0-9]* diff --git a/editors/elvis/PLIST.common b/editors/elvis/PLIST.common index f9d924c67c4..91cfacbcee2 100644 --- a/editors/elvis/PLIST.common +++ b/editors/elvis/PLIST.common @@ -1,16 +1,12 @@ -@comment $NetBSD: PLIST.common,v 1.2 2004/01/20 22:48:07 recht Exp $ +@comment $NetBSD: PLIST.common,v 1.3 2006/05/15 16:29:19 joerg Exp $ bin/elvfmt bin/elvis bin/elvtags bin/ref -man/cat1/elvfmt.0 -man/cat1/elvis.0 -man/cat1/elvtags.0 -man/cat1/ref.0 -man/manl/elvfmt.1 -man/manl/elvis.1 -man/manl/elvtags.1 -man/manl/ref.1 +man/man1/elvfmt.1 +man/man1/elvis.1 +man/man1/elvtags.1 +man/man1/ref.1 share/elvis/README share/elvis/README.etc share/doc/elvis/bugs.txt diff --git a/editors/elvis/distinfo b/editors/elvis/distinfo index 56eb2a5f482..024f7d361d9 100644 --- a/editors/elvis/distinfo +++ b/editors/elvis/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.5 2005/11/07 20:13:44 tv Exp $ +$NetBSD: distinfo,v 1.6 2006/05/15 16:29:19 joerg Exp $ SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477 RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 Size (elvis-2.2_0.tar.gz) = 1439293 bytes -SHA1 (patch-aa) = b533a7437de65eac9faed27826edce2111f71f30 SHA1 (patch-ab) = 3ded3089b617bccc3458e6c9101a339534fd3152 -SHA1 (patch-ac) = d95439604922dd92ae658ca6e09dca4829ea66c7 +SHA1 (patch-ac) = bbed33584e0301da4265727082336fb941e1638b SHA1 (patch-ad) = 702b08ec1182c3673721de62690a3a7c32983b8a diff --git a/editors/elvis/patches/patch-aa b/editors/elvis/patches/patch-aa deleted file mode 100644 index 8f53e4af3d5..00000000000 --- a/editors/elvis/patches/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/20 21:16:07 recht Exp $ - ---- instman.sh.orig 2003-10-21 04:32:25.000000000 +0200 -+++ instman.sh 2003-12-09 20:42:20.000000000 +0100 -@@ -207,18 +207,18 @@ - install) - if [ -x /usr/bin/nroff ] - then -- /usr/bin/nroff -man doc/$i.man >$catdir/$i$ext -+ /usr/bin/nroff -man doc/$i.man >$catdir/$i.0 - elif [ -x ./elvis ] - then - ELVISPATH=dummypath; export ELVISPATH -- ./elvis -Gquit -c"se bd=man lpt=bs lplines=0|lp! $catdir/$i$ext" doc/$i.man -+ ./elvis -Gquit -c"se bd=man lpt=bs lplines=0|lp! $catdir/$i.0" doc/$i.man - else - # give nroff another chance -- nroff -man doc/$i.man >$catdir/$i$ext -+ nroff -man doc/$i.man >$catdir/$i.0 - fi - ;; - remove) -- rm $catdir/$i$ext* -+ rm $catdir/$i.0 - ;; - esac - done diff --git a/editors/elvis/patches/patch-ac b/editors/elvis/patches/patch-ac index 3d11d44d825..b98d2a9f55f 100644 --- a/editors/elvis/patches/patch-ac +++ b/editors/elvis/patches/patch-ac @@ -1,14 +1,19 @@ -$NetBSD: patch-ac,v 1.1 2004/01/21 10:11:19 recht Exp $ +$NetBSD: patch-ac,v 1.2 2006/05/15 16:29:19 joerg Exp $ ---- 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 @@ +--- Makefile.in.orig 2003-10-21 02:32:25.000000000 +0000 ++++ Makefile.in +@@ -440,23 +440,24 @@ 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) +- sh instman.sh -p$(PREFIX) $(ALL) - -[ -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)" \ |