Attachment #207412 for bug #238686




# $FreeBSD$

PORTNAME=	alliance
DISTVERSION=	5.1.1
PORTREVISION=	8
CATEGORIES=	cad
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

LICENSE_FILE=	${WRKSRC}/LICENCE
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BROKEN=		unfetchable
BROKEN_aarch64=		fails to link: collect2: error: ld returned 1 exit status

BUILD_DEPENDS=	convert:graphics/ImageMagick7 \
		fig2dev:print/transfig
LIB_DEPENDS=	libXp.so:x11/libXp

USES=		autoreconf:build libtool motif gmake tar:bz2 xorg
USE_GCC=	any
USE_TEX=	dvipsk:build latex:build
USE_XORG=	ice sm x11 xext xt

USES=		bison gmake libtool motif

USE_GCC=	any
HAS_CONFIGURE=	yes
CONFIGURE_ENV=	ALLIANCE_TOP=${ALLIANCE_TOP}
CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
		--prefix=${ALLIANCE_TOP}

# Seems to work without it but should be tested a bit more...
#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' \
		${WRKSRC}/xgra/src/XSB_parse.c
	# These Makefiles contains hardcoded references to make(1). Replace them with
	# gmake(1) to avoid build failures of the documentation.
	#
	# Maybe there's a better way to handle this...
	${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>

Lines 1-2 Link Here

(-)cad/alliance/distinfo (-2 / +3 lines)
1	SHA256 (alliance-5.0-20120515.tar.gz) = a971497699c1725fbde6bb8769e127298bb1171e18add747b2ce2434ad827b8b	1	TIMESTAMP = 1568066206
2	SIZE (alliance-5.0-20120515.tar.gz) = 8341111	2	SHA256 (alliance-5.1.1.tar.bz2) = 811f201881af46d9d36f1c60b184c136fd2b8bebbe932a29e07ced40394ecc10
		3	SIZE (alliance-5.1.1.tar.bz2) = 4486561

Lines 1-95 Link Here

(-)cad/alliance/files/patch-06-fix-format-strings (-95 lines)
1	Description: Format string fixes
2	This patch fixes some format string problems with fprintf().
3	Author: Roland Stigge <stigge@antcom.de>
4
5	===================================================================
6	--- alliance-5.0-20110203.orig/rtd/src/rtd_drive.c 2002-09-30 18:21:10.000000000 +0200
7	+++ rtd/src/rtd_drive.c 2012-03-24 15:24:00.000000000 +0100
8	@@ -100,7 +100,7 @@
9	RtlExprLength = Length;
10	}
11
12	- fprintf( RtlFile, Name );
13	+ fprintf( RtlFile, "%s", Name );
14	}
15
16	/*------------------------------------------------------------\
17	===================================================================
18	--- alliance-5.0-20110203.orig/vpd/src/vpd_drive.c 2002-09-30 18:21:32.000000000 +0200
19	+++ vpd/src/vpd_drive.c 2012-03-24 15:37:53.000000000 +0100
20	@@ -100,7 +100,7 @@
21	VpnExprLength = Length;
22	}
23
24	- fprintf( VpnFile, Name );
25	+ fprintf( VpnFile, "%s", Name );
26	}
27
28	/*------------------------------------------------------------\
29	===================================================================
30	--- alliance-5.0-20110203.orig/boog/src/bog_normalize_message.c 2002-09-30 18:19:58.000000000 +0200
31	+++ boog/src/bog_normalize_message.c 2012-03-24 15:50:03.000000000 +0100
32	@@ -106,7 +106,7 @@
33	}
34
35	fprintf(stderr,"BEH: ");
36	- fprintf(stderr,message);
37	+ fprintf(stderr,"%s",message);
38	fprintf(stderr," in '");
39	fflush(stderr);
40	display_abl(abl);
41	===================================================================
42	--- alliance-5.0-20110203.orig/l2p/src/drive_ps.c 2005-02-17 16:34:44.000000000 +0100
43	+++ l2p/src/drive_ps.c 2012-03-24 16:02:33.000000000 +0100
44	@@ -83,22 +83,22 @@
45	break;
46	case E_OPEN :
47	fprintf (stderr, "Problem while opening file ");
48	- fprintf (stderr, msg);
49	+ fprintf (stderr, "%s", msg);
50	break;
51	case E_CLOSE :
52	fprintf (stderr, "Problem while closing file ");
53	- fprintf (stderr, msg);
54	+ fprintf (stderr, "%s", msg);
55	break;
56	case E_WRITE :
57	fprintf (stderr, "Problem while writing file ");
58	- fprintf (stderr, msg);
59	+ fprintf (stderr, "%s", msg);
60	break;
61	case E_READ :
62	fprintf (stderr, "Problem while reading file ");
63	- fprintf (stderr, msg);
64	+ fprintf (stderr, "%s", msg);
65	break;
66	case E_OUTBOX :
67	- fprintf (stderr, msg);
68	+ fprintf (stderr, "%s", msg);
69	break;
70	default :
71	fprintf (stderr, "Unknow internal error");
72	===================================================================
73	--- alliance-5.0-20110203.orig/loon/src/lon_normalize_message.c 2004-09-06 23:26:09.000000000 +0200
74	+++ loon/src/lon_normalize_message.c 2012-03-24 16:15:39.000000000 +0100
75	@@ -106,7 +106,7 @@
76	}
77
78	fprintf(stderr,"BEH: ");
79	- fprintf(stderr,message);
80	+ fprintf(stderr,"%s",message);
81	fprintf(stderr," in '");
82	fflush(stderr);
83	display_abl(abl);
84	===================================================================
85	--- alliance-5.0-20110203.orig/sea/src/util_LEFDEF.c 2004-09-29 23:40:46.000000000 +0200
86	+++ sea/src/util_LEFDEF.c 2012-03-24 16:36:27.000000000 +0100
87	@@ -213,7 +213,7 @@
88	*pI = (char)0; pI += 1;
89	sprintf (asLEF, "%s(%s)", sTmp, pI);
90	} else {
91	- sprintf (asLEF, sTmp);
92	+ sprintf (asLEF, "%s", sTmp);
93	}
94
95	return (asLEF);




Description: Fix segfaults in different executables
 Some executables in the package crashed upon certain command line option
 combinations. This patch fixes this.
Author: Roland Stigge <stigge@antcom.de>
Bug-Debian: http://bugs.debian.org/715651
Bug-Debian: http://bugs.debian.org/716217
Bug-Debian: http://bugs.debian.org/716529

--- alliance-5.0-20120515.orig/asimut/src/vh_simulad.c
+++ asimut/src/vh_simulad.c
@@ -155,8 +155,8 @@ char **argv;
         arg_flg [i  ] = 1;
         }
 
-      if ((!strcmp (argv [i], "-fixeddelay"))
-       || (!strcmp (argv [i], "-fd")))
+      if (((!strcmp (argv [i], "-fixeddelay"))
+       || (!strcmp (argv [i], "-fd"))) && (argc > i + 1))
         {
         fixdly_flg    = 1;
         delay_mode   |= BEH_DELAY_FIXED;
@@ -165,8 +165,8 @@ char **argv;
         arg_flg [i+1] = 1;
         }
 
-      if ((!strcmp (argv [i], "-backdelay"))
-       || (!strcmp (argv [i], "-bd")))
+      if (((!strcmp (argv [i], "-backdelay"))
+       || (!strcmp (argv [i], "-bd"))) && (argc > i + 1))
         {
         bckdly_flg    = i + 2;
         delay_mode   |= BEH_DELAY_BACKANOTATED;
@@ -221,14 +221,14 @@ char **argv;
         arg_flg [i] = 1;
         }
 
-      if (!strcmp (argv [i], "-p"))
+      if (!strcmp (argv [i], "-p") && (argc > i + 1))
         {
         sscanf (argv [i+1], "%u", &max_pat);
         arg_flg [i  ] = 1;
         arg_flg [i+1] = 1;
         }
 
-      if (!strcmp (argv [i], "-l"))
+      if (!strcmp (argv [i], "-l") && (argc > i + 1))
         {
         sscanf (argv [i+1], "%u", &labelsiz);
         arg_flg [i  ] = 1;
@@ -241,7 +241,7 @@ char **argv;
         arg_flg [i] = 1;
         }
 
-      if (!strcmp (argv [i], "-stat"))
+      if (!strcmp (argv [i], "-stat") && (argc > i + 1))
         {
         stat_flg      = i + 2;
         sscanf (argv [i+1], "%u", &ref_date);
@@ -264,7 +264,7 @@ char **argv;
         arg_flg [i+1] = 1;
         }
 
-      if (!strcmp (argv [i], "-inspect"))
+      if (!strcmp (argv [i], "-inspect") && (argc > i + 1))
         {
         str           = namealloc (argv [i+1]);
         pt_pains      = pat_addpains (pt_pains, str, str);
--- alliance-5.0-20120515.orig/m2e/src/m2e.c
+++ m2e/src/m2e.c
@@ -102,6 +102,8 @@ int ParseCommand(int argc,char *argv[])
      switch(argv[i][1])
      {
        case 'v':
+	 if (argc <= i + 1)
+		 break;
          i++;
          sscanf(argv[i],"%d",&VerboseMode);
          if(VerboseMode>=VMINFO) 
@@ -109,6 +111,8 @@ int ParseCommand(int argc,char *argv[])
          break;
 
        case 'o':
+	 if (argc <= i + 1)
+		 break;
          i++;
          OutputName=argv[i];
          if(VerboseMode>=VMINFO) 
--- alliance-5.0-20120515.orig/mips_asm/src/mips_y.y
+++ mips_asm/src/mips_y.y
@@ -92,14 +92,14 @@ char *argv [];
     {
     if (arg_flg [i] == 0)
       {
-      if (!strcmp (argv[i], "-textsize"))
+      if (!strcmp (argv[i], "-textsize") && argc > i + 1)
         {
         sscanf (argv[i+1], "%u", &txt_siz);
         arg_flg [i  ] = 1;
         arg_flg [i+1] = 1;
         }
 
-      if (!strcmp (argv[i], "-datasize"))
+      if (!strcmp (argv[i], "-datasize") && argc > i + 1)
         {
         sscanf (argv[i+1], "%u", &dat_siz);
         arg_flg [i  ] = 1;
@@ -112,7 +112,7 @@ char *argv [];
         arg_flg [i]   = 1         ;
         }
 
-      if (!strcmp (argv[i], "-symbol"))
+      if (!strcmp (argv[i], "-symbol") && argc > i + 1)
         {
         MPS_SYMBOL    = 'y'       ;
         symbol_fil    = argv [i+1];




--- asimut/src/Makefile.in.orig	2012-05-14 14:46:17 UTC
+++ asimut/src/Makefile.in
@@ -451,8 +451,6 @@ libCst_la_LDFLAGS = -version-info @CST_D
 libSch_la_LDFLAGS = -version-info @SCH_DLL_VERSION@
 asimut_LDADD = \
 -lBvl \
--lBhl \
--L. libCst.la libSch.la \
 -L$(top_builddir)/mbkvti/src \
 -L$(top_builddir)/mbkedif/src \
 -L$(top_builddir)/mbkhilo/src \
@@ -473,7 +471,9 @@ asimut_LDADD = \
 -lMlu \
 -lMal \
 -lMcl -lMel -lMhl -lMgl -lMsl \
-      -lMvg -lMlo -lRcn -lBvl -lBeh -lPpt -lPhl -lPat -lLog -lMut
+-lMvg -lMlo -lRcn -lBeh -lPpt -lPhl -lPat -lLog -lMut \
+-lBhl \
+-L. libCst.la libSch.la
 
 asimut_SOURCES = \
 beh_delay.h	  c_fsyn_sr1k_56.c    vh_debug.c    vh_lspec.c	  vh_util.h \




Add "float" package to avoid "Unknown float option 'H'" error

--- 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




--- elp/src/elp.c.orig	2002-06-12 12:54:39 UTC
+++ elp/src/elp.c
@@ -62,6 +62,7 @@ elpFCT elpenv()
    if ( str == (char *)NULL ) str = ALLIANCE_TOP;
    sprintf( elpTechnoFile, "%s/%s", str, TECHNOLOGY );
  }
+ return (0); 
 }
 
 /*****************************************************************************/
