Update to 0.7.13.

Submitted by:	me
Reviewed by:	MAINTAINER, with some corrections

5 files changed, 30 insertions, 40 deletions

diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 9b99fca5143e..98461e9e4225 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -10,12 +10,14 @@
 # AbiWord build system.
 
 PORTNAME=	AbiWord
-PORTVERSION=	0.7.12
+PORTVERSION=	0.7.13
 CATEGORIES=	editors
-MASTER_SITES=	http://download.abisource.com/releases/${PORTVERSION}/src/
+MASTER_SITES=	http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
 DISTNAME=	abi-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} expat.tar.gz unixfonts.tar.gz \
-		wv.tar.gz abidistfiles.tar.gz libiconv.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} expat-${PORTVERSION}.tar.gz \
+		unixfonts-${PORTVERSION}.tar.gz wv-${PORTVERSION}.tar.gz \
+		abidistfiles-${PORTVERSION}.tar.gz \
+		psiconv-${PORTVERSION}.tar.gz libiconv-${PORTVERSION}.tar.gz
 
 MAINTAINER=	wolman@cs.washington.edu
 
@@ -27,7 +29,7 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 DIST_SUBDIR=	AbiWord
 
-WRKSRC=		${WRKDIR}/abi-${PORTVERSION}/src
+WRKSRC=		${WRKDIR}/abi/src
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
@@ -35,12 +37,6 @@ MAKE_ENV=	prefix="${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
-# start by deleting some junk files that should never have been placed
-# in the tar file
-pre-build:
-	cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?line.jpg
-	cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?space.jpg
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index 3046d318a120..6d96ce7e35f6 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1,6 +1,7 @@
-MD5 (AbiWord/abi-0.7.12.tar.gz) = 3c7eb8cfaef1971d97a44b2fba1fa7a9
-MD5 (AbiWord/expat.tar.gz) = 75d92a57bb22498ff5d6c76990a8738d
-MD5 (AbiWord/unixfonts.tar.gz) = 618cfbc3de9b73407d47ba283b5955a9
-MD5 (AbiWord/wv.tar.gz) = a956dc042c470d1d13a683e1d47d83f4
-MD5 (AbiWord/abidistfiles.tar.gz) = 21634e08ddbc83ff55a59158515726f3
-MD5 (AbiWord/libiconv.tar.gz) = a13838bc277a3b73a25781eff8beead2
+MD5 (AbiWord/abi-0.7.13.tar.gz) = b2a453691cd11a6ef5e50dbdc4aeaa63
+MD5 (AbiWord/expat-0.7.13.tar.gz) = d90138f78cd45a747c27eb417c9c8346
+MD5 (AbiWord/unixfonts-0.7.13.tar.gz) = 7c743d4a35debe23136555f6a28f618b
+MD5 (AbiWord/wv-0.7.13.tar.gz) = aadfb035f72c0aeca6c1905e1f3b6914
+MD5 (AbiWord/abidistfiles-0.7.13.tar.gz) = b1a7e82dd8c727c3ea4df66bf0a7b58f
+MD5 (AbiWord/psiconv-0.7.13.tar.gz) = 3ef161a65dfa8f136e74fd18f6b613f8
+MD5 (AbiWord/libiconv-0.7.13.tar.gz) = 4fa91903f68ee8838da3eada9f870baf
diff --git a/editors/AbiWord2/files/patch-ba b/editors/AbiWord2/files/patch-ba
deleted file mode 100644
index 7321cef4eeac..000000000000
--- a/editors/AbiWord2/files/patch-ba
+++ /dev/null
@@ -1,23 +0,0 @@
---- af/xap/xp/xap_EncodingManager.cpp.orig	Mon Nov 27 17:14:03 2000
-+++ af/xap/xp/xap_EncodingManager.cpp	Tue Jan  2 19:02:31 2001
-@@ -39,16 +39,16 @@
- 
- XAP_EncodingManager::~XAP_EncodingManager()
- {
--  if(iconv_handle_N2U)
-+  if(iconv_handle_N2U != (iconv_t)-1)
-     iconv_close(iconv_handle_N2U);
- 
--  if(iconv_handle_U2N)
-+  if(iconv_handle_U2N != (iconv_t)-1)
-     iconv_close(iconv_handle_U2N);
- 
--  if(iconv_handle_U2Win)
-+  if(iconv_handle_U2Win != (iconv_t)-1)
-     iconv_close(iconv_handle_U2Win);
-   
--  if(iconv_handle_Win2U)
-+  if(iconv_handle_Win2U != (iconv_t)-1)
-     iconv_close(iconv_handle_Win2U);
- }
- 
diff --git a/editors/AbiWord2/files/patch-bb b/editors/AbiWord2/files/patch-bb
new file mode 100644
index 000000000000..093f9c8939e9
--- /dev/null
+++ b/editors/AbiWord2/files/patch-bb
@@ -0,0 +1,10 @@
+--- ../../psiconv/psiconv/generate_layout.c.orig	Fri Jan 19 13:17:35 2001
++++ ../../psiconv/psiconv/generate_layout.c	Fri Mar  2 04:17:38 2001
+@@ -78,7 +78,6 @@
+     return res;
+   if ((res = psiconv_write_color(buf,value->color)))
+     return res;
+-  // Unknown byte
+   return psiconv_write_u8(buf,1);
+ }
+ 
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 940d300d44ed..f9c153af1439 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -264,6 +264,7 @@ AbiSuite/AbiWord/strings/hu-HU.strings
 AbiSuite/AbiWord/strings/id-ID.strings
 AbiSuite/AbiWord/strings/it-IT.strings
 AbiSuite/AbiWord/strings/lt-LT.strings
+AbiSuite/AbiWord/strings/nb-NO.strings
 AbiSuite/AbiWord/strings/nn-NO.strings
 AbiSuite/AbiWord/strings/no-BOK.strings
 AbiSuite/AbiWord/strings/pl-PL.strings
@@ -292,6 +293,8 @@ AbiSuite/fonts/a010033l.afm
 AbiSuite/fonts/a010033l.pfa
 AbiSuite/fonts/a010035l.afm
 AbiSuite/fonts/a010035l.pfa
+AbiSuite/fonts/adobe-full.u2g
+AbiSuite/fonts/adobe-short.u2g
 AbiSuite/fonts/b018012l.afm
 AbiSuite/fonts/b018012l.pfa
 AbiSuite/fonts/b018015l.afm
@@ -300,6 +303,7 @@ AbiSuite/fonts/b018032l.afm
 AbiSuite/fonts/b018032l.pfa
 AbiSuite/fonts/b018035l.afm
 AbiSuite/fonts/b018035l.pfa
+AbiSuite/fonts/d050000l.u2g
 AbiSuite/fonts/bchb.afm
 AbiSuite/fonts/bchb.pfa
 AbiSuite/fonts/bchbi.afm
@@ -319,6 +323,7 @@ AbiSuite/fonts/c059036l.pfa
 AbiSuite/fonts/d050000l.afm
 AbiSuite/fonts/d050000l.pfa
 AbiSuite/fonts/fonts.dir
+AbiSuite/fonts/fonts.scale
 AbiSuite/fonts/n019003l.afm
 AbiSuite/fonts/n019003l.pfa
 AbiSuite/fonts/n019004l.afm
@@ -361,6 +366,7 @@ AbiSuite/fonts/p052024l.afm
 AbiSuite/fonts/p052024l.pfa
 AbiSuite/fonts/s050000l.afm
 AbiSuite/fonts/s050000l.pfa
+AbiSuite/fonts/s050000l.u2g
 AbiSuite/fonts/z003034l.afm
 AbiSuite/fonts/z003034l.pfa
 AbiSuite/icons/abiword_48.png