diff -urN astrometry.orig/Makefile astrometry/Makefile
--- astrometry.orig/Makefile	2010-09-21 13:08:40.000000000 +0200
+++ astrometry/Makefile	2010-10-05 23:01:49.000000000 +0200
@@ -2,11 +2,12 @@
 # Date created:                         7 July 2009
 # Whom:                                 Dereckson <dereckson@gmail.com>
 #
-# $FreeBSD: ports/astro/astrometry/Makefile,v 1.8 2010/09/21 11:08:40 makc Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	astrometry
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.astrometry.net/downloads/
 DISTNAME=	astrometry.net-${PORTVERSION}
@@ -28,8 +29,12 @@
 MAKE_JOBS_UNSAFE=	yes
 SUB_FILES=	pkg-message
 
+.include <bsd.port.pre.mk>
+
 post-extract:
-	${CP} ${FILESDIR}/gnu-specific-config.h ${WRKSRC}/util/
+.if ${OSVERSION} < 700000 && ${ARCH} == "amd64"
+	${CP} ${FILESDIR}/os-features-config.h ${WRKSRC}/util/
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
@@ -38,8 +43,6 @@
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not build on sparc64
 .endif
diff -urN astrometry.orig/files/gnu-specific-config.h astrometry/files/gnu-specific-config.h
--- astrometry.orig/files/gnu-specific-config.h	2009-07-17 19:13:13.000000000 +0200
+++ astrometry/files/gnu-specific-config.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#define NEED_CANONICALIZE_FILE_NAME 1
-#define NEED_DECLARE_QSORT_R 1
-#define NEED_QSORT_R 0
-#define NEED_SWAP_QSORT_R 0
diff -urN astrometry.orig/files/os-features-config.h astrometry/files/os-features-config.h
--- astrometry.orig/files/os-features-config.h	1970-01-01 01:00:00.000000000 +0100
+++ astrometry/files/os-features-config.h	2010-10-05 23:06:06.000000000 +0200
@@ -0,0 +1,5 @@
+#define NEED_CANONICALIZE_FILE_NAME 1
+#define NEED_DECLARE_QSORT_R 1
+#define NEED_QSORT_R 0
+#define NEED_SWAP_QSORT_R 0
+#define HAVE_NETPBM 0