diff options
| author | Chris Hutchinson <portmaster@bsdforge.com> | 2024-02-27 16:30:28 +0000 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2024-02-27 16:30:55 +0000 |
| commit | f755375b37c8a681c898ff07259f101e621c3618 (patch) | |
| tree | c8793a824c90def851fe3c288942210b8a29bfcc /editors | |
| parent | d7ec7196f29e0c5e7ecd3bd0c4e3303ea7e8cccf (diff) | |
| download | ports-f755375b37c8a681c898ff07259f101e621c3618.tar.gz ports-f755375b37c8a681c898ff07259f101e621c3618.zip | |
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/2bsd-vi/Makefile | 2 | ||||
| -rw-r--r-- | editors/2bsd-vi/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | editors/2bsd-vi/pkg-plist | 10 |
3 files changed, 13 insertions, 16 deletions
diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile index 38977c0c3c46..907b13b69b0f 100644 --- a/editors/2bsd-vi/Makefile +++ b/editors/2bsd-vi/Makefile @@ -1,6 +1,6 @@ PORTNAME= vi PORTVERSION= 050325 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= SF/ex-${PORTNAME}/ex-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= 2bsd- diff --git a/editors/2bsd-vi/files/patch-Makefile b/editors/2bsd-vi/files/patch-Makefile index cbf2c5337856..60fdf390ac6d 100644 --- a/editors/2bsd-vi/files/patch-Makefile +++ b/editors/2bsd-vi/files/patch-Makefile @@ -1,17 +1,13 @@ ---- Makefile.orig 2005-03-24 23:50:09 UTC +--- Makefile.orig 2005-03-24 15:50:09 UTC +++ Makefile -@@ -79,10 +79,9 @@ +@@ -79,7 +79,6 @@ # Destinations for installation. $(PRESERVEDIR) is used for recovery files. # It will get mode 1777. # -PREFIX = /usr/local BINDIR = $(PREFIX)/bin LIBEXECDIR = $(PREFIX)/libexec --MANDIR = $(PREFIX)/share/man -+MANDIR = $(PREFIX)/man - PRESERVEDIR = /var/preserve - - # + MANDIR = $(PREFIX)/share/man @@ -94,7 +93,7 @@ # # A BSD-like install program. GNU install will fit well here, too. @@ -56,7 +52,7 @@ INCLUDE = /usr/include OBJS = ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \ ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \ -@@ -296,13 +292,6 @@ +@@ -296,24 +292,13 @@ # install in standard place install-man: @@ -70,14 +66,15 @@ $(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1 $(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1 ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1 -@@ -310,10 +299,6 @@ + ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/vedit.1 ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1 - install: all install-man +-install: all install-man - rm -f $(DESTDIR)$(BINDIR)/ex $(DESTDIR)$(BINDIR)/edit \ - $(DESTDIR)$(BINDIR)/vedit $(DESTDIR)$(BINDIR)/vi \ - $(DESTDIR)$(BINDIR)/view - test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) ++install: all install-man # special provisions for sticky install if test -f $(DESTDIR)$(BINDIR)/ex; \ then test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \ diff --git a/editors/2bsd-vi/pkg-plist b/editors/2bsd-vi/pkg-plist index 6300a67c103d..9aaf39f207d9 100644 --- a/editors/2bsd-vi/pkg-plist +++ b/editors/2bsd-vi/pkg-plist @@ -5,9 +5,9 @@ bin/vi bin/view libexec/exrecover libexec/expreserve -man/man1/edit.1.gz -man/man1/ex.1.gz -man/man1/vedit.1.gz -man/man1/vi.1.gz -man/man1/view.1.gz +share/man/man1/edit.1.gz +share/man/man1/ex.1.gz +share/man/man1/vedit.1.gz +share/man/man1/vi.1.gz +share/man/man1/view.1.gz @dir(,,1777) %%PRESERVEDIR%% |