- Change MAINTAINER e-mail

- Get rid of patches no longer used
- Get rid of pkg-plist no longer used
- Do all build inside the Makefile

Notified by: kris (via pointyhat)
Approved by: ehaupt (mentor)

4 files changed, 26 insertions, 76 deletions

diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile
index df6b1198be37..3992168b31b4 100644
--- a/math/ccmath/Makefile
+++ b/math/ccmath/Makefile
@@ -12,18 +12,37 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs
 
-MAINTAINER=	db@db.net
+MAINTAINER=	db@FreeBSD.org
 COMMENT=	A mathematics library with many different functions
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
-post-configure:
-.if (${MACHINE_ARCH} != "i386")
-	(cd ${WRKSRC} && ${SH} non_intel.sh)
+PORTDOCS=	*
+PLIST_FILES=	include/ccmath.h lib/libccm.a lib/libccm.so lib/libccm.so.1
+SRC_DIRS=	cfit complex fft geom intg matrix roots sfunc simu sort statf \
+		tseries util xarm
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+COPT=		-fPIC
 .endif
 
+post-extract:
+	@${CP} ${WRKSRC}/matrix/supp/solv.c ${WRKSRC}/matrix
+	@${CP} ${WRKSRC}/simu/supp/*.c ${WRKSRC}/simu
+	@${CP} ${WRKSRC}/xarm/supp/big-end/*.c ${WRKSRC}/xarm
+	@${RM} ${WRKSRC}/matrix/*.s
+	@${RM} ${WRKSRC}/simu/*.s
+
 do-build:
-	(cd ${WRKSRC} && ${SH} makelibs.sh)
+.for d in ${SRC_DIRS}
+	(cd ${WRKSRC}/${d}; ${CC} ${CFLAGS} ${COPT} -c *.c)
+	${MV} ${WRKSRC}/${d}/*.o ${WRKSRC}/tmp
+.endfor
+	(cd ${WRKSRC}/matrix; ${CC} ${COPT} -c qrb*.c)
+	${MV} ${WRKSRC}/matrix/*.o ${WRKSRC}/tmp
+	(cd ${WRKSRC}/tmp; ${AR} r libccm.a *.o; ${CC} -shared -o libccm.so *.o)
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/ccmath.h ${PREFIX}/include
@@ -35,4 +54,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/manual/* ${PREFIX}/share/doc/ccmath
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/ccmath/files/patch-aa b/math/ccmath/files/patch-aa
deleted file mode 100644
index 5094b1058252..000000000000
--- a/math/ccmath/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- non_intel.sh.orig	Wed Mar  7 16:13:59 2001
-+++ non_intel.sh	Wed Mar  7 16:14:20 2001
-@@ -13,9 +13,5 @@
- rm $MDR/simu/*.s
- echo " .s code replaced in simu"
- echo  
--echo " bigendian byte order (y/n)"
--read F
--if [ $F = "y" ]
--  then cp $MDR/xarm/supp/big-end/*.c $MDR/xarm
--  echo " bigend code installed in xarm"
--fi
-+cp $MDR/xarm/supp/big-end/*.c $MDR/xarm
-+echo " bigend code installed in xarm"
diff --git a/math/ccmath/files/patch-ac b/math/ccmath/files/patch-ac
deleted file mode 100644
index 27f4db72d8f9..000000000000
--- a/math/ccmath/files/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
--echo "Intel platform ? (y/n)"
--read F
- for dr in $LST
-   do
-     cd $MDR/$dr
-     echo `pwd`
--    cc -c -O3 *.c
-+    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
-+    cd $MDR/matrix
-+    cc -c $CFLAGS solv.s
-     mv *.o $LSOD
-     cd $MDR/simu
--    cc -c -O3 *.s
-+    cc -c $CFLAGS *.s
-     mv *.o $LSOD
--fi
- cd $LSOD
- ar r libccm.a *.o
- ld -shared -o libccm.so *.o
diff --git a/math/ccmath/pkg-plist b/math/ccmath/pkg-plist
deleted file mode 100644
index 9fbd09a20c71..000000000000
--- a/math/ccmath/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-include/ccmath.h
-lib/libccm.a
-lib/libccm.so
-lib/libccm.so.1
-%%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%%