aboutsummaryrefslogtreecommitdiff
path: root/editors/abiword-devel/files/patch-an
diff options
context:
space:
mode:
Diffstat (limited to 'editors/abiword-devel/files/patch-an')
-rw-r--r--editors/abiword-devel/files/patch-an37
1 files changed, 12 insertions, 25 deletions
diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword-devel/files/patch-an
index 1048c7ae0a2b..54d3de78eb22 100644
--- a/editors/abiword-devel/files/patch-an
+++ b/editors/abiword-devel/files/patch-an
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- src/Makefile.orig Mon Jun 7 00:15:08 2004
-+++ src/Makefile Mon Jun 7 00:51:56 2004
+--- 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)
@@ -21,31 +18,21 @@ $FreeBSD$
@for k in $(CANON_SubDirs); do \
$(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical; \
done
-@@ -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)
+@@ -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.
- @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.xml $(CANONDIR)/dictionary
- endif
-@@ -115,10 +120,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 abi*)
- # 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))