Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Jul 2012 16:12:50 -0700
From:      Timothy Beyer <beyert@cs.ucr.edu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Timothy Beyer <beyert@cs.ucr.edu>
Subject:   ports/169774: fix broken port: math/proofgeneral
Message-ID:  <87394zdxcd.wl@fastmail.fm>
Resent-Message-ID: <201207102320.q6ANKA7S086562@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         169774
>Category:       ports
>Synopsis:       fix broken port: math/proofgeneral
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 10 23:20:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Timothy Beyer
>Release:        FreeBSD 9.0-RELEASE-p1 i386
>Organization:
no organization
>Environment:
System: FreeBSD aeonserv.aeonnet 9.0-RELEASE-p1 FreeBSD 9.0-RELEASE-p1 #11: Fri May 11 22:49:12 PDT 2012 root@aeonserv.aeonnet:/usr/obj/usr/src/sys
/CUSTOM i386

>Description:

- Fix build when newer versions of texi2html are used. (the port was previously
broken by the recent upgrade to texi2html 5.x, which this addresses)

- Directly ignore if attempting to compile with XEmacs, since it is not
supported by the ProofGeneral developers.

Explanation:

Due to recent changes in the port textproc/texi2html, the port no longer
compiles, and was recently marked as BROKEN.  This patch fixes this issue, and
also fixes a common build error of using XEmacs to build, since it is no longer
supported by the ProofGeneral developers.

>How-To-Repeat:
apply the patch and build

>Fix:
    Apply the patch and build

--- proofgeneral.diff begins here ---
Index: math/proofgeneral/Makefile
==================================================================
--- math/proofgeneral/Makefile
+++ math/proofgeneral/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD: ports/math/proofgeneral/Makefile,v 1.30 2012/06/27 19:30:14 pav Exp $
 #
 
 PORTNAME=	proofgeneral
 PORTVERSION=	4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 PKGNAMESUFFIX=	-${EMACS_NAME}
 DISTNAME=	ProofGeneral-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
@@ -21,12 +21,10 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-BROKEN=		does not build
-
 USE_EMACS=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
 
@@ -35,10 +33,14 @@
 .ifdef (PACKAGE_BUILDING)
 PLIST_SUB+=	PACKAGE_BUILDING="@comment "
 .else
 PLIST_SUB+=	PACKAGE_BUILDING=""
 .endif
+
+.if ${EMACS_NAME} == xemacs
+IGNORE=	the ProofGeneral developers no longer support XEmacs
+.endif
 
 MAKE_ARGS+=	PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" MAKE="${GMAKE}" \
 	DOCDIR="${DOCSDIR}" MANDIR="${PREFIX}/man/man1" INFODIR="${PREFIX}/info" \
 	BINDIR="${PREFIX}/bin" DESKTOP="${PREFIX}/share" \
 	ELISPP="${EMACS_SITE_LISPDIR}/ProofGeneral" \

Index: math/proofgeneral/files/patch-doc-Makefile.doc
==================================================================
--- math/proofgeneral/files/patch-doc-Makefile.doc
+++ math/proofgeneral/files/patch-doc-Makefile.doc
@@ -1,7 +1,16 @@
 --- doc/Makefile.doc.orig	2011-05-05 10:46:27.000000000 -0700
-+++ doc/Makefile.doc	2012-04-11 22:03:35.000000000 -0700
++++ doc/Makefile.doc	2012-07-10 15:19:30.000000000 -0700
+@@ -18,7 +18,7 @@
+ 
+ MAKE = make -f Makefile.doc 
+ MAKEINFO = makeinfo
+-TEXI2HTML = texi2html -expandinfo -number -split_chapter --noheader
++TEXI2HTML = texi2html -expandinfo -number-sections -split_chapter --noheader
+ # `texinfo-tex' package contains texi2pdf
+ TEXI2PDF = texi2pdf
+ # `dviutils' package contains these useful utilities.
 @@ -40,16 +40,13 @@
  
  TMPFILE=pgt
  
 -.SUFFIXES:  .texi .info .html .pdf .gz

--- proofgeneral.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



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