From owner-svn-ports-all@FreeBSD.ORG Wed Jul 16 16:53:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1AB65562; Wed, 16 Jul 2014 16:53:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07BEF2BCC; Wed, 16 Jul 2014 16:53:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GGrbd7086095; Wed, 16 Jul 2014 16:53:37 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GGrbwL086093; Wed, 16 Jul 2014 16:53:37 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201407161653.s6GGrbwL086093@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Wed, 16 Jul 2014 16:53:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362086 - head/math/proofgeneral X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jul 2014 16:53:38 -0000 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 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 .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