summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2002-03-21 10:36:07 +0000
committerDan Armak <danarmak@gentoo.org>2002-03-21 10:36:07 +0000
commit6b9fa40dc5a252e886cf5f2a375dc8027f72d8ba (patch)
treeaa30c54c7cddafae8f8820999a9703818b073e43 /app-text/noweb/files
parentupdated too new version of bind (diff)
downloadgentoo-2-6b9fa40dc5a252e886cf5f2a375dc8027f72d8ba.tar.gz
gentoo-2-6b9fa40dc5a252e886cf5f2a375dc8027f72d8ba.tar.bz2
gentoo-2-6b9fa40dc5a252e886cf5f2a375dc8027f72d8ba.zip
use awk not icon, because icon is broken and may take a while to fix. Also fix some sandbox
violations.
Diffstat (limited to 'app-text/noweb/files')
-rw-r--r--app-text/noweb/files/noweb-2.9-r1-gentoo.diff (renamed from app-text/noweb/files/noweb-2.9-gentoo.diff)42
1 files changed, 30 insertions, 12 deletions
diff --git a/app-text/noweb/files/noweb-2.9-gentoo.diff b/app-text/noweb/files/noweb-2.9-r1-gentoo.diff
index d24b8c31b454..c3170db70ab6 100644
--- a/app-text/noweb/files/noweb-2.9-gentoo.diff
+++ b/app-text/noweb/files/noweb-2.9-r1-gentoo.diff
@@ -1,5 +1,6 @@
---- Makefile.orig Wed Mar 28 15:40:00 2001
-+++ Makefile Wed Aug 1 20:46:24 2001
+diff -ur src-new/Makefile src/Makefile
+--- Makefile Wed Mar 28 15:40:00 2001
++++ Makefile Thu Mar 21 12:22:47 2002
@@ -3,12 +3,12 @@
#
# Adjust these two lines for your ANSI C compiler
@@ -8,8 +9,7 @@
+#CFLAGS=
# If you have Icon, you should use the Icon versions of the noweb pipeline.
# Set LIBSRC=icon
--LIBSRC=awk
-+LIBSRC=icon
+ LIBSRC=awk
# If you have no Icon compiler, but do have icont, make ICONC=icont
-ICONC=iconc
+ICONC=icont
@@ -177,26 +177,43 @@
sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt | gzip > $(CATDIR)/cpif.$(MANEXT).gz
sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt | gzip > $(CATDIR)/nodefs.$(MANEXT).gz
sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt | gzip > $(CATDIR)/noroots.$(MANEXT).gz
-@@ -143,13 +143,13 @@
+@@ -143,13 +143,14 @@
rm -f $(CATDIR)/nountangle.$(MANEXT).gz
(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
install-tex:
- -mkdir $(TEXINPUTS) 2>/dev/null
- cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
+- -texhash || echo "Program texhash not found or failed"
+ -mkdir -p ${DESTDIR}/$(TEXINPUTS) 2>/dev/null
+ cp tex/nwmac.tex tex/noweb.sty ${DESTDIR}/$(TEXINPUTS)
- -texhash || echo "Program texhash not found or failed"
++ #-texhash || echo "Program texhash not found or failed"
install-elisp:
- -mkdir $(ELISP) 2>/dev/null
- cp elisp/noweb-mode.el $(ELISP)
-+ -mkdir -p $(ELISP) 2>/dev/null
-+ cp elisp/noweb-mode.el /$(ELISP)
++ # right now $ELISP is /dev/null so don't mess with it
++ #-mkdir -p $(DESTDIR)/$(ELISP) 2>/dev/null
++ #cp elisp/noweb-mode.el $(DESTDIR)$(ELISP)
checkin:
for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
---- icon/Makefile.orig Thu Sep 14 03:00:00 2000
-+++ icon/Makefile Wed Aug 1 20:46:03 2001
+diff -ur src-new/awk/Makefile src/awk/Makefile
+--- awk/Makefile Mon Mar 27 02:00:00 2000
++++ awk/Makefile Thu Mar 21 12:09:35 2002
+@@ -16,8 +16,8 @@
+ touch $(EXECS)
+
+ install: all
+- cp $(LIBEXECS) $(LIB)
+- cp $(BINEXECS) $(BIN)
++ cp $(LIBEXECS) $(DESTDIR)/$(LIB)
++ cp $(BINEXECS) $(DESTDIR)/$(BIN)
+
+ source: $(EXECS)
+
+diff -ur src-new/icon/Makefile src/icon/Makefile
+--- icon/Makefile Thu Sep 14 03:00:00 2000
++++ icon/Makefile Thu Mar 21 12:08:58 2002
@@ -32,9 +32,9 @@
touch $(SRCS)
@@ -210,8 +227,9 @@
clean:
/bin/rm -f *.tex *.dvi *.aux *.log *.blg *.bbl *~ *.toc *.html *.u1 *.u2
---- lib/Makefile.orig Fri Jun 23 13:56:00 2000
-+++ lib/Makefile Wed Aug 1 20:46:03 2001
+diff -ur src-new/lib/Makefile src/lib/Makefile
+--- lib/Makefile Fri Jun 23 13:56:00 2000
++++ lib/Makefile Thu Mar 21 12:08:58 2002
@@ -11,9 +11,9 @@
chmod +x unmarkup emptydefn toascii nwmtime pipedocs h2a btdefn