[csw-devel] SF.net SVN: gar:[2908] csw/mgar/pkg/gvim/trunk

harpchad at users.sourceforge.net harpchad at users.sourceforge.net
Mon Jan 26 19:24:09 CET 2009 

Revision: 2908
          http://gar.svn.sourceforge.net/gar/?rev=2908&view=rev
Author:   harpchad
Date:     2009-01-26 18:24:09 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
- update to patch level 088
- now using gar v2
- now includes 64 bit binaries (w/isaexec)
- removed links to vim build directory

Modified Paths:
--------------
    csw/mgar/pkg/gvim/trunk/Makefile
    csw/mgar/pkg/gvim/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gvim/trunk/files/vimtutor.patch

Removed Paths:
-------------
    csw/mgar/pkg/gvim/trunk/files/CSWgvim.depend
    csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype
    csw/mgar/pkg/gvim/trunk/files/vimtutor.diff

Property Changed:
----------------
    csw/mgar/pkg/gvim/trunk/


Property changes on: csw/mgar/pkg/gvim/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/gvim/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gvim/trunk/Makefile	2009-01-26 09:33:30 UTC (rev 2907)
+++ csw/mgar/pkg/gvim/trunk/Makefile	2009-01-26 18:24:09 UTC (rev 2908)
@@ -1,5 +1,7 @@
 GARNAME = vim
 DISTVERSION = 7.2
+PATCHREV = 088
+GARVERSION = $(DISTVERSION).$(PATCHREV)
 CATEGORIES = utils
 SPKG_SOURCEURL = http://www.vim.org/download.php
 DESCRIPTION = Vi IMproved with GTK+ support
@@ -13,30 +15,76 @@
 
 #DEPENDS = utils/mktemp lib/ncurses
 
-include ../vim/files/config.mk
-DISTFILES += $(call admfiles,CSWgvim,prototype depend)
+MASTER_SITES += ftp://ftp.vim.org/pub/vim/patches/$(DISTVERSION)/
+MASTER_SITES += ftp://ftp.vim.org/pub/vim/extra/
+MASTER_SITES += ftp://ftp.vim.org/pub/vim/unix/
+
+DISTFILES  = $(call admfiles,CSWgvim,)
+DISTFILES += $(GARNAME)-$(DISTVERSION).tar.bz2
+DISTFILES += $(GARNAME)-$(DISTVERSION)-lang.tar.gz
+DISTFILES += $(GARNAME)-$(DISTVERSION)-extra.tar.gz
 DISTFILES += gvim.desktop
 
+PATCHFILES  = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T))
+PATCHFILES += vimtutor.patch
+
+WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION))
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-global-runtime=$(sharedstatedir)/$(GARNAME)
+CONFIGURE_ARGS += --with-features=huge
+CONFIGURE_ARGS += --with-tlib=ncurses
+CONFIGURE_ARGS += --enable-multibyte
+CONFIGURE_ARGS += --enable-cscope
 CONFIGURE_ARGS += --with-vim-name="vim-x11"
 CONFIGURE_ARGS += --enable-gui=gnome2
 
-include ../vim/files/patches.mk
+BUILD_ARGS += "VIMRCLOC=/opt/csw/etc/vim"
+BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72"
+BUILD64 = 1
 
+PATCHDIRLEVEL = 0
+
+REQUIRED_PKGS_CSWgvim  = CSWvimrt CSWbonobo2 CSWfconfig CSWftype2 CSWgconf2
+REQUIRED_PKGS_CSWgvim += CSWggettext CSWglib2 CSWgnomekeyring CSWgnomevfs2 CSWgtk2
+REQUIRED_PKGS_CSWgvim += CSWiconv CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo
+REQUIRED_PKGS_CSWgvim += CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui CSWlibnet CSWlibpopt
+REQUIRED_PKGS_CSWgvim += CSWlibxml2 CSWlibxrender CSWncurses CSWorbit2 CSWpango
+REQUIRED_PKGS_CSWgvim += CSWperl CSWpng CSWzlib
+
 INSTALL_SCRIPTS = minimal
 
 # Test requires controlling terminal
 TEST_SCRIPTS =
 
+MERGE_EXCLUDE_FILES = /opt/csw/bin/sparcv9/gvim-x11tutor
+
 include gar/category.mk
 
