6 files changed, 47 insertions, 78 deletions

diff --git a/math/proofgeneral/files/patch-Makefile b/math/proofgeneral/files/patch-Makefile
index 99bb497b9e43..a00773657a13 100644
--- a/math/proofgeneral/files/patch-Makefile
+++ b/math/proofgeneral/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Apr 18 01:23:53 2004
-+++ Makefile	Sat Aug 13 13:50:43 2005
+--- Makefile.orig	Thu Dec  8 07:07:44 2005
++++ Makefile	Thu Dec  8 07:36:00 2005
 @@ -15,7 +15,7 @@
  
  # Set this to "emacs" or "xemacs" according to your version of Emacs.
@@ -19,26 +19,17 @@
  
  PWD=$(shell pwd)
  
-@@ -65,7 +64,8 @@
+@@ -69,8 +68,7 @@
  ##	     compiles.
  ##
  compile: .byte-compile
 -	lastemacs=`cat .byte-compile`; if [ "$$lastemacs" != "$(EMACS)" ]; then rm -f .byte-compile; make .byte-compile; fi
+-
 +	lastemacs=`cat .byte-compile`; if [ "$$lastemacs" != "${EMACS_NAME}" ]; then rm -f .byte-compile; $(MAKE) .byte-compile; fi
-+	$(BYTECOMP) generic/proof-menu.el
- 
  
  .byte-compile: $(EL) x-symbol/lisp/*.el
-@@ -78,7 +78,7 @@
- 	rm -f $(BROKENELC)
- 	@echo " Byte compiling X-Symbol..."
- 	(cd x-symbol/lisp; rm -f *.elc; $(MAKE) EMACS="$(EMACS) -q -no-site-file")
--	echo $(EMACS) > $(@)
-+	echo ${EMACS_NAME} > $(@)
- 	@echo "*************************************************"
- 	@echo " Finished."
  	@echo "*************************************************"
-@@ -123,41 +123,36 @@
+@@ -127,41 +125,36 @@
  # 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.
@@ -56,11 +47,10 @@
  DEST_ELISP=${DEST_PREFIX}/${ELISPP}
  
  BINDIR=${PREFIX}/bin
--DESKTOP=${PREFIX}/share
+ DESKTOP=${PREFIX}/share
 -DOCDIR=${PREFIX}/share/doc/ProofGeneral
 -MANDIR=${PREFIX}/share/man/man1
 -INFODIR=${PREFIX}/share/info/
-+DESKTOP=${DESKTOP_PREFIX}/share
 +DOCDIR=${DOCSDIR}
 +MANDIR=${PREFIX}/man/man1
 +INFODIR=${PREFIX}/info/
@@ -69,33 +59,40 @@
 +install: install-desktop install-elisp install-bin install-init install-doc
  
  install-desktop:
- 	mkdir -p ${DESKTOP}/icons/hicolor/16x16
+-	mkdir -p ${DESKTOP}/icons/hicolor/16x16
 -	cp etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16
-+	${BSD_INSTALL_DATA} etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16
- 	mkdir -p ${DESKTOP}/icons/hicolor/32x32
+-	mkdir -p ${DESKTOP}/icons/hicolor/32x32
 -	cp etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32
-+	${BSD_INSTALL_DATA} etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32
- 	mkdir -p ${DESKTOP}/icons/hicolor/48x48
+-	mkdir -p ${DESKTOP}/icons/hicolor/48x48
 -	cp etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48
-+	${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48
- 	mkdir -p ${DESKTOP}/pixmaps
+-	mkdir -p ${DESKTOP}/pixmaps
 -	cp etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps
-+	${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps
- 	mkdir -p ${DESKTOP}/applications
+-	mkdir -p ${DESKTOP}/applications
 -	cp etc/desktop/proofgeneral.desktop ${DESKTOP}/applications
-+	${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/applications
- 	mkdir -p ${DESKTOP}/mime-info
+-	mkdir -p ${DESKTOP}/mime-info
 -	cp etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info
 -	cp etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info
+-	mkdir -p ${DESKTOP}/application-registry
+-	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
++	mkdir -p ${DESKTOP}/icons/hicolor/16x16
++	${BSD_INSTALL_DATA} etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16
++	mkdir -p ${DESKTOP}/icons/hicolor/32x32
++	${BSD_INSTALL_DATA} etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32
++	mkdir -p ${DESKTOP}/icons/hicolor/48x48
++	${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48
++	mkdir -p ${DESKTOP}/pixmaps
++	${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps
++	mkdir -p ${DESKTOP}/applications
++	${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/applications
++	mkdir -p ${DESKTOP}/mime-info
 +	${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info
 +	${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info
- 	mkdir -p ${DESKTOP}/application-registry
--	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
++	mkdir -p ${DESKTOP}/application-registry
 +	${BSD_INSTALL_DATA} etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
  
  # NB: .el files are not strictly necessary, but we package/install them
  # for the time being to help with debugging, or for users to recompile.
-@@ -172,14 +167,30 @@
+@@ -176,14 +169,30 @@
  install-el:
  	mkdir -p ${ELISP}
  	for f in ${ELISP_DIRS} ${EXTRA_DIRS}; do mkdir -p ${ELISP}/$$f; done
@@ -130,7 +127,7 @@
  
  install-init:
  	mkdir -p ${ELISP_START}
-@@ -189,18 +200,16 @@
+@@ -193,18 +202,16 @@
  
  install-bin: scripts
  	mkdir -p ${BINDIR}
@@ -154,16 +151,16 @@
  
  ##
  ## scripts: try to patch bash and perl scripts with correct paths
-@@ -243,7 +252,7 @@
+@@ -247,7 +254,7 @@
  
  # Set PGHOME path in scripts back to default location.
  cleanpgscripts:
 -	make pgscripts DEST_ELISP='$$$$HOME/ProofGeneral'
-+    $(MAKE) pgscripts DEST_ELISP='$$$$HOME/ProofGeneral'
++	$(MAKE) pgscripts DEST_ELISP='$$$$HOME/ProofGeneral'
  
  
  ##
-@@ -253,11 +262,11 @@
+@@ -257,11 +264,11 @@
  ##
  
  devel.%:
diff --git a/math/proofgeneral/files/patch-doc-Makefile b/math/proofgeneral/files/patch-doc-Makefile
index 85c8608c7d37..e69de29bb2d1 100644
--- a/math/proofgeneral/files/patch-doc-Makefile
+++ b/math/proofgeneral/files/patch-doc-Makefile
@@ -1,13 +0,0 @@
---- doc/Makefile.orig	Tue Jun  7 17:42:22 2005
-+++ doc/Makefile	Tue Jun  7 17:42:47 2005
-@@ -19,8 +19,8 @@
- 	$(MAKE) doc
- 
- %:
--	make -f Makefile.doc DOCNAME=PG-adapting MAKE="make -f Makefile.doc" $@
--	make -f Makefile.doc DOCNAME=ProofGeneral MAKE="make -f Makefile.doc" $@ 
-+	$(MAKE) -f Makefile.doc DOCNAME=PG-adapting MAKE="$(MAKE) -f Makefile.doc" $@
-+	$(MAKE) -f Makefile.doc DOCNAME=ProofGeneral MAKE="$(MAKE) -f Makefile.doc" $@ 
- 
- ##
- ## man page for proofgeneral script
diff --git a/math/proofgeneral/files/patch-doc-Makefile.doc b/math/proofgeneral/files/patch-doc-Makefile.doc
index 9480f3be265c..5de6e3a9a2fb 100644
--- a/math/proofgeneral/files/patch-doc-Makefile.doc
+++ b/math/proofgeneral/files/patch-doc-Makefile.doc
@@ -1,17 +1,17 @@
---- doc/Makefile.doc.orig	Sun Apr 18 09:39:58 2004
-+++ doc/Makefile.doc	Fri Jul 22 22:10:05 2005
-@@ -152,10 +152,10 @@
+--- doc/Makefile.doc.orig	Thu Dec  8 07:39:33 2005
++++ doc/Makefile.doc	Thu Dec  8 07:39:46 2005
+@@ -153,10 +153,10 @@
  ## texi: update magic comments in texi from docstrings in code.
  ##	  (developer use only!)
  ##
 -$(DOCNAME).texi: ../*/*.el 
 -	$(MAKE) magic
 -magic:
--	$(EMACS) -l docstring-magic.el $(DOCNAME).texi -f texi-docstring-magic -f save-buffer
+-	$(EMACS) $(EMACSFLAGS) -l docstring-magic.el $(DOCNAME).texi -f texi-docstring-magic -f save-buffer
 +#$(DOCNAME).texi: ../*/*.el 
 +#	$(MAKE) magic
 +#magic:
-+#	$(EMACS) -batch -l ../generic/texi-docstring-magic.el -l ../generic/proof-site.el -l ../generic/pg-user.el $(DOCNAME).texi -f texi-docstring-magic -f save-buffer
++#	$(EMACS) $(EMACSFLAGS) -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 668ccc6ab733..aefef292bf1c 100644
--- a/math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop
+++ b/math/proofgeneral/files/patch-etc_desktop_proofgeneral.desktop
@@ -1,11 +1,11 @@
---- etc/desktop/proofgeneral.desktop.orig	Sat Aug 13 14:19:29 2005
-+++ etc/desktop/proofgeneral.desktop	Sat Aug 13 14:19:46 2005
-@@ -2,7 +2,7 @@
+--- etc/desktop/proofgeneral.desktop.orig	Thu Dec  8 07:40:38 2005
++++ etc/desktop/proofgeneral.desktop	Thu Dec  8 07:41:03 2005
+@@ -5,7 +5,7 @@
  Name=Proof General
- Comment=Organise Your Proofs!
- Exec=proofgeneral %F
+ GenericName=Theorem proving environment
+ Comment=Organise your proofs!
 -Icon=proofgeneral.png
 +Icon=%%PREFIX%%/share/pixmaps/proofgeneral.png
- Terminal=false
- Type=Application
- Encoding=UTF-8
+ FilePattern=proofgeneral
+ TryExec=proofgeneral
+ Exec=proofgeneral %F
diff --git a/math/proofgeneral/files/patch-generic-proof-menu.el b/math/proofgeneral/files/patch-generic-proof-menu.el
index ff4c4f33394b..e69de29bb2d1 100644
--- a/math/proofgeneral/files/patch-generic-proof-menu.el
+++ b/math/proofgeneral/files/patch-generic-proof-menu.el
@@ -1,15 +0,0 @@
---- generic/proof-menu.el.orig	Fri Jul 22 17:46:09 2005
-+++ generic/proof-menu.el	Fri Jul 22 17:46:09 2005
-@@ -176,10 +176,10 @@
- 	     (cons "Help"
- 		   (append
- 		    `([,(concat proof-assistant " information")
--		       '(proof-help)
-+		        (proof-help)
- 		       ,menuvisiblep proof-info-command]
- 		      [,(concat proof-assistant " web page")
--		       '(browse-url proof-assistant-home-page)
-+		        (browse-url proof-assistant-home-page)
- 		       ,menuvisiblep proof-assistant-home-page])
- 		    (proof-ass help-menu-entries))))))))
- 
diff --git a/math/proofgeneral/files/patch-isa_isabelle-system.el b/math/proofgeneral/files/patch-isa_isabelle-system.el
index e42f6b7b7c28..9c2a901f799e 100644
--- a/math/proofgeneral/files/patch-isa_isabelle-system.el
+++ b/math/proofgeneral/files/patch-isa_isabelle-system.el
@@ -1,6 +1,6 @@
---- isa/isabelle-system.el.orig	Thu Sep  8 12:43:45 2005
-+++ isa/isabelle-system.el	Thu Sep  8 12:45:12 2005
-@@ -73,10 +73,6 @@
+--- isa/isabelle-system.el.orig	Thu Dec  8 07:43:17 2005
++++ isa/isabelle-system.el	Thu Dec  8 07:43:38 2005
+@@ -74,10 +74,6 @@
  with full path."
    (interactive)
    (unless (or isatool-not-found (file-executable-p isa-isatool-command))