ports/175596: x11/xcoloredit: Update MASTER_SITES

[KATO Tsuguru]

>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 at 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 <bsd.port.mk>
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 <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/X.h>
+ #include <X11/Intrinsic.h>
+@@ -50,6 +51,7 @@
+ #include <X11/Xaw/Form.h>
+ #include <X11/Xaw/Box.h>
+ #include <X11/Xmu/Atoms.h>
++#include <X11/Xmu/StdSel.h>
+ #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: