Attachment 13235 Details for Bug 25294 – vide.diff

[patch] vide.diff

vide.diff (text/plain; charset=us-ascii), 11.12 KB, created by clive on 2001-02-26 02:54:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: clive

Created: 2001-02-26 02:54:09 UTC

Size: 11.12 KB

patch

obsolete

>diff -ruN vide~/Makefile vide/Makefile
>--- vide~/Makefile	Thu Oct  5 14:42:35 2000
>+++ vide/Makefile	Sun Feb 25 17:25:14 2001
>@@ -6,11 +6,14 @@
> #
> 
> PORTNAME=	vide
>-PORTVERSION=	0.2.6
>+PORTVERSION=	0.5
> CATEGORIES=	x11-fm
> MASTER_SITES=	http://vide.sourceforge.net/
> 
>-MAINTAINER=	careilly@thecia.ie
>+MAINTAINER=	sergeiga@yahoo.com
>+
>+RUN_DEPENDS=	vim:${PORTSDIR}/editors/vim5
>+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
> 
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
>@@ -19,6 +22,8 @@
> CONFIGURE_ENV=	CPPFLAGS="-DHAVE_SYS_PARAM_H"
> 
> PLIST_SUB=	VERSION=${PORTVERSION}
>+
>+PATCH_WRKSRC=	${WRKSRC}/src
> 
> post-patch:
> 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/*.c
>diff -ruN vide~/distinfo vide/distinfo
>--- vide~/distinfo	Sat Jun 10 06:25:04 2000
>+++ vide/distinfo	Sun Feb 25 16:39:08 2001
>@@ -1 +1 @@
>-MD5 (vide-0.2.6.tar.gz) = cb8479b92e169e15035efa5f9c71c5f3
>+MD5 (vide-0.5.tar.gz) = e2141aea2576157e9df4f7a94aa3a8b2
>diff -ruN vide~/files/patch-aa vide/files/patch-aa
>--- vide~/files/patch-aa	Sat Jun 10 06:25:05 2000
>+++ vide/files/patch-aa	Thu Jan  1 08:00:00 1970
>@@ -1,16 +0,0 @@
>---- src/search_mode.c.orig	Wed May 17 20:28:02 2000
>-+++ src/search_mode.c	Wed May 17 20:30:57 2000
>-@@ -16,6 +16,13 @@
>-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
>-  */
>- 
>-+#ifdef HAVE_SYS_PARAM_H
>-+#include <sys/param.h>
>-+#endif
>-+
>-+#if (defined(BSD) && (BSD>=199103))
>-+#include <sys/types.h>
>-+#endif
>- #include <fnmatch.h>
>- #include<stdio.h>
>- #include<string.h>
>diff -ruN vide~/files/patch-ac vide/files/patch-ac
>--- vide~/files/patch-ac	Thu Jun 29 00:36:54 2000
>+++ vide/files/patch-ac	Thu Jan  1 08:00:00 1970
>@@ -1,73 +0,0 @@
>---- src/vide.c.orig	Thu May 11 03:04:39 2000
>-+++ src/vide.c	Sat Jun 17 15:19:25 2000
>-@@ -224,6 +224,9 @@
>- 
>- 	getcwd(current_dir, sizeof(current_dir));
>- 
>-+  /* i18n support */
>-+  gtk_set_locale();
>-+
>-   /* Set up handler for sigchild so that we don't get zombies */
>-   new_action.sa_handler = received_sigchild;
>-   sigemptyset (&new_action.sa_mask);
>-@@ -243,7 +246,7 @@
>-   gdk_color_parse ("yellow", &TAG_COLOR);
>-   gdk_color_parse ("wheat", &DRAG_HILIGHT);
>-   COMMAND_TEXT_FONT =
>--    gdk_font_load ("-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*-*");
>-+    gdk_fontset_load ("-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*-*,*");
>- 
>-   cfg.filetypes = NULL;
>-   cfg.bookmarks = NULL;
>-@@ -259,7 +262,7 @@
>-       cfg.confirm_delete = TRUE; // not used
>-       cfg.confirm_overwrite = TRUE; // not used
>-       cfg.start_with_cwd = FALSE; 
>--      strncpy (cfg.viewer_command, "rxvt -e vim",
>-+      strncpy (cfg.viewer_command, "xterm -e vi",
>- 	       sizeof (cfg.viewer_command));
>-       cfg.window_width = 640;
>-       cfg.window_height = 480;
>-@@ -268,7 +271,7 @@
>-       cfg.divide_popup_menu = FALSE; // not used
>-       cfg.dir_history_max_length = 15; 
>-       cfg.command_history_max_length = 10;
>--      strncpy (cfg.xterm_command, "rxvt", sizeof (cfg.xterm_command));
>-+      strncpy (cfg.xterm_command, "xterm", sizeof (cfg.xterm_command));
>-       chdir (getenv ("HOME"));
>-       getcwd (app.left_view.dir, PATH_MAX);
>-       strncpy (app.right_view.dir, app.left_view.dir, PATH_MAX);
>-@@ -280,9 +283,9 @@
>-     {
>-       /* Setup some default filetypes */
>-       add_filetype ("jpeg,jpg,png,xpm,gif", "xv,gimp", "Image Files");
>--      add_filetype ("c,cpp,h,pl,java, py", "x vim", "Source Code Files");
>-+      add_filetype ("c,cpp,h,pl,java, py", "x vi", "Source Code Files");
>-       add_filetype ("o,so,a", "x nm %f | less", "Object Files");
>--      add_filetype ("htm,html,php", "netscape,x vim", "HTML Documents");
>-+      add_filetype ("htm,html,php", "netscape,x vi", "HTML Documents");
>-       add_filetype ("tar.gz,tgz", "x tar xzvf %f ,x tar tzvf %f | less",
>- 		    "Gzipped Tarballs");
>- 			add_filetype("zip, Z", "x unzip %f", "Zip");
>-@@ -310,7 +313,7 @@
>-       gchar trash_com[128];
>- 			gchar memo_com[128];
>-       g_snprintf (trash_com, 128, "mv %%f %s", cfg.trash);
>--			g_snprintf (memo_com, 128, "rxvt -e vim %s/memo", cfg.config_dir);
>-+			g_snprintf (memo_com, 128, "xterm -e vi %s/memo", cfg.config_dir);
>- 
>-       add_user_command (" ", "NULL");
>- 			add_user_command ("Memo", memo_com);
>-@@ -332,9 +335,9 @@
>- 	}
>- 	if(!read_command_mode_file())
>- 	{
>--		add_command("mutt", "exe rxvt -e mutt");
>--		add_command("ps", "exe rxvt -e top");
>--		add_command("vi", "exe rxvt -e vim");
>-+		add_command("mutt", "exe xterm -e mutt");
>-+		add_command("ps", "exe xterm -e top");
>-+		add_command("vi", "exe xterm -e vi");
>- 		add_command("Backup", "/~$");
>- 	  add_command("touch", "exe touch %{Name of new file.}");
>- 	}
>diff -ruN vide~/files/patch-ad vide/files/patch-ad
>--- vide~/files/patch-ad	Thu Jun 29 00:36:54 2000
>+++ vide/files/patch-ad	Thu Jan  1 08:00:00 1970
>@@ -1,29 +0,0 @@
>---- src/command_mode.c.orig	Sat Jun 17 15:24:19 2000
>-+++ src/command_mode.c	Sat Jun 17 15:57:34 2000
>-@@ -201,7 +201,7 @@
>- 	buf[4] = '\0';
>- 	if(!strcmp(buf, "grep"))
>- 	{
>--		g_snprintf(buf, sizeof(buf), "vim \"+ grep %s\"", command);
>-+		g_snprintf(buf, sizeof(buf), "vi \"+ grep %s\"", command);
>- 		exec_in_xterm(buf);
>- 	}
>- 
>-@@ -280,7 +280,7 @@
>- 
>- 	if(!strcmp(command, "h"))
>- 	{
>--		g_snprintf(buf, sizeof(buf), "%s -e vim %s/vide%s.txt",
>-+		g_snprintf(buf, sizeof(buf), "%s -e vi %s/vide%s.txt",
>- 				cfg.xterm_command, cfg.config_dir, VERSION);
>- 		file_exec(buf);
>- 	}
>-@@ -363,7 +363,7 @@
>- 	/* load file into vi */
>- 	if(!strcmp(command, "e"))
>- 	{
>--		g_snprintf(buf, sizeof(buf), "%s -e vim \"%s\"", cfg.xterm_command, file);
>-+		g_snprintf(buf, sizeof(buf), "%s -e vi \"%s\"", cfg.xterm_command, file);
>- 		file_exec(buf);  
>- 		
>- /*		g_snprintf(buf, sizeof(buf), ":e %s/%s\r", curr_view->dir, file);
>diff -ruN vide~/files/patch-ae vide/files/patch-ae
>--- vide~/files/patch-ae	Thu Jun 29 00:36:54 2000
>+++ vide/files/patch-ae	Thu Jan  1 08:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/config_files.c.orig	Thu Apr 27 04:12:22 2000
>-+++ src/config_files.c	Sat Jun 17 14:26:55 2000
>-@@ -60,7 +60,7 @@
>- {
>- 	gchar command[PATH_MAX];
>- 
>--	g_snprintf(command, sizeof(command), "cp /usr/local/share/vide/vide%s.txt %s",
>-+	g_snprintf(command, sizeof(command), "cp %%PREFIX%%/share/vide/vide%s.txt %s",
>- 			VERSION, help_file);
>- 	file_exec(command);
>- 
>diff -ruN vide~/files/patch-af vide/files/patch-af
>--- vide~/files/patch-af	Thu Jun 29 00:36:54 2000
>+++ vide/files/patch-af	Thu Jan  1 08:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/main_menu.c.orig	Sat Jun 17 15:24:20 2000
>-+++ src/main_menu.c	Sat Jun 17 15:56:55 2000
>-@@ -27,7 +27,7 @@
>- help_cb(GtkWidget *widget, gpointer data)
>- {
>- 	gchar help_command[NAME_MAX];
>--	g_snprintf(help_command, sizeof(help_command), "%s -e vim %s/vide%s.txt",
>-+	g_snprintf(help_command, sizeof(help_command), "%s -e vi %s/vide%s.txt",
>- 			cfg.xterm_command, cfg.config_dir, VERSION); 
>- 	file_exec(help_command);
>- 
>diff -ruN vide~/files/patch-config_files.c vide/files/patch-config_files.c
>--- vide~/files/patch-config_files.c	Thu Jan  1 08:00:00 1970
>+++ vide/files/patch-config_files.c	Sun Feb 25 16:35:49 2001
>@@ -0,0 +1,35 @@
>+*** config_files.c.orig	Wed Feb 21 22:23:30 2001
>+--- config_files.c	Wed Feb 21 22:24:42 2001
>+***************
>+*** 16,21 ****
>+--- 16,27 ----
>+   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
>+   */
>+  
>++ #include<sys/param.h>
>++ #if defined(__FreeBSD_version)
>++     #define CP_HELP "cp %%PREFIX%%/share/vide/vide%s.txt %s"
>++ #else
>++     #define CP_HELP "cp /usr/local/share/vide/vide%s.txt %s"
>++ #endif
>+  
>+  #include <stdlib.h>
>+  #include <stdio.h>
>+***************
>+*** 60,67 ****
>+  {
>+  	gchar command[PATH_MAX];
>+  
>+! 	g_snprintf(command, sizeof(command), "cp /usr/local/share/vide/vide%s.txt %s",
>+! 			VERSION, help_file);
>+  	file_exec(command);
>+  
>+  }
>+--- 66,72 ----
>+  {
>+  	gchar command[PATH_MAX];
>+  
>+! 	g_snprintf(command, sizeof(command), CP_HELP, VERSION, help_file);
>+  	file_exec(command);
>+  
>+  }
>diff -ruN vide~/files/patch-search_mode.c vide/files/patch-search_mode.c
>--- vide~/files/patch-search_mode.c	Thu Jan  1 08:00:00 1970
>+++ vide/files/patch-search_mode.c	Sun Feb 25 16:35:49 2001
>@@ -0,0 +1,17 @@
>+*** search_mode.c.orig	Tue Feb 20 00:14:47 2001
>+--- search_mode.c	Tue Feb 20 00:05:23 2001
>+***************
>+*** 16,21 ****
>+--- 16,27 ----
>+   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
>+   */
>+  
>++ #include<sys/param.h>
>++ #if (defined(BSD) && (BSD>=199103))
>++     /* Required by regex.h on FreeBSD 4.2 at least. */
>++     #include<sys/types.h>
>++ #endif
>++ 
>+  #include <fnmatch.h>
>+  #include<stdio.h>
>+  #include<string.h>
>diff -ruN vide~/files/patch-vide.c vide/files/patch-vide.c
>--- vide~/files/patch-vide.c	Thu Jan  1 08:00:00 1970
>+++ vide/files/patch-vide.c	Sun Feb 25 16:35:49 2001
>@@ -0,0 +1,71 @@
>+*** vide.c.orig	Wed Feb 21 22:20:33 2001
>+--- vide.c	Wed Feb 21 22:21:03 2001
>+***************
>+*** 16,22 ****
>+   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
>+   */
>+  
>+! 
>+  
>+  #include <string.h>
>+  #include <unistd.h>
>+--- 16,29 ----
>+   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
>+   */
>+  
>+! #include<sys/param.h>
>+! #if defined(__FreeBSD_version)
>+!     #define RXVT_VIM "xterm -e vim"
>+!     #define RXVT "xterm"
>+! #else
>+!     #define RXVT_VIM "rxvt -e vim"
>+!     #define RXVT "rxvt"
>+! #endif
>+  
>+  #include <string.h>
>+  #include <unistd.h>
>+***************
>+*** 280,285 ****
>+--- 287,294 ----
>+  
>+  	getcwd(current_dir, sizeof(current_dir));
>+  
>++   /* i18n support */
>++   gtk_set_locale();
>+  
>+    /* Set up handler for sigchild so that we don't get zombies */
>+    new_action.sa_handler = received_sigchild;
>+***************
>+*** 329,335 ****
>+        cfg.start_with_cwd = FALSE; 
>+  			strncpy(cfg.vi_clone, "vim", sizeof(cfg.vi_clone));
>+  			strncpy(cfg.vi_command, "vim", sizeof(cfg.vi_command));
>+!       strncpy (cfg.viewer_command, "rxvt -e vim",
>+  	       sizeof (cfg.viewer_command));
>+        cfg.window_width = 640;
>+        cfg.window_height = 480;
>+--- 338,344 ----
>+        cfg.start_with_cwd = FALSE; 
>+  			strncpy(cfg.vi_clone, "vim", sizeof(cfg.vi_clone));
>+  			strncpy(cfg.vi_command, "vim", sizeof(cfg.vi_command));
>+!       strncpy (cfg.viewer_command, RXVT_VIM,
>+  	       sizeof (cfg.viewer_command));
>+        cfg.window_width = 640;
>+        cfg.window_height = 480;
>+***************
>+*** 337,343 ****
>+        cfg.window_ypos = 0;
>+        cfg.dir_history_max_length = 15; 
>+        cfg.command_history_max_length = 10;
>+!       strncpy (cfg.xterm_command, "rxvt", sizeof (cfg.xterm_command));
>+        chdir (getenv ("HOME"));
>+        getcwd (app.left_view.dir, PATH_MAX);
>+        strncpy (app.right_view.dir, app.left_view.dir, PATH_MAX);
>+--- 346,352 ----
>+        cfg.window_ypos = 0;
>+        cfg.dir_history_max_length = 15; 
>+        cfg.command_history_max_length = 10;
>+!       strncpy (cfg.xterm_command, RXVT, sizeof (cfg.xterm_command));
>+        chdir (getenv ("HOME"));
>+        getcwd (app.left_view.dir, PATH_MAX);
>+        strncpy (app.right_view.dir, app.left_view.dir, PATH_MAX);
>diff -ruN vide~/pkg-descr vide/pkg-descr
>--- vide~/pkg-descr	Sat Jun 10 06:25:05 2000
>+++ vide/pkg-descr	Sun Feb 25 16:35:49 2001
>@@ -6,5 +6,5 @@
> 
> WWW: http://vide.sourceforge.net/
> 
>-- Colman
>-careilly@thecia.ie
>+- Sergei Gnezdov
>+sergeiga@yahoo.com

Actions: View | Diff

Attachments on bug 25294: 13234 | 13235