From owner-svn-ports-all@FreeBSD.ORG Mon Feb 4 14:28:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 55EA3658; Mon, 4 Feb 2013 14:28:35 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 334E01E97; Mon, 4 Feb 2013 14:28:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r14ESZaB064123; Mon, 4 Feb 2013 14:28:35 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r14ESYeW064121; Mon, 4 Feb 2013 14:28:34 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201302041428.r14ESYeW064121@svn.freebsd.org> From: Martin Wilke Date: Mon, 4 Feb 2013 14:28:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311620 - in head/x11/xcoloredit: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Feb 2013 14:28:35 -0000 Author: miwi Date: Mon Feb 4 14:28:34 2013 New Revision: 311620 URL: http://svnweb.freebsd.org/changeset/ports/311620 Log: - Update MASTER_SITES PR: 175596 Submitted by: Ports Fury Modified: head/x11/xcoloredit/Makefile (contents, props changed) head/x11/xcoloredit/files/patch-xcoloredit.c (contents, props changed) Modified: head/x11/xcoloredit/Makefile ============================================================================== --- head/x11/xcoloredit/Makefile Mon Feb 4 14:26:51 2013 (r311619) +++ head/x11/xcoloredit/Makefile Mon Feb 4 14:28:34 2013 (r311620) @@ -9,17 +9,19 @@ PORTNAME= xcoloredit 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 Modified: head/x11/xcoloredit/files/patch-xcoloredit.c ============================================================================== --- head/x11/xcoloredit/files/patch-xcoloredit.c Mon Feb 4 14:26:51 2013 (r311619) +++ head/x11/xcoloredit/files/patch-xcoloredit.c Mon Feb 4 14:28:34 2013 (r311620) @@ -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) {