From owner-freebsd-ports Mon Sep 25 14:10:22 2000 Delivered-To: freebsd-ports@freebsd.org Received: from pebkac.owp.csus.edu (pebkac.owp.csus.edu [130.86.232.245]) by hub.freebsd.org (Postfix) with ESMTP id 746E837B424; Mon, 25 Sep 2000 14:10:03 -0700 (PDT) Received: from owp.csus.edu (jofybu@[130.86.77.19]) by pebkac.owp.csus.edu (8.9.3/8.9.3) with ESMTP id OAA04147; Mon, 25 Sep 2000 14:09:58 -0700 (PDT) (envelope-from joseph.scott@owp.csus.edu) Message-ID: <39CFBE03.165CC3A1@owp.csus.edu> Date: Mon, 25 Sep 2000 14:05:07 -0700 From: Joseph Scott X-Mailer: Mozilla 4.75 [en] (X11; U; Linux 2.2.12 i386) X-Accept-Language: en,pdf MIME-Version: 1.0 To: ports@freebsd.org Cc: billf@freebsd.org, billf@chc-chimes.com Subject: FreeBSD Port: ethereal-0.8.10 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org I've tried a couple of time to get the net/ethereal port updated. The first time I sent in a PR with patches for the update. That PR sat unloved for so long that a new version of ethereal was released before it was taken care of. With the latest version of I sent an email to the maintainer (billf@freebsd.org) on the 18th of September, outlining what looked like needed to be done to update the port. I'm really new to the update/create ports gig so I'm trying to give as much detail as possible and asking for feedback about how I might do things better. I never got a response from billf@freebsd.org but he did close the now useless PR but didn't update net/ethereal. I'm sure that Bill Fumerola (billf@freebsd.org) is very busy, like most folks in the tech industry. What's the best way to proceed here? As I'm fairly new figuring out the guts of the ports collection (instead of being content with 'make install' :-) I don't know if it would be correct for me to ask to maintain such port as ethereal. However, if Bill does not have the time, would someone else be interested? Another note, someone else has submitted a PR about updating the port to the latest version, see : http://www.FreeBSD.org/cgi/query-pr.cgi?pr=21491 I have not tried out the patches in there yet. For completeness I've included my previous email to Bill. Thanks. -------------------- Given the recent discussion on -ports and -stable about getting ports and other items committed in a timely manner I figured I've put it a plug for updating the net/ethereal port to the latest version :-) When they released 0.8.11 I submitted a PR (ports/20846) for the upgrade. They've now released 0.8.12 so that PR may as well get closed. I'm new to the world of -ports updating/creating/etc, having been a happy user of the ports collections for a few years now. So I'm looking at what's needed to update the net/ethereal port from 0.8.10 (where it is now) to 0.8.12 (the current release version) after having done the obvious (bump the PORTVERSION and do a 'make makesum') : 1. patch-aa no longer applies cleanly so I took a quick look at it and here's what I found, a. The first section of the patch adds the following line : gtk_set_locale (); This line now appears in the 0.8.12 source so it's no longer needed. b. The second part of the patch replaces calls to gdk_font_load with gdk_fontset_load. The gdk_font_load calls have changed a little bit but are still there, along with two other calls to gdk_font_load. I've never used gtk/gdk so I don't know if all of the uses of gdk_font_load need to be replaced, but that's what I'm assuming in the second part of the this diff (if I'm wrong just yank it): --- diff -ruN main.c.orig main.c --- gtk/main.c.orig Mon Sep 18 16:38:21 2000 +++ gtk/main.c Mon Sep 18 16:38:41 2000 @@ -1198,8 +1198,8 @@ /* Try to load the regular and boldface fixed-width fonts */ bold_font_name = boldify(prefs->gui_font_name); - m_r_font = gdk_font_load(prefs->gui_font_name); - m_b_font = gdk_font_load(bold_font_name); + m_r_font = gdk_fontset_load(prefs->gui_font_name); + m_b_font = gdk_fontset_load(bold_font_name); if (m_r_font == NULL || m_b_font == NULL) { /* XXX - pop this up as a dialog box? no */ if (m_r_font == NULL) { @@ -1221,11 +1221,11 @@ gdk_font_unref(m_b_font); } g_free(bold_font_name); - if ((m_r_font = gdk_font_load("6x13")) == NULL) { + if ((m_r_font = gdk_fontset_load("6x13")) == NULL) { fprintf(stderr, "ethereal: Error: font 6x13 not found\n"); exit(1); } - if ((m_b_font = gdk_font_load("6x13bold")) == NULL) { + if ((m_b_font = gdk_fontset_load("6x13bold")) == NULL) { fprintf(stderr, "ethereal: Error: font 6x13bold not found\n"); exit(1); } --- 2. patch-ab doesn't apply cleanly either. All this patch appears to do is change the default font settings for ethereal. This is still needed, I tried it with out the patch on my system and the help docs look like junk. The default font prefs have moved to prefs.c (from gtk/main.h). There is now only one settings that applies to non-Win32 systems. Here's my new patch-ab : --- diff -ruN prefs.c.orig prefs.c --- prefs.c.orig Mon Sep 18 16:45:14 2000 +++ prefs.c Mon Sep 18 16:45:33 2000 @@ -533,7 +533,7 @@ #ifdef WIN32 prefs.gui_font_name = g_strdup("-*-lucida console-medium-r-*-*-*-100-*-*-*-*-*-*"); #else - prefs.gui_font_name = g_strdup("-*-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-*-*"); + prefs.gui_font_name = g_strdup("-*-lucidatypewriter-medium-r-normal-*-*-120-*-*-*-*-iso8859-1,*"); #endif prefs.gui_marked_fg.pixel = 65535; prefs.gui_marked_fg.red = 65535; --- 3. Is it usually considered better to kill these two patches (aa and ab) and create new ones because they are so different, or should they just be updated? 4. There doesn't seem to be any new files installed with this release so PLIST doesn't need any updating. However, I'm hoping for a bullet proof way to generate good PLIST's. I've tried out the example in the porters handbook and Kris Kennaway told me how does it. Do you have a particular way to generate accurate PLIST data? 5. The only remaing diff is for the net/ethereal/Makefile : --- diff -ruN Makefile.orig Makefile --- Makefile.orig Mon Sep 18 16:58:16 2000 +++ Makefile Mon Sep 18 16:57:59 2000 @@ -6,7 +6,7 @@ # PORTNAME= ethereal -PORTVERSION= 0.8.10 +PORTVERSION= 0.8.12 CATEGORIES= net ipv6 MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \ http://www.linuxberg.com/files/x11/network/ \ --- 6. I haven't sent in a PR for this data, do you think that's something that's usefull instead of directly contacting the maintainer first? Do you have helpful hints to someone who's trying to do more in helping out with the ports collection (and the that end FreeBSD in general)? Thanks. -- Joseph Scott joseph.scott@owp.csus.edu The Office Of Water Programs - CSU Sacramento To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message