Update to 2.1.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2198 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 69 insertions, 41 deletions

diff --git a/editors/AbiWord2/files/patch-abiword.desktop b/editors/AbiWord2/files/patch-abiword.desktop
new file mode 100644
index 000000000..1253b21b4
--- /dev/null
+++ b/editors/AbiWord2/files/patch-abiword.desktop
@@ -0,0 +1,11 @@
+--- abiword.desktop.orig	Sun Mar 28 15:35:29 2004
++++ abiword.desktop	Sun Mar 28 15:35:40 2004
+@@ -13,7 +13,7 @@
+ Icon=abiword_48.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
++Categories=Application;Office;WordProcessor;
+ StartupNotify=true
+ Encoding=UTF-8
+ 
diff --git a/editors/AbiWord2/files/patch-an b/editors/AbiWord2/files/patch-an
index a116fb076..e26f0a525 100644
--- a/editors/AbiWord2/files/patch-an
+++ b/editors/AbiWord2/files/patch-an
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/editors/AbiWord2/files/patch-an,v 1.5 2003/02/23 18:39:35 marcus Exp $
-
---- src/Makefile.orig	Thu May 30 17:51:53 2002
-+++ src/Makefile	Wed Jun  5 15:47:41 2002
-@@ -48,6 +48,7 @@
+--- src/Makefile.orig	Mon Dec 22 13:06:12 2003
++++ src/Makefile	Sun Mar 28 15:29:40 2004
+@@ -52,6 +52,7 @@
  
  ## Set the following to a list of pathnames to be copied to $(CANONDIR)
  CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
@@ -11,7 +8,7 @@ $FreeBSD: ports/editors/AbiWord2/files/patch-an,v 1.5 2003/02/23 18:39:35 marcus
  
  ## Set the following to a list of directories (probably a subset of DIRS)
  ## that have work to do.
-@@ -58,6 +59,9 @@
+@@ -62,6 +63,9 @@
  	@for k in $(CANON_TOPLEVELFILES); do			\
  		$(ABICOPY) $$k $(CANONDIR);			\
  	done
@@ -21,26 +18,21 @@ $FreeBSD: ports/editors/AbiWord2/files/patch-an,v 1.5 2003/02/23 18:39:35 marcus
  	@for k in $(CANON_SubDirs); do				\
  		$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical;	\
  	done
-@@ -72,6 +76,7 @@
- 			cp $$k american.hash;		\
- 			rm $$k ;			\
- 		done)
+@@ -83,6 +87,7 @@
+ ifeq ($(ABI_OPT_PSPELL),1)
+ 	echo "Using Pspell build, not installing ispell hash files"
+ else
 +	@(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
- # We currently only ship american.hash, so the above and below aren't logical.
- # For same reason, this will only copy american.hash-encoding once in place.  The rest is in abispell.
- 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.hash-encoding $(CANONDIR)/dictionary	
-@@ -112,10 +117,12 @@
- 	fi
+ 	# We currently only ship american.hash
+ 	@$(subst xxxx,$(CANONDIR)/dictionary,$(VERIFY_DIRECTORY))
+ 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/$(OS_ENDIAN).american.hash $(CANONDIR)/dictionary/american.hash
+@@ -92,7 +97,8 @@
+ ifeq ($(ABI_NATIVE),unix)
  # icons for X window manager use
  	@$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
 -	(cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons)
 +	(cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons)
 +	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*)
- # font stuff for installation
- 	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
--	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)
-+	(cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts)
-+	@(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*)
  endif
  
- ##################################################################
+ 	@$(subst xxxx,$(CANONDIR)/clipart,$(VERIFY_DIRECTORY))
diff --git a/editors/AbiWord2/files/patch-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh
index 699048775..20ab42ded 100644
--- a/editors/AbiWord2/files/patch-autogen.sh
+++ b/editors/AbiWord2/files/patch-autogen.sh
@@ -1,5 +1,5 @@
---- autogen.sh.orig	Mon Oct  6 04:00:53 2003
-+++ autogen.sh	Fri Oct 31 16:07:18 2003
+--- autogen.sh.orig	Fri Feb 20 08:28:02 2004
++++ autogen.sh	Sun Mar 28 15:33:09 2004
 @@ -10,7 +10,7 @@
  
  rm -f autogen.err
@@ -9,7 +9,7 @@
  
  if [ $? -ne 0 ]; then
      echo "Error: you need automake 1.4 or later.  Please upgrade."
-@@ -19,17 +19,17 @@
+@@ -19,9 +19,9 @@
  
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
  # 
