diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1997-08-22 19:55:37 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1997-08-22 19:55:37 +0000 |
| commit | c23dacf9a9896aac1471943f034fc2296343009a (patch) | |
| tree | 8625866cced43e172a39bdadc0c4ab4a18cdef88 /editors/vim | |
| parent | Fix path on master site. (diff) | |
Upgrade to the 5.0m beta
Notes
Notes:
svn path=/head/; revision=7658
Diffstat (limited to 'editors/vim')
| -rw-r--r-- | editors/vim/Makefile | 9 | ||||
| -rw-r--r-- | editors/vim/distinfo | 2 | ||||
| -rw-r--r-- | editors/vim/files/patch-01 | 41 |
3 files changed, 15 insertions, 37 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 1bc0ecbc7253..983e74c612f1 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -4,10 +4,10 @@ # Date created: Sat June 29, 1996 # Whom: David O'Brien (obrien@cs.ucdavis.edu) # -# $Id: Makefile,v 1.5 1997/06/12 16:35:09 obrien Exp $ +# $Id: Makefile,v 1.6 1997/07/28 18:35:40 obrien Exp $ # -DISTNAME= vim-5.0l +DISTNAME= vim-5.0m CATEGORIES= editors MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \ ftp://ftp.nuxi.com/pub/vim/beta-test/unix/ \ @@ -19,15 +19,16 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \ MAINTAINER= obrien@FreeBSD.org WRKSRC= ${WRKDIR}/${DISTNAME}/src +MAKE_FLAGS= CONF_ARGS=--prefix=${PREFIX} -f USE_GMAKE= yes ALL_TARGET= MAN1= vim.1 xxd.1 ctags.1 .if defined(HAVE_MOTIF) REQUIRES_MOTIF= yes -MAKE_FLAGS+= CONF_OPT_GUI="--enable-gui=motif" MOTIFHOME=${X11BASE} -f +MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=motif" MOTIFHOME=${X11BASE} ${MAKE_FLAGS} .else -MAKE_FLAGS+= CONF_OPT_GUI="--enable-gui=yes" -f +MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=yes" ${MAKE_FLAGS} .endif pre-build: diff --git a/editors/vim/distinfo b/editors/vim/distinfo index 43779b1e121a..590a615b29a5 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1 +1 @@ -MD5 (vim-5.0l.tar.gz) = 223c1640ef2de9c889ea0c335a26aaf4 +MD5 (vim-5.0m.tar.gz) = b82908d5e0fadcb1b6a1ca9b229a5155 diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01 index 59137fc70c3a..066c0578094a 100644 --- a/editors/vim/files/patch-01 +++ b/editors/vim/files/patch-01 @@ -1,34 +1,11 @@ ---- Makefile.orig Tue Jun 10 13:57:59 1997 -+++ Makefile Wed Jun 11 04:17:07 1997 -@@ -563,7 +563,7 @@ - $(MOTIF_COMMENT)GUI_DEFS = -DUSE_GUI_MOTIF $(NARROW_PROTO) - $(MOTIF_COMMENT)GUI_IPATH = -I$(GUI_INC_LOC) - $(MOTIF_COMMENT)GUI_LIBS_DIR = -L$(GUI_LIB_LOC) --$(MOTIF_COMMENT)GUI_LIBS = -lXm -lXt -+$(MOTIF_COMMENT)GUI_LIBS = ${MOTIFLIB} -lXt - $(MOTIF_COMMENT)GUI_TARGETS = $(BINDIR)/$(GVIMTARGET) \ +--- Makefile.orig Thu Aug 21 04:24:06 1997 ++++ Makefile Fri Aug 22 11:59:58 1997 +@@ -578,7 +578,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) \ -@@ -800,7 +800,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_ARGS) -+ $(CONF_OPT_PERL) $(CONF_ARGS) \ -+ --prefix=$(PREFIX) - - # When configure.in has changed, run autoconf to produce configure - # If you don't have autoconf, use the configure that's there -@@ -941,10 +942,10 @@ - installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(REXTARGET) $(BINDIR)/$(RVIEWTARGET) - - $(BINDIR)/$(EXTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET) -+ #cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET) - - $(BINDIR)/$(VIEWTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET) -+ #cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET) - - $(BINDIR)/$(GVIMTARGET): - cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET) |