- Update to 2.2.5.

4 files changed, 24 insertions, 24 deletions

diff --git a/cad/adms/Makefile b/cad/adms/Makefile
index 01251f824764..a6087f3e99f5 100644
--- a/cad/adms/Makefile
+++ b/cad/adms/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	adms
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=mot-adms
diff --git a/cad/adms/distinfo b/cad/adms/distinfo
index 7c6cd2c804aa..7428bbbe2f8e 100644
--- a/cad/adms/distinfo
+++ b/cad/adms/distinfo
@@ -1,3 +1,3 @@
-MD5 (adms-2.2.4.tar.gz) = cdc073d8b549bb2153423ab162a62727
-SHA256 (adms-2.2.4.tar.gz) = 9dab117138e3fb023bb144f59d2c598e366d7222ab029c97fa9e6d022c970a31
-SIZE (adms-2.2.4.tar.gz) = 704227
+MD5 (adms-2.2.5.tar.gz) = a73d58246bb3532392fc208ec7b778cf
+SHA256 (adms-2.2.5.tar.gz) = 6ae1a3f91f80c221094ff01d2d1032af2350ccdaea8f70c1c69f4e1a9e3c10ff
+SIZE (adms-2.2.5.tar.gz) = 706220
diff --git a/cad/adms/files/patch-configure b/cad/adms/files/patch-configure
index be7bc121c45f..584e3f52ebaa 100644
--- a/cad/adms/files/patch-configure
+++ b/cad/adms/files/patch-configure
@@ -1,31 +1,32 @@
---- configure.orig	Sat Jul 29 10:30:30 2006
-+++ configure	Sat Jul 29 10:31:30 2006
-@@ -1510,9 +1510,6 @@
-           ac_config_headers="$ac_config_headers config.h"
+--- configure.orig	Fri Apr 27 02:18:29 2007
++++ configure	Fri Apr 27 02:19:20 2007
+@@ -1943,10 +1943,6 @@
  
+ ac_config_headers="$ac_config_headers config.h"
  
+-
 -# force use of gnu compiler
 -CC=gcc
 -
  # specific configuration.
  ac_aux_dir=
- for ac_dir in auxconf $srcdir/auxconf; do
-@@ -4181,33 +4178,6 @@
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+ for ac_dir in auxconf "$srcdir"/auxconf; do
+@@ -4112,41 +4108,6 @@
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
 -fi
 -
 -
 -#force use of flex/bison
--if test "x$LEX" != xflex; then
+-if test "x$LEX" != "xflex"; then
 -  { echo "$as_me:$LINENO: WARNING: Program flex not found (found $LEX)" >&5
 -echo "$as_me: WARNING: Program flex not found (found $LEX)" >&2;}
 -  { { echo "$as_me:$LINENO: error: Please install gnu flex from http://www.gnu.org/software/flex/" >&5
 -echo "$as_me: error: Please install gnu flex from http://www.gnu.org/software/flex/" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
--if test "x$YACC" != 'xbison -y'; then
+-if test "x$YACC" != "xbison -y"; then
 -  { echo "$as_me:$LINENO: WARNING: Program bison not found (found $YACC)" >&5
 -echo "$as_me: WARNING: Program bison not found (found $YACC)" >&2;}
 -  { { echo "$as_me:$LINENO: error: Please install gnu bison from http://www.gnu.org/software/bison/" >&5
@@ -34,7 +35,15 @@
 -fi
 -
 -#advice use of gcc
--if test "x$CC" != xgcc; then
+-if test "x$GCC" = "xyes"; then
+-  case "$CFLAGS" in
+-  *-Wall*)
+-    # already present
+-    ;;
+-  *)
+-    CFLAGS="$CFLAGS -Wall"
+-  esac
+-else
 -  { echo "$as_me:$LINENO: WARNING: Seems that the selected C-compiler is not gnu gcc C-compiler" >&5
 -echo "$as_me: WARNING: Seems that the selected C-compiler is not gnu gcc C-compiler" >&2;}
 -  { echo "$as_me:$LINENO: WARNING: We advice you to use gcc as C-compiler" >&5
diff --git a/cad/adms/pkg-plist b/cad/adms/pkg-plist
index fc82db9e2fdd..eac916057dd7 100644
--- a/cad/adms/pkg-plist
+++ b/cad/adms/pkg-plist
@@ -1,10 +1,5 @@
 bin/admsCheck
-bin/admsPreprocessor
 bin/admsXml
-lib/libadmsCheck.a
-lib/libadmsCheck.la
-lib/libadmsCheck.so
-lib/libadmsCheck.so.0
 lib/libadmsFile.a
 lib/libadmsFile.la
 lib/libadmsFile.so
@@ -21,7 +16,3 @@ lib/libadmsVeriloga.a
 lib/libadmsVeriloga.la
 lib/libadmsVeriloga.so
 lib/libadmsVeriloga.so.0
-lib/libadmsXml.a
-lib/libadmsXml.la
-lib/libadmsXml.so
-lib/libadmsXml.so.0