Update to 0.9.6

PR:		47082
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

6 files changed, 66 insertions, 12 deletions

diff --git a/print/scribus-devel/files/patch-admin-ltmain.sh b/print/scribus-devel/files/patch-admin-ltmain.sh
new file mode 100644
index 000000000000..a06304e33ad8
--- /dev/null
+++ b/print/scribus-devel/files/patch-admin-ltmain.sh
@@ -0,0 +1,44 @@
+--- admin/ltmain.sh.orig	Sun Mar 10 00:03:33 2002
++++ admin/ltmain.sh	Tue Jan  7 21:37:22 2003
+@@ -1123,6 +1123,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -1206,6 +1207,10 @@
+ 	    # These systems don't actually have c library (as such)
+ 	    continue
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    continue
++	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+ 	    deplibs="$deplibs -framework System"
+@@ -2747,6 +2752,9 @@
+ 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+ 	    deplibs="$deplibs -framework System"
+@@ -4622,10 +4630,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in b/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in
index a2bc0dab72b4..bc570739cec5 100644
--- a/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in
+++ b/print/scribus-devel/files/patch-scribus-libpdf-Makefile.in
@@ -1,9 +1,9 @@
---- scribus/libpdf/Makefile.in.orig	Sun Nov 10 06:26:45 2002
-+++ scribus/libpdf/Makefile.in	Wed Nov 13 17:32:16 2002
+--- scribus/libpdf/Makefile.in.orig	Tue Dec 31 03:30:32 2002
++++ scribus/libpdf/Makefile.in	Tue Jan  7 21:02:13 2003
 @@ -226,7 +226,7 @@
  x_libraries = @x_libraries@
  
- libdir = $(prefix)/share/scribus/libs
+ libdir = $(prefix)/lib/scribus/libs
 -CPPFLAGS = -I$(top_builddir)/scribus
 +CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
  ####### kdevelop will overwrite this part!!! (begin)##########
diff --git a/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in b/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in
index b02759ebf776..5ee1129178db 100644
--- a/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in
+++ b/print/scribus-devel/files/patch-scribus-libpostscript-Makefile.in
@@ -1,9 +1,9 @@
---- scribus/libpostscript/Makefile.in.orig	Sun Nov 10 06:26:45 2002
-+++ scribus/libpostscript/Makefile.in	Wed Nov 13 17:32:03 2002
+--- scribus/libpostscript/Makefile.in.orig	Tue Dec 31 03:30:32 2002
++++ scribus/libpostscript/Makefile.in	Tue Jan  7 21:02:19 2003
 @@ -226,7 +226,7 @@
  x_libraries = @x_libraries@
  
- libdir = $(prefix)/share/scribus/libs
+ libdir = $(prefix)/lib/scribus/libs
 -CPPFLAGS = -I$(top_builddir)/scribus
 +CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
  ####### kdevelop will overwrite this part!!! (begin)##########
diff --git a/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in b/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in
index 547703dc01e3..3bc7fb90dac6 100644
--- a/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in
+++ b/print/scribus-devel/files/patch-scribus-libprefs-Makefile.in
@@ -1,9 +1,9 @@
---- scribus/libprefs/Makefile.in.orig	Sun Nov 10 06:26:45 2002
-+++ scribus/libprefs/Makefile.in	Wed Nov 13 17:31:38 2002
+--- scribus/libprefs/Makefile.in.orig	Tue Dec 31 03:30:32 2002
++++ scribus/libprefs/Makefile.in	Tue Jan  7 21:02:25 2003
 @@ -226,7 +226,7 @@
  x_libraries = @x_libraries@
  
- libdir = $(prefix)/share/scribus/libs
+ libdir = $(prefix)/lib/scribus/libs
 -CPPFLAGS = -I$(top_builddir)/scribus
 +CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
  ####### kdevelop will overwrite this part!!! (begin)##########
diff --git a/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in b/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in
index 3dab0f97e1c7..d22f197537fa 100644
--- a/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in
+++ b/print/scribus-devel/files/patch-scribus-plugins-libchar-Makefile.in
@@ -1,9 +1,9 @@
---- scribus/plugins/libchar/Makefile.in.orig	Sun Nov 10 06:26:45 2002
-+++ scribus/plugins/libchar/Makefile.in	Wed Nov 13 17:31:52 2002
+--- scribus/plugins/libchar/Makefile.in.orig	Tue Dec 31 03:30:32 2002
++++ scribus/plugins/libchar/Makefile.in	Tue Jan  7 21:13:33 2003
 @@ -226,7 +226,7 @@
  x_libraries = @x_libraries@
  
- libdir = $(prefix)/share/scribus/plugins
+ libdir = $(prefix)/lib/scribus/plugins
 -CPPFLAGS = -I$(top_builddir)/scribus
 +CPPFLAGS = -I$(top_builddir)/scribus @CPPFLAGS@
  ####### kdevelop will overwrite this part!!! (begin)##########
diff --git a/print/scribus-devel/files/patch-scribus-scribusview.cpp b/print/scribus-devel/files/patch-scribus-scribusview.cpp
new file mode 100644
index 000000000000..a237a7a22122
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus-scribusview.cpp
@@ -0,0 +1,10 @@
+--- scribus/scribusview.cpp.orig	Wed Dec 25 22:48:05 2002
++++ scribus/scribusview.cpp	Wed Jan  8 01:25:13 2003
+@@ -19,6 +19,7 @@
+ #include "scribusview.moc"
+ #include "page.h"
+ #include "pageback.h"
++#include <stdlib.h>
+ #include <qcolor.h>
+ #include <qfont.h>
+ #include <qfontmetrics.h>