summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-03-27 20:23:30 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-03-27 20:23:30 +0000
commit887958d6ca00bd6796c57c04c1eb9a5c8face3ec (patch)
treea9a6cb20b171add298e380ac6c9dbda396778154
parent- Update to version 20040216 (diff)
Fix patching on non-CURRENT systems.
-rw-r--r--x11/xscreensaver-gnome/Makefile2
-rw-r--r--x11/xscreensaver-gnome/files/patch-ab10
2 files changed, 2 insertions, 10 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 6c66f962abcb..4a491eb2520f 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -89,5 +89,7 @@ post-patch:
${WRKSRC}/hacks/glx/extrusion.c
@${REINPLACE_CMD} -e 's| ||' \
${WRKSRC}/hacks/glx/klein.c
+ @${REINPLACE_CMD} -E -e 's|^[[:space:]]*GL_LIBS="${PTHREAD_LIBS}"|#|g' \
+ ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index f7eed0f53230..54df708a7b1b 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -9,16 +9,6 @@
OBJCC="$OBJCC -Wall"
# supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
# and then perhaps we can do without -pedantic?
-@@ -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.