diff -urN proofgeneral.orig/Makefile proofgeneral/Makefile
--- proofgeneral.orig/Makefile	2014-07-07 08:31:01.000000000 -0700
+++ proofgeneral/Makefile	2014-07-07 21:37:02.000000000 -0700
@@ -1,9 +1,9 @@
 # Created by: Timothy Bourke <timbob@bigpond.com>
-# $FreeBSD: head/math/proofgeneral/Makefile 361099 2014-07-07 15:31:01Z olgeni $
+# $FreeBSD: head/math/proofgeneral/Makefile 359185 2014-06-25 05:35:31Z bapt $
 
 PORTNAME=	proofgeneral
 PORTVERSION=	4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 PKGNAMESUFFIX=	-${EMACS_NAME}
@@ -11,7 +11,7 @@
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	beyert@cs.ucr.edu
-COMMENT=	Generic interface for proof assistants
+COMMENT=	A generic interface for proof assistants
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -21,33 +21,33 @@
 
 USE_EMACS=	yes
 INSTALLS_ICONS=	yes
-USES=		gmake perl5
+USES=	gmake perl5 shebangfix
+SHEBANG_FILES=	lego/legotags coq/coqtags isar/isartags
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${EMACS_NAME} == xemacs
 IGNORE=	the ProofGeneral developers no longer support XEmacs
 .endif
 
-MAKE_ARGS+=	PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" MAKE="${MAKE_CMD}" \
-	DOCDIR="${DOCSDIR}" MANDIR="${PREFIX}/man/man1" INFODIR="${PREFIX}/info" \
-	BINDIR="${PREFIX}/bin" DESKTOP="${PREFIX}/share" \
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" DEST_PREFIX="${STAGEDIR}${PREFIX}" \
+	MAKE="${MAKE_CMD}" EMACS="${EMACS_NAME}" EMACS_NAME="${EMACS_NAME}" \
+	DOCDIR="${STAGEDIR}${DOCSDIR}" MANDIR="${STAGEDIR}${PREFIX}/man/man1" \
+	INFODIR="${STAGEDIR}${PREFIX}/info" \
+	BINDIR="${STAGEDIR}${PREFIX}/bin" DESKTOP="${STAGEDIR}${PREFIX}/share" \
+	EMACS_SITE_LISPDIR="${EMACS_SITE_LISPDIR}" \
 	ELISPP="${EMACS_SITE_LISPDIR}/ProofGeneral" \
-	ELISP="${PREFIX}/${EMACS_SITE_LISPDIR}/ProofGeneral" \
-	ELISP_START="${PREFIX}/${EMACS_SITE_LISPDIR}/site-start.d" \
-	EMACS="${EMACS_NAME}" EMACS_NAME="${EMACS_NAME}" \
-	DEST_ELISP="${PREFIX}/${EMACS_SITE_LISPDIR}/ProofGeneral" \
-	EMACS_SITE_LISPDIR="${EMACS_SITE_LISPDIR}"
+	ELISP="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/ProofGeneral" \
+	ELISP_START="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/site-start.d" \
+	DEST_ELISP="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/ProofGeneral"
 
 SUB_FILES=	pkg-message
 SUB_LIST=	EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
 
-MAN1=		proofgeneral.1
 MANCOMPRESSED=	no
 INFO=		PG-adapting ProofGeneral
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ARGS+=	DOCSDIR=${DOCSDIR} INSTALLDOC=install-doc
 BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
 .endif
@@ -59,6 +59,14 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/etc/desktop/proofgeneral.desktop
+	@${REINPLACE_CMD} -e  \
+		"s|PERL_SCRIPTS = lego/legotags coq/coqtags isar/isartags||g" \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e  "s|PG_SCRIPTS = bin/proofgeneral||g" \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e  \
+		's|PGHOMEDEFAULT=$$HOME|PGHOMEDEFAULT=${PREFIX}/${EMACS_SITE_LISPDIR}|g' \
+	${WRKSRC}/bin/proofgeneral
 	@${TOUCH} ${WRKSRC}/.byte-compile
 	@${REINPLACE_CMD} -e 's,%%EMACS_NAME%%,${EMACS_NAME},' \
 		${WRKSRC}/isar/interface
diff -urN proofgeneral.orig/pkg-plist proofgeneral/pkg-plist
--- proofgeneral.orig/pkg-plist	2014-05-09 14:13:09.000000000 -0700
+++ proofgeneral/pkg-plist	2014-06-29 16:21:03.000000000 -0700
@@ -4,6 +4,7 @@
 bin/proofgeneral
 share/application-registry/proofgeneral.applications
 share/applications/proofgeneral.desktop
+man/man1/proofgeneral.1.gz
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/acl2/acl2.el
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/acl2/acl2.elc
 %%EMACS_SITE_LISPDIR%%/ProofGeneral/ccc/ccc.el