- Remove useless gnome glade module requirement.

  This also provoked wired crashes for -CURRENT users default libmapping
  to libc_r.
- Do not link against libpthread at all. There is no code make real use
  of pthread API so don't create our own dll hell.
  Nvidia libGL users must be happy now. No more libc_r libmapping for
  xscreensaver GL hacks required.

3 files changed, 25 insertions, 4 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index d77265e73938..6c66f962abcb 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xscreensaver-gnome
 PORTVERSION=	4.15
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index d5d7a65b33da..f7eed0f53230 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Sat Nov  8 22:45:13 2003
-+++ configure	Sat Nov  8 22:45:58 2003
-@@ -2572,7 +2572,7 @@
+--- configure.orig	Thu Mar 25 22:53:53 2004
++++ configure	Thu Mar 25 22:57:09 2004
+@@ -2574,7 +2574,7 @@
    if test -n "$GCC"; then
      echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5
  echo "${ECHO_T}Turning on gcc compiler warnings." >&6
@@ -9,7 +9,17 @@
      OBJCC="$OBJCC -Wall"
      # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
      # and then perhaps we can do without -pedantic?
-@@ -18603,13 +18603,13 @@
+@@ -15346,9 +15346,6 @@
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+-if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  GL_LIBS="-lpthread"
+-fi
+ 
+     fi
+ 
+@@ -19014,13 +19011,13 @@
  # Now that we know whether we have Gnome, we can decide where the XML
  # config files get installed.
  #
diff --git a/x11/xscreensaver-gnome/files/patch-driver::xscreensaver-demo.glade2 b/x11/xscreensaver-gnome/files/patch-driver::xscreensaver-demo.glade2
new file mode 100644
index 000000000000..14f241fbfa8a
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-driver::xscreensaver-demo.glade2
@@ -0,0 +1,10 @@
+--- driver/xscreensaver-demo.glade2.orig	Sat Mar 27 02:04:45 2004
++++ driver/xscreensaver-demo.glade2	Sat Mar 27 02:05:15 2004
+@@ -2,7 +2,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ 
+ <glade-interface>
+-<requires lib="gnome"/>
+ 
+ <widget class="GtkWindow" id="xscreensaver_demo">
+   <property name="title" translatable="yes">XScreenSaver</property>