Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Sep 2019 11:11:14 +0000 (UTC)
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r513117 - in head/cad/alliance: . files
Message-ID:  <201909281111.x8SBBE7I015756@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kai
Date: Sat Sep 28 11:11:14 2019
New Revision: 513117
URL: https://svnweb.freebsd.org/changeset/ports/513117

Log:
  cad/alliance: Update to 5.1.1, remove BROKEN and undeprecate
  
  * The code has been modernized so most of the patches and the workaround
    with USE_CXXSTD are therefore no longer required.  USE_GCC is still needed
    for build as some files cannot be compiled with Clang.
  
    The updated code also contains no more occurences of the long deprecated
    gets(3) function which has been removed since FreeBSD 1300043. [1]
  
  * A patch from Debian's patchset [2] is required to remedy build issues
    with the documentation.
  
  * Add USE_XORG to pass stage QA as some binaries are linked against various
    X libraries.  Among these libraries is also the recently deprecated
    x11/libXp, which is probably not needed but (still) pulled in by the
    OpenMotif toolkit.
  
  * Also pet portlint/portclippy while I'm here by grouping related USE_*
    variables to the USES block and sort the other variables according to the
    PHB.
  
  PR:		238686
  Submitted by:	Loïc Bartoletti <lbartoletti@tuxfamily.org> (based on)
  Reported by:	emaste [1]
  Obtained from:	Debian [2]

Added:
  head/cad/alliance/files/patch-documentation_tutorials_start_start.tex   (contents, props changed)
Deleted:
  head/cad/alliance/files/patch-06-fix-format-strings
  head/cad/alliance/files/patch-11-fix-segfaults
  head/cad/alliance/files/patch-asimut_src_Makefile.in
  head/cad/alliance/files/patch-elp_src_elp.c
  head/cad/alliance/files/patch-ppt_src_Makefile.in
Modified:
  head/cad/alliance/Makefile
  head/cad/alliance/distinfo
  head/cad/alliance/pkg-descr
  head/cad/alliance/pkg-plist

Modified: head/cad/alliance/Makefile
==============================================================================
--- head/cad/alliance/Makefile	Sat Sep 28 11:04:24 2019	(r513116)
+++ head/cad/alliance/Makefile	Sat Sep 28 11:11:14 2019	(r513117)
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	alliance
-DISTVERSION=	5.0-20120515
-PORTREVISION=	8
+DISTVERSION=	5.1.1
 CATEGORIES=	cad
-MASTER_SITES=	http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
-		http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \
-		http://www-asim.lip6.fr/pub/alliance/distribution/5.0/
+MASTER_SITES=	ftp://asim.lip6.fr/pub/alliance/distribution/5.0/ \
+		ftp://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
+		ftp://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete set of CAD tools and libraries for VLSI design
@@ -17,33 +16,42 @@ LICENSE_NAME=	Alliance VLSI Cad System License
 LICENSE_FILE=	${WRKSRC}/LICENCE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN=		unfetchable
-DEPRECATED=	Unfetchable, unmaintained
-EXPIRATION_DATE=	2019-10-16
 BROKEN_aarch64=		fails to link: collect2: error: ld returned 1 exit status
 
-CONFLICTS_INSTALL=	fspclient-*
+BUILD_DEPENDS=	convert:graphics/ImageMagick7 \
+		fig2dev:print/transfig
 
-WRKSRC=		${WRKDIR}/alliance-5.0
-SUB_FILES=	pkg-message
-
-USES=		bison gmake libtool motif
-
+USES=		autoreconf:build gmake libtool motif tar:bz2 xorg
 USE_GCC=	any
+USE_TEX=	dvipsk:build latex:build
+USE_XORG=	ice sm x11 xext xp xt
+
 HAS_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-ALLIANCE_TOP=	${PREFIX}/alliance
 CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP}
 
-# The port does not build with C++11 or later (bug 219275).
-USE_CXXSTD=	gnu++98
-
 MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL=	fspclient-*
+
+SUB_FILES=	pkg-message
+WRKSRC=		${WRKDIR}/alliance/src
+
+ALLIANCE_TOP=	${PREFIX}/alliance
+
 post-patch:
-	${REINPLACE_CMD} -e '/include <malloc.h>/d' \
+	@${REINPLACE_CMD} -e '/include <malloc.h>/d' \
 		${WRKSRC}/xgra/src/XSB_parse.c
+	# These Makefiles contain hardcoded references to make(1). Replace them with
+	# gmake(1) to avoid build failures of the documentation.
+	@${REINPLACE_CMD} -e 's/; make/; gmake/' \
+		${WRKSRC}/documentation/Makefile.am \
+		${WRKSRC}/documentation/alliance-examples/Makefile \
+		${WRKSRC}/documentation/tutorials/Makefile.am
+
+pre-configure:
+	@cd ${WRKSRC} && ./autostuff
 
 .include <bsd.port.mk>

