- Clean up to make it looks nicer.

- Change from autogen.sh to configure; it works fine with tweaks.
- No longer wv check for the conflict, which it depends on textproc/wv
  rather than the one include AbiWord's tarball. I have tested my Mom
  and sister's docs from their work/school and they works fine with wv
  port. I don't see any problem or slowdown.
- Force AbiWord to check/compile everything what apps that are
  installed (headers, libraries, etc) from ports rather than check and
  use the stuff that are included in tarball such as wv, zlib, libpng,
  popt and etc. (Use external dependencies.)
- Improvement the autochecks and knobs of WITH_ENCHANT and WITH_ASPELL.
- Add the new WITHOUT_GTKSPELL knob to allow us not depend and install
  either Aspell or Enchant, but the spell checker will be still enable
  and dictionary will be install. The spell checker works fine in my
  test so far.
- Add install the Help docs to fix the ports/66623 and add a new
  WITHOUT_HELP_DOCS to disable the install Help docs.

Reviewed by:	marcus and adamw

1 files changed, 16 insertions, 11 deletions

diff --git a/editors/AbiWord2/files/patch-an b/editors/AbiWord2/files/patch-an
index f2e91bdd806e..1048c7ae0a2b 100644
--- a/editors/AbiWord2/files/patch-an
+++ b/editors/AbiWord2/files/patch-an
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- 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 Jun  7 00:15:08 2004
++++ src/Makefile	Mon Jun  7 00:51:56 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 +11,7 @@ $FreeBSD$
  
  ## 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,21 +21,26 @@ $FreeBSD$
  	@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 ;			\
+@@ -73,9 +77,10 @@
+ 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/$(OS_ENDIAN).*.hash $(CANONDIR)/dictionary
+ 	@(cd $(CANONDIR)/dictionary; 				\
+ 		for k in *.hash; do				\
+-			cp $$k american.hash;		\
+-			rm $$k ;			\
++			$(ABICOPY) $$k american.hash;		\
++			$(ABIRM) $$k ;				\
  		done)
 +	@(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 @@
+ 	@$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.xml $(CANONDIR)/dictionary	
+ endif
+@@ -115,10 +120,12 @@
  	fi
  # 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*)
++	@(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r abi*)
  # font stuff for installation
  	@$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY))
 -	(cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts)