From owner-freebsd-ports Mon Jun 26 8:20:49 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 81F6F37B908 for ; Mon, 26 Jun 2000 08:20:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA56895; Mon, 26 Jun 2000 08:20:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5161337B961; Mon, 26 Jun 2000 08:18:39 -0700 (PDT) Message-Id: <20000626151839.5161337B961@hub.freebsd.org> Date: Mon, 26 Jun 2000 08:18:39 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/19526: Update port: x11-fm/vide Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 19526 >Category: ports >Synopsis: Update port: x11-fm/vide >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: Mon Jun 26 08:20:05 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - USE_XLIB -> USE_X_PREFIX - Use GTK_CONFIG instead of hardcoded gtk12-config - Replace external rxvt/vim with more common xterm/vi - Fix pkg/PLIST New file: patches/patch-ad patches/patch-ae patches/patch-af Remove file: patches/patch-ab Contacted maintainer with no responce. >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-fm/vide/Makefile x11-fm/vide/Makefile --- /usr/ports/x11-fm/vide/Makefile Sat Jun 10 07:25:04 2000 +++ x11-fm/vide/Makefile Sat Jun 17 14:28:08 2000 @@ -14,10 +14,18 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -CFLAGS+= -DHAVE_SYS_PARAM_H -MANCOMPRESSED= yes -USE_XLIB= yes -GNU_CONFIGURE= yes +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +USE_X_PREFIX= yes USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-DHAVE_SYS_PARAM_H" \ + GTK_CONFIG="${GTK_CONFIG}" +CONFIGURE_ARGS= --disable-gtktest + +PLIST_SUB= VERSION=${PORTVERSION} + +post-patch: + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/*.c .include diff -urN /usr/ports/x11-fm/vide/patches/patch-ab x11-fm/vide/patches/patch-ab --- /usr/ports/x11-fm/vide/patches/patch-ab Sat Jun 10 07:25:05 2000 +++ x11-fm/vide/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,90 +0,0 @@ ---- configure.orig Wed May 17 21:49:12 2000 -+++ configure Wed May 17 21:50:49 2000 -@@ -1551,18 +1551,18 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config - fi - fi - -- # Extract the first word of "gtk-config", so it can be a program name with args. --set dummy gtk-config; ac_word=$2 -+ # Extract the first word of "gtk12-config", so it can be a program name with args. -+set dummy gtk12-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1568: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then -@@ -1648,16 +1648,16 @@ - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { -- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ printf("\n*** 'gtk12-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); -- printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** was found! If gtk12-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); -- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** If gtk12-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk12-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -@@ -1688,10 +1688,10 @@ - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** probably means that the wrong copy of the gtk12-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -- printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** correct copy of gtk12-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } -@@ -1722,10 +1722,10 @@ - else - echo "$ac_t""no" 1>&6 - if test "$GTK_CONFIG" = "no" ; then -- echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** The gtk12-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" -- echo "*** full path to gtk-config." -+ echo "*** full path to gtk12-config." - else - if test -f conf.gtktest ; then - : -@@ -1767,7 +1767,7 @@ - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -+ echo "*** may want to edit the gtk12-config script: $GTK_CONFIG" - fi - rm -f conftest* - CFLAGS="$ac_save_CFLAGS" -@@ -1776,7 +1776,7 @@ - fi - GTK_CFLAGS="" - GTK_LIBS="" -- { echo "configure: error: Cannot find GTK: Is gtk-config in path?" 1>&2; exit 1; } -+ { echo "configure: error: Cannot find GTK: Is gtk12-config in path?" 1>&2; exit 1; } - fi - - diff -urN /usr/ports/x11-fm/vide/patches/patch-ac x11-fm/vide/patches/patch-ac --- /usr/ports/x11-fm/vide/patches/patch-ac Sat Jun 17 09:09:33 2000 +++ x11-fm/vide/patches/patch-ac Sat Jun 17 15:20:10 2000 @@ -1,15 +1,16 @@ ---- src/vide.c.orig Sun Jun 11 19:04:56 2000 -+++ src/vide.c Sun Jun 11 19:06:53 2000 -@@ -224,6 +224,8 @@ +--- 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 +245,7 @@ +@@ -243,7 +246,7 @@ gdk_color_parse ("yellow", &TAG_COLOR); gdk_color_parse ("wheat", &DRAG_HILIGHT); COMMAND_TEXT_FONT = @@ -18,3 +19,55 @@ 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 -urN /usr/ports/x11-fm/vide/patches/patch-ad x11-fm/vide/patches/patch-ad --- /usr/ports/x11-fm/vide/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ x11-fm/vide/patches/patch-ad Sat Jun 17 15:57:47 2000 @@ -0,0 +1,29 @@ +--- 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 -urN /usr/ports/x11-fm/vide/patches/patch-ae x11-fm/vide/patches/patch-ae --- /usr/ports/x11-fm/vide/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ x11-fm/vide/patches/patch-ae Sat Jun 17 14:27:08 2000 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/x11-fm/vide/patches/patch-af x11-fm/vide/patches/patch-af --- /usr/ports/x11-fm/vide/patches/patch-af Thu Jan 1 09:00:00 1970 +++ x11-fm/vide/patches/patch-af Sat Jun 17 15:57:03 2000 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/x11-fm/vide/pkg/PLIST x11-fm/vide/pkg/PLIST --- /usr/ports/x11-fm/vide/pkg/PLIST Sat Jun 10 07:25:05 2000 +++ x11-fm/vide/pkg/PLIST Sat Jun 17 14:04:48 2000 @@ -1 +1,4 @@ +bin/pauseme bin/vide +share/vide/vide%%VERSION%%.txt +@dirrm share/vide >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message