summaryrefslogtreecommitdiff
path: root/textproc/dict/files/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/dict/files/patch-ab')
-rw-r--r--textproc/dict/files/patch-ab71
1 files changed, 11 insertions, 60 deletions
diff --git a/textproc/dict/files/patch-ab b/textproc/dict/files/patch-ab
index 4591a805a96f..011679160f01 100644
--- a/textproc/dict/files/patch-ab
+++ b/textproc/dict/files/patch-ab
@@ -1,11 +1,17 @@
---- Makefile.in.orig Sun Jul 5 18:09:59 1998
-+++ Makefile.in Tue Mar 23 16:38:53 1999
-@@ -35,3 +35,3 @@
+--- Makefile.in.orig Fri Jan 12 01:24:29 2001
++++ Makefile.in Mon Aug 20 17:22:10 2001
+@@ -33,7 +33,7 @@
+ srcdir= @srcdir@
+ VPATH= @srcdir@
prefix= @prefix@
-subdirs= @allsubdirs@ regex # doc -- use rfc2229 instead
+subdirs= @allsubdirs@ # regex # doc -- use rfc2229 instead
exec_prefix= @exec_prefix@
-@@ -59,5 +59,5 @@
+ man1_prefix= @mandir@/man1
+ man8_prefix= @mandir@/man8
+@@ -57,9 +57,9 @@
+ -DDICT_CONFIG_PATH=\"$(conf)\"
+ SCFLAGS= @SCFLAGS@
LDFLAGS= @LDFLAGS@
-XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
+XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
@@ -13,60 +19,5 @@
-LDLIBS= @LIBS@ -Lregex -lregex
+LDLIBS= @LIBS@ -lgnuregex
-@@ -77,13 +77,3 @@
- echo making in $$subdir; \
-- if [ "$$subdir" = "zlib" ]; then \
-- (cd $$subdir \
-- && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
-- || exit 1; \
-- elif [ "$$subdir" = "regex" ]; then \
-- (cd $$subdir \
-- && $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
-- || exit 1; \
-- else \
-- (cd $$subdir && $(MAKE)) || exit 1; \
-- fi \
-+ (cd $$subdir && $(MAKE)) || exit 1; \
- done
-@@ -104,3 +94,3 @@
- dict:: dict.c $(HEADERS) $(CLIOBJS)
-- $(CC) $(ALLFLAGS) -o $@ $< $(CLIOBJS) $(LDLIBS)
-+ $(CC) $(ALLFLAGS) -o $@ $< $(CLIOBJS) -Llibmaa -lmaa
-
-@@ -118,7 +108,9 @@
-
--servparse.c: servparse.y
-- $(YACC) -tdv $<
-- cmp -s y.tab.h servparse.h || mv y.tab.h servparse.h
-- cmp -s y.tab.c servparse.c || mv y.tab.c servparse.c
-- -rm -f y.tab.h y.tab.c
-+servparse.c: servparse.h
-+
-+servparse.h: servparse.y
-+ $(YACC) -tdv -b serv $<
-+ cmp -s serv.tab.h servparse.h || mv serv.tab.h servparse.h
-+ cmp -s serv.tab.c servparse.c || mv serv.tab.c servparse.c
-+ -rm -f serv.tab.h serv.tab.c
-
-@@ -133,7 +125,9 @@
-
--clientparse.c: clientparse.y
-- $(YACC) -tdv $<
-- cmp -s y.tab.h clientparse.h || mv y.tab.h clientparse.h
-- cmp -s y.tab.c clientparse.c || mv y.tab.c clientparse.c
-- -rm -f y.tab.h y.tab.c
-+clientparse.c: clientparse.h
-+
-+clientparse.h: clientparse.y
-+ $(YACC) -tdv -b client $<
-+ cmp -s client.tab.h clientparse.h || mv client.tab.h clientparse.h
-+ cmp -s client.tab.c clientparse.c || mv client.tab.c clientparse.c
-+ -rm -f client.tab.h client.tab.c
-
-@@ -143,4 +137,4 @@
- install.dict: dict
-- install dict $(bindir)
-- install -m 644 dict.1 $(man1_prefix)
-+ $(INSTALL) -m 755 -o bin -g bin dict $(bindir)
-+ $(INSTALL) -m 644 -o bin -g bin dict.1 $(man1_prefix)
+ EXES= dict dictd dictzip