5 files changed, 83 insertions, 45 deletions

diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index d2ea26f477ad..b6575d0115ca 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -6,18 +6,21 @@
 # $FreeBSD$
 
 PORTNAME=		wcslib
-PORTVERSION=	4.3.3
+PORTVERSION=	4.4.4
 CATEGORIES=		astro
 MASTER_SITES=	ftp://ftp.atnf.csiro.au/pub/software/wcslib/
 
 MAINTAINER=		tonymaher@optusnet.com.au
 COMMENT=		Library for parsing/generating FITS headers
 
+USE_BZIP2=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=		yes
 MAKEFILE=		GNUmakefile
 USE_LDCONFIG=	yes
 
+PLIST_SUB=		VERSION="${PORTVERSION}"
+
 # See makedefs.in which describes why you want to set the extra support.
 # For most users it will not be required.
 
@@ -26,6 +29,10 @@ OPTIONS=		CFITSIO "Add cfitsio support (for tests only)" Off \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES=	${FILESDIR}/6-patch-configure
+.endif
+
 # The configure script unconditionally searches for the cftisio library
 # and uses it if found.
 
@@ -40,4 +47,8 @@ PLIST_SUB+=		HPXCVT="@comment "
 LIB_DEPENDS+=	pgplot.5:${PORTSDIR}/graphics/pgplot
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's#%%PKGDIR%%#${LOCALBASE}/libdata#g' \
+		${WRKSRC}/GNUmakefile
+
 .include <bsd.port.post.mk>
diff --git a/astro/wcslib/distinfo b/astro/wcslib/distinfo
index ec019bcdd271..5cc84b104233 100644
--- a/astro/wcslib/distinfo
+++ b/astro/wcslib/distinfo
@@ -1,3 +1,3 @@
-MD5 (wcslib-4.3.3.tar.gz) = 651b9e7a1845919fdad20f833aaac0bc
-SHA256 (wcslib-4.3.3.tar.gz) = 24031144861085dc1e45cf0c2f3864eb40f259a65ab80a2ce547fd1baabc02de
-SIZE (wcslib-4.3.3.tar.gz) = 629037
+MD5 (wcslib-4.4.4.tar.bz2) = 273e804dc8da31309246be7f14fb90d1
+SHA256 (wcslib-4.4.4.tar.bz2) = 557ecab50af0cb84e4f18ca19eede3624d6538f22eb580bd5a67f78f7d65ebaa
+SIZE (wcslib-4.4.4.tar.bz2) = 1590830
diff --git a/astro/wcslib/files/6-patch-configure b/astro/wcslib/files/6-patch-configure
new file mode 100644
index 000000000000..c5bc573a994d
--- /dev/null
+++ b/astro/wcslib/files/6-patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2010-01-03 16:00:48.000000000 +1100
++++ configure	2010-01-03 16:02:03.000000000 +1100
+@@ -9439,7 +9439,7 @@
+ 
+     SUBDIRS="C Fortran"
+     TSTDIRS="C Fortran"
+-    INSTDIR="pgsbox"
++    INSTDIR="Fortran"
+   fi
+ fi
+ 
diff --git a/astro/wcslib/files/patch-GNUmakefile b/astro/wcslib/files/patch-GNUmakefile
new file mode 100644
index 000000000000..f850d0962595
--- /dev/null
+++ b/astro/wcslib/files/patch-GNUmakefile
@@ -0,0 +1,16 @@
+--- GNUmakefile.orig	2010-01-05 09:25:18.000000000 +0800
++++ GNUmakefile	2010-01-05 09:26:17.000000000 +0800
+@@ -55,10 +55,10 @@
+ 	   $(INSTALL) -m 444 CHANGES $(INCDIR)/CHANGES
+ 	   $(INSTALL) -m 444 COPYING $(INCDIR)/COPYING
+ 	   $(INSTALL) -m 444 README  $(INCDIR)/README
+-	   if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
+-	     $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \
++	   if [ ! -d "%%PKGDIR%%/pkgconfig" ] ; then \
++	     $(INSTALL) -d -m 2775 %%PKGDIR%%/pkgconfig ; \
+ 	   fi
+-	   $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
++	   $(INSTALL) -m 444 wcslib.pc %%PKGDIR%%/pkgconfig/wcslib.pc
+ 
+ realclean cleanest :
+ 	for DIR in $(SUBDIRS) doxygen ; do \
diff --git a/astro/wcslib/pkg-plist b/astro/wcslib/pkg-plist
index 79cef6a08e10..78f2fb3230a6 100644
--- a/astro/wcslib/pkg-plist
+++ b/astro/wcslib/pkg-plist
@@ -1,46 +1,46 @@
 %%HPXCVT%%bin/HPXcvt
 bin/fitshdr
 include/wcslib
