Attachment #50173 for bug #76486

View | Details | Raw Unified | Return to bug 76486
Collapse All | Expand All

Lines 6-12 Link Here

(-)2bsd-vi.new/Makefile (-1 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= vi	8	PORTNAME= vi
9	PORTVERSION= 040605	9	PORTVERSION= 041202
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= editors	11	CATEGORIES= editors
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 16-21 Link Here
16		16
17	MAINTAINER= lx@redundancy.redundancy.org	17	MAINTAINER= lx@redundancy.redundancy.org
18	COMMENT= The original vi editor, updated to run on modern OSes	18	COMMENT= The original vi editor, updated to run on modern OSes
		19
		20	USE_BZIP2= yes
19		21
20	MAN1= ex.1 vi.1	22	MAN1= ex.1 vi.1
21	MLINKS= ex.1 edit.1 vi.1 vedit.1 vi.1 view.1	23	MLINKS= ex.1 edit.1 vi.1 vedit.1 vi.1 view.1

Lines 1-2 Link Here

(-)2bsd-vi.new/distinfo (-2 / +2 lines)
1	MD5 (ex-040605.tar.gz) = f4b9473c6a771b94ff2e605c53310908	1	MD5 (ex-041202.tar.bz2) = a3575c35064fec507348d6a1ed10eff5
2	SIZE (ex-040605.tar.gz) = 265672	2	SIZE (ex-041202.tar.bz2) = 210929




--- Makefile.old	Wed Jan 19 09:43:24 2005
+++ Makefile	Wed Jan 19 09:43:41 2005
@@ -79,10 +79,9 @@
 # Destinations for installation. $(PRESERVEDIR) is used for recovery files.
 # It will get mode 1777.

 
 #
 # Compiler and linker flags.
@@ -292,13 +291,6 @@
 # install in standard place
 
 install-man:

 	$(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
@@ -306,10 +298,6 @@
 	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1
 
 install: all install-man

 # special provisions for sticky install
 	if test -f $(DESTDIR)$(BINDIR)/ex; \
 	then	test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \
@@ -319,7 +307,6 @@
 		rm -f $(DESTDIR)$(BINDIR)/ex.old.$$$$; \
 	fi
 	$(INSTALL) -c $(STRIP) -m 1755 ex $(DESTDIR)$(BINDIR)/ex
-	test -d $(DESTDIR)$(LIBEXECDIR) || mkdir -p $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL) -c $(STRIP) exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover
 	$(INSTALL) -c $(STRIP) expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve
 	ln -s ex $(DESTDIR)$(BINDIR)/edit
 	ln -s ex $(DESTDIR)$(BINDIR)/vedit
 	ln -s ex $(DESTDIR)$(BINDIR)/vi
 	ln -s ex $(DESTDIR)$(BINDIR)/view
-	test -d $(DESTDIR)$(PRESERVEDIR) || mkdir -p $(DESTDIR)$(PRESERVEDIR)
-	chmod 1777 $(DESTDIR)$(PRESERVEDIR)
 
 ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h
 ex.o: ex_vars.h libterm/libterm.h




--- /tmp/mapmalloc.c	Mon Jul 12 16:28:16 2004
+++ mapmalloc.c	Mon Jul 12 16:28:37 2004
@@ -550,14 +550,6 @@
 	return NULL;
 }
 
-/*ARGSUSED*/
-char *
-valloc(size)
-size_t size;
-{
-	return NULL;
-}
-
 char *
 mallinfo()
 {

Return to bug 76486

Lines 1-5 Link Here

(-)2bsd-vi.new/files/patch-Makefile (-16 / +8 lines)
1	--- /var/tmp/Makefile.orig Mon Jul 12 11:06:48 2004	1	--- Makefile.old Wed Jan 19 09:43:24 2005
2	+++ Makefile Mon Jul 12 11:29:22 2004	2	+++ Makefile Wed Jan 19 09:43:41 2005
3	@@ -79,10 +79,9 @@	3	@@ -79,10 +79,9 @@
4	# Destinations for installation. $(PRESERVEDIR) is used for recovery files.	4	# Destinations for installation. $(PRESERVEDIR) is used for recovery files.
5	# It will get mode 1777.	5	# It will get mode 1777.
Lines 21-27 Link Here
21		21
22	#	22	#
23	# Compiler and linker flags.	23	# Compiler and linker flags.
24	@@ -276,13 +275,6 @@	24	@@ -292,13 +291,6 @@
25	# install in standard place	25	# install in standard place
26		26
27	install-man:	27	install-man:
Lines 35-41 Link Here
35	$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1	35	$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1
36	$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1	36	$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1
37	ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1	37	ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1
38	@@ -290,10 +282,6 @@	38	@@ -306,10 +298,6 @@
39	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1	39	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1
40		40
41	install: all install-man	41	install: all install-man
Lines 46-64 Link Here
46	# special provisions for sticky install	46	# special provisions for sticky install
47	if test -f $(DESTDIR)$(BINDIR)/ex; \	47	if test -f $(DESTDIR)$(BINDIR)/ex; \
48	then test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \	48	then test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \
49	@@ -303,15 +291,12 @@	49	@@ -319,7 +307,6 @@
50	rm -f $(DESTDIR)$(BINDIR)/ex.old.$$$$; \	50	rm -f $(DESTDIR)$(BINDIR)/ex.old.$$$$; \
51	fi	51	fi
52	$(INSTALL) -c -s -m 1755 ex $(DESTDIR)$(BINDIR)/ex	52	$(INSTALL) -c $(STRIP) -m 1755 ex $(DESTDIR)$(BINDIR)/ex
53	- test -d $(DESTDIR)$(LIBEXECDIR) \|\| mkdir -p $(DESTDIR)$(LIBEXECDIR)	53	- test -d $(DESTDIR)$(LIBEXECDIR) \|\| mkdir -p $(DESTDIR)$(LIBEXECDIR)
54	$(INSTALL) -c -s exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover	54	$(INSTALL) -c $(STRIP) exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover
55	$(INSTALL) -c -s expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve	55	$(INSTALL) -c $(STRIP) expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve
56	ln -s ex $(DESTDIR)$(BINDIR)/edit	56	ln -s ex $(DESTDIR)$(BINDIR)/edit
57	ln -s ex $(DESTDIR)$(BINDIR)/vedit
58	ln -s ex $(DESTDIR)$(BINDIR)/vi
59	ln -s ex $(DESTDIR)$(BINDIR)/view
60	- test -d $(DESTDIR)$(PRESERVEDIR) \|\| mkdir -p $(DESTDIR)$(PRESERVEDIR)
61	- chmod 1777 $(DESTDIR)$(PRESERVEDIR)
62
63	ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h
64	ex.o: ex_vars.h libterm/libterm.h

Lines 1-17 Link Here

(-)2bsd-vi.new/files/patch-mapalloc.c (-17 lines)
1	--- /tmp/mapmalloc.c Mon Jul 12 16:28:16 2004
2	+++ mapmalloc.c Mon Jul 12 16:28:37 2004
3	@@ -550,14 +550,6 @@
4	return NULL;
5	}
6
7	-/ARGSUSED/
8	-char *
9	-valloc(size)
10	-size_t size;
11	-{
12	- return NULL;
13	-}
14	-
15	char *
16	mallinfo()
17	{