From mezz@ns1.mezzweb.com  Mon Mar 22 10:13:33 2004
Return-Path: <mezz@ns1.mezzweb.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3B77016A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Mar 2004 10:13:33 -0800 (PST)
Received: from ns1.mezzweb.com (ip68-103-32-11.ks.ok.cox.net [68.103.32.11])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9497043D39
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Mar 2004 10:13:32 -0800 (PST)
	(envelope-from mezz@ns1.mezzweb.com)
Received: from ns1.mezzweb.com (localhost [127.0.0.1])
	by ns1.mezzweb.com (8.12.10/8.12.10) with ESMTP id i2MHjwKm046647;
	Mon, 22 Mar 2004 11:45:58 -0600 (CST)
	(envelope-from mezz@ns1.mezzweb.com)
Received: (from mezz@localhost)
	by ns1.mezzweb.com (8.12.10/8.12.10/Submit) id i2MHjw07046646;
	Mon, 22 Mar 2004 11:45:58 -0600 (CST)
	(envelope-from mezz)
Message-Id: <200403221745.i2MHjw07046646@ns1.mezzweb.com>
Date: Mon, 22 Mar 2004 11:45:58 -0600 (CST)
From: Jeremy Messenger <mezz7@cox.net>
Reply-To: Jeremy Messenger <mezz7@cox.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jylefort@brutele.be
Subject: Patch port: editors/beaver, fix the build w/ GTK 2.4 and a major clean up.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64587
>Category:       ports
>Synopsis:       Patch port: editors/beaver, fix the build w/ GTK 2.4 and a major clean up.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 22 10:20:17 PST 2004
>Closed-Date:    Sun Mar 28 09:47:09 PST 2004
>Last-Modified:  Sun Mar 28 09:47:09 PST 2004
>Originator:     Mezz
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Thu Jan 29
23:14:45 CST 2004 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386

>Description:
A major clean up and fixes.
	- Fix the build with GTK 2.4
	- Fix the language installtion
	- Fix the memory bugs that cause the crash in -CURRENT with
	  malloc.conf->AJ, added a new patch (files/patch-src::conf.c). [1]
	- Correct the pkg-plist
	- More use the stuff from bsd.gnome.mk, so remove few stuff from the
	  post-patch since the gnomehack and gnomeprefix will take care of it.
	- Clean up the pkg-descr by remove the quote and look better in 80
	  column screen.
	- Add SIZE data.
	- Bump the PORTREVISION, because of pkg-plist and other fixes.

[1] Obtained from:	Beaver CVS

>How-To-Repeat:
n/a

>Fix:
New file:
	- files/patch-src::conf.c


--- beaver.diff begins here ---
diff -urN beaver.orig/Makefile beaver/Makefile
--- beaver.orig/Makefile	Wed Feb  4 13:40:22 2004
+++ beaver/Makefile	Tue Mar 15 03:07:15 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=		beaver
 PORTVERSION=		0.3.1
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,17 +15,14 @@
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		A programmer's text editor for GTK+ 2.0
 
-USE_GNOME=		gtk20
-
 USE_X_PREFIX=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 USE_REINPLACE=		yes
-
-LIB_DEPENDS=		gtksourceview-1.0.0:${PORTSDIR}/x11-toolkits/gtksourceview
+USE_GNOME=		gnomehack gnomeprefix gtk20 gtksourceview lthack
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/applications|/gnome/applications|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|/pixmaps|/gnome/pixmaps|' ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
 
 .include <bsd.port.mk>
diff -urN beaver.orig/distinfo beaver/distinfo
--- beaver.orig/distinfo	Wed Jun 18 14:25:40 2003
+++ beaver/distinfo	Tue Mar 15 02:54:35 2004
@@ -1 +1,2 @@
 MD5 (beaver-0.3.1.tar.gz) = b7281a4e9a4a802111aa2854fa5e7541
+SIZE (beaver-0.3.1.tar.gz) = 473502
diff -urN beaver.orig/files/patch-src::conf.c beaver/files/patch-src::conf.c
--- beaver.orig/files/patch-src::conf.c	Wed Dec 31 18:00:00 1969
+++ beaver/files/patch-src::conf.c	Tue Mar 15 02:40:24 2004
@@ -0,0 +1,74 @@
+--- src/conf.c.orig	Tue Mar 15 02:40:04 2004
++++ src/conf.c	Tue Mar 15 02:40:07 2004
+@@ -183,6 +183,7 @@
+   t_conf	conf;
+   gint		ret_val;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (get_conf(key, &conf))
+     {
+       free_conf(&conf);
+@@ -198,6 +199,7 @@
+   t_conf	conf;
+   gint		ret_val;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (get_conf(key, &conf))
+     {
+       free_conf(&conf);
+@@ -213,6 +215,7 @@
+   t_conf	conf;
+   gboolean	ret_val;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (get_conf(key, &conf))
+     {
+       free_conf(&conf);
+@@ -231,6 +234,7 @@
+   t_conf	conf;
+   gboolean	ret_val;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (get_conf(key, &conf))
+     {
+       free_conf(&conf);
+@@ -249,6 +253,7 @@
+   t_conf	conf;
+   gchar		*ret_val;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (get_conf(key, &conf))
+     {
+       free_conf(&conf);
+@@ -266,6 +271,7 @@
+   t_conf	conf;
+   gchar		*ret_val;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (get_conf(key, &conf))
+     {
+       free_conf(&conf);
+@@ -386,6 +392,7 @@
+ {
+   t_conf	conf;
+ 
++  bzero( &conf, sizeof(conf) );
+   conf.line = g_strdup_printf("%d", value);
+   if (set_conf(key, &conf))
+     {
+@@ -400,6 +407,7 @@
+ {
+   t_conf	conf;
+ 
++  bzero( &conf, sizeof(conf) );
+   if (value)
+     conf.line = g_strdup("TRUE");
+   else
+@@ -417,6 +425,7 @@
+ {
+   t_conf	conf;
+ 
++  bzero( &conf, sizeof(conf) );
+   conf.line = g_strdup(value);
+   if (set_conf(key, &conf))
+     {
diff -urN beaver.orig/pkg-descr beaver/pkg-descr
--- beaver.orig/pkg-descr	Sun Apr 13 00:31:27 2003
+++ beaver/pkg-descr	Tue Mar 15 03:06:03 2004
@@ -1,15 +1,9 @@
-From the homepage:
-
-"Beaver is an Early AdVanced EditoR, for Linux and other Unix (and
-even Windows); in other words, it's a text editor that is intended to
-be lightweight, but full of useful features for programming, from
-websites editing to C coding. It is based upon the GTK+ toolkit,
-supports many languages through config files and offers functions such
-as automatic indentation, completion and correction, or syntax
-highlighting. In fact, it is 100% compatible with the Ultraedit's
-wordfile.txt files, and has its own mini macro language."
+Beaver is an Early AdVanced EditoR, for Linux and other Unix (and even Windows);
+in other words, it's a text editor that is intended to be lightweight, but full
+of useful features for programming, from websites editing to C coding. It is
+based upon the GTK+ toolkit, supports many languages through config files and
+offers functions such as automatic indentation, completion and correction, or
+syntax highlighting. In fact, it is 100% compatible with the Ultraedit's
+wordfile.txt files, and has its own mini macro language.
 
 WWW: http://www.nongnu.org/beaver/
-
-- Jean-Yves Lefort
-jylefort@brutele.be
diff -urN beaver.orig/pkg-plist beaver/pkg-plist
--- beaver.orig/pkg-plist	Wed Jun 18 14:25:40 2003
+++ beaver/pkg-plist	Tue Mar 15 03:08:27 2004
@@ -1,4 +1,4 @@
 bin/beaver
-share/gnome/pixmaps/beaver.png
 share/gnome/applications/beaver.desktop
-@dirrm share/beaver
+share/gnome/pixmaps/beaver.png
+share/locale/de/LC_MESSAGES/beaver.mo
--- beaver.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Sun Mar 28 09:46:57 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64587 
>Unformatted:
