[MAINTAINER] math/proofgeneral: 3.7.0 -> 3.7.1

PR:		ports/126066
Submitted by:	Timothy Bourke <timbob@bigpond.com>

5 files changed, 34 insertions, 12 deletions

diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 49391b458c13..aae6eeafc908 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	proofgeneral
-PORTVERSION=	3.7
-PORTREVISION=	1
+PORTVERSION=	3.7.1
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
-DISTNAME=	ProofGeneral-3.7
+DISTNAME=	ProofGeneral-3.7.1
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	timbob@bigpond.com
@@ -68,7 +67,9 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/teTeX-base
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/etc/desktop/proofgeneral.desktop
-	${TOUCH} ${WRKSRC}/.byte-compile
+	@${TOUCH} ${WRKSRC}/.byte-compile
+	@${REINPLACE_CMD} -e 's,%%EMACS_NAME%%,${EMACS_NAME},' \
+		${WRKSRC}/isar/interface
 
 pre-build:
 #.if defined(BYTE_COMPILE)
diff --git a/math/proofgeneral/distinfo b/math/proofgeneral/distinfo
index 011164ebed1b..92a2ef316de6 100644
--- a/math/proofgeneral/distinfo
+++ b/math/proofgeneral/distinfo
@@ -1,3 +1,3 @@
-MD5 (ProofGeneral-3.7.tgz) = 87c546b914a08dfe014ef55af3e9f92f
-SHA256 (ProofGeneral-3.7.tgz) = 2bdd9ef83d836391f779c41883b3ecdd5da7256cfa25d10c1442ba00cefd3e8e
-SIZE (ProofGeneral-3.7.tgz) = 1981651
+MD5 (ProofGeneral-3.7.1.tgz) = eebfff672b5941823fe893075316b02e
+SHA256 (ProofGeneral-3.7.1.tgz) = e613aa2f24564465f450b06b2d804e6815b220652c9f778e3d3471b644fdaa93
+SIZE (ProofGeneral-3.7.1.tgz) = 2023176
diff --git a/math/proofgeneral/files/patch-Makefile b/math/proofgeneral/files/patch-Makefile
index a44c95e9a92c..194cb0b7a220 100644
--- a/math/proofgeneral/files/patch-Makefile
+++ b/math/proofgeneral/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	2008-02-01 00:06:38.000000000 +1100
-+++ Makefile	2008-02-23 20:45:58.000000000 +1100
++++ Makefile	2008-07-29 13:09:58.000000000 +1000
 @@ -21,7 +21,7 @@
  
  # Set this to "emacs" or "xemacs" according to your version of Emacs.
@@ -30,7 +30,7 @@
  
  ## 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,7 +84,7 @@
+@@ -85,10 +84,10 @@
  	@echo "****************************************************************"
  	@echo " Byte compiling... "
  	@echo "****************************************************************"
@@ -38,7 +38,11 @@
 +	$(MAKE) elc
  	@echo " Byte compiling X-Symbol..."
  	(cd x-symbol/lisp; $(MAKE) EMACS="$(EMACS) -q -no-site-file")
- 	echo $(EMACS) > $(@)
+-	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
@@ -107,7 +111,7 @@
 -	for f in ${EXTRA_DIRS}; do cp -prf $$f/* ${ELISP}/$$f; done
 -	for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done
 +	for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.el ${ELISP}/$$f; done
-+	for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_DATA} $$f ${ELISP}/$$f; done
++	for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_SCRIPT} $$f ${ELISP}/$$f; done
 +	for f in ${EXTRA_DIRS}; \
 +		do for g in `find -d $$f -type d`; \
 +		   do mkdir -p ${ELISP}/$$g; \
@@ -124,7 +128,7 @@
 -	for f in ${ELISP_DIRS}; do cp -pf $$f/*.elc ${ELISP}/$$f; done
 -	for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done
 +	for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.elc ${ELISP}/$$f; done
-+	for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_DATA} $$f ${ELISP}/$$f; done
++	for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_SCRIPT} $$f ${ELISP}/$$f; done
  
  install-init:
  	mkdir -p ${ELISP_START}
diff --git a/math/proofgeneral/files/patch-isar-interface b/math/proofgeneral/files/patch-isar-interface
new file mode 100644
index 000000000000..0c92163c5af4
--- /dev/null
+++ b/math/proofgeneral/files/patch-isar-interface
@@ -0,0 +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 @@
+ GEOMETRY=""
+ KEYWORDS=""
+ LOGIC="$ISABELLE_LOGIC"
+-PROGNAME="emacs"
++PROGNAME="%%EMACS_NAME%%"
+ INITFILE="true"
+ WINDOWSYSTEM="true"
+ XSYMBOL=""
diff --git a/math/proofgeneral/pkg-plist b/math/proofgeneral/pkg-plist
index 8e6120b09db4..c6915b2027ae 100644
--- a/math/proofgeneral/pkg-plist
+++ b/math/proofgeneral/pkg-plist
@@ -56,6 +56,8 @@ bin/proofgeneral
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/pg-xml.elc
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-autoloads.el
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-autoloads.elc
+%%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-auxmodes.el
+%%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-auxmodes.elc
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-config.el
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-config.elc
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/generic/proof-depends.el
@@ -188,6 +190,8 @@ bin/proofgeneral
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/maths-menu.el
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/pg-dev.el
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/pg-dev.elc
+%%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/pg-fontsets.el
+%%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/pg-fontsets.elc
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/proof-compat.el
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/proof-compat.elc
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/lib/span-extent.el
@@ -276,6 +280,8 @@ bin/proofgeneral
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/escherknot.xbm
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts-ttf/README
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts-ttf/isaxsym.ttf
+%%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts-ttf/XSymb0Medium.ttf
+%%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts-ttf/XSymb1Medium.ttf
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts/2helvR12.bdf
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts/2helvR14.bdf
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/x-symbol/etc/fonts/3helvR12.bdf