Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Aug 2010 05:17:20 GMT
From:      Yuri <yuri@tsoft.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/149954: x11/xmx: port update
Message-ID:  <201008250517.o7P5HK50004590@www.freebsd.org>
Resent-Message-ID: <201008250520.o7P5K6Vu015007@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         149954
>Category:       ports
>Synopsis:       x11/xmx: port update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 25 05:20:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Yuri
>Release:        8.1-STABLE amd64
>Organization:
n/a
>Environment:
>Description:
x11/xmx is currently broken on amd64. Rather than marking it such, I developed a patch that fixes the problem.

Please apply the attached patch.

Thanks,
Yuri

PS: xmx still seems somewhat broken in that it has sporadic failures. But at least with this patch it compiled and runs without segvs.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rNu Makefile.orig Makefile
--- Makefile.orig	2010-08-11 18:51:07.000000000 -0700
+++ Makefile	2010-08-24 22:13:36.000000000 -0700
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmx
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
 EXTRACT_SUFX=	.tar.Z
diff -rNu files/patch-fix-amd64.orig files/patch-fix-amd64
--- files/patch-fix-amd64	1969-12-31 16:00:00.000000000 -0800
+++ files/patch-fix-amd64	2010-08-24 21:58:12.000000000 -0700
@@ -0,0 +1,50 @@
+diff -ru bufio.c.orig bufio.c
+--- bufio.c.orig	1994-04-13 09:22:21.000000000 -0700
++++ bufio.c	2010-08-24 21:45:48.000000000 -0700
+@@ -35,9 +35,6 @@
+ static void	adjust();
+ static void	trim_high_water();
+ 
+-extern char *	malloc();
+-extern char *	calloc();
+-
+ /************************************************************************
+ *									*
+ *   local constants							*
+diff -ru error.c.orig error.c
+--- error.c.orig	1994-04-13 09:22:22.000000000 -0700
++++ error.c	2010-08-24 21:46:53.000000000 -0700
+@@ -16,6 +16,7 @@
+ *									*
+ ************************************************************************/
+ #include <stdio.h>
++#include "xmx.h"
+ 
+ static int print = 1;
+ 
+diff -ru xmx.h.orig xmx.h
+--- xmx.h.orig	1994-04-13 09:22:24.000000000 -0700
++++ xmx.h	2010-08-24 21:46:14.000000000 -0700
+@@ -38,6 +38,11 @@
+ 
+ #define REQHISTORY	64	/* size of per client history */
+ 
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <strings.h>
++
+ typedef unsigned long rid_t;
+ typedef unsigned long atom_t;
+ typedef unsigned long pixel_t;
+@@ -104,10 +109,6 @@
+ *									*
+ ************************************************************************/
+ 
+-/* system */
+-char *		malloc();
+-char *		calloc();
+-
+ /* bufio.c */
+ 
+ void		buf_init();


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008250517.o7P5HK50004590>