-include/wcslib-4.3/CHANGES_C
-include/wcslib-4.3/CHANGES_FORTRAN
-include/wcslib-4.3/COPYING
-include/wcslib-4.3/README
-include/wcslib-4.3/cel.h
-include/wcslib-4.3/cel.inc
-include/wcslib-4.3/fitshdr.h
-include/wcslib-4.3/fitshdr.inc
-include/wcslib-4.3/getwcstab.h
-include/wcslib-4.3/getwcstab.inc
-include/wcslib-4.3/lin.h
-include/wcslib-4.3/lin.inc
-include/wcslib-4.3/log.h
-include/wcslib-4.3/log.inc
-include/wcslib-4.3/prj.h
-include/wcslib-4.3/prj.inc
-include/wcslib-4.3/spc.h
-include/wcslib-4.3/spc.inc
-include/wcslib-4.3/sph.h
-include/wcslib-4.3/sph.inc
-include/wcslib-4.3/spx.h
-include/wcslib-4.3/spx.inc
-include/wcslib-4.3/tab.h
-include/wcslib-4.3/tab.inc
-include/wcslib-4.3/wcs.h
-include/wcslib-4.3/wcs.inc
-include/wcslib-4.3/wcsconfig.h
-include/wcslib-4.3/wcsconfig_f77.h
-include/wcslib-4.3/wcsfix.h
-include/wcslib-4.3/wcsfix.inc
-include/wcslib-4.3/wcshdr.h
-include/wcslib-4.3/wcshdr.inc
-include/wcslib-4.3/wcslib.h
-include/wcslib-4.3/wcsmath.h
-include/wcslib-4.3/wcstrig.h
-include/wcslib-4.3/wcsunits.h
-include/wcslib-4.3/wcsunits.inc
-include/wcslib-4.3/wcsutil.h
-lib/libwcs-4.3.a
+include/wcslib-%%VERSION%%/CHANGES
+include/wcslib-%%VERSION%%/COPYING
+include/wcslib-%%VERSION%%/README
+include/wcslib-%%VERSION%%/cel.h
+include/wcslib-%%VERSION%%/cel.inc
+include/wcslib-%%VERSION%%/fitshdr.h
+include/wcslib-%%VERSION%%/fitshdr.inc
+include/wcslib-%%VERSION%%/getwcstab.h
+include/wcslib-%%VERSION%%/getwcstab.inc
+include/wcslib-%%VERSION%%/lin.h
+include/wcslib-%%VERSION%%/lin.inc
+include/wcslib-%%VERSION%%/log.h
+include/wcslib-%%VERSION%%/log.inc
+include/wcslib-%%VERSION%%/prj.h
+include/wcslib-%%VERSION%%/prj.inc
+include/wcslib-%%VERSION%%/spc.h
+include/wcslib-%%VERSION%%/spc.inc
+include/wcslib-%%VERSION%%/sph.h
+include/wcslib-%%VERSION%%/sph.inc
+include/wcslib-%%VERSION%%/spx.h
+include/wcslib-%%VERSION%%/spx.inc
+include/wcslib-%%VERSION%%/tab.h
+include/wcslib-%%VERSION%%/tab.inc
+include/wcslib-%%VERSION%%/wcs.h
+include/wcslib-%%VERSION%%/wcs.inc
+include/wcslib-%%VERSION%%/wcsconfig.h
+include/wcslib-%%VERSION%%/wcsconfig_f77.h
+include/wcslib-%%VERSION%%/wcsfix.h
+include/wcslib-%%VERSION%%/wcsfix.inc
+include/wcslib-%%VERSION%%/wcshdr.h
+include/wcslib-%%VERSION%%/wcshdr.inc
+include/wcslib-%%VERSION%%/wcslib.h
+include/wcslib-%%VERSION%%/wcsmath.h
+include/wcslib-%%VERSION%%/wcstrig.h
+include/wcslib-%%VERSION%%/wcsunits.h
+include/wcslib-%%VERSION%%/wcsunits.inc
+include/wcslib-%%VERSION%%/wcsutil.h
+lib/libwcs-%%VERSION%%.a
 lib/libwcs.a
 lib/libwcs.so
-lib/libwcs.so.4.3
-@dirrm include/wcslib-4.3
+lib/libwcs.so.%%VERSION%%
+libdata/pkgconfig/wcslib.pc
+@dirrm include/wcslib-%%VERSION%%