xastir: update to 2.2.2

science/xastir/Portfile

@@ -12,13 +12,12 @@ description         Amateur Radio APRS tracking software
 long_description    {*}${description}
 homepage            http://www.xastir.org/
 
-github.setup        Xastir Xastir 2.1.8 Release-
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from tarball
-checksums           rmd160  8e32480f5bd43d262d3ca2153fb69c492273ad25 \
-                    sha256  8b010e0ae665c1dd5f83c609940b6b8b56ad0f777bac0f637f599311111bf973 \
-                    size    2222069
-revision            15
+github.setup        Xastir Xastir 2.2.2 Release-
+github.tarball_from archive
+checksums           rmd160  3db74760bfc66accd4bf9302c3c222020f9d9f2e \
+                    sha256  e80d1640ef2b8071984a633d45beae878c120d6012cb371405b160a06b328542 \
+                    size    2246995
+revision            0
 
 use_autoconf        yes
 autoconf.cmd        ./bootstrap.sh
@@ -38,18 +37,21 @@ depends_lib         port:xorg-libXp \
                     port:pcre \
                     port:db48 \
                     port:tiff \
-                    port:proj4 \
+                    port:proj \
                     port:shapelib \
                     port:curl
 
 patchfiles          patch-acinclude.m4.diff \
-                    patch-bootstrap.sh.diff \
                     patch-configure.ac.diff
 
 configure.args      --without-graphicsmagick
 
-configure.cppflags-append   -I${prefix}/include/db48
-configure.ldflags-append    -L${prefix}/lib/db48
+configure.cppflags-append \
+                    -I${prefix}/include/db48 \
+                    -I${prefix}/lib/proj9/include
+configure.ldflags-append \
+                    -L${prefix}/lib/db48 \
+                    -L${prefix}/lib/proj9/lib
 
 app.create yes
 app.name Xastir

science/xastir/files/patch-acinclude.m4.diff

@@ -1,6 +1,6 @@
---- acinclude.m4.orig	2010-01-30 20:12:23.000000000 -0600
-+++ acinclude.m4	2010-05-06 15:15:25.000000000 -0500
-@@ -37,14 +37,6 @@
+--- acinclude.m4.orig
++++ acinclude.m4
+@@ -36,14 +36,6 @@
  [
  AC_MSG_CHECKING([for search paths])
 
@@ -15,17 +15,7 @@
  AC_MSG_RESULT([done])
  ])
 
-@@ -120,9 +112,6 @@
- ;;
- darwin*)
-   system=Darwin
--  LDFLAGS="-L/sw/lib -L/opt/local/lib $LDFLAGS"
--  CPPFLAGS="-I/sw/include -I/opt/local/include $CPPFLAGS"
--  EXTRA_BIN_PATH=":/opt/local/bin:/sw/bin"
- ;;
- freebsd*)
-   system=FreeBSD
-@@ -161,7 +150,7 @@
+@@ -98,7 +90,7 @@
  [
  BINPATH=$PATH