summaryrefslogtreecommitdiff
path: root/math/proofgeneral/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/proofgeneral/files')
-rw-r--r--math/proofgeneral/files/patch-Makefile102
-rw-r--r--math/proofgeneral/files/patch-doc-Makefile.doc65
-rw-r--r--math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop4
-rw-r--r--math/proofgeneral/files/patch-isar-interface12
4 files changed, 82 insertions, 101 deletions
diff --git a/math/proofgeneral/files/patch-Makefile b/math/proofgeneral/files/patch-Makefile
index 194cb0b7a220..0de221d9298c 100644
--- a/math/proofgeneral/files/patch-Makefile
+++ b/math/proofgeneral/files/patch-Makefile
@@ -1,76 +1,20 @@
---- Makefile.orig 2008-02-01 00:06:38.000000000 +1100
-+++ Makefile 2008-07-29 13:09:58.000000000 +1000
-@@ -21,7 +21,7 @@
+--- Makefile.orig 2010-10-10 15:56:56.000000000 -0700
++++ Makefile 2012-04-11 22:30:19.000000000 -0700
+@@ -41,7 +41,7 @@
+ ELISP_EXTRAS=isar/interface isar/isartags
+ EXTRA_DIRS = images
- # Set this to "emacs" or "xemacs" according to your version of Emacs.
- # NB: this is also used to set default install path names below.
--EMACS=$(shell if [ -z "`which emacs`" ]; then echo xemacs; else echo emacs; fi)
-+EMACS=${EMACS_NAME}
+-DOC_FILES=AUTHORS BUGS COMPATIBILITY CHANGES COPYING INSTALL README REGISTER doc/*.pdf
++DOC_FILES=AUTHORS BUGS COMPATIBILITY CHANGES COPYING INSTALL README REGISTER
+ DOC_EXAMPLES=acl2/*.acl2 hol98/*.sml isar/*.thy lclam/*.lcm lego/*.l pgshell/*.pgsh phox/*.phx plastic/*.lf twelf/*.elf
+ DOC_SUBDIRS=${DOC_EXAMPLES} */README* */CHANGES */BUGS
- # We default to /usr rather than /usr/local because installs of
- # desktop and doc files under /usr/local are unlikely to work with
-@@ -29,8 +29,7 @@
- # individually before the install section.
- # NB: DEST_PREFIX is used for final destination prefix, in case we're
- # packaging into a build prefix rather than live root (e.g. in rpmbuild).
--PREFIX=/usr
--DEST_PREFIX=/usr
-+DEST_PREFIX=${PREFIX}
-
- PWD=$(shell pwd)
-
-@@ -75,8 +74,8 @@
- ## old .elc's and re-compile.
- ##
- compile: $(EL) x-symbol/lisp/*.el
-- lastemacs=`cat .byte-compile 2>/dev/null || echo `; if [ "$$lastemacs" != "" ] && [ "$$lastemacs" != "$(EMACS)" ]; then rm -f .byte-compile $(ELC) x-symbol/lisp/*.elc; fi
-- make .byte-compile
-+ lastemacs=`cat .byte-compile 2>/dev/null || echo `; if [ "$$lastemacs" != "" ] && [ "$$lastemacs" != "$(EMACS_NAME)" ]; then rm -f .byte-compile $(ELC) x-symbol/lisp/*.elc; fi
-+ $(MAKE) .byte-compile
-
- ## Compiling can show up errors in the code, but be wary of fixing obsoletion
- ## or argument call warnings unless they're valid for both Emacsen.
-@@ -85,10 +84,10 @@
- @echo "****************************************************************"
- @echo " Byte compiling... "
- @echo "****************************************************************"
-- make elc
-+ $(MAKE) elc
- @echo " Byte compiling X-Symbol..."
- (cd x-symbol/lisp; $(MAKE) EMACS="$(EMACS) -q -no-site-file")
-- echo $(EMACS) > $(@)
-+ echo $(EMACS_NAME) > $(@)
- @echo "****************************************************************"
- @echo " Finished."
- @echo "****************************************************************"
-@@ -137,39 +136,35 @@
- # Set Elisp directories according to paths used in Red Hat RPMs
- # (which may or may not be official Emacs policy). We generate
- # a pg-init.el file which loads the appropriate proof-site.el.
--ifeq ($(EMACS),xemacs)
--ELISPP=share/xemacs/site-packages/lisp/ProofGeneral
--ELISP_START=${PREFIX}/share/xemacs/site-packages/lisp/site-start.d
--else
--ELISPP=share/${EMACS}/site-lisp/ProofGeneral
--ELISP_START=${PREFIX}/share/${EMACS}/site-lisp/site-start.d
--endif
-+ELISPP=${EMACS_SITE_LISPDIR}/ProofGeneral
-+ELISP_START=${PREFIX}/${EMACS_SITE_LISPDIR}/site-start.d
-
- ELISP=${PREFIX}/${ELISPP}
- DEST_ELISP=${DEST_PREFIX}/${ELISPP}
-
- BINDIR=${PREFIX}/bin
- DESKTOP=${PREFIX}/share
--DOCDIR=${PREFIX}/share/doc/ProofGeneral
--MANDIR=${PREFIX}/share/man/man1
--INFODIR=${PREFIX}/share/info
-+DOCDIR=${DOCSDIR}
-+MANDIR=${PREFIX}/man/man1
-+INFODIR=${PREFIX}/info
+@@ -135,22 +135,23 @@
+ MANDIR=${PREFIX}/share/man/man1
+ INFODIR=${PREFIX}/share/info
-install: install-desktop install-elisp install-bin install-init
-+install: install-desktop install-elisp install-bin install-init install-man ${INSTALLDOC}
++install: install-desktop install-elisp install-bin install-init ${INSTALLDOC}
install-desktop:
- mkdir -p ${DESKTOP}/icons/hicolor/16x16
@@ -103,7 +47,7 @@
# backwards compatibility with old linuxes
mkdir -p ${DESKTOP}/application-registry
cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
-@@ -190,15 +185,23 @@
+@@ -168,15 +169,23 @@
install-el:
mkdir -p ${ELISP}
for f in ${ELISP_DIRS} ${EXTRA_DIRS}; do mkdir -p ${ELISP}/$$f; done
@@ -132,7 +76,7 @@
install-init:
mkdir -p ${ELISP_START}
-@@ -208,24 +211,33 @@
+@@ -186,18 +195,23 @@
install-bin: scripts
mkdir -p ${BINDIR}
@@ -140,7 +84,7 @@
+ ${BSD_INSTALL_SCRIPT} ${BIN_SCRIPTS} ${BINDIR}
-install-doc: doc.info doc.pdf
-+install-man: doc.info
++install-doc: doc.html
mkdir -p ${MANDIR}
- cp -pf doc/proofgeneral.1 ${MANDIR}
- mkdir -p ${INFODIR}
@@ -150,8 +94,6 @@
+ ${BSD_INSTALL_MAN} doc/proofgeneral.1 ${MANDIR}
+ ${BSD_INSTALL_MAN} doc/PG-adapting.info ${INFODIR}
+ ${BSD_INSTALL_MAN} doc/ProofGeneral.info ${INFODIR}
-+
-+install-doc: doc.pdf doc.html
mkdir -p ${DOCDIR}
- for f in ${DOC_FILES}; do cp -pf $$f ${DOCDIR}; done
- for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; cp -pf $$f ${DOCDIR}/$$f; done
@@ -164,16 +106,6 @@
+ mkdir -p ${DOCDIR}/PG-adapting
+ for f in doc/PG-adapting/*.html; do \
+ ${BSD_INSTALL_MAN} $$f ${DOCDIR}/PG-adapting/`basename $$f`; done
-+ for f in ProofGeneral.pdf PG-adapting.pdf; do \
-+ ${BSD_INSTALL_MAN} doc/$$f ${DOCDIR}/$$f; done
doc: FORCE
-- (cd doc; make EMACS=$(EMACS) $*)
-+ (cd doc; $(MAKE) EMACS=$(EMACS) $*)
-
- doc.%: FORCE
-- (cd doc; make EMACS=$(EMACS) $*)
-+ (cd doc; $(MAKE) EMACS=$(EMACS) $*)
-
- ##
- ## scripts: try to patch bash and perl scripts with correct paths
+ (cd doc; $(MAKE) EMACS=$(EMACS) $*)
diff --git a/math/proofgeneral/files/patch-doc-Makefile.doc b/math/proofgeneral/files/patch-doc-Makefile.doc
index 5d44677f52b0..023e954eead0 100644
--- a/math/proofgeneral/files/patch-doc-Makefile.doc
+++ b/math/proofgeneral/files/patch-doc-Makefile.doc
@@ -1,17 +1,66 @@
---- doc/Makefile.doc.orig 2008-02-23 15:11:19.000000000 +1100
-+++ doc/Makefile.doc 2008-02-23 15:10:59.000000000 +1100
-@@ -155,10 +155,10 @@
+--- doc/Makefile.doc.orig 2011-05-05 10:46:27.000000000 -0700
++++ doc/Makefile.doc 2012-04-11 22:03:35.000000000 -0700
+@@ -40,16 +40,13 @@
+
+ TMPFILE=pgt
+
+-.SUFFIXES: .texi .info .html .pdf .gz
++.SUFFIXES: .texi .info .html .gz
+
+ default: doc
+
+ .texi.info:
+ $(MAKEINFO) $<
+
+-.texi.pdf:
+- $(TEXI2PDF) $<
+-
+ .texi.html:
+ $(TEXI2HTML) --output $* $<
+
+@@ -61,21 +58,19 @@
+ gzip -f -9 $*
+
+ ##
+-## doc : build pdf, info files from $(DOCNAME).texi
++## doc : build info files from $(DOCNAME).texi
+ ##
+-doc: pdf info
++doc: info
+
+ ##
+ ## all : build all documentation targets
+ ##
+-all: html info pdf
++all: html info
+
+ ##
+ ## dist: build distribution targets
+ ##
+-dist: info html pdf
+-
+-pdf: $(DOCNAME).pdf
++dist: info html
+
+ # da: target is a fake: we actually make in a subdir
+ html: $(DOCNAME).html
+@@ -97,18 +92,13 @@
+ ## distclean: Remove documentation targets
+ ##
+ distclean: clean
+- rm -rf $(DOCNAME).info* $(DOCNAME).pdf $(DOCNAME)
++ rm -rf $(DOCNAME).info* $(DOCNAME)
+
+ ##
+ ## texi: update magic comments in texi from docstrings in code.
## (developer use only!)
+ ## Must be run from source .els otherwise function arguments lost
##
- ## remove this for now: no magic during dist ../*/*.el
-$(DOCNAME).texi:
- $(MAKE) magic
-magic:
+- (cd ..; make clean)
- $(EMACS) $(EMACSFLAGS) -batch -l ./docstring-magic.el $(DOCNAME).texi -f texi-docstring-magic -f save-buffer
-+#$(DOCNAME).texi:
-+# $(MAKE) magic
-+#magic:
-+# $(EMACS) $(EMACSFLAGS) -batch -l ./docstring-magic.el $(DOCNAME).texi -f texi-docstring-magic -f save-buffer
debugmagic:
$(EMACS) $(EMACFLAGS) -eval '(setq debug-on-error t)' -l ./docstring-magic.el $(DOCNAME).texi -f texi-docstring-magic -f save-buffer
diff --git a/math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop b/math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop
index aefef292bf1c..04bae45e1bcc 100644
--- a/math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop
+++ b/math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop
@@ -1,5 +1,5 @@
---- etc/desktop/proofgeneral.desktop.orig Thu Dec 8 07:40:38 2005
-+++ etc/desktop/proofgeneral.desktop Thu Dec 8 07:41:03 2005
+--- etc/desktop/proofgeneral.desktop.orig 2012-04-11 20:39:33.000000000 -0700
++++ etc/desktop/proofgeneral.desktop 2012-04-11 20:41:16.000000000 -0700
@@ -5,7 +5,7 @@
Name=Proof General
GenericName=Theorem proving environment
diff --git a/math/proofgeneral/files/patch-isar-interface b/math/proofgeneral/files/patch-isar-interface
index 0c92163c5af4..97da1fbb35f7 100644
--- a/math/proofgeneral/files/patch-isar-interface
+++ b/math/proofgeneral/files/patch-isar-interface
@@ -1,11 +1,11 @@
---- isar/interface.orig 2008-07-29 13:22:58.000000000 +1000
-+++ isar/interface 2008-07-29 13:25:10.000000000 +1000
-@@ -60,7 +60,7 @@
+--- isar/interface.orig 2011-01-27 11:54:20.000000000 -0800
++++ isar/interface 2012-04-11 20:26:06.000000000 -0700
+@@ -57,7 +57,7 @@
+ UNICODE=""
+ FONT=""
GEOMETRY=""
- KEYWORDS=""
- LOGIC="$ISABELLE_LOGIC"
-PROGNAME="emacs"
+PROGNAME="%%EMACS_NAME%%"
INITFILE="true"
WINDOWSYSTEM="true"
- XSYMBOL=""
+ UNICODE_SYMBOLS=""
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 11:38:08 +0000