- Update to 2.2.1

PR:		ports/58209
Submitted by:	Ying-Chieh Liao <ijliao@HAgw.NCTU.edu.tw>

5 files changed, 28 insertions, 34 deletions

diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile
index f54283cfffde..b92b4717c757 100644
--- a/math/ccmath/Makefile
+++ b/math/ccmath/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=       ccmath
-PORTVERSION=	2.2.0
-CATEGORIES=     math
+PORTNAME=	ccmath
+PORTVERSION=	2.2.1
+CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs
 
diff --git a/math/ccmath/distinfo b/math/ccmath/distinfo
index 0125fafdb9a9..b1519746968f 100644
--- a/math/ccmath/distinfo
+++ b/math/ccmath/distinfo
@@ -1 +1 @@
-MD5 (ccmath-2.2.0.tar.gz) = 96d9b148d4dc06dba82441006b39a3d3
+MD5 (ccmath-2.2.1.tar.gz) = 4d875071c7114839546c815cc2b7732c
diff --git a/math/ccmath/files/patch-ab b/math/ccmath/files/patch-ab
deleted file mode 100644
index c386e839fff6..000000000000
--- a/math/ccmath/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- tseries/sany.c.orig	Wed Mar  7 16:20:33 2001
-+++ tseries/sany.c	Wed Mar  7 16:20:40 2001
-@@ -5,7 +5,7 @@
-  *  public license (LGPL). ( See the lgpl.license file for details.)
-  * ------------------------------------------------------------------------
-  */
--#include "ccmath.h"
-+#include "../ccmath.h"
- int sany(double *x,int n,double *pm,double *cd,double *ci,
-        int nd,int ms,int lag)
- { struct complex *pc,*p,**qc,**q;
diff --git a/math/ccmath/files/patch-ac b/math/ccmath/files/patch-ac
index 3dcbbfb7335d..27f4db72d8f9 100644
--- a/math/ccmath/files/patch-ac
+++ b/math/ccmath/files/patch-ac
@@ -1,6 +1,6 @@
---- makelibs.sh.orig	Sat May 20 09:01:56 2000
-+++ makelibs.sh	Fri Nov 21 07:44:44 2003
-@@ -9,23 +9,19 @@
+--- makelibs.sh.orig	Sat Oct 18 22:13:50 2003
++++ makelibs.sh	Sat Oct 18 22:15:05 2003
+@@ -10,13 +10,11 @@
  LST="cfit complex fft geom intg matrix roots sfunc simu sort statf tseries util xarm"
  MDR=`pwd`
  LSOD=$MDR/tmp
@@ -14,6 +14,11 @@
 +    cc -c $CFLAGS -fPIC *.c
      mv *.o $LSOD
    done
+ 
+@@ -27,14 +25,12 @@
+ mv *.o $LSOD
+ cd $MDR
+ 
 -if [ $F = "y" ]
 -  then cd $MDR/matrix
 -    cc -c -O3 solv.s
diff --git a/math/ccmath/pkg-plist b/math/ccmath/pkg-plist
index e017b0d2e56b..bda2a4184b6c 100644
--- a/math/ccmath/pkg-plist
+++ b/math/ccmath/pkg-plist
@@ -1,19 +1,19 @@
 include/ccmath.h
 lib/libccm.a
 lib/libccm.so
-%%PORTDOCS%%share/doc/ccmath/C00-intro
-%%PORTDOCS%%share/doc/ccmath/C01-matrix
-%%PORTDOCS%%share/doc/ccmath/C02-intg
-%%PORTDOCS%%share/doc/ccmath/C03-geom
-%%PORTDOCS%%share/doc/ccmath/C04-cfit
-%%PORTDOCS%%share/doc/ccmath/C05-roots
-%%PORTDOCS%%share/doc/ccmath/C06-fft
-%%PORTDOCS%%share/doc/ccmath/C07-simu
-%%PORTDOCS%%share/doc/ccmath/C08-statf
-%%PORTDOCS%%share/doc/ccmath/C09-sfunc
-%%PORTDOCS%%share/doc/ccmath/C10-sort
-%%PORTDOCS%%share/doc/ccmath/C11-tseries
-%%PORTDOCS%%share/doc/ccmath/C12-complex
-%%PORTDOCS%%share/doc/ccmath/C13-xarm
-%%PORTDOCS%%share/doc/ccmath/C14-util
-%%PORTDOCS%%@dirrm share/doc/ccmath
+%%PORTDOCS%%%%DOCSDIR%%/C00-intro
+%%PORTDOCS%%%%DOCSDIR%%/C01-matrix
+%%PORTDOCS%%%%DOCSDIR%%/C02-intg
+%%PORTDOCS%%%%DOCSDIR%%/C03-geom
+%%PORTDOCS%%%%DOCSDIR%%/C04-cfit
+%%PORTDOCS%%%%DOCSDIR%%/C05-roots
+%%PORTDOCS%%%%DOCSDIR%%/C06-fft
+%%PORTDOCS%%%%DOCSDIR%%/C07-simu
+%%PORTDOCS%%%%DOCSDIR%%/C08-statf
+%%PORTDOCS%%%%DOCSDIR%%/C09-sfunc
+%%PORTDOCS%%%%DOCSDIR%%/C10-sort
+%%PORTDOCS%%%%DOCSDIR%%/C11-tseries
+%%PORTDOCS%%%%DOCSDIR%%/C12-complex
+%%PORTDOCS%%%%DOCSDIR%%/C13-xarm
+%%PORTDOCS%%%%DOCSDIR%%/C14-util
+%%PORTDOCS%%@dirrm %%DOCSDIR%%