@@ -19,9 +19,11 @@
 -aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
 +%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
  
- echo "Checking for PKG_CHECK_MODULES..."
+ if test -f autom4te.cache/requests; then
+     echo "Checking for PKG_CHECK_MODULES in autom4te.cache/requests ..."
+@@ -32,9 +32,9 @@
+ fi
  
- pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
  if test "x$pkgcheckdef" = "x"; then
 -  echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
 -  (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
@@ -31,8 +33,8 @@
 +    echo "%%ACLOCAL%% failed! Unable to continue."
      exit 1
    }
-   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
-@@ -51,9 +51,9 @@
+   if test -f autom4te.cache/requests; then
+@@ -62,9 +62,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
  # 
@@ -44,7 +46,7 @@
      echo ""
      echo "* * * warning: possible errors while running automake - check autogen.err"
      echo ""
-@@ -69,7 +69,7 @@
+@@ -80,7 +80,7 @@
  # 
  echo "Creating configure..."
  
diff --git a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop
deleted file mode 100644
index 656c586a6..000000000
--- a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pkg/linux/rpm/data/abiword.desktop.orig	Sun Apr  6 14:45:19 2003
-+++ src/pkg/linux/rpm/data/abiword.desktop	Sun Apr 20 00:33:09 2003
-@@ -12,7 +12,7 @@
- Icon=abiword_48.png
- Terminal=0
- Type=Application
--Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
-+Categories=Application;Office;WordProcessor;
- StartupNotify=true
- Encoding=UTF-8
- X-Desktop-File-Install-Version=0.3
diff --git a/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp b/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp
new file mode 100644
index 000000000..66ffce5c5
--- /dev/null
+++ b/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp
@@ -0,0 +1,34 @@
+--- src/wp/ap/unix/ap_UnixDialog_FormatTOC.cpp.orig	Sun Mar 28 15:54:04 2004
++++ src/wp/ap/unix/ap_UnixDialog_FormatTOC.cpp	Sun Mar 28 15:55:46 2004
+@@ -532,11 +532,11 @@
+ 	{
+ 		sVal = new UT_String(static_cast<char *>(vecTypeList->getNthItem(j)));
+ 		m_vecAllPropVals.addItem(static_cast<void *>(sVal));
+-		const gchar * szLab = static_cast<const gchar *>(vecTypeList->getNthItem(j));
++		const gchar * szLab = (const gchar *)(vecTypeList->getNthItem(j));
+ 		UT_DEBUGMSG(("Got label %s for item %d \n",szLab,j));
+ 		GtkWidget * pW = gtk_menu_item_new_with_label(szLab);
+ 		g_object_set_data(G_OBJECT(pW),"toc-prop",(gpointer)(sProp->c_str()));
+-		const gchar * szVal = static_cast<const gchar *>(vecPropList->getNthItem(j));
++		const gchar * szVal = (const gchar *)(vecPropList->getNthItem(j));
+ 		g_object_set_data(G_OBJECT(pW),"toc-val",(gpointer)(szVal));
+ 		g_signal_connect(G_OBJECT(pW),
+ 			   "activate",
+@@ -558,7 +558,7 @@
+ 		m_vecAllPropVals.addItem(static_cast<void *>(sVal));
+ 		GtkWidget * pW = gtk_menu_item_new_with_label(static_cast<char *>(vecTypeList->getNthItem(j)));
+ 		g_object_set_data(G_OBJECT(pW),"toc-prop",(gpointer)sProp->c_str());
+-		const gchar * szVal = static_cast<const gchar *>(vecPropList->getNthItem(j));
++		const gchar * szVal = (const gchar *)(vecPropList->getNthItem(j));
+ 		g_object_set_data(G_OBJECT(pW),"toc-val",(gpointer)(szVal));
+ 		g_signal_connect(G_OBJECT(pW),
+ 						 "activate",
+@@ -586,7 +586,7 @@
+ 		m_vecAllPropVals.addItem(static_cast<void *>(sProp));
+ 		sVal = new UT_String(static_cast<char *>(vecProps->getNthItem(j)));
+ 		m_vecAllPropVals.addItem(static_cast<void *>(sVal));
+-		const gchar * szLab = static_cast<const gchar *>(vecLabels->getNthItem(j));
++		const gchar * szLab = (const gchar *)(vecLabels->getNthItem(j));
+ 		UT_DEBUGMSG(("Got label %s for item %d \n",szLab,j));
+ 		GtkWidget * pW = gtk_menu_item_new_with_label(szLab);
+ 		g_object_set_data(G_OBJECT(pW),"toc-prop",(gpointer)(sProp->c_str()));