Update to version 1.2.1

PR:		ports/76163
Submitted by:	Ports Fury

7 files changed, 99 insertions, 52 deletions

diff --git a/print/scribus-devel/files/patch-admin-ltmain.sh b/print/scribus-devel/files/patch-admin-ltmain.sh
deleted file mode 100644
index 2a39aeb5fa1..00000000000
--- a/print/scribus-devel/files/patch-admin-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- admin/ltmain.sh.orig	Mon Jun  7 02:20:19 2004
-+++ admin/ltmain.sh	Mon Jun  7 02:24:08 2004
-@@ -1123,6 +1123,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -1202,7 +1203,7 @@
-       -l*)
- 	if test "$arg" = "-lc"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-freebsd*)
- 	    # These systems don't actually have c library (as such)
- 	    continue
- 	    ;;
-@@ -2744,7 +2745,7 @@
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-freebsd*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
-@@ -4622,10 +4623,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::helpbrowser.cpp b/print/scribus-devel/files/patch-scribus::helpbrowser.cpp
new file mode 100644
index 00000000000..c02deeb72ac
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::helpbrowser.cpp
@@ -0,0 +1,11 @@
+--- scribus/helpbrowser.cpp.orig	Fri Jan  7 05:18:30 2005
++++ scribus/helpbrowser.cpp	Mon Jan 10 22:11:45 2005
+@@ -58,7 +58,7 @@
+ 	QString fileName;
+ 	mHistory.clear();
+ 	struct histd his;
+-	language = guiLanguage=="" ? "en" : guiLanguage.left(2);
++	language = guiLanguage=="" ? QString( "en" ) : guiLanguage.left(2);
+ 	helpBrowsermainLayout = new QVBoxLayout( this); 
+ 	buttonLayout = new QHBoxLayout;
+ 	buttonLayout->setSpacing( 6 );
diff --git a/print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp b/print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
new file mode 100644
index 00000000000..acd6e36c269
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
@@ -0,0 +1,11 @@
+--- scribus/plugins/fileloader/oodraw/sxwunzip.cpp.orig	Fri Dec 17 10:17:03 2004
++++ scribus/plugins/fileloader/oodraw/sxwunzip.cpp	Mon Jan 10 20:43:53 2005
+@@ -24,6 +24,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ # include <unistd.h>
+ # include <utime.h>
diff --git a/print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp b/print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
new file mode 100644
index 00000000000..905dea92419
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
@@ -0,0 +1,11 @@
+--- scribus/plugins/gettext/sxwim/sxwunzip.cpp.orig	Wed Dec 15 05:46:22 2004
++++ scribus/plugins/gettext/sxwim/sxwunzip.cpp	Mon Jan 10 20:34:50 2005
+@@ -26,6 +26,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #include <utime.h>
+ 
diff --git a/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::cmdobj.cpp b/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::cmdobj.cpp
deleted file mode 100644
index 5bc93d8ee46..00000000000
--- a/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::cmdobj.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- scribus/plugins/scriptplugin/cmdobj.cpp.orig	Tue Jul 13 05:24:03 2004
-+++ scribus/plugins/scriptplugin/cmdobj.cpp	Sun Aug 29 20:02:39 2004
-@@ -26,7 +26,7 @@
- 															Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen);
- 	Carrier->doc->ActPage->SetRectFrame(Carrier->doc->ActPage->Items.at(i));
- 	if (GetUniqueItem(QString(Name)) == NULL)
--		(Name != "") ? Carrier->doc->ActPage->Items.at(i)->AnName = QString(Name) : NULL;
-+		(Name != "") ? Carrier->doc->ActPage->Items.at(i)->AnName = QString(Name) : QString::null;
- /*	else
- 	{
- 		PyErr_SetString(PyExc_Exception, ERROBJ);
diff --git a/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp b/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
new file mode 100644
index 00000000000..2982e2b88c5
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
@@ -0,0 +1,56 @@
+--- scribus/plugins/scriptplugin/scriptplugin.cpp.orig	Tue Jan  4 07:45:50 2005
++++ scribus/plugins/scriptplugin/scriptplugin.cpp	Mon Jan 10 21:21:27 2005
+@@ -52,6 +52,27 @@
+ #include <qtextstream.h>
+ #include <cstdlib>
+ 
++// XXX Implement strndup for FreeBSD.
++#ifdef __FreeBSD__
++#ifdef __cplusplus
++extern "C" {
++#endif
++static char *
++mystrndup(const char *str, int len) {
++    char *ret;
++
++    if ((str == NULL || len < 0)) return(NULL);
++    ret = (char *)malloc(len + 1);
++    if (ret == NULL) return(NULL);
++    memcpy(ret, str, len);
++    ret[len] = '\0';
++    return(ret);
++}
++#ifdef __cplusplus
++}
++#endif
++#endif
++
+ // Exceptions; visible from cmdvar.h, set up in initscribus()
+ PyObject* ScribusException;
+ PyObject* NoDocOpenError;
+@@ -499,8 +520,13 @@
+ {
+ 	/* Work around the braindead Python/C API not using 'const' for
+ 	 * strings it won't change. */
++#ifdef __FreeBSD__
++	char* newNameTemp = mystrndup(newName, strlen(newName));
++	char* oldNameTemp = mystrndup(oldName, strlen(oldName));
++#else
+ 	char* newNameTemp = strndup(newName, strlen(newName));
+ 	char* oldNameTemp = strndup(oldName, strlen(oldName));
++#endif
+ 	assert(newNameTemp != NULL);
+ 	assert(oldNameTemp != NULL);
+ 	/* We use PyMapping_GetItemString because unlike PyDict_GetItemString it
+@@ -563,7 +589,11 @@
+ 	 */
+ 	QCString utfTranslated = translated.utf8();
+ 	const char* trch = utfTranslated.data();
++#ifdef __FreeBSD__
++	return mystrndup(trch, strlen(trch));
++#else
+ 	return strndup(trch, strlen(trch));
++#endif
+ }
+ 
+ /* Now we're using the more pythonic convention for names:
diff --git a/print/scribus-devel/files/patch-scribus::utils.cpp b/print/scribus-devel/files/patch-scribus::utils.cpp
new file mode 100644
index 00000000000..2a4eb366ed7
--- /dev/null
+++ b/print/scribus-devel/files/patch-scribus::utils.cpp
@@ -0,0 +1,10 @@
+--- scribus/util.cpp.orig	Fri Jan  7 04:04:34 2005
++++ scribus/util.cpp	Mon Jan 10 22:03:01 2005
+@@ -29,6 +29,7 @@
+ #include <qdir.h>
+ #include <qpointarray.h>
+ #include <qmessagebox.h>
++#include <algorithm>
+ #include <cstdlib>
+ #include <cmath>
+ #include <unistd.h>