aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-04-20 10:50:44 +0800
committermarcus <marcus@FreeBSD.org>2003-04-20 10:50:44 +0800
commitb4e6af91fba85f8e5f55a3387dbeda73594128e2 (patch)
treeff2bd56da8aa791f21b54e85cee051f19a1339d8
parent44e8845fbc64b19a98b79fe447ba82659a50f882 (diff)
downloadfreebsd-ports-gnome-b4e6af91fba85f8e5f55a3387dbeda73594128e2.tar.gz
freebsd-ports-gnome-b4e6af91fba85f8e5f55a3387dbeda73594128e2.tar.zst
freebsd-ports-gnome-b4e6af91fba85f8e5f55a3387dbeda73594128e2.zip
Borrow a patch from Doug to fix getimage with Perl < 5.6.
Obtained from: x11/xscreensaver
-rw-r--r--x11/xscreensaver-gnome/Makefile1
-rw-r--r--x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file20
2 files changed, 21 insertions, 0 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index d586053fc1c5..8ce9d4d91db3 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xscreensaver-gnome
PORTVERSION= 4.09
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
new file mode 100644
index 000000000000..5a9ed975f5ff
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
@@ -0,0 +1,20 @@
+--- driver/xscreensaver-getimage-file.orig Sun Jan 19 21:27:38 2003
++++ driver/xscreensaver-getimage-file Fri Apr 18 23:02:37 2003
+@@ -42,7 +42,7 @@
+ # So we do it like this instead:
+ #
+ BEGIN {
+- if (! defined(&S_ISLNK)) { # perhaps defined by "POSIX"?
++ if ((! defined(&S_ISLNK)) and ($] > 5.6)) { # perhaps defined by "POSIX"?
+ require Fcntl;
+ import Fcntl ':mode'; # if not, look for it in "Fcntl".
+ }
+@@ -139,7 +139,7 @@
+ if (S_ISDIR($mode)) {
+ push @dirs, $file;
+ print STDERR "$progname: found dir $file\n" if ($verbose > 2);
+- } elsif (S_ISREG($mode) || S_ISLNK($mode)) {
++ } elsif (S_ISREG($mode) || (-l "$file")) {
+ push @all_files, $file;
+ print STDERR "$progname: found file $file\n" if ($verbose > 2);
+ } elsif ($verbose > 2) {