@@ -249,7 +250,7 @@ if(elpGeneral[elpACM] == 1.0)
     lotrs->PS = lotrs->PD = lotrs->WIDTH ;
     }
 
-return ;
+return 0;
 }
 
 
@@ -457,7 +458,7 @@ if((lotrs->PS != 0.0) && (lotrs->XS != 0
       addcapa( lotrs->SOURCE->SIG, elpLotrsCapaSource(lotrs) ) ;
     }
 
-return ;
+return 0;
 }
 
 
@@ -487,7 +488,7 @@ for(lotrs = lofig->LOTRS ; lotrs != NULL
   
   addcapa( lotrs->GRID->SIG, elpLotrsCapaGrid(lotrs) );
 }
-return ;
+return 0;
 }
 
 
@@ -515,5 +516,5 @@ lotrs_list *lotrs  ;
 for(lotrs = lofig->LOTRS ; lotrs != NULL ; lotrs = lotrs->NEXT)
 elpLotrsShrink(lotrs) ;
 
-return ;
+return 0;
 }

Lines 1-11 Link Here

(-)cad/alliance/files/patch-ppt_src_Makefile.in (-11 lines)
1	--- ppt/src/Makefile.in.orig 2012-05-14 14:46:35 UTC
2	+++ ppt/src/Makefile.in
3	@@ -769,7 +769,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pa
4	$(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \
5	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \
6	\| sed -e "s/int[ ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \
7	- \| sed -e "s/PAT_DECL_Y_STYPE[ ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
8	+ \| sed -e "s/PAT_DECL_Y_STYPE[ ]*pat_decl_y_lval;/PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
9	\| sed -e "s/int[ ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \
10	> pat_decl_y.c \
11	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h

Lines 5-8 Link Here

(-)cad/alliance/pkg-descr (-1 / +1 lines)
5	twelve year effort spent at ASIM department of LIP6 laboratory of	5	twelve year effort spent at ASIM department of LIP6 laboratory of
6	the Pierre et Marie Curie University (Paris VI, France).	6	the Pierre et Marie Curie University (Paris VI, France).
7		7
8	WWW: http://www-asim.lip6.fr/recherche/alliance/	8	WWW: https://www-soc.lip6.fr/equipe-cian/logiciels/alliance/




alliance/bin/sxlib2lef
alliance/bin/syf
alliance/bin/vasy
alliance/bin/x2vy
alliance/bin/x2y
alliance/bin/xfsm
alliance/bin/xgra

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

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

Return to bug 238686

Lines 2-13 Link Here

(-)cad/alliance/Makefile (-19 / +33 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= alliance	4	PORTNAME= alliance
5	DISTVERSION= 5.0-20120515	5	DISTVERSION= 5.1.1
6	PORTREVISION= 8
7	CATEGORIES= cad	6	CATEGORIES= cad
8	MASTER_SITES= http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \	7	MASTER_SITES= ftp://asim.lip6.fr/pub/alliance/distribution/5.0/ \
9	http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \	8	ftp://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
10	http://www-asim.lip6.fr/pub/alliance/distribution/5.0/	9	ftp://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/
11		10
12	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Complete set of CAD tools and libraries for VLSI design	12	COMMENT= Complete set of CAD tools and libraries for VLSI design
Lines 17-47 Link Here
17	LICENSE_FILE= ${WRKSRC}/LICENCE	16	LICENSE_FILE= ${WRKSRC}/LICENCE
18	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	17	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
19		18
20	BROKEN= unfetchable
21	BROKEN_aarch64= fails to link: collect2: error: ld returned 1 exit status	19	BROKEN_aarch64= fails to link: collect2: error: ld returned 1 exit status
22		20
23	CONFLICTS_INSTALL= fspclient-*	21	BUILD_DEPENDS= convert:graphics/ImageMagick7 \
		22	fig2dev:print/transfig
		23	LIB_DEPENDS= libXp.so:x11/libXp
24		24
25	WRKSRC= ${WRKDIR}/alliance-5.0	25	USES= autoreconf:build libtool motif gmake tar:bz2 xorg
26	SUB_FILES= pkg-message	26	USE_GCC= any
		27	USE_TEX= dvipsk:build latex:build
		28	USE_XORG= ice sm x11 xext xt
27		29
28	USES= bison gmake libtool motif
29
30	USE_GCC= any
31	HAS_CONFIGURE= yes	30	HAS_CONFIGURE= yes
32	INSTALL_TARGET= install-strip	31	CONFIGURE_ENV= ALLIANCE_TOP=${ALLIANCE_TOP}
33	ALLIANCE_TOP= ${PREFIX}/alliance	32	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
34	CONFIGURE_ENV+= ALLIANCE_TOP=${ALLIANCE_TOP}
35	CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
36	--prefix=${ALLIANCE_TOP}	33	--prefix=${ALLIANCE_TOP}
37		34
38	# The port does not build with C++11 or later (bug 219275).	35	# Seems to work without it but should be tested a bit more...
39	USE_CXXSTD= gnu++98	36	#MAKE_JOBS_UNSAFE= yes
		37	INSTALL_TARGET= install-strip
40		38
41	MAKE_JOBS_UNSAFE= yes	39	CONFLICTS_INSTALL= fspclient-*
42		40
		41	SUB_FILES= pkg-message
		42	WRKSRC= ${WRKDIR}/alliance/src
		43
		44	ALLIANCE_TOP= ${PREFIX}/alliance
		45
43	post-patch:	46	post-patch:
44	${REINPLACE_CMD} -e '/include <malloc.h>/d' \	47	${REINPLACE_CMD} -e '/include <malloc.h>/d' \
45	${WRKSRC}/xgra/src/XSB_parse.c	48	${WRKSRC}/xgra/src/XSB_parse.c
		49	# These Makefiles contains hardcoded references to make(1). Replace them with
		50	# gmake(1) to avoid build failures of the documentation.
		51	#
		52	# Maybe there's a better way to handle this...
		53	${REINPLACE_CMD} -e 's/; make/; gmake/' \
		54	${WRKSRC}/documentation/Makefile.am \
		55	${WRKSRC}/documentation/alliance-examples/Makefile \
		56	${WRKSRC}/documentation/tutorials/Makefile.am
46		57
		58	pre-configure:
		59	@cd ${WRKSRC} && ./autostuff
		60
47	.include <bsd.port.mk>	61	.include <bsd.port.mk>

Lines 1-115 Link Here

(-)cad/alliance/files/patch-11-fix-segfaults (-115 lines)
1	Description: Fix segfaults in different executables
2	Some executables in the package crashed upon certain command line option
3	combinations. This patch fixes this.
4	Author: Roland Stigge <stigge@antcom.de>
5	Bug-Debian: http://bugs.debian.org/715651
6	Bug-Debian: http://bugs.debian.org/716217
7	Bug-Debian: http://bugs.debian.org/716529
8
9	--- alliance-5.0-20120515.orig/asimut/src/vh_simulad.c
10	+++ asimut/src/vh_simulad.c
11	@@ -155,8 +155,8 @@ char **argv;
12	arg_flg [i ] = 1;
13	}
14
15	- if ((!strcmp (argv [i], "-fixeddelay"))
16	- \|\| (!strcmp (argv [i], "-fd")))
17	+ if (((!strcmp (argv [i], "-fixeddelay"))
18	+ \|\| (!strcmp (argv [i], "-fd"))) && (argc > i + 1))
19	{
20	fixdly_flg = 1;
21	delay_mode \|= BEH_DELAY_FIXED;
22	@@ -165,8 +165,8 @@ char **argv;
23	arg_flg [i+1] = 1;
24	}
25
26	- if ((!strcmp (argv [i], "-backdelay"))
27	- \|\| (!strcmp (argv [i], "-bd")))
28	+ if (((!strcmp (argv [i], "-backdelay"))
29	+ \|\| (!strcmp (argv [i], "-bd"))) && (argc > i + 1))
30	{
31	bckdly_flg = i + 2;
32	delay_mode \|= BEH_DELAY_BACKANOTATED;
33	@@ -221,14 +221,14 @@ char **argv;
34	arg_flg [i] = 1;
35	}
36
37	- if (!strcmp (argv [i], "-p"))
38	+ if (!strcmp (argv [i], "-p") && (argc > i + 1))
39	{
40	sscanf (argv [i+1], "%u", &max_pat);
41	arg_flg [i ] = 1;
42	arg_flg [i+1] = 1;
43	}
44
45	- if (!strcmp (argv [i], "-l"))
46	+ if (!strcmp (argv [i], "-l") && (argc > i + 1))
47	{
48	sscanf (argv [i+1], "%u", &labelsiz);
49	arg_flg [i ] = 1;
50	@@ -241,7 +241,7 @@ char **argv;
51	arg_flg [i] = 1;
52	}
53
54	- if (!strcmp (argv [i], "-stat"))
55	+ if (!strcmp (argv [i], "-stat") && (argc > i + 1))
56	{
57	stat_flg = i + 2;
58	sscanf (argv [i+1], "%u", &ref_date);
59	@@ -264,7 +264,7 @@ char **argv;
60	arg_flg [i+1] = 1;
61	}
62
63	- if (!strcmp (argv [i], "-inspect"))
64	+ if (!strcmp (argv [i], "-inspect") && (argc > i + 1))
65	{
66	str = namealloc (argv [i+1]);
67	pt_pains = pat_addpains (pt_pains, str, str);
68	--- alliance-5.0-20120515.orig/m2e/src/m2e.c
69	+++ m2e/src/m2e.c
70	@@ -102,6 +102,8 @@ int ParseCommand(int argc,char *argv[])
71	switch(argv[i][1])
72	{
73	case 'v':
74	+ if (argc <= i + 1)
75	+ break;
76	i++;
77	sscanf(argv[i],"%d",&VerboseMode);
78	if(VerboseMode>=VMINFO)
79	@@ -109,6 +111,8 @@ int ParseCommand(int argc,char *argv[])
80	break;
81
82	case 'o':
83	+ if (argc <= i + 1)
84	+ break;
85	i++;
86	OutputName=argv[i];
87	if(VerboseMode>=VMINFO)
88	--- alliance-5.0-20120515.orig/mips_asm/src/mips_y.y
89	+++ mips_asm/src/mips_y.y
90	@@ -92,14 +92,14 @@ char *argv [];
91	{
92	if (arg_flg [i] == 0)
93	{
94	- if (!strcmp (argv[i], "-textsize"))
95	+ if (!strcmp (argv[i], "-textsize") && argc > i + 1)
96	{
97	sscanf (argv[i+1], "%u", &txt_siz);
98	arg_flg [i ] = 1;
99	arg_flg [i+1] = 1;
100	}
101
102	- if (!strcmp (argv[i], "-datasize"))
103	+ if (!strcmp (argv[i], "-datasize") && argc > i + 1)
104	{
105	sscanf (argv[i+1], "%u", &dat_siz);
106	arg_flg [i ] = 1;
107	@@ -112,7 +112,7 @@ char *argv [];
108	arg_flg [i] = 1 ;
109	}
110
111	- if (!strcmp (argv[i], "-symbol"))
112	+ if (!strcmp (argv[i], "-symbol") && argc > i + 1)
113	{
114	MPS_SYMBOL = 'y' ;
115	symbol_fil = argv [i+1];

Lines 1-22 Link Here

(-)cad/alliance/files/patch-asimut_src_Makefile.in (-22 lines)
1	--- asimut/src/Makefile.in.orig 2012-05-14 14:46:17 UTC
2	+++ asimut/src/Makefile.in
3	@@ -451,8 +451,6 @@ libCst_la_LDFLAGS = -version-info @CST_D
4	libSch_la_LDFLAGS = -version-info @SCH_DLL_VERSION@
5	asimut_LDADD = \
6	-lBvl \
7	--lBhl \
8	--L. libCst.la libSch.la \
9	-L$(top_builddir)/mbkvti/src \
10	-L$(top_builddir)/mbkedif/src \
11	-L$(top_builddir)/mbkhilo/src \
12	@@ -473,7 +471,9 @@ asimut_LDADD = \
13	-lMlu \
14	-lMal \
15	-lMcl -lMel -lMhl -lMgl -lMsl \
16	- -lMvg -lMlo -lRcn -lBvl -lBeh -lPpt -lPhl -lPat -lLog -lMut
17	+-lMvg -lMlo -lRcn -lBeh -lPpt -lPhl -lPat -lLog -lMut \
18	+-lBhl \
19	+-L. libCst.la libSch.la
20
21	asimut_SOURCES = \
22	beh_delay.h c_fsyn_sr1k_56.c vh_debug.c vh_lspec.c vh_util.h \

Line 0 Link Here

(-)cad/alliance/files/patch-documentation_tutorials_start_start.tex (+13 lines)
	1	Add "float" package to avoid "Unknown float option 'H'" error
	2
	3	--- documentation/tutorials/start/start.tex.orig 2014-08-02 23:38:00 UTC
	4	+++ documentation/tutorials/start/start.tex
	5	@@ -9,7 +9,7 @@
	6	%
	7	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
	8	\documentclass{article}
	9	-\usepackage{charter,setspace,fancybox}
	10	+\usepackage{charter,setspace,fancybox,float}
	11	\textwidth 15cm
	12	\textheight 23cm
	13	\oddsidemargin +0.75cm

Lines 1-44 Link Here

(-)cad/alliance/files/patch-elp_src_elp.c (-44 lines)
1	--- elp/src/elp.c.orig 2002-06-12 12:54:39 UTC
2	+++ elp/src/elp.c
3	@@ -62,6 +62,7 @@ elpFCT elpenv()
4	if ( str == (char *)NULL ) str = ALLIANCE_TOP;
5	sprintf( elpTechnoFile, "%s/%s", str, TECHNOLOGY );
6	}
7	+ return (0);
8	}
9
10	/*****************************************************************************/
11	@@ -249,7 +250,7 @@ if(elpGeneral[elpACM] == 1.0)
12	lotrs->PS = lotrs->PD = lotrs->WIDTH ;
13	}
14
15	-return ;
16	+return 0;
17	}
18
19
20	@@ -457,7 +458,7 @@ if((lotrs->PS != 0.0) && (lotrs->XS != 0
21	addcapa( lotrs->SOURCE->SIG, elpLotrsCapaSource(lotrs) ) ;
22	}
23
24	-return ;
25	+return 0;
26	}
27
28
29	@@ -487,7 +488,7 @@ for(lotrs = lofig->LOTRS ; lotrs != NULL
30
31	addcapa( lotrs->GRID->SIG, elpLotrsCapaGrid(lotrs) );
32	}
33	-return ;
34	+return 0;
35	}
36
37
38	@@ -515,5 +516,5 @@ lotrs_list *lotrs ;
39	for(lotrs = lofig->LOTRS ; lotrs != NULL ; lotrs = lotrs->NEXT)
40	elpLotrsShrink(lotrs) ;
41
42	-return ;
43	+return 0;
44	}

Lines 41-47 Link Here

(-)cad/alliance/pkg-plist (-26 lines)
41	alliance/bin/sxlib2lef	41	alliance/bin/sxlib2lef
42	alliance/bin/syf	42	alliance/bin/syf
43	alliance/bin/vasy	43	alliance/bin/vasy
44	alliance/bin/x2vy
45	alliance/bin/x2y	44	alliance/bin/x2y
46	alliance/bin/xfsm	45	alliance/bin/xfsm
47	alliance/bin/xgra	46	alliance/bin/xgra
Lines 1509-1515 Link Here
1509	alliance/lib/libBhl.a	1508	alliance/lib/libBhl.a
1510	alliance/lib/libBtr.a	1509	alliance/lib/libBtr.a
1511	alliance/lib/libBvl.a	1510	alliance/lib/libBvl.a
1512	alliance/lib/libCst.a
1513	alliance/lib/libCtl.a	1511	alliance/lib/libCtl.a
1514	alliance/lib/libCtp.a	1512	alliance/lib/libCtp.a
1515	alliance/lib/libElp.a	1513	alliance/lib/libElp.a
Lines 1518-1565 Link Here
1518	alliance/lib/libFtl.a	1516	alliance/lib/libFtl.a
1519	alliance/lib/libFvh.a	1517	alliance/lib/libFvh.a
1520	alliance/lib/libLog.a	1518	alliance/lib/libLog.a
1521	alliance/lib/libMal.a
1522	alliance/lib/libMap.a
1523	alliance/lib/libMcl.a
1524	alliance/lib/libMcp.a
1525	alliance/lib/libMel.a
1526	alliance/lib/libMgl.a
1527	alliance/lib/libMgn.a	1519	alliance/lib/libMgn.a
1528	alliance/lib/libMhl.a
1529	alliance/lib/libMlo.a	1520	alliance/lib/libMlo.a
1530	alliance/lib/libMlu.a	1521	alliance/lib/libMlu.a
1531	alliance/lib/libMmg.a
1532	alliance/lib/libMph.a	1522	alliance/lib/libMph.a
1533	alliance/lib/libMpu.a	1523	alliance/lib/libMpu.a
1534	alliance/lib/libMsl.a
1535	alliance/lib/libMut.a	1524	alliance/lib/libMut.a
1536	alliance/lib/libMvg.a
1537	alliance/lib/libMvl.a
1538	alliance/lib/libPat.a	1525	alliance/lib/libPat.a
1539	alliance/lib/libPgn.a	1526	alliance/lib/libPgn.a
1540	alliance/lib/libPhl.a
1541	alliance/lib/libPpt.a
1542	alliance/lib/libRcf.a
1543	alliance/lib/libRcn.a	1527	alliance/lib/libRcn.a
1544	alliance/lib/libRds.a	1528	alliance/lib/libRds.a
1545	alliance/lib/libRfm.a
1546	alliance/lib/libRgs.a
1547	alliance/lib/libRpr.a
1548	alliance/lib/libRtd.a	1529	alliance/lib/libRtd.a
1549	alliance/lib/libRtl.a
1550	alliance/lib/libRtn.a	1530	alliance/lib/libRtn.a
1551	alliance/lib/libRut.a
1552	alliance/lib/libRwi.a
1553	alliance/lib/libSch.a	1531	alliance/lib/libSch.a
1554	alliance/lib/libScl.a	1532	alliance/lib/libScl.a
1555	alliance/lib/libVbh.a	1533	alliance/lib/libVbh.a
1556	alliance/lib/libVbl.a
1557	alliance/lib/libVex.a	1534	alliance/lib/libVex.a
1558	alliance/lib/libVpd.a
1559	alliance/lib/libVpn.a	1535	alliance/lib/libVpn.a
1560	alliance/lib/libVrd.a	1536	alliance/lib/libVrd.a
1561	alliance/lib/libVtl.a
1562	alliance/lib/libVvh.a
1563	alliance/tutorials/place_and_route.pdf	1537	alliance/tutorials/place_and_route.pdf
1564	alliance/tutorials/place_and_route/src/Makefile	1538	alliance/tutorials/place_and_route/src/Makefile
1565	alliance/tutorials/place_and_route/src/amd2901/Makefile	1539	alliance/tutorials/place_and_route/src/amd2901/Makefile