Modified: head/cad/alliance/distinfo
==============================================================================
--- head/cad/alliance/distinfo	Sat Sep 28 11:04:24 2019	(r513116)
+++ head/cad/alliance/distinfo	Sat Sep 28 11:11:14 2019	(r513117)
@@ -1,2 +1,3 @@
-SHA256 (alliance-5.0-20120515.tar.gz) = a971497699c1725fbde6bb8769e127298bb1171e18add747b2ce2434ad827b8b
-SIZE (alliance-5.0-20120515.tar.gz) = 8341111
+TIMESTAMP = 1568066206
+SHA256 (alliance-5.1.1.tar.bz2) = 811f201881af46d9d36f1c60b184c136fd2b8bebbe932a29e07ced40394ecc10
+SIZE (alliance-5.1.1.tar.bz2) = 4486561

Added: head/cad/alliance/files/patch-documentation_tutorials_start_start.tex
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/alliance/files/patch-documentation_tutorials_start_start.tex	Sat Sep 28 11:11:14 2019	(r513117)
@@ -0,0 +1,15 @@
+Add "float" package to avoid "Unknown float option 'H'" error
+
+Obtained from Debian
+
+--- documentation/tutorials/start/start.tex.orig	2014-08-02 23:38:00 UTC
++++ documentation/tutorials/start/start.tex
+@@ -9,7 +9,7 @@
+ %
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \documentclass{article}
+-\usepackage{charter,setspace,fancybox}
++\usepackage{charter,setspace,fancybox,float}
+ \textwidth 15cm
+ \textheight 23cm
+ \oddsidemargin  +0.75cm

Modified: head/cad/alliance/pkg-descr
==============================================================================
--- head/cad/alliance/pkg-descr	Sat Sep 28 11:04:24 2019	(r513116)
+++ head/cad/alliance/pkg-descr	Sat Sep 28 11:11:14 2019	(r513117)
@@ -5,4 +5,4 @@ of portable CMOS libraries is provided.  Alliance is t
 twelve year effort spent at ASIM department of LIP6 laboratory of
 the Pierre et Marie Curie University (Paris VI, France).
 
-WWW: http://www-asim.lip6.fr/recherche/alliance/
+WWW: https://www-soc.lip6.fr/equipe-cian/logiciels/alliance/

Modified: head/cad/alliance/pkg-plist
==============================================================================
--- head/cad/alliance/pkg-plist	Sat Sep 28 11:04:24 2019	(r513116)
+++ head/cad/alliance/pkg-plist	Sat Sep 28 11:11:14 2019	(r513117)
@@ -41,7 +41,6 @@ alliance/bin/seroute
 alliance/bin/sxlib2lef
 alliance/bin/syf
 alliance/bin/vasy
-alliance/bin/x2vy
 alliance/bin/x2y
 alliance/bin/xfsm
 alliance/bin/xgra
@@ -1509,7 +1508,6 @@ alliance/lib/libBeh.a
 alliance/lib/libBhl.a
 alliance/lib/libBtr.a
 alliance/lib/libBvl.a
-alliance/lib/libCst.a
 alliance/lib/libCtl.a
 alliance/lib/libCtp.a
 alliance/lib/libElp.a
@@ -1518,48 +1516,24 @@ alliance/lib/libFsm.a
 alliance/lib/libFtl.a
 alliance/lib/libFvh.a
 alliance/lib/libLog.a
-alliance/lib/libMal.a
-alliance/lib/libMap.a
-alliance/lib/libMcl.a
-alliance/lib/libMcp.a
-alliance/lib/libMel.a
-alliance/lib/libMgl.a
 alliance/lib/libMgn.a
-alliance/lib/libMhl.a
 alliance/lib/libMlo.a
 alliance/lib/libMlu.a
-alliance/lib/libMmg.a
 alliance/lib/libMph.a
 alliance/lib/libMpu.a
-alliance/lib/libMsl.a
 alliance/lib/libMut.a
-alliance/lib/libMvg.a
-alliance/lib/libMvl.a
 alliance/lib/libPat.a
 alliance/lib/libPgn.a
-alliance/lib/libPhl.a
-alliance/lib/libPpt.a
-alliance/lib/libRcf.a
 alliance/lib/libRcn.a
 alliance/lib/libRds.a
-alliance/lib/libRfm.a
-alliance/lib/libRgs.a
-alliance/lib/libRpr.a
 alliance/lib/libRtd.a
-alliance/lib/libRtl.a
 alliance/lib/libRtn.a
-alliance/lib/libRut.a
-alliance/lib/libRwi.a
 alliance/lib/libSch.a
 alliance/lib/libScl.a
 alliance/lib/libVbh.a
-alliance/lib/libVbl.a
 alliance/lib/libVex.a
-alliance/lib/libVpd.a
 alliance/lib/libVpn.a
 alliance/lib/libVrd.a
-alliance/lib/libVtl.a
-alliance/lib/libVvh.a
 alliance/tutorials/place_and_route.pdf
 alliance/tutorials/place_and_route/src/Makefile
 alliance/tutorials/place_and_route/src/amd2901/Makefile



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