Attachment 143635 Details for Bug 190892 – cad_adms.diff

[patch] cad_adms.diff

cad_adms.diff (text/plain), 6.12 KB, created by tkato432 on 2014-06-10 18:47:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-06-10 18:47:35 UTC

Size: 6.12 KB

patch

obsolete

>diff -urN /usr/ports/cad/adms/Makefile cad/adms/Makefile
>--- /usr/ports/cad/adms/Makefile	2013-12-31 05:07:51.000000000 +0900
>+++ cad/adms/Makefile	2014-06-11 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/cad/adms/Makefile 338158 2013-12-30 18:36:10Z antoine $
> 
> PORTNAME=	adms
>-PORTVERSION=	2.3.0
>-PORTREVISION=	0
>+PORTVERSION=	2.3.2
> CATEGORIES=	cad
> MASTER_SITES=	SF/mot-${PORTNAME}/${PORTNAME}-source/${PORTVERSION:R}
> 
>@@ -11,11 +10,11 @@
> COMMENT=	Model generator for SPICE simulators
> 
> LICENSE=	LGPL21
>-LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake pkgconfig
>+USES=		bison gmake libtool pkgconfig
> USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
>+INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/cad/adms/distinfo cad/adms/distinfo
>--- /usr/ports/cad/adms/distinfo	2014-01-23 05:07:11.000000000 +0900
>+++ cad/adms/distinfo	2014-06-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (adms-2.3.0.tar.gz) = 0d14e61b1c8c224c7703c396581ffd293977bc607becfca241d17945a215081f
>-SIZE (adms-2.3.0.tar.gz) = 639604
>+SHA256 (adms-2.3.2.tar.gz) = 120631ced4662790b0ce1f6b29823c945c0cbba9b9ab63a75d863a469989b73f
>+SIZE (adms-2.3.2.tar.gz) = 775414
>diff -urN /usr/ports/cad/adms/files/patch-configure cad/adms/files/patch-configure
>--- /usr/ports/cad/adms/files/patch-configure	2014-01-23 05:07:11.000000000 +0900
>+++ cad/adms/files/patch-configure	2014-06-11 00:00:00.000000000 +0900
>@@ -1,32 +1,67 @@
> --- configure.orig	2011-05-13 09:26:24.000000000 +0200
> +++ configure	2012-02-18 20:13:24.549495741 +0100
>-@@ -4811,37 +4811,6 @@
>- $as_echo "no, using $LN_S" >&6; }
>+@@ -15708,72 +15708,6 @@
>+ 
>  fi
>  
>+-#advice use of gcc
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5
>+-$as_echo_n "checking for C compiler vendor... " >&6; }
>+-if ${ax_cv_c_compiler_vendor+:} false; then :
>+-  $as_echo_n "(cached) " >&6
>+-else
>+-  # note: don't check for gcc first since some other compilers define __GNUC__
>+-  vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
>+-           ibm:       __xlc__,__xlC__,__IBMC__,__IBMCPP__
>+-           pathscale: __PATHCC__,__PATHSCALE__
>+-           clang:     __clang__
>+-           gnu:       __GNUC__
>+-           sun:       __SUNPRO_C,__SUNPRO_CC
>+-           hp:        __HP_cc,__HP_aCC
>+-           dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
>+-           borland:   __BORLANDC__,__TURBOC__
>+-           comeau:    __COMO__
>+-           cray:      _CRAYC
>+-           kai:       __KCC
>+-           lcc:       __LCC__
>+-           sgi:       __sgi,sgi
>+-           microsoft: _MSC_VER
>+-           metrowerks: __MWERKS__
>+-           watcom:    __WATCOMC__
>+-           portland:  __PGI
>+-           unknown:   UNKNOWN"
>+-  for ventest in $vendors; do
>+-    case $ventest in
>+-      *:) vendor=$ventest; continue ;;
>+-      *)  vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;;
>+-    esac
>+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+-/* end confdefs.h.  */
>+-
>+-int
>+-main ()
>+-{
> -
>--#force use of flex/bison
>--if test "x$LEX" != "xflex"; then
>--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Program flex not found (found $LEX)" >&5
>--$as_echo "$as_me: WARNING: Program flex not found (found $LEX)" >&2;}
>--  as_fn_error $? "Please install gnu flex from http://www.gnu.org/software/flex/" "$LINENO" 5
>+-      #if !($vencpp)
>+-        thisisanerror;
>+-      #endif
>+-
>+-  ;
>+-  return 0;
>+-}
>+-_ACEOF
>+-if ac_fn_c_try_compile "$LINENO"; then :
>+-  break
> -fi
>--if test "x$YACC" != "xbison -y"; then
>--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Program bison not found (found $YACC)" >&5
>--$as_echo "$as_me: WARNING: Program bison not found (found $YACC)" >&2;}
>--  as_fn_error $? "Please install gnu bison from http://www.gnu.org/software/bison/" "$LINENO" 5
>+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+-  done
>+-  ax_cv_c_compiler_vendor=`echo $vendor | cut -d: -f1`
>+-
> -fi
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_vendor" >&5
>+-$as_echo "$ax_cv_c_compiler_vendor" >&6; }
> -
>--#advice use of gcc
>--if test "x$GCC" = "xyes"; then
>--  case "$CFLAGS" in
>--  *-Wall*)
>--    # already present
>--    ;;
>--  *)
>--    CFLAGS="$CFLAGS -Wall"
>--  esac
>--else
>+-if test "x$ax_cv_c_compiler_vendor" != "xgnu"; then
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems that the selected C-compiler is not gnu gcc C-compiler" >&5
> -$as_echo "$as_me: WARNING: Seems that the selected C-compiler is not gnu gcc C-compiler" >&2;}
> -  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: We advice you to use gcc as C-compiler" >&5
>@@ -35,6 +70,6 @@
> -$as_echo "$as_me: WARNING: You can install it from http://www.gnu.org/software/gcc/" >&2;}
> -fi
> -
>- # Libtool initialisation.
>- # Make sure we can run config.sub.
>- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
>+ if ${CFLAGS+:} false; then :
>+   case " $CFLAGS " in
>+     *"  "*)
>diff -urN /usr/ports/cad/adms/pkg-descr cad/adms/pkg-descr
>--- /usr/ports/cad/adms/pkg-descr	2014-01-23 05:07:11.000000000 +0900
>+++ cad/adms/pkg-descr	2014-06-11 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
> ADMS is a code generator that converts electrical compact device models
>-specified in high-level description language into ready-to-compile c code for
>-the API of spice simulators.
>+specified in high-level description language into ready-to-compile c
>+code for the API of spice simulators.
> 
> WWW: http://mot-adms.sourceforge.net/
>diff -urN /usr/ports/cad/adms/pkg-plist cad/adms/pkg-plist
>--- /usr/ports/cad/adms/pkg-plist	2014-01-23 05:07:11.000000000 +0900
>+++ cad/adms/pkg-plist	2014-06-11 00:00:00.000000000 +0900
>@@ -1,18 +1,19 @@
> bin/admsXml
> lib/libadmsAdmstpath.a
>-lib/libadmsAdmstpath.la
> lib/libadmsAdmstpath.so
> lib/libadmsAdmstpath.so.0
>+lib/libadmsAdmstpath.so.0.0.0
> lib/libadmsElement.a
>-lib/libadmsElement.la
> lib/libadmsElement.so
> lib/libadmsElement.so.0
>+lib/libadmsElement.so.0.0.0
> lib/libadmsPreprocessor.a
>-lib/libadmsPreprocessor.la
> lib/libadmsPreprocessor.so
> lib/libadmsPreprocessor.so.0
>+lib/libadmsPreprocessor.so.0.0.0
> lib/libadmsVeriloga.a
>-lib/libadmsVeriloga.la
> lib/libadmsVeriloga.so
> lib/libadmsVeriloga.so.0
>+lib/libadmsVeriloga.so.0.0.0
>+man/man1/admsCheck.1.gz
> man/man1/admsXml.1.gz

Actions: View | Diff

Attachments on bug 190892: 143635