4 files changed, 96 insertions, 31 deletions

diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index df8da07d9c9a..74b4b8fce230 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -7,25 +7,30 @@
 #
 
 PORTNAME=	libnova
-PORTVERSION=	0.11.0
-PORTREVISION=	2
+PORTVERSION=	0.12.0
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}_${PORTVERSION}-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Astronomical Calculation Library
 
 USE_GNOME=	gnometarget lthack
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
 IGNORE=		requires FreeBSD 5.3 or higher
 .endif
 
+post-extract:
+	@${TAR} xf ${WRKDIR}/${PORTNAME}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -C ${WRKDIR}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
 
diff --git a/astro/libnova/distinfo b/astro/libnova/distinfo
index 3a16eea4e642..c2b32e887f32 100644
--- a/astro/libnova/distinfo
+++ b/astro/libnova/distinfo
@@ -1,3 +1,3 @@
-MD5 (libnova-0.11.0.tar.gz) = 3ebe93b4ba772860d1dcd06e17e759f7
-SHA256 (libnova-0.11.0.tar.gz) = 94f3bc29c98692606cb8a62e138f02a1f040d121c5d684cca7e28c2c1b045ae2
-SIZE (libnova-0.11.0.tar.gz) = 1529667
+MD5 (libnova_0.12.0-1.tar.gz) = cca5972306b032b58413ee30b64e18a4
+SHA256 (libnova_0.12.0-1.tar.gz) = d7d0a00bf3fd0fc6819277d3854b80c4c1bd0905b3d9f1d8f296455e42c9fde3
+SIZE (libnova_0.12.0-1.tar.gz) = 3033093
diff --git a/astro/libnova/files/patch-src_precession.c b/astro/libnova/files/patch-src_precession.c
new file mode 100644
index 000000000000..0f7784f12cef
--- /dev/null
+++ b/astro/libnova/files/patch-src_precession.c
@@ -0,0 +1,58 @@
+--- src/precession.c.orig	Tue Jan 10 23:35:08 2006
++++ src/precession.c	Tue Aug 15 18:03:50 2006
+@@ -56,21 +56,21 @@
+ 	theta = ln_deg_to_rad (theta); 
+ 
+ 	/* calc A,B,C equ 20.4 */
+-	A = cosl (mean_dec) * sinl (mean_ra + zeta);
+-	B = cosl (theta) * cosl (mean_dec) * cosl (mean_ra + zeta) - sinl (theta) * sinl (mean_dec);
+-	C = sinl (theta) * cosl (mean_dec) * cosl (mean_ra + zeta) + cosl (theta) * sinl (mean_dec);
++	A = cos (mean_dec) * sin (mean_ra + zeta);
++	B = cos (theta) * cos (mean_dec) * cos (mean_ra + zeta) - sin (theta) * sin (mean_dec);
++	C = sin (theta) * cos (mean_dec) * cos (mean_ra + zeta) + cos (theta) * sin (mean_dec);
+ 	
+-	ra = atan2l (A,B) + eta;
++	ra = atan2 (A,B) + eta;
+ 	
+ 	/* check for object near celestial pole */
+ 	if (mean_dec > (0.4 * M_PI) || mean_dec < (-0.4 * M_PI)) {
+ 		/* close to pole */
+-		dec = acosl (sqrt(A * A + B * B));
++		dec = acos (sqrt(A * A + B * B));
+ 		if (mean_dec < 0.)
+ 		  dec *= -1; /* 0 <= acos() <= PI */
+ 	} else {
+ 		/* not close to pole */
+-		dec = asinl (C);
++		dec = asin (C);
+ 	}
+ 
+ 	/* change to degrees */
+@@ -114,21 +114,21 @@
+ 	theta = ln_deg_to_rad (theta); 
+ 
+ 	/* calc A,B,C equ 20.4 */
+-	A = cosl (mean_dec) * sinl (mean_ra + zeta);
+-	B = cosl (theta) * cosl (mean_dec) * cosl (mean_ra + zeta) - sinl (theta) * sinl (mean_dec);
+-	C = sinl (theta) * cosl (mean_dec) * cosl (mean_ra + zeta) + cosl (theta) * sinl (mean_dec);
++	A = cos (mean_dec) * sin (mean_ra + zeta);
++	B = cos (theta) * cos (mean_dec) * cos (mean_ra + zeta) - sin (theta) * sin (mean_dec);
++	C = sin (theta) * cos (mean_dec) * cos (mean_ra + zeta) + cos (theta) * sin (mean_dec);
+ 	
+-	ra = atan2l (A,B) + eta;
++	ra = atan2 (A,B) + eta;
+ 	
+ 	/* check for object near celestial pole */
+ 	if (mean_dec > (0.4 * M_PI) || mean_dec < (-0.4 * M_PI)) {
+ 		/* close to pole */
+-		dec = acosl (sqrt(A * A + B * B));
++		dec = acos (sqrt(A * A + B * B));
+ 		if (mean_dec < 0.)
+ 		  dec *= -1; /* 0 <= acos() <= PI */
+ 	} else {
+ 		/* not close to pole */
+-		dec = asinl (C);
++		dec = asin (C);
+ 	}
+ 
+ 	/* change to degrees */
diff --git a/astro/libnova/pkg-plist b/astro/libnova/pkg-plist
index fa911489a387..0af7affa3f66 100644
--- a/astro/libnova/pkg-plist
+++ b/astro/libnova/pkg-plist
@@ -1,38 +1,40 @@
 bin/libnovaconfig
-include/libnova/julian_day.h
-include/libnova/dynamical_time.h
-include/libnova/sidereal_time.h
-include/libnova/transform.h
-include/libnova/nutation.h
-include/libnova/libnova.h
 include/libnova/aberration.h
+include/libnova/airmass.h
+include/libnova/angular_separation.h
 include/libnova/apparent_position.h
-include/libnova/solar.h
-include/libnova/precession.h
-include/libnova/proper_motion.h
-include/libnova/mercury.h
-include/libnova/venus.h
+include/libnova/asteroid.h
+include/libnova/comet.h
+include/libnova/dynamical_time.h
 include/libnova/earth.h
-include/libnova/mars.h
+include/libnova/elliptic_motion.h
+include/libnova/hyperbolic_motion.h
+include/libnova/julian_day.h
 include/libnova/jupiter.h
-include/libnova/saturn.h
-include/libnova/uranus.h
-include/libnova/neptune.h
-include/libnova/pluto.h
-include/libnova/vsop87.h
+include/libnova/libnova.h
+include/libnova/ln_types.h
 include/libnova/lunar.h
-include/libnova/elliptic_motion.h
-include/libnova/asteroid.h
-include/libnova/comet.h
+include/libnova/mars.h
+include/libnova/mercury.h
+include/libnova/neptune.h
+include/libnova/nutation.h
 include/libnova/parabolic_motion.h
+include/libnova/parallax.h
+include/libnova/pluto.h
+include/libnova/precession.h
+include/libnova/proper_motion.h
 include/libnova/refraction.h
 include/libnova/rise_set.h
-include/libnova/angular_separation.h
-include/libnova/ln_types.h
+include/libnova/saturn.h
+include/libnova/sidereal_time.h
+include/libnova/solar.h
+include/libnova/transform.h
+include/libnova/uranus.h
 include/libnova/utility.h
-include/libnova/hyperbolic_motion.h
-lib/libnova-0.11.so
-lib/libnova-0.11.so.0
+include/libnova/venus.h
+include/libnova/vsop87.h
+lib/libnova-0.12.so
+lib/libnova-0.12.so.0
 lib/libnova.a
 lib/libnova.la
 lib/libnova.so