ports/121891: [PATCH] graphics/glfw: cleanup USE_X_PREFIX, respect PTHREAD_LIBS

[Dmitry Marakasov]

>Number:         121891
>Category:       ports
>Synopsis:       [PATCH] graphics/glfw: cleanup USE_X_PREFIX, respect PTHREAD_LIBS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 20 02:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE FreeBSD 7.0-RELEASE #5: Fri Mar 14 14:26:43 MSK 2008 root at hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
* Change USE_X_PREFIX to USE_XORG
* While here, fix patch so pthread libs don't get erroneously detected as -lpthread, but as ${PTHREAD_LIBS}
* While here, use SF macro
>How-To-Repeat:
>Fix:

--- glfw.patch begins here ---
diff -ruN glfw.orig/Makefile glfw/Makefile
--- glfw.orig/Makefile	2008-03-20 05:12:06.000000000 +0300
+++ glfw/Makefile	2008-03-20 05:21:44.000000000 +0300
@@ -7,16 +7,15 @@
 
 PORTNAME=	glfw
 PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A portable framework for OpenGL development
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xxf86vm xext
 USE_GL=		yes
 ALL_TARGET=	x11
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
diff -ruN glfw.orig/files/patch-compile.sh glfw/files/patch-compile.sh
--- glfw.orig/files/patch-compile.sh	2008-03-20 05:12:06.000000000 +0300
+++ glfw/files/patch-compile.sh	2008-03-20 05:20:42.000000000 +0300
@@ -1,5 +1,5 @@
---- compile.sh.orig	Sun Feb 15 01:19:38 2004
-+++ compile.sh	Thu Apr  1 11:12:31 2004
+--- compile.sh.orig	2004-07-25 00:36:46.000000000 +0400
++++ compile.sh	2008-03-20 05:20:39.000000000 +0300
 @@ -72,10 +72,10 @@
  ##########################################################################
  if [ "x$force_gcc" = xyes ]; then
@@ -29,7 +29,7 @@
  # X11R5 in /usr/X11R5/lib ?
  elif [ -r "/usr/X11R5/lib" ]; then
   LFLAGS="$LFLAGS -L/usr/X11R5/lib"
-@@ -140,9 +140,9 @@
+@@ -145,9 +145,9 @@
  rm -f conftest*
  
  echo " Using GNU C: ""$use_gcc" 1>&6
@@ -42,7 +42,7 @@
  echo " " 1>&6
  
  
-@@ -164,6 +164,8 @@
+@@ -169,6 +169,8 @@
  int main() {; return 0;}
  EOF
  
@@ -51,7 +51,18 @@
  if { (eval echo $config_script: \"$compile\") 1>&5; (eval $compile) 2>&5; }; then
    rm -rf conftest*
    has_xf86vm=yes
-@@ -206,7 +208,7 @@
+@@ -200,18 +202,10 @@
+ 
+ # Try -lpthread (most systems)
+ LIBS_OLD="$LIBS"
+-LIBS="$LIBS -lpthread"
+-if { (eval echo $config_script: \"$link\") 1>&5; (eval $link) 2>&5; }; then
+-  rm -rf conftest*
+-  has_pthread=yes
+-else
+-  echo "$config_script: failed program was:" >&5
+-  cat conftest.c >&5
+-fi
  
  # Try -pthread (e.g. FreeBSD)
  if [ "x$has_pthread" = xno ]; then
@@ -60,7 +71,7 @@
    if { (eval echo $config_script: \"$link\") 1>&5; (eval $link) 2>&5; }; then
      rm -rf conftest*
      has_pthread=yes
-@@ -364,24 +366,24 @@
+@@ -369,24 +363,24 @@
  echo "$config_script: Checking for sysconf support" >&5
  has_sysconf=no
  
@@ -96,7 +107,7 @@
  
  echo " sysconf support: ""$has_sysconf" 1>&6
  if [ "x$has_sysconf" = xyes ]; then
-@@ -424,9 +426,9 @@
+@@ -429,9 +423,9 @@
  # Post fixups
  ##########################################################################
  if [ "x$use_gcc" = xyes ]; then
--- glfw.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: