5 files changed, 17 insertions, 16 deletions

diff --git a/editors/abiword/files/patch-GNUmakefile.in b/editors/abiword/files/patch-GNUmakefile.in
index e7b1b3f4059a..6385aea4d9af 100644
--- a/editors/abiword/files/patch-GNUmakefile.in
+++ b/editors/abiword/files/patch-GNUmakefile.in
@@ -1,6 +1,6 @@
---- GNUmakefile.in.orig	Wed Jan  5 15:28:11 2005
-+++ GNUmakefile.in	Wed Jan  5 15:30:55 2005
-@@ -315,15 +315,15 @@
+--- GNUmakefile.in.orig	Wed Jul 20 22:21:46 2005
++++ GNUmakefile.in	Wed Jul 20 22:23:12 2005
+@@ -337,15 +337,15 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  SUBDIRS = src
@@ -25,7 +25,7 @@
  @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
  @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
  @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no
-@@ -816,7 +816,6 @@
+@@ -844,7 +844,6 @@
  
  # Install the datafiles. This is quick-and-dirty.
  install-data-local:
@@ -33,7 +33,7 @@
  	if test -d $(top_srcdir)/../abidistfiles ; then \
  	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
  	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
-@@ -829,11 +828,7 @@
+@@ -857,11 +856,7 @@
  	      for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \
  	        if test -f $$file ; then \
  		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index 02339d5a28ad..a8faac36b4da 100644
--- a/editors/abiword/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -1,5 +1,5 @@
---- abiword.desktop.orig	Mon Apr  4 00:10:55 2005
-+++ abiword.desktop	Mon Apr  4 00:12:20 2005
+--- abiword.desktop.orig	Tue Oct  4 13:22:33 2005
++++ abiword.desktop	Tue Oct  4 13:23:58 2005
 @@ -3,11 +3,11 @@
  Icon=abiword_48.png
  Terminal=false
diff --git a/editors/abiword/files/patch-aq b/editors/abiword/files/patch-aq
index e00bf0585c14..98ce2809346a 100644
--- a/editors/abiword/files/patch-aq
+++ b/editors/abiword/files/patch-aq
@@ -1,6 +1,6 @@
---- src/config/abi_defs.mk.orig	Thu Jun 17 14:54:58 2004
-+++ src/config/abi_defs.mk	Thu Jun 17 14:55:04 2004
-@@ -217,11 +217,11 @@
+--- src/config/abi_defs.mk.orig	Sun Jun 12 16:07:25 2005
++++ src/config/abi_defs.mk	Sun Jun 12 16:08:49 2005
+@@ -202,11 +202,11 @@
  ## INSTALL program...
  
  define MAKE_OBJDIR
@@ -10,11 +10,11 @@
  
  define VERIFY_DIRECTORY
 -if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
-+if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p xxxx; fi
  endef
  
  ifeq ($(OS_NAME), WIN32)
-@@ -266,7 +266,9 @@
+@@ -251,7 +251,9 @@
  ##################################################################
  ##################################################################
  
diff --git a/editors/abiword/files/patch-ar b/editors/abiword/files/patch-ar
index 5832a8deed5c..fb71cb0b6a26 100644
--- a/editors/abiword/files/patch-ar
+++ b/editors/abiword/files/patch-ar
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+$MCom: ports/editors/abiword/files/patch-ar,v 1.2 2005/10/14 20:39:57 adamw Exp $
 
 --- src/pkg/common/unix/scripts/install.sh.orig	Sat Apr  7 10:59:52 2001
 +++ src/pkg/common/unix/scripts/install.sh	Wed Aug  8 13:31:57 2001
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
index dd1f65d7282b..d892f8e3334f 100644
--- a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
@@ -1,11 +1,11 @@
---- src/af/util/xp/ut_iconv.cpp.orig	Fri Jan  2 16:00:33 2004
-+++ src/af/util/xp/ut_iconv.cpp	Fri Jan  2 16:08:03 2004
+--- src/af/util/xp/ut_iconv.cpp.orig	Wed Jul 20 22:24:55 2005
++++ src/af/util/xp/ut_iconv.cpp	Wed Jul 20 22:25:23 2005
 @@ -67,7 +67,7 @@
  #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
  (defined (__MACH__) && defined (__APPLE__)) || \
  (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
--defined(__BEOS__) || defined (__AIX__) || \
-+defined(__BEOS__) || defined (__AIX__) || defined (__FreeBSD__) || \
+-defined (__AIX__) || \
++defined (__AIX__) || defined (__FreeBSD__) || \
  (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
  
  #define ICONV_CONST const