From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 22 02:20:16 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CDAF16A4CE for ; Fri, 22 Apr 2005 02:20:16 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E425B43D41 for ; Fri, 22 Apr 2005 02:20:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3M2KFjl096478 for ; Fri, 22 Apr 2005 02:20:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3M2KFS2096477; Fri, 22 Apr 2005 02:20:15 GMT (envelope-from gnats) Resent-Date: Fri, 22 Apr 2005 02:20:15 GMT Resent-Message-Id: <200504220220.j3M2KFS2096477@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Stone Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3054B16A4CE for ; Fri, 22 Apr 2005 02:18:49 +0000 (GMT) Received: from dfmm.org (treehorn.dfmm.org [66.180.195.213]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB2E843D1D for ; Fri, 22 Apr 2005 02:18:48 +0000 (GMT) (envelope-from jason-fbsd-ports-gale@shalott.net) Received: (qmail 74601 invoked by uid 1000); 22 Apr 2005 02:18:46 -0000 Message-Id: <20050422021846.74600.qmail@treehorn.dfmm.org> Date: 22 Apr 2005 02:18:46 -0000 From: Jason Stone To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80230: unbreak gale port on 4.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jason Stone List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 02:20:16 -0000 >Number: 80230 >Category: ports >Synopsis: unbreak gale port on 4.x >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Apr 22 02:20:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jason Stone >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD treehorn.dfmm.org 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Thu Mar 3 01:13:08 PST 2005 root@treehorn.dfmm.org:/usr/obj/usr/src/sys/JKERN i386 >Description: unbreak gale on 4.x >How-To-Repeat: >Fix: diff -ruN gale.orig/Makefile gale/Makefile --- gale.orig/Makefile Thu Apr 21 03:19:42 2005 +++ gale/Makefile Thu Apr 21 19:16:01 2005 @@ -7,6 +7,7 @@ PORTNAME= gale PORTVERSION= 0.99f +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://download.ofb.net/${PORTNAME}/ DISTNAME= ${PORTNAME}-${PORTVERSION}ruit @@ -34,14 +35,13 @@ .include .if ${OSVERSION} < 500039 -IGNORE= requires wchar functions for compilation +CFLAGS+= -DNEED_WCWIDTH .endif # cheesy hack - test-oop doesn't build, but we don't care. pre-configure: ${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \ ${WRKSRC}/liboop/Makefile.in - ${ECHO} -n > ${WRKSRC}/libgale/wcwidth.c post-install: @${CAT} ${PKGMESSAGE} diff -ruN gale.orig/files/patch-wcwidth gale/files/patch-wcwidth --- gale.orig/files/patch-wcwidth Wed Dec 31 16:00:00 1969 +++ gale/files/patch-wcwidth Thu Apr 21 15:05:11 2005 @@ -0,0 +1,15 @@ +--- libgale/wcwidth.c.orig Mon Dec 30 21:08:50 2002 ++++ libgale/wcwidth.c Thu Apr 21 15:02:47 2005 +@@ -6,6 +6,7 @@ + * Markus Kuhn -- 2000-02-08 -- public domain + */ + ++#ifdef NEED_WCWIDTH + #include "gale/compat.h" + + /* These functions define the column width of an ISO 10646 character +@@ -126,3 +127,4 @@ + + return width; + } ++#endif >Release-Note: >Audit-Trail: >Unformatted: