6 files changed, 54 insertions, 13 deletions

diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile
index d2c697364a05..2b38019f91ac 100644
--- a/math/fftw3-long/Makefile
+++ b/math/fftw3-long/Makefile
@@ -12,6 +12,6 @@ COMMENT=	Fast C routines (Long Double Percision)
 FFTW3_FLAVOR=	long
 MASTERDIR=	${.CURDIR}/../../math/fftw3
 
-ONLY_FOR_ARCHS=	i386
+#ONLY_FOR_ARCHS=	i386 sparc64
 
 .include "${MASTERDIR}/Makefile"
diff --git a/math/ldouble/Makefile b/math/ldouble/Makefile
index f11d34b6de98..f0c98d1f8285 100644
--- a/math/ldouble/Makefile
+++ b/math/ldouble/Makefile
@@ -7,26 +7,36 @@
 
 PORTNAME=	ldouble
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.moshier.net/
-DISTNAME=	ldouble
+DISTFILES=	${LDOUBLE_DISTFILE}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Long double math precision functions
 
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-ONLY_FOR_ARCHS=	i386
+# Known to work on atleast sparc64 & i386
+#ONLY_FOR_ARCHS=	i386 sparc64
 
 PLIST_FILES=	lib/libml.a \
 		lib/libml.so \
-		lib/libml.so.0 \
-		include/mathl.h
+		lib/libml.so.0
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH}=="i386"
+LDOUBLE_DISTFILE=	ldouble.zip
+USE_ZIP=		yes
+EXTRA_PATCHES=	${FILESDIR}/i386-makefile-patch
 PORTDOCS=	ldoubdoc.html
+.else
+LDOUBLE_DISTFILE=	128bit.tgz
+EXTRA_PATCHES=	${FILESDIR}/128-makefile-patch
+PORTDOCS=	128bdoc.html
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; s|%%CFLAGS%%|${CFLAGS}|' \
@@ -35,11 +45,12 @@ post-patch:
 do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ldoubdoc.html ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 	${INSTALL_DATA} ${WRKSRC}/libml.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/libml.so.0 ${PREFIX}/lib
 	${LN} -sf libml.so.0 ${PREFIX}/lib/libml.so
-	${INSTALL_DATA} ${WRKSRC}/protos.h ${PREFIX}/include/mathl.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/ldouble/distinfo b/math/ldouble/distinfo
index 83185af93be7..3b8e8f6bf4ce 100644
--- a/math/ldouble/distinfo
+++ b/math/ldouble/distinfo
@@ -1,3 +1,6 @@
 MD5 (ldouble.zip) = e7c83fa95acb0e5426aa644170267524
 SHA256 (ldouble.zip) = e02e46c2a164788f9f0b605a2efce7beb97adad1be62cfddf36f04c705a5e487
 SIZE (ldouble.zip) = 226266
+MD5 (128bit.tgz) = 166ba62beccdf176ebbc644d9ca61473
+SHA256 (128bit.tgz) = 24d30482fc984446f0aacdd3fe4298fef5d5af5c089766ac899be2321a4e37b2
+SIZE (128bit.tgz) = 163340
diff --git a/math/ldouble/files/128-makefile-patch b/math/ldouble/files/128-makefile-patch
new file mode 100644
index 000000000000..5e1b9ffb3a46
--- /dev/null
+++ b/math/ldouble/files/128-makefile-patch
@@ -0,0 +1,27 @@
+--- makefile.orig	Fri Apr 14 09:22:25 2006
++++ makefile	Fri Apr 14 09:27:49 2006
+@@ -1,7 +1,7 @@
+ # Makefile for 128-bit long double precision calculator
+ # and test programs.
+-CC= gcc
+-CFLAGS = -msoft-quad-float -fno-builtin -g -O2 -Wall
++CC= %%CC%%
++CFLAGS = -msoft-quad-float -fno-builtin %%CFLAGS%%
+ #CFLAGS = -mhard-quad-float -fno-builtin -g -O2 -Wall
+ INCS= mconf.h
+ 
+@@ -12,7 +12,13 @@
+ expx2ll.o floorll.o polevll.o constll.o mtherr.o
+ IEEOBJS= ieee.o econst.o
+ 
+-all: lcalc mtstl lparanoi monotll libml.a
++SHARED_LIB=	libml.so
++SHARED_LIB_VER=	$(SHARED_LIB).0
++
++all: libml.a $(SHARED_LIB_VER)
++
++$(SHARED_LIB_VER): $(OBJS)
++	$(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS)
+ 
+ lcalc: lcalc.o $(OBJS) $(IEEOBJS) $(INCS)
+ 	$(CC) -v -o lcalc lcalc.o $(OBJS) $(IEEOBJS)
diff --git a/math/ldouble/files/patch-makefile b/math/ldouble/files/i386-makefile-patch
index fe70bb3c8257..fe70bb3c8257 100644
--- a/math/ldouble/files/patch-makefile
+++ b/math/ldouble/files/i386-makefile-patch
diff --git a/math/ldouble/pkg-descr b/math/ldouble/pkg-descr
index 503be1c9d8c8..34037973e8f7 100644
--- a/math/ldouble/pkg-descr
+++ b/math/ldouble/pkg-descr
@@ -1,4 +1,4 @@
 Library of elementary mathematical functions, probability and elliptic
-integrals in 80-bit long double precision.
+integrals in 80-bit (x86) or 128-bit long double precision.
 
-WWW:	http://www.moshier.net/ldoubdoc.html
+WWW:	http://www.moshier.net/