6 files changed, 17 insertions, 29 deletions

diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index b146d46b2d48..217a36d58d36 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -5,19 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	alliance
-PORTVERSION=	5.0.20070718
-PORTREVISION=	1
+PORTVERSION=	5.0.20090901
 CATEGORIES=	cad
 MASTER_SITES=	http://www-asim.lip6.fr/pub/alliance/distribution/5.0/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
-DISTNAME=	${PORTNAME}-5.0-20070718
+DISTNAME=	${PORTNAME}-5.0-20090901
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A complete set of CAD tools and libraries for VLSI design
 
-BROKEN=		does not compile
-
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	${PKGNAME} does not build on ${ARCH}
 
@@ -31,7 +28,6 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP} ${CONFIGURE_TARGET}
-SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -197,7 +193,4 @@ pre-configure:
 pre-su-install:
 	${MKDIR} ${ALLIANCE_TOP}
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/cad/alliance/distinfo b/cad/alliance/distinfo
index f4fb5361e14e..440c500a2029 100644
--- a/cad/alliance/distinfo
+++ b/cad/alliance/distinfo
@@ -1,3 +1,3 @@
-MD5 (alliance-5.0-20070718.tar.gz) = 917f4493c09f6f5c49d5a606a5e9bbd8
-SHA256 (alliance-5.0-20070718.tar.gz) = 4e17c8f9f4d344061166856d47e58527c6ae870fda0c73b5ba0200967d23af9f
-SIZE (alliance-5.0-20070718.tar.gz) = 8197393
+MD5 (alliance-5.0-20090901.tar.gz) = f3b692c4ea9e54c040280f660b3cf170
+SHA256 (alliance-5.0-20090901.tar.gz) = f1589f5e250fd9e47c03d7548226e0442f425f1c87dcca3484ccb219bd8db2a6
+SIZE (alliance-5.0-20090901.tar.gz) = 8056116
diff --git a/cad/alliance/files/patch-nero-src-ADefs.h b/cad/alliance/files/patch-nero-src-ADefs.h
deleted file mode 100644
index a243095f62b3..000000000000
--- a/cad/alliance/files/patch-nero-src-ADefs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nero/src/ADefs.h.orig	2007-10-28 11:33:28.000000000 +0900
-+++ nero/src/ADefs.h	2007-10-28 11:33:43.000000000 +0900
-@@ -138,7 +138,7 @@
- 
-       // Allocators.
-       private: static void *operator new    (size_t size);
--      private: static void  operator delete (void *zone);
-+      public:  static void  operator delete (void *zone);
-       public:  static void *operator new    (size_t size, CNodeASSet &NS);
- 
-       // Modifiers.
diff --git a/cad/alliance/files/patch-xgra-src-XSB_parse.c b/cad/alliance/files/patch-xgra-src-XSB_parse.c
new file mode 100644
index 000000000000..719579cade43
--- /dev/null
+++ b/cad/alliance/files/patch-xgra-src-XSB_parse.c
@@ -0,0 +1,10 @@
+--- xgra/src/XSB_parse.c.orig	2009-11-30 01:53:57.000000000 +0900
++++ xgra/src/XSB_parse.c	2009-11-30 01:54:08.000000000 +0900
+@@ -43,7 +43,6 @@
+ |                                                             |
+ \------------------------------------------------------------*/
+ 
+-# include <malloc.h>
+ # include <stdlib.h>
+ # include <string.h>
+ # include "mut.h"
diff --git a/cad/alliance/files/pkg-message.in b/cad/alliance/files/pkg-message.in
deleted file mode 100644
index d83c31cbe876..000000000000
--- a/cad/alliance/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-NOTE: To use Alliance you need to set several environment variables.
-      See %%PREFIX%%/alliance/etc/alc_env.{csh,sh} for the details.
--------------------------------------------------------------------------------
diff --git a/cad/alliance/pkg-plist b/cad/alliance/pkg-plist
index e511cad9f600..eb67ca84a459 100644
--- a/cad/alliance/pkg-plist
+++ b/cad/alliance/pkg-plist
@@ -177,14 +177,13 @@ alliance/etc/spimodel.cfg
 alliance/etc/cmos.rds
 alliance/etc/prol.elp
 alliance/etc/attila.conf
-alliance/etc/alc_env.csh
-alliance/etc/alc_env.sh
 alliance/etc/cmos.dreal
 alliance/etc/cmos.graal
 alliance/etc/sxlib.scapin
 alliance/etc/se_defaults.mac
 alliance/etc/cmos.lef
 alliance/etc/xfsm.par
+alliance/etc/xgra.par
 alliance/etc/xpat.par
 alliance/etc/xsch.par
 alliance/etc/xvpn.par
@@ -234,6 +233,7 @@ alliance/bin/syf
 alliance/bin/vasy
 alliance/bin/x2y
 alliance/bin/xfsm
+alliance/bin/xgra
 alliance/bin/xpat
 alliance/bin/xsch
 alliance/bin/xvpn