1 files changed, 0 insertions, 79 deletions
diff --git a/editors/openoffice-devel/files/patch-set_soenv.in b/editors/openoffice-devel/files/patch-set_soenv.in
deleted file mode 100644
index e03a7829946d..000000000000
--- a/editors/openoffice-devel/files/patch-set_soenv.in
+++ /dev/null
@@ -1,79 +0,0 @@
---- set_soenv.in.orig	2015-01-17 23:35:07.000000000 -0800
-+++ set_soenv.in	2015-02-23 16:02:44.000000000 -0800
-@@ -359,7 +359,7 @@
- elsif ( $platform =~ m/freebsd/ ) 
- {     $BIG_SVX        = "TRUE";
-       $COM            = "GCC";
--      $COMPATH        = '@COMPATH@'; 
-+      $COMPATH        = '@COMPATH@' . '/bin'; 
-       $CVER           = "C300";
-       $GUI            = "UNX";
-       $GUIBASE        = "unx";
-@@ -2617,26 +2617,37 @@
- 	my @originalPairs = @_;
- 	my @pairs = @originalPairs;
- 	my @Path = split /$ps/, $oldPath;
-+	my @buildPath;
-+	my @sysPath;
-+	my $elem;
-+
-+	for $elem (@Path) {
-+	    if ($elem eq '.' || $elem =~ m'^$SOLARENV/' ||
-+		$elem =~ m'/solenv/') {
-+		    push @buildPath, $elem;
-+	    } else {
-+		    push @sysPath, $elem;
-+	    }
-+	}
- 
- 	while (@pairs) {
- 	    my $path = shift @pairs;
- 	    my $cmd = shift @pairs;
- 	    my $to_append = 1;
--	    my $elem;
- 
- 	    if (! -x "$path/$cmd") {
- 		AddWarning ("Missing executable $path/$cmd\n");
- 	    }
- 
--	    for $elem (@Path) {
-+	    for $elem (@sysPath) {
- 		if ($elem eq $path) {
- #		    print "Hit duplicate path in path; break\n";
- 		    $to_append = 0;
- 		    last;
- 		}
--		if (-f "$elem/$cmd") {
-+		if (-f "$elem/$cmd" && ! -l "$elem/$cmd") {
- #		    print "Element already in path ...\n";
--		    unshift @Path, $path;
-+		    unshift @sysPath, $path;
- 		    $to_append = 0;
- 		    last;
- 		} else {
-@@ -2644,7 +2655,7 @@
- 		}
- 	    }
- 	    if ($to_append) {
--		push @Path, $path;
-+		push @sysPath, $path;
- 	    }
- 	}
- 
-@@ -2654,14 +2665,14 @@
- 	    my $cmd = shift @pairs;
- 	    my $realpath;
- 
--	    $realpath = PathLookup ($cmd, @Path);
-+	    $realpath = PathLookup ($cmd, @sysPath);
- 	    if (!($realpath eq $path)) {
- 		AddWarning ("Path conflict for executables " .
-                             "$path/$cmd against $realpath");
- 	    }
- 	}
- 
--	return join $ps, CleanupPath (@Path);
-+	return join $ps, @buildPath, CleanupPath (@sysPath);
- }
- 
- #------------------------------------------------------------