-# Don't install the runtime
-install-minimal:
-	@$(INSTALL_ENV) $(MAKE) -C $(WORKSRC)/src \
-		installvimbin installlinks installtools installgtutorbin
+post-install-isa-sparcv8 post-install-isa-i386:
 	mkdir -p $(DESTDIR)/opt/csw/share/pixmaps
 	cp $(WORKSRC)/runtime/vim48x48.png $(DESTDIR)/opt/csw/share/pixmaps/gvim.png
 	mkdir -p $(DESTDIR)/opt/csw/share/applications
 	cp $(DOWNLOADDIR)/gvim.desktop $(DESTDIR)/opt/csw/share/applications/gvim.desktop
 	mv $(DESTDIR)/opt/csw/bin/gvim-x11tutor $(DESTDIR)/opt/csw/bin/gvimtutor
+	mv $(DESTDIR)/opt/csw/bin/gvim-x11 $(DESTDIR)/opt/csw/bin/gvim
+	mv $(DESTDIR)/opt/csw/bin/rgvim-x11 $(DESTDIR)/opt/csw/bin/rgvim
+	mv $(DESTDIR)/opt/csw/bin/evim-x11 $(DESTDIR)/opt/csw/bin/evim
+	mv $(DESTDIR)/opt/csw/bin/gvim-x11diff $(DESTDIR)/opt/csw/bin/gvimdiff
 	@$(MAKECOOKIE)
 	$(DONADA)
+
+post-install-isa-sparcv9 post-install-isa-amd64:
+	mv $(DESTDIR)/opt/csw/bin/$(ISA)/gvim-x11 $(DESTDIR)/opt/csw/bin/$(ISA)/gvim
+	mv $(DESTDIR)/opt/csw/bin/$(ISA)/rgvim-x11 $(DESTDIR)/opt/csw/bin/$(ISA)/rgvim
+	mv $(DESTDIR)/opt/csw/bin/$(ISA)/evim-x11 $(DESTDIR)/opt/csw/bin/$(ISA)/evim
+	mv $(DESTDIR)/opt/csw/bin/$(ISA)/gvim-x11diff $(DESTDIR)/opt/csw/bin/$(ISA)/gvimdiff
+	@$(MAKECOOKIE)
+	$(DONADA)
+
+# Don't install the runtime
+install-minimal:
+	@$(INSTALL_ENV) $(MAKE) -C $(WORKSRC)/src \
+		installvimbin installglinks installgtutorbin
+	@$(MAKECOOKIE)
+	$(DONADA)

Modified: csw/mgar/pkg/gvim/trunk/checksums
===================================================================
--- csw/mgar/pkg/gvim/trunk/checksums	2009-01-26 09:33:30 UTC (rev 2907)
+++ csw/mgar/pkg/gvim/trunk/checksums	2009-01-26 18:24:09 UTC (rev 2908)
@@ -81,11 +81,14 @@
 3bdf4ec7db7976876a827f2dfa269e89  download/7.2.081
 590c9aa51fcb808ece4b6b4bfaaaaf30  download/7.2.082
 2a10abc536f7a69ff3ef353b55b6cb65  download/7.2.083
+78defaaa03e61955f6624b796efb8655  download/7.2.084
+869116b3e92e944d40a3e03f9a99816f  download/7.2.085
+5af26f073ebeba60af90525d68a61725  download/7.2.086
+639d7a80864afe68132725e377f52f19  download/7.2.087
+44b152484534fa23c4ff531316a0e518  download/7.2.088
 35e04482f07c57221c9a751aaa3b8dac  download/vim-7.2-extra.tar.gz
 d8884786979e0e520c112faf2e176f05  download/vim-7.2-lang.tar.gz
 f0901284b338e448bfd79ccca0041254  download/vim-7.2.tar.bz2
-582717146f6bbd5b73db83a2f62e62a5  download/vimtutor.diff
-2f6bf1938bfdc77a305903e70e3d1de2  download/CSWgvim.depend
+582717146f6bbd5b73db83a2f62e62a5  download/vimtutor.patch
 3d2b62d6810417d562ed17aaada29868  download/CSWgvim.gspec
-2b8beca0088c83291df67af00616a197  download/CSWgvim.prototype
 47396843634a6e3c05d4f5d6b4bf8a72  download/gvim.desktop

Deleted: csw/mgar/pkg/gvim/trunk/files/CSWgvim.depend
===================================================================
--- csw/mgar/pkg/gvim/trunk/files/CSWgvim.depend	2009-01-26 09:33:30 UTC (rev 2907)
+++ csw/mgar/pkg/gvim/trunk/files/CSWgvim.depend	2009-01-26 18:24:09 UTC (rev 2908)
@@ -1,28 +0,0 @@
-P CSWvimrt vimrt - vim shared runtime and documentation
-P CSWbonobo2 libbonobo2 - GNOME component and compound document system
-P CSWfconfig fontconfig - A library for configuring and customizing font access.
-P CSWftype2 freetype2 - The free and portable high quality font engine
-P CSWgconf2 gconf2 - GNOME configuration database system
-P CSWggettext ggettext - GNU gettext
-P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+
-P CSWgnomekeyring gnomekeyring - keep password and other secrets for users
-P CSWgnomevfs2 gnomevfs2 - GNOME Virtual File System
-P CSWgtk2 gtk2 - GTK+, The GIMP Toolkit
-P CSWiconv libiconv - GNU iconv library
-P CSWlibart libart - High performance 2D graphics library
-P CSWlibatk libatk - Accessibility toolkit for GNOME
-P CSWlibbonoboui libbonoboui - UI code for the GNOME 2 Object Activation Framework
-P CSWlibcairo libcairo - The Cairo 2D Graphics Library
-P CSWlibgnome libgnome - The main GNOME 2 library
-P CSWlibgnomecanvas libgnomecanvas - Gnome2 Canvas Lib
-P CSWlibgnomeui libgnomeui - The main GNOME 2 UI library
-P CSWlibnet libnet - the libnet packet construction library
-P CSWlibpopt libpopt - Command line option parsing library
-P CSWlibxml2 libxml2 - XML Parser Library
-P CSWlibxrender libxrender - fontconfig.org Xrender library
-P CSWncurses ncurses - ncurses library and utilities
-P CSWorbit2 orbit2 - ORBit 2.x CORBA tools and libs
-P CSWpango libpango - Library for laying out and rendering text
-P CSWperl perl - A high-level, general-purpose programming language.
-P CSWpng png - library for Portable Network Graphics format (PNG)
-P CSWzlib zlib - Zlib Data Compression Library

Deleted: csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype
===================================================================
--- csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype	2009-01-26 09:33:30 UTC (rev 2907)
+++ csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype	2009-01-26 18:24:09 UTC (rev 2908)
@@ -1,15 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/vim-x11 0755 root bin
-s none /opt/csw/bin/evim=vim-x11
-s none /opt/csw/bin/eview=vim-x11
-s none /opt/csw/bin/gview=vim-x11
-s none /opt/csw/bin/gvim=vim-x11
-s none /opt/csw/bin/gvimdiff=vim-x11
-s none /opt/csw/bin/rgview=vim-x11
-s none /opt/csw/bin/rgvim=vim-x11
-f none /opt/csw/bin/gvimtutor 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/pixmaps 0755 root bin
-f none /opt/csw/share/pixmaps/gvim.png 0644 root bin
-d none /opt/csw/share/applications 0755 root bin
-f none /opt/csw/share/applications/gvim.desktop 0644 root bin

Deleted: csw/mgar/pkg/gvim/trunk/files/vimtutor.diff
===================================================================
--- csw/mgar/pkg/gvim/trunk/files/vimtutor.diff	2009-01-26 09:33:30 UTC (rev 2907)
+++ csw/mgar/pkg/gvim/trunk/files/vimtutor.diff	2009-01-26 18:24:09 UTC (rev 2908)
@@ -1 +0,0 @@
-link ../../vim/files/vimtutor.diff
\ No newline at end of file

Added: csw/mgar/pkg/gvim/trunk/files/vimtutor.patch
===================================================================
--- csw/mgar/pkg/gvim/trunk/files/vimtutor.patch	                        (rev 0)
+++ csw/mgar/pkg/gvim/trunk/files/vimtutor.patch	2009-01-26 18:24:09 UTC (rev 2908)
@@ -0,0 +1,13 @@
+*** src/vimtutor.o      Thu Dec 18 23:27:44 2008
+--- src/vimtutor        Thu Dec 18 23:28:10 2008
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #! /bin/sh
+  
++ PATH=`dirname $0`:$PATH
++ export PATH
++ 
+  # Start Vim on a copy of the tutor file.
+  
+  # Usage: vimtutor [-g] [xx]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list