aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2000-01-28 08:08:56 +0800
committerjmz <jmz@FreeBSD.org>2000-01-28 08:08:56 +0800
commit37db1cbf20a05d02d322a2035ead950db1c0e3b9 (patch)
tree8c2ce4d1a196458db90b0411f7341884d92c2670
parent9602fa80aa0133a459f6fc8769a20e9de9b72efd (diff)
downloadfreebsd-ports-gnome-37db1cbf20a05d02d322a2035ead950db1c0e3b9.tar.gz
freebsd-ports-gnome-37db1cbf20a05d02d322a2035ead950db1c0e3b9.tar.zst
freebsd-ports-gnome-37db1cbf20a05d02d322a2035ead950db1c0e3b9.zip
The port was broken because dicts were installed in $SHAREDIR but
ispell was looking for files in $LIBDIR. Because $LIBDIR is only used for dictionaries, we don't need the SHAREDIR variable. Just define LIBDIR to $PREFIX/share/ispell.
-rw-r--r--textproc/ispell/files/patch-ab21
-rw-r--r--textproc/ispell/scripts/configure3
2 files changed, 2 insertions, 22 deletions
diff --git a/textproc/ispell/files/patch-ab b/textproc/ispell/files/patch-ab
index 6cdd4170563a..42d7015bc30b 100644
--- a/textproc/ispell/files/patch-ab
+++ b/textproc/ispell/files/patch-ab
@@ -9,27 +9,6 @@
echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
> /tmp/emi$$$$; \
$$EMACS -batch -l /tmp/emi$$$$; \
-@@ -310,9 +310,9 @@
- $(MAKE) LANGUAGE_TARGET=install SHELLDEBUG=$(SHELLDEBUG) \
- language-subdirs
- . ./config.sh; \
-- [ -d $$LIBDIR ] || (mkdir $$LIBDIR; chmod 755 $$LIBDIR); \
-+ [ -d $$SHAREDIR ] || (mkdir $$SHAREDIR; chmod 755 $$SHAREDIR); \
- set -x; \
-- cd $$LIBDIR; \
-+ cd $$SHAREDIR; \
- if [ $$MASTERHASH != $DEFHASH ]; then \
- rm -f $$DEFHASH; \
- ln $$MASTERHASH $$DEFHASH; \
-@@ -412,7 +412,7 @@
- config.sh: config.X local.h
- set $(SHELLDEBUG); \
- for var in BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH DEFLANG \
-- ELISPDIR EMACS HASHSUFFIX INSTALL \
-+ ELISPDIR EMACS HASHSUFFIX INSTALL SHAREDIR \
- LANGUAGES LIBDIR LIBES LINT LINTFLAGS \
- MAKE_SORTTMP MAN1DIR MAN1EXT MAN4DIR MAN4EXT MASTERHASH \
- MSGLANG REGLIB STATSUFFIX \
@@ -508,7 +508,7 @@
local.h:
set +e; [ -r local.h ] || cp local.h.samp local.h
diff --git a/textproc/ispell/scripts/configure b/textproc/ispell/scripts/configure
index 8ba19d8c338a..eef66742e868 100644
--- a/textproc/ispell/scripts/configure
+++ b/textproc/ispell/scripts/configure
@@ -26,7 +26,8 @@ echo "#undef WORDS" >> local.h
echo '#define WORDS "/usr/share/dict/words"' >> local.h
echo '#undef ELISPDIR' >> local.h
echo "#define ELISPDIR \"$PREFIX/share/emacs/site-lisp\"" >> local.h
-echo "#define SHAREDIR \"$PREFIX/share/ispell\"" >> local.h
+echo "#undef LIBDIR" >> local.h
+echo "#define LIBDIR \"$PREFIX/share/ispell\"" >> local.h
mv Makefile Makefile.orig
sed -e 's/^[ ]*$/\