Attachment 89188 Details for Bug 126066 – proofgeneral-xemacs-3.7.1.patch

[patch] proofgeneral-xemacs-3.7.1.patch

proofgeneral-xemacs-3.7.1.patch (text/plain), 6.48 KB, created by Timothy Bourke on 2008-07-29 07:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Bourke

Created: 2008-07-29 07:40:01 UTC

Size: 6.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/math/proofgeneral/Makefile,v
>retrieving revision 1.20
>diff -u -r1.20 Makefile
>--- Makefile	6 Jun 2008 13:44:02 -0000	1.20
>+++ Makefile	29 Jul 2008 06:27:02 -0000
>@@ -2,15 +2,14 @@
> # Date created:        11 August 2005
> # Whom:                Timothy Bourke <timbob@bigpond.com>
> #
>-# $FreeBSD: ports/math/proofgeneral/Makefile,v 1.20 2008/06/06 13:44:02 edwin Exp $
>+# $FreeBSD$
> #
> 
> 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 @@
> 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)
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/math/proofgeneral/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- distinfo	4 Apr 2008 12:13:33 -0000	1.6
>+++ distinfo	29 Jul 2008 06:27:02 -0000
>@@ -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
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/math/proofgeneral/pkg-plist,v
>retrieving revision 1.9
>diff -u -r1.9 pkg-plist
>--- pkg-plist	4 Apr 2008 12:13:33 -0000	1.9
>+++ pkg-plist	29 Jul 2008 06:27:02 -0000
>@@ -56,6 +56,8 @@
> %%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 @@
> %%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 @@
> %%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
>Index: files/patch-Makefile
>===================================================================
>RCS file: /home/ncvs/ports/math/proofgeneral/files/patch-Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 patch-Makefile
>--- files/patch-Makefile	4 Apr 2008 12:13:33 -0000	1.6
>+++ files/patch-Makefile	29 Jul 2008 06:27:02 -0000
>@@ -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}
>Index: files/patch-isar-interface
>===================================================================
>RCS file: files/patch-isar-interface
>diff -N files/patch-isar-interface
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-isar-interface	29 Jul 2008 06:27:02 -0000
>@@ -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=""

Actions: View | Diff

Attachments on bug 126066: 89188