From hopet@evenstar.ics.muni.cz  Sat Oct 22 09:26:31 2005
Return-Path: <hopet@evenstar.ics.muni.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B3D4316A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Oct 2005 09:26:31 +0000 (GMT)
	(envelope-from hopet@evenstar.ics.muni.cz)
Received: from evenstar.ics.muni.cz (evenstar.ics.muni.cz [147.251.3.44])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1CD6C43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Oct 2005 09:26:30 +0000 (GMT)
	(envelope-from hopet@evenstar.ics.muni.cz)
Received: from evenstar.ics.muni.cz (localhost.ics.muni.cz [127.0.0.1])
	by evenstar.ics.muni.cz (8.13.3/8.13.1) with ESMTP id j9M9QSTB047394
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Oct 2005 11:26:28 +0200 (CEST)
	(envelope-from hopet@evenstar.ics.muni.cz)
Received: (from root@localhost)
	by evenstar.ics.muni.cz (8.13.3/8.13.1/Submit) id j9M9QS4q047393;
	Sat, 22 Oct 2005 11:26:28 +0200 (CEST)
	(envelope-from hopet)
Message-Id: <200510220926.j9M9QS4q047393@evenstar.ics.muni.cz>
Date: Sat, 22 Oct 2005 11:26:28 +0200 (CEST)
From: Petr Holub <hopet@ics.muni.cz>
Reply-To: Petr Holub <hopet@ics.muni.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE] x11/xcalib update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         87834
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] x11/xcalib update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 22 09:30:18 GMT 2005
>Closed-Date:    Sat Oct 22 21:58:38 CEST 2005
>Last-Modified:  Sat Oct 22 21:58:38 CEST 2005
>Originator:     Petr Holub
>Release:        FreeBSD 5.4-RELEASE-p8 i386
>Organization:
Masaryk University
>Environment:
System: FreeBSD evenstar.ics.muni.cz 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #7: Thu Oct 13 12:05:20 CEST 2005 toor@evenstar.ics.muni.cz:/usr/src/sys/i386/compile/EVENSTAR i386


>Description:
	Patch on using X11BASE instead of hard-coded path on Krises notice.
	I've also corrected pkg-descr.
>How-To-Repeat:
>Fix:

	Patch attached.

--- xcalib.patch begins here ---
diff -ruN xcalib.orig/Makefile xcalib/Makefile
--- xcalib.orig/Makefile	Sat Sep 17 22:33:14 2005
+++ xcalib/Makefile	Sat Oct 22 11:17:24 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcalib
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	x11 graphics
 MASTER_SITES=	http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
diff -ruN xcalib.orig/files/patch-Makefile xcalib/files/patch-Makefile
--- xcalib.orig/files/patch-Makefile	Thu Jan  1 01:00:00 1970
+++ xcalib/files/patch-Makefile	Sat Oct 22 11:04:38 2005
@@ -0,0 +1,28 @@
+--- Makefile.orig	Sat Oct 22 10:56:05 2005
++++ Makefile	Sat Oct 22 11:02:58 2005
+@@ -43,10 +43,10 @@
+ 
+ XCALIB_VERSION = 0.6
+ CFLAGS = -Os
+-XINCLUDEDIR = /usr/X11R6/include
+-XLIBDIR = /usr/X11R6/lib
+-LCMSINCLUDEDIR = /usr/local/include
+-LCMSLIBDIR = /usr/local/lib
++XINCLUDEDIR = $(X11BASE)/include
++XLIBDIR = $(X11BASE)/lib
++LCMSINCLUDEDIR = $(PREFIX)/include
++LCMSLIBDIR = $(PREFIX)/lib
+ # for ATI's proprietary driver (must contain the header file fglrx_gamma.h)
+ FGLRXINCLUDEDIR = ./fglrx
+ FGLRXLIBDIR = ./fglrx
+@@ -84,8 +84,8 @@
+ 	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o icclib/libicc.a -lX11 -lXxf86vm -lXext
+ 
+ install:
+-	cp ./xcalib $(DESTDIR)/usr/local/bin/
+-	chmod 0644 $(DESTDIR)/usr/local/bin/xcalib
++	cp ./xcalib $(PREFIX)/bin/
++	chmod 0644 $(PREFIX)/bin/xcalib
+ 
+ clean:
+ 	rm -f xcalib.o
diff -ruN xcalib.orig/pkg-descr xcalib/pkg-descr
--- xcalib.orig/pkg-descr	Wed Apr  6 11:15:12 2005
+++ xcalib/pkg-descr	Sat Oct 22 11:18:56 2005
@@ -13,7 +13,7 @@
   GERMANY
 
 
-The latest version is 0.5 (as of April, 2004) 
+The latest version is 0.6 (as of August, 2005) 
 
 WWW: http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
 
--- xcalib.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Sat Oct 22 21:02:13 CEST 2005 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87834 
State-Changed-From-To: open->closed 
State-Changed-By: ehaupt 
State-Changed-When: Sat Oct 22 21:58:37 CEST 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87834 
>Unformatted:
