From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 25 21:10:09 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 79AE1ECB for ; Fri, 25 Jan 2013 21:10:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 245449B8 for ; Fri, 25 Jan 2013 21:10:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0PLA9Oo075211 for ; Fri, 25 Jan 2013 21:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0PLA9RF075210; Fri, 25 Jan 2013 21:10:09 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jan 2013 21:10:09 GMT Resent-Message-Id: <201301252110.r0PLA9RF075210@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 18C85C62 for ; Fri, 25 Jan 2013 21:03:14 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id D1EC493F for ; Fri, 25 Jan 2013 21:03:13 +0000 (UTC) Received: from localhost.localdomain (ZT034163.ppp.dion.ne.jp [59.128.34.163]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id 9D2FF23C031 for ; Sat, 26 Jan 2013 06:03:08 +0900 (JST) Message-Id: <20130126054946.045e582f778870d13298caeb@yahoo.com> Date: Sat, 26 Jan 2013 05:49:46 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/175596: x11/xcoloredit: Update MASTER_SITES X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 21:10:09 -0000 >Number: 175596 >Category: ports >Synopsis: x11/xcoloredit: Update MASTER_SITES >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 25 21:10:08 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p11 i386 >Organization: >Environment: >Description: - Update MASTER_SITES >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/xcoloredit/Makefile x11/xcoloredit/Makefile --- /usr/ports/x11/xcoloredit/Makefile 2012-11-08 10:08:58.000000000 +0900 +++ x11/xcoloredit/Makefile 2013-01-12 22:27:20.000000000 +0900 @@ -9,17 +9,19 @@ PORTVERSION= 1.2 PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.x.org/R5contrib/ +MASTER_SITES= XCONTRIB/../R5contrib DISTNAME= ${PORTNAME} EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Find colour values by graphical colour mixing -USE_IMAKE= yes USE_XORG= ice sm x11 xaw xext xmu xpm xt -MAN1= xcoloredit.1 +USE_IMAKE= yes +MAKE_JOBS_SAFE= yes + MANCOMPRESSED= yes +MAN1= xcoloredit.1 PLIST_FILES= bin/xcoloredit .include diff -urN /usr/ports/x11/xcoloredit/files/patch-xcoloredit.c x11/xcoloredit/files/patch-xcoloredit.c --- /usr/ports/x11/xcoloredit/files/patch-xcoloredit.c 2012-11-08 10:08:58.000000000 +0900 +++ x11/xcoloredit/files/patch-xcoloredit.c 2013-01-12 22:48:53.000000000 +0900 @@ -1,6 +1,22 @@ --- xcoloredit.c.orig Wed May 30 22:10:09 2007 +++ xcoloredit.c Wed May 30 22:10:57 2007 -@@ -85,6 +85,7 @@ +@@ -38,6 +38,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -50,6 +51,7 @@ + #include + #include + #include ++#include + #include "Xcoloredit.h" + #include "color.h" + +@@ -85,6 +87,7 @@ static void move_scroll(); static void change_text_colour(); @@ -8,3 +24,61 @@ #define MEMORY_OFFSET 8 #define NUM_MEMORIES 36 +@@ -182,8 +185,8 @@ + #undef offset + + +-void main(argc, argv) +-unsigned int argc; ++int main(argc, argv) ++int argc; + char **argv; + { + Status ok; +@@ -696,7 +699,7 @@ + (float)0.025); + XawScrollbarSetThumb(valScroll, (float)(1.0 - hsv_values.v), + (float)0.025); +-#endif SOLID_THUMB ++#endif /* SOLID_THUMB */ + } + + +@@ -878,7 +881,7 @@ + XawScrollbarSetThumb(w, top, (float)(1.0 - top)); + #else + XawScrollbarSetThumb(w, top, (float)0.025); +-#endif SOLID_THUMB ++#endif /* SOLID_THUMB */ + + do_change = FALSE; + pass_value = 1.0 - rgb_values.r/65536.0; +@@ -941,7 +944,7 @@ + XawScrollbarSetThumb(w, top, (float)(1.0 - top)); + #else + XawScrollbarSetThumb(w, top, (float)0.025); +-#endif SOLID_THUMB ++#endif /* SOLID_THUMB */ + move_lock(); + } + +@@ -960,7 +963,7 @@ + (float)(1.0 - locked_top)); + #else + XawScrollbarSetThumb(lockedScroll, locked_top, (float)0.025); +-#endif SOLID_THUMB ++#endif /* SOLID_THUMB */ + } + + +@@ -986,8 +989,8 @@ + unsigned long *length; + int *format; + { +- if (XmuConvertStandardSelection(w, selection, target, type, value, +- length, format)) ++ if (XmuConvertStandardSelection(w, (Time)0, selection, target, type, ++ (XPointer *)value, length, format)) + return TRUE; + + if (*target == XA_STRING) { >Release-Note: >Audit-Trail: >Unformatted: