From amdmi3@amdmi3.ru  Fri Mar  8 14:10:27 2013
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 26A63917
	for <freebsd-gnats-submit@freebsd.org>; Fri,  8 Mar 2013 14:10:27 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.57])
	by mx1.freebsd.org (Postfix) with ESMTP id DD61F2EE
	for <freebsd-gnats-submit@freebsd.org>; Fri,  8 Mar 2013 14:10:26 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256)
	(Exim 4.80)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1UDy09-0004Pd-BP
	for FreeBSD-gnats-submit@freebsd.org; Fri, 08 Mar 2013 18:10:25 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id EB3D4B84D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Mar 2013 18:10:24 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id E0B7ED02; Fri,  8 Mar 2013 18:10:24 +0400 (MSK)
Message-Id: <20130308141024.E0B7ED02@hades.panopticon>
Date: Fri,  8 Mar 2013 18:10:24 +0400 (MSK)
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Reply-To: Dmitry Marakasov <amdmi3@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] graphics/fpc-opengl: fix glut support
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         176749
>Category:       ports
>Synopsis:       [PATCH] graphics/fpc-opengl: fix glut support
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    acm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 08 14:20:00 UTC 2013
>Closed-Date:    Thu May 23 03:48:20 UTC 2013
>Last-Modified:  Thu May 23 03:48:20 UTC 2013
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Wed Jun 13 17:39:20 MSK 2012 root@hades.panopticon:/usr/obj/usr/src/sys/HADES amd64


>Description:
fpc opengl module has hardcoded libglut.so.3 for GLUT library, while freeglut on FreeBSD uses libglut.so.12, and it should anyway be just libglut.so. The patch fixes this and is required for games/hedgewars update.

>How-To-Repeat:
>Fix:
---
Index: Makefile
===================================================================
--- Makefile	(revision 313649)
+++ Makefile	(working copy)
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
Index: files/patch-packages-opengl-src-glut.pp
===================================================================
--- files/patch-packages-opengl-src-glut.pp	(revision 0)
+++ files/patch-packages-opengl-src-glut.pp	(working copy)
@@ -0,0 +1,19 @@
+Index: packages/opengl/src/glut.pp
+===================================================================
+--- packages/opengl/src/glut.pp	(revision 23728)
++++ packages/opengl/src/glut.pp	(working copy)
+@@ -768,13 +768,9 @@
+   {$ifdef darwin}
+   LoadGlut('/System/Library/Frameworks/GLUT.framework/GLUT');
+   {$else}
+-  {$IFDEF haiku}
++  {$IFNDEF MORPHOS}
+   LoadGlut('libglut.so');
+-  {$ELSE}
+-  {$IFNDEF MORPHOS}
+-  LoadGlut('libglut.so.3');
+   {$ENDIF}
+-  {$ENDIF}
+   {$endif}
+   {$ENDIF OS2}
+   {$ENDIF}
---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->acm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 8 14:20:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176749 

Date: Sat, 23 Mar 2013 01:30:14 -0500
From: =?ISO-8859-1?Q?Alonso_C=E1rdenas_M=E1rquez?= <acardenas@bsd-peru.org>
To: bug-followup@FreeBSD.org, Dmitry Marakasov <amdmi3@FreeBSD.org>
Subject: [PATCH] graphics/fpc-opengl: fix glut support

 --047d7b5d8cff5f9afd04d891b459
 Content-Type: multipart/alternative; boundary=047d7b5d8cff5f9af904d891b457
 
 --047d7b5d8cff5f9af904d891b457
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi Dmitry
 
 could you test following patch file?
 
 Greetings
 ACM
 
 --047d7b5d8cff5f9af904d891b457--
 --047d7b5d8cff5f9afd04d891b459
 Content-Type: application/octet-stream; 
 	name="patch-packages-opengl-src-glut.pp"
 Content-Disposition: attachment; 
 	filename="patch-packages-opengl-src-glut.pp"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hemee1k60
 
 LS0tIHBhY2thZ2VzL29wZW5nbC9zcmMvZ2x1dC5wcAkyMDEzLTAzLTIzIDAxOjE5OjE0LjAwMDAw
 MDAwMCAtMDUwMAorKysgcGFja2FnZXMvb3BlbmdsL3NyYy9nbHV0LnBwCTIwMTMtMDMtMjMgMDE6
 MjI6NDcuMDAwMDAwMDAwIC0wNTAwCkBAIC03NjUsMTMgKzc2NSwxMyBAQAogICB7JGlmZGVmIGRh
 cndpbn0KICAgTG9hZEdsdXQoJy9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL0dMVVQuZnJhbWV3
 b3JrL0dMVVQnKTsKICAgeyRlbHNlfQotICB7JElGREVGIGhhaWt1fQorICB7JGlmIGRlZmluZWQo
 aGFpa3UpIG9yIGRlZmluZWQoZnJlZWJzZCl9CiAgIExvYWRHbHV0KCdsaWJnbHV0LnNvJyk7Ci0g
 IHskRUxTRX0KKyAgeyRlbHNlfQogICB7JElGTkRFRiBNT1JQSE9TfQogICBMb2FkR2x1dCgnbGli
 Z2x1dC5zby4zJyk7CiAgIHskRU5ESUZ9Ci0gIHskRU5ESUZ9CisgIHskZW5kaWZ9CiAgIHskZW5k
 aWZ9CiAgIHskRU5ESUZ9CiAK
 --047d7b5d8cff5f9afd04d891b459--
State-Changed-From-To: open->feedback 
State-Changed-By: acm 
State-Changed-When: Sun Mar 24 05:17:07 UTC 2013 
State-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=176749 

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/176749: [PATCH] graphics/fpc-opengl: fix glut support
Date: Mon, 20 May 2013 22:55:39 +0400

 * acm@FreeBSD.org (acm@FreeBSD.org) wrote:
 
 > could you test following patch file?
 
 This patch works fine, please commit
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176749: commit references a PR
Date: Thu, 23 May 2013 03:24:41 +0000 (UTC)

 Author: amdmi3
 Date: Thu May 23 03:24:28 2013
 New Revision: 318833
 URL: http://svnweb.freebsd.org/changeset/ports/318833
 
 Log:
   - Fix glut library version
   
   PR:		176749
   Submitted by:	myself
   Approved by:	acm (maintainer via private email)
 
 Added:
   head/graphics/fpc-opengl/files/
   head/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp   (contents, props changed)
 Modified:
   head/graphics/fpc-opengl/Makefile
 
 Modified: head/graphics/fpc-opengl/Makefile
 ==============================================================================
 --- head/graphics/fpc-opengl/Makefile	Thu May 23 03:21:20 2013	(r318832)
 +++ head/graphics/fpc-opengl/Makefile	Thu May 23 03:24:28 2013	(r318833)
 @@ -1,7 +1,7 @@
  # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
  # $FreeBSD$
  
 -PORTREVISION=	0
 +PORTREVISION=	1
  CATEGORIES=	graphics lang
  PKGNAMESUFFIX=	-opengl
  
 
 Added: head/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp	Thu May 23 03:24:28 2013	(r318833)
 @@ -0,0 +1,19 @@
 +--- packages/opengl/src/glut.pp	2013-03-23 01:19:14.000000000 -0500
 ++++ packages/opengl/src/glut.pp	2013-03-23 01:22:47.000000000 -0500
 +@@ -765,13 +765,13 @@
 +   {$ifdef darwin}
 +   LoadGlut('/System/Library/Frameworks/GLUT.framework/GLUT');
 +   {$else}
 +-  {$IFDEF haiku}
 ++  {$if defined(haiku) or defined(freebsd)}
 +   LoadGlut('libglut.so');
 +-  {$ELSE}
 ++  {$else}
 +   {$IFNDEF MORPHOS}
 +   LoadGlut('libglut.so.3');
 +   {$ENDIF}
 +-  {$ENDIF}
 ++  {$endif}
 +   {$endif}
 +   {$ENDIF}
 + 
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: amdmi3 
State-Changed-When: Thu May 23 03:48:19 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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