kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade to version 5.0q

Browse source
This commit is contained in:
David E. O'Brien 1997-11-11 15:20:17 +00:00
parent 452d725b2d
commit e61cd6ce12
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=8583
12 changed files with 54 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editors/vim/Makefile
View file

@ -4,10 +4,10 @@
# Date created: Sat June 29, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $Id: Makefile,v 1.8 1997/10/01 09:59:51 obrien Exp $
# $Id: Makefile,v 1.9 1997/10/22 10:23:39 obrien Exp $
#
DISTNAME= vim-5.0p
DISTNAME= vim-5.0q
CATEGORIES= editors
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \
ftp://ftp.nuxi.com/pub/vim/beta-test/unix/ \
@ -20,7 +20,7 @@ MAINTAINER= obrien@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKE_FLAGS= CONF_ARGS=--prefix=${PREFIX} -f
ALL_TARGET=
ALL_TARGET= #
MAN1= vim.1 xxd.1 ctags.1
.if defined(HAVE_MOTIF)
@ -35,7 +35,7 @@ pre-build:
post-install:
[ -e ${PREFIX}/bin/gvim ] || /bin/ln -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
@/bin/rm -f ${PREFIX}/man/man1/etags.1
@${RM} -f ${PREFIX}/man/man1/etags.1
@/bin/ln -sf ${PREFIX}/man/man1/ctags.1.gz ${PREFIX}/man/man1/etags.1.gz

2
editors/vim/distinfo
View file

@ -1 +1 @@
MD5 (vim-5.0p.tar.gz) = a50ead0bed59fdd35e8569ba50f11436
MD5 (vim-5.0q.tar.gz) = a667f90339a8948b4c55af8e44431ef6

45
editors/vim/files/patch-01
View file

@ -1,34 +1,23 @@
--- Makefile.orig Sun Oct 19 16:11:50 1997
+++ Makefile Mon Oct 20 09:51:51 1997
@@ -614,7 +614,7 @@
MOTIF_DEFS = -DUSE_GUI_MOTIF $(NARROW_PROTO)
MOTIF_IPATH = -I$(GUI_INC_LOC)
MOTIF_LIBS_DIR = -L$(GUI_LIB_LOC)
-MOTIF_LIBS = -lXm -lXt
+MOTIF_LIBS = ${MOTIFLIB} -lXt
MOTIF_TARGETS = $(BINDIR)/$(GVIMTARGET) \
$(BINDIR)/$(GEXTARGET) \
$(BINDIR)/$(GVIEWTARGET) \
@@ -857,7 +857,8 @@
GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
CC="$(CC)" CFLAGS="$(CFLAGS)" TERM_LIB="$(TERM_LIB)" \
$(CONF_SHELL) ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) \
- $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS)
+ $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS) \
+ --prefix=$(PREFIX)
--- Makefile.orig Sun Nov 9 15:34:28 1997
+++ Makefile Tue Nov 11 06:51:53 1997
@@ -249,6 +249,7 @@
# When configure.in has changed, run autoconf to produce configure
# If you don't have autoconf, use the configure that's there
@@ -999,37 +1000,37 @@
installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(REXTARGET) $(BINDIR)/$(RVIEWTARGET)
### Extra configure arguments - just put anything here, just an example
#CONF_ARGS = --exec-prefix=/usr
+CONF_ARGS = --prefix=$(PREFIX)
### For creating a plain Vim without any X11 related fancies use this one:
### (otherwise Vim configure will try to include xterm titlebar access)
@@ -1018,31 +1019,31 @@
installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
$(BINDIR)/$(EXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -sf $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
$(BINDIR)/$(VIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -sf $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
$(BINDIR)/$(GVIMTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
@ -46,10 +35,6 @@
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
$(BINDIR)/$(REXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(REXTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(REXTARGET)
$(BINDIR)/$(RVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
@ -58,10 +43,6 @@
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
$(BINDIR)/$(RGEXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGEXTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGEXTARGET)
$(BINDIR)/$(RGVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)

20
editors/vim/files/patch-02
View file

@ -1,20 +0,0 @@
--- configure.orig Thu Sep 25 15:30:18 1997
+++ configure Sun Oct 19 22:53:37 1997
@@ -951,7 +951,7 @@
PERL_CFLAGS="$perlcppflags"
fi
perllibs=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ldopts' | sed '/Warning/d'`
+ -e 'ldopts' | sed '/Warning/d' | sed '/Note (probably harmless)/d'`
if test "X$perllibs" != "X"; then
LIBS="$perllibs $LIBS"
fi
@@ -2175,7 +2175,7 @@
echo "configure:2176: checking for location of Motif GUI libs" >&5
GUI_LIB_LOC=
for try in $gui_libs; do
- if test -f "$try/libXm.a" -o -f "$try/libXm.so" -o -f "$try/libXm.sl"; then
+ if test -f "$try/libXm.a" -o -f "$try/libXm.so.0.1" -o -f "$try/libXm.sl"; then
GUI_LIB_LOC=$try
if test "`(uname) 2>/dev/null`" = SunOS &&
uname -r | grep '^5' >/dev/null; then

8
editors/vim5/Makefile
View file

@ -4,10 +4,10 @@
# Date created: Sat June 29, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $Id: Makefile,v 1.8 1997/10/01 09:59:51 obrien Exp $
# $Id: Makefile,v 1.9 1997/10/22 10:23:39 obrien Exp $
#
DISTNAME= vim-5.0p
DISTNAME= vim-5.0q
CATEGORIES= editors
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \
ftp://ftp.nuxi.com/pub/vim/beta-test/unix/ \
@ -20,7 +20,7 @@ MAINTAINER= obrien@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKE_FLAGS= CONF_ARGS=--prefix=${PREFIX} -f
ALL_TARGET=
ALL_TARGET= #
MAN1= vim.1 xxd.1 ctags.1
.if defined(HAVE_MOTIF)
@ -35,7 +35,7 @@ pre-build:
post-install:
[ -e ${PREFIX}/bin/gvim ] || /bin/ln -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
@/bin/rm -f ${PREFIX}/man/man1/etags.1
@${RM} -f ${PREFIX}/man/man1/etags.1
@/bin/ln -sf ${PREFIX}/man/man1/ctags.1.gz ${PREFIX}/man/man1/etags.1.gz

2
editors/vim5/distinfo
View file

@ -1 +1 @@
MD5 (vim-5.0p.tar.gz) = a50ead0bed59fdd35e8569ba50f11436
MD5 (vim-5.0q.tar.gz) = a667f90339a8948b4c55af8e44431ef6

45
editors/vim5/files/patch-01
View file

@ -1,34 +1,23 @@
--- Makefile.orig Sun Oct 19 16:11:50 1997
+++ Makefile Mon Oct 20 09:51:51 1997
@@ -614,7 +614,7 @@
MOTIF_DEFS = -DUSE_GUI_MOTIF $(NARROW_PROTO)
MOTIF_IPATH = -I$(GUI_INC_LOC)
MOTIF_LIBS_DIR = -L$(GUI_LIB_LOC)
-MOTIF_LIBS = -lXm -lXt
+MOTIF_LIBS = ${MOTIFLIB} -lXt
MOTIF_TARGETS = $(BINDIR)/$(GVIMTARGET) \
$(BINDIR)/$(GEXTARGET) \
$(BINDIR)/$(GVIEWTARGET) \
@@ -857,7 +857,8 @@
GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
CC="$(CC)" CFLAGS="$(CFLAGS)" TERM_LIB="$(TERM_LIB)" \
$(CONF_SHELL) ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) \
- $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS)
+ $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS) \
+ --prefix=$(PREFIX)
--- Makefile.orig Sun Nov 9 15:34:28 1997
+++ Makefile Tue Nov 11 06:51:53 1997
@@ -249,6 +249,7 @@
# When configure.in has changed, run autoconf to produce configure
# If you don't have autoconf, use the configure that's there
@@ -999,37 +1000,37 @@
installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(REXTARGET) $(BINDIR)/$(RVIEWTARGET)
### Extra configure arguments - just put anything here, just an example
#CONF_ARGS = --exec-prefix=/usr
+CONF_ARGS = --prefix=$(PREFIX)
### For creating a plain Vim without any X11 related fancies use this one:
### (otherwise Vim configure will try to include xterm titlebar access)
@@ -1018,31 +1019,31 @@
installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
$(BINDIR)/$(EXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -sf $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
$(BINDIR)/$(VIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -sf $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
$(BINDIR)/$(GVIMTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
@ -46,10 +35,6 @@
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
$(BINDIR)/$(REXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(REXTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(REXTARGET)
$(BINDIR)/$(RVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
@ -58,10 +43,6 @@
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
$(BINDIR)/$(RGEXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGEXTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGEXTARGET)
$(BINDIR)/$(RGVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)

20
editors/vim5/files/patch-02
View file

@ -1,20 +0,0 @@
--- configure.orig Thu Sep 25 15:30:18 1997
+++ configure Sun Oct 19 22:53:37 1997
@@ -951,7 +951,7 @@
PERL_CFLAGS="$perlcppflags"
fi
perllibs=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ldopts' | sed '/Warning/d'`
+ -e 'ldopts' | sed '/Warning/d' | sed '/Note (probably harmless)/d'`
if test "X$perllibs" != "X"; then
LIBS="$perllibs $LIBS"
fi
@@ -2175,7 +2175,7 @@
echo "configure:2176: checking for location of Motif GUI libs" >&5
GUI_LIB_LOC=
for try in $gui_libs; do
- if test -f "$try/libXm.a" -o -f "$try/libXm.so" -o -f "$try/libXm.sl"; then
+ if test -f "$try/libXm.a" -o -f "$try/libXm.so.0.1" -o -f "$try/libXm.sl"; then
GUI_LIB_LOC=$try
if test "`(uname) 2>/dev/null`" = SunOS &&
uname -r | grep '^5' >/dev/null; then

8
editors/vim6/Makefile
View file

@ -4,10 +4,10 @@
# Date created: Sat June 29, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $Id: Makefile,v 1.8 1997/10/01 09:59:51 obrien Exp $
# $Id: Makefile,v 1.9 1997/10/22 10:23:39 obrien Exp $
#
DISTNAME= vim-5.0p
DISTNAME= vim-5.0q
CATEGORIES= editors
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \
ftp://ftp.nuxi.com/pub/vim/beta-test/unix/ \
@ -20,7 +20,7 @@ MAINTAINER= obrien@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKE_FLAGS= CONF_ARGS=--prefix=${PREFIX} -f
ALL_TARGET=
ALL_TARGET= #
MAN1= vim.1 xxd.1 ctags.1
.if defined(HAVE_MOTIF)
@ -35,7 +35,7 @@ pre-build:
post-install:
[ -e ${PREFIX}/bin/gvim ] || /bin/ln -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
@/bin/rm -f ${PREFIX}/man/man1/etags.1
@${RM} -f ${PREFIX}/man/man1/etags.1
@/bin/ln -sf ${PREFIX}/man/man1/ctags.1.gz ${PREFIX}/man/man1/etags.1.gz

2
editors/vim6/distinfo
View file

@ -1 +1 @@
MD5 (vim-5.0p.tar.gz) = a50ead0bed59fdd35e8569ba50f11436
MD5 (vim-5.0q.tar.gz) = a667f90339a8948b4c55af8e44431ef6

45
editors/vim6/files/patch-01
View file

@ -1,34 +1,23 @@
--- Makefile.orig Sun Oct 19 16:11:50 1997
+++ Makefile Mon Oct 20 09:51:51 1997
@@ -614,7 +614,7 @@
MOTIF_DEFS = -DUSE_GUI_MOTIF $(NARROW_PROTO)
MOTIF_IPATH = -I$(GUI_INC_LOC)
MOTIF_LIBS_DIR = -L$(GUI_LIB_LOC)
-MOTIF_LIBS = -lXm -lXt
+MOTIF_LIBS = ${MOTIFLIB} -lXt
MOTIF_TARGETS = $(BINDIR)/$(GVIMTARGET) \
$(BINDIR)/$(GEXTARGET) \
$(BINDIR)/$(GVIEWTARGET) \
@@ -857,7 +857,8 @@
GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
CC="$(CC)" CFLAGS="$(CFLAGS)" TERM_LIB="$(TERM_LIB)" \
$(CONF_SHELL) ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) \
- $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS)
+ $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS) \
+ --prefix=$(PREFIX)
--- Makefile.orig Sun Nov 9 15:34:28 1997
+++ Makefile Tue Nov 11 06:51:53 1997
@@ -249,6 +249,7 @@
# When configure.in has changed, run autoconf to produce configure
# If you don't have autoconf, use the configure that's there
@@ -999,37 +1000,37 @@
installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(REXTARGET) $(BINDIR)/$(RVIEWTARGET)
### Extra configure arguments - just put anything here, just an example
#CONF_ARGS = --exec-prefix=/usr
+CONF_ARGS = --prefix=$(PREFIX)
### For creating a plain Vim without any X11 related fancies use this one:
### (otherwise Vim configure will try to include xterm titlebar access)
@@ -1018,31 +1019,31 @@
installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
$(BINDIR)/$(EXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -sf $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
$(BINDIR)/$(VIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -sf $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
$(BINDIR)/$(GVIMTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
@ -46,10 +35,6 @@
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
$(BINDIR)/$(REXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(REXTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(REXTARGET)
$(BINDIR)/$(RVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
@ -58,10 +43,6 @@
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
$(BINDIR)/$(RGEXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGEXTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGEXTARGET)
$(BINDIR)/$(RGVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)

20
editors/vim6/files/patch-02
View file

@ -1,20 +0,0 @@
--- configure.orig Thu Sep 25 15:30:18 1997
+++ configure Sun Oct 19 22:53:37 1997
@@ -951,7 +951,7 @@
PERL_CFLAGS="$perlcppflags"
fi
perllibs=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ldopts' | sed '/Warning/d'`
+ -e 'ldopts' | sed '/Warning/d' | sed '/Note (probably harmless)/d'`
if test "X$perllibs" != "X"; then
LIBS="$perllibs $LIBS"
fi
@@ -2175,7 +2175,7 @@
echo "configure:2176: checking for location of Motif GUI libs" >&5
GUI_LIB_LOC=
for try in $gui_libs; do
- if test -f "$try/libXm.a" -o -f "$try/libXm.so" -o -f "$try/libXm.sl"; then
+ if test -f "$try/libXm.a" -o -f "$try/libXm.so.0.1" -o -f "$try/libXm.sl"; then
GUI_LIB_LOC=$try
if test "`(uname) 2>/dev/null`" = SunOS &&
uname -r | grep '^5' >/dev/null; then