Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jul 2014 16:53:37 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362086 - head/math/proofgeneral
Message-ID:  <201407161653.s6GGrbwL086093@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Wed Jul 16 16:53:37 2014
New Revision: 362086
URL: http://svnweb.freebsd.org/changeset/ports/362086
QAT: https://qat.redports.org/buildarchive/r362086/

Log:
  - Add stage support
  - Use ${PORT_OPTIONS:MDOCS} instead of !defined(NOPORTDOCS)
  - Uses shebangfix
  
  PR:		ports/191503
  Submitted by:	Timothy Beyer <beyert@cs.ucr.edu>

Modified:
  head/math/proofgeneral/Makefile
  head/math/proofgeneral/pkg-plist

Modified: head/math/proofgeneral/Makefile
==============================================================================
--- head/math/proofgeneral/Makefile	Wed Jul 16 16:18:31 2014	(r362085)
+++ head/math/proofgeneral/Makefile	Wed Jul 16 16:53:37 2014	(r362086)
@@ -3,7 +3,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 PKGNAMESUFFIX=	-${EMACS_NAME}
@@ -21,33 +21,33 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hi
 
 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="${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 @@ PORTDOCS=	AUTHORS BUGS CHANGES COMPATIBI
 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

Modified: head/math/proofgeneral/pkg-plist
==============================================================================
--- head/math/proofgeneral/pkg-plist	Wed Jul 16 16:18:31 2014	(r362085)
+++ head/math/proofgeneral/pkg-plist	Wed Jul 16 16:53:37 2014	(r362086)
@@ -4,6 +4,7 @@ bin/legotags
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407161653.s6GGrbwL086093>