Date: Thu, 2 Aug 2001 13:24:01 +0200 (CEST) From: martti.kuparinen@iki.fi To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29385: [PATCH] vim6 update Message-ID: <200108021124.f72BO1h47448@dhcp118.verkstad.net>
next in thread | raw e-mail | index | archive | help
>Number: 29385 >Category: ports >Synopsis: [PATCH] vim6 update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Aug 02 04:30:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Martti Kuparinen >Release: FreeBSD 4.3-RELEASE i386 >Organization: >Environment: System: FreeBSD dhcp118 4.3-RELEASE FreeBSD 4.3-RELEASE #0: Mon Jul 30 11:40:49 CEST 2001 root@dhcp118:/usr/obj/usr/src/sys/KAYAK i386 >Description: Update vim6 to the latest version (6.0ap). >How-To-Repeat: >Fix: diff -Nru /usr/ports/editors/vim6/Makefile vim6/Makefile --- /usr/ports/editors/vim6/Makefile Wed Jun 27 23:33:44 2001 +++ vim6/Makefile Thu Aug 2 13:18:00 2001 @@ -7,7 +7,7 @@ # PORTNAME?= vim -PORTVERSION= 6.0ae +PORTVERSION= 6.0ap PORTREVISION?= 0 CATEGORIES?= editors MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \ @@ -18,8 +18,6 @@ ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unreleased/unix/ \ ftp://ftp.mirror.ac.uk/sites/ftp.vim.org/pub/vim/unreleased/unix/ \ ftp://ftp.progsoc.uts.edu.au/pub/vim/unreleased/unix/ -DISTNAME= vim-${PORTVERSION} -DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX} #PATCH_SITES= ${MASTER_SITES:S/unix/patches/} #.for p in 01 @@ -42,7 +40,7 @@ MAKE_ARGS+= CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib" ALL_TARGET= # PLIST_SUB= VIM_VER=${DISTNAME:S/-//:S/.//} -MAN1= eview.1 evim.1 gvimdiff.1 vim.1 vimdiff.1 vimtutor.1 xxd.1 +MAN1= evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1 MLINKS= vim.1 rvim.1 vim.1 rview.1 .include <bsd.port.pre.mk> diff -Nru /usr/ports/editors/vim6/distinfo vim6/distinfo --- /usr/ports/editors/vim6/distinfo Thu May 10 02:40:33 2001 +++ vim6/distinfo Thu Aug 2 12:50:17 2001 @@ -1,2 +1 @@ -MD5 (vim/vim-6.0ae-src.tar.bz2) = ea474f85cc8632523d3dee22cff3e1a5 -MD5 (vim/vim-6.0ae-rt.tar.bz2) = 2f568e017eaf8be07433508bb9e785b0 +MD5 (vim/vim-6.0ap.tar.bz2) = 6d8746e2db80a86c2fa6b9ef02aa139b diff -Nru /usr/ports/editors/vim6/files/patch-01 vim6/files/patch-01 --- /usr/ports/editors/vim6/files/patch-01 Thu May 3 12:35:39 2001 +++ vim6/files/patch-01 Thu Aug 2 12:58:48 2001 @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Apr 29 13:28:12 2001 -+++ Makefile Thu May 3 03:34:11 2001 -@@ -305,6 +305,7 @@ +--- Makefile.orig Sun Jul 29 16:51:28 2001 ++++ Makefile Thu Aug 2 12:58:33 2001 +@@ -278,6 +278,7 @@ # of make, will buid Vim. # CONFIGURE - configure arguments {{{1 @@ -8,101 +8,101 @@ # You can give a lot of options to configure. # Change this to your desire and do 'make config' afterwards -@@ -1657,40 +1658,40 @@ - installvimdiff: $(BINDIR)/$(VIMDIFFTARGET) $(BINDIR)/$(GVIMDIFFTARGET) +@@ -1674,40 +1675,40 @@ + installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(GVIMDIFFTARGET) - $(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) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET) - - $(BINDIR)/$(GVIEWTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET) - - $(BINDIR)/$(RVIMTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET) - - $(BINDIR)/$(RVIEWTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET) - - $(BINDIR)/$(RGVIMTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET) - - $(BINDIR)/$(RGVIEWTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET) - - $(BINDIR)/$(VIMDIFFTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(VIMDIFFTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(VIMDIFFTARGET) - - $(BINDIR)/$(GVIMDIFFTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMDIFFTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMDIFFTARGET) - - $(BINDIR)/$(EVIMTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(EVIMTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(EVIMTARGET) - - $(BINDIR)/$(EVIEWTARGET): -- cd $(BINDIR); ln -s $(VIMTARGET) $(EVIEWTARGET) -+ cd $(BINDIR); ln -sf $(VIMTARGET) $(EVIEWTARGET) + $(DEST_BIN)/$(EXTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET) + + $(DEST_BIN)/$(VIEWTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET) + + $(DEST_BIN)/$(GVIMTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET) + + $(DEST_BIN)/$(GVIEWTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET) + + $(DEST_BIN)/$(RVIMTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET) + + $(DEST_BIN)/$(RVIEWTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET) + + $(DEST_BIN)/$(RGVIMTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET) + + $(DEST_BIN)/$(RGVIEWTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET) + + $(DEST_BIN)/$(VIMDIFFTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET) + + $(DEST_BIN)/$(GVIMDIFFTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET) + + $(DEST_BIN)/$(EVIMTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET) + + $(DEST_BIN)/$(EVIEWTARGET): +- cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET) ++ # cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET) # create links for the manual pages with various names to vim. This is only # done when the links (or manpages with the same name) don't exist yet. -@@ -1708,34 +1709,34 @@ - $(MANSUBDIR)/$(EVIEWNAME).1 +@@ -1725,34 +1726,34 @@ + $(DEST_MAN)/$(EVIEWNAME).1 - $(MANSUBDIR)/$(EXNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1 -+ #cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(EXNAME).1 - - $(MANSUBDIR)/$(VIEWNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1 -+ #cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(VIEWNAME).1 - - $(MANSUBDIR)/$(GVIMNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1 - - $(MANSUBDIR)/$(GVIEWNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1 - - $(MANSUBDIR)/$(RVIMNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1 - - $(MANSUBDIR)/$(RVIEWNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1 - - $(MANSUBDIR)/$(RGVIMNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1 - - $(MANSUBDIR)/$(RGVIEWNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1 - - $(MANSUBDIR)/$(GVIMDIFFNAME).1: -- cd $(MANSUBDIR); ln -s $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1 -+ cd $(MANSUBDIR); ln -sf $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1 - - $(MANSUBDIR)/$(EVIEWNAME).1: -- cd $(MANSUBDIR); ln -s $(EVIMNAME).1 $(EVIEWNAME).1 -+ cd $(MANSUBDIR); ln -sf $(EVIMNAME).1 $(EVIEWNAME).1 + $(DEST_MAN)/$(EXNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(EXNAME).1 ++ # cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(EXNAME).1 + + $(DEST_MAN)/$(VIEWNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(VIEWNAME).1 ++ # cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(VIEWNAME).1 + + $(DEST_MAN)/$(GVIMNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIMNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIMNAME).1 + + $(DEST_MAN)/$(GVIEWNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIEWNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIEWNAME).1 + + $(DEST_MAN)/$(RVIMNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIMNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIMNAME).1 + + $(DEST_MAN)/$(RVIEWNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIEWNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIEWNAME).1 + + $(DEST_MAN)/$(RGVIMNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIMNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIMNAME).1 + + $(DEST_MAN)/$(RGVIEWNAME).1: +- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIEWNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1 + + $(DEST_MAN)/$(GVIMDIFFNAME).1: +- cd $(DEST_MAN); ln -s $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1 ++ cd $(DEST_MAN); ln -sf $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1 + + $(DEST_MAN)/$(EVIEWNAME).1: +- cd $(DEST_MAN); ln -s $(EVIMNAME).1 $(EVIEWNAME).1 ++ cd $(DEST_MAN); ln -sf $(EVIMNAME).1 $(EVIEWNAME).1 uninstall: uninstall_runtime - -rm -f $(BINDIR)/$(VIMTARGET) + -rm -f $(DEST_BIN)/$(VIMTARGET) diff -Nru /usr/ports/editors/vim6/files/patch-02 vim6/files/patch-02 --- /usr/ports/editors/vim6/files/patch-02 Mon Nov 6 22:53:56 2000 +++ vim6/files/patch-02 Thu Aug 2 12:54:06 2001 @@ -1,8 +1,16 @@ ---- auto/configure.orig Tue Oct 31 13:03:47 2000 -+++ auto/configure Mon Nov 6 11:26:36 2000 -@@ -3171 +3171 @@ +--- auto/configure.orig Sat Jul 28 15:52:41 2001 ++++ auto/configure Thu Aug 2 12:53:28 2001 +@@ -3272,11 +3272,11 @@ + + if test "x$gtk_config_prefix" != "x" ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + GTK_CONFIG=${GTK_CONFIG} -@@ -3175 +3175 @@ + fi + if test "x$gtk_config_exec_prefix" != "x" ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + GTK_CONFIG=${GTK_CONFIG} + fi + if test "X$GTK_CONFIG" = "X"; then + # Extract the first word of "gtk-config", so it can be a program name with args. diff -Nru /usr/ports/editors/vim6/pkg-plist vim6/pkg-plist --- /usr/ports/editors/vim6/pkg-plist Thu May 24 03:21:29 2001 +++ vim6/pkg-plist Thu Aug 2 13:18:44 2001 @@ -4,16 +4,16 @@ bin/xxd @comment bin/ex @comment bin/gex -bin/eview -bin/evim -bin/gview +@comment bin/eview +@comment bin/evim +@comment bin/gview bin/gvim -bin/rgview -bin/rgvim -bin/rview -bin/rvim -bin/vimdiff -bin/gvimdiff +@comment bin/rgview +@comment bin/rgvim +@comment bin/rview +@comment bin/rvim +@comment bin/vimdiff +@comment bin/gvimdiff @comment bin/view @exec mkdir %D/share/vim/%%VIM_VER%%/lang @comment Insert PLIST.share-vim here >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108021124.f72BO1h47448>