[84635] trunk/dports/science/xastir

ryandesign at macports.org ryandesign at macports.org
Wed Sep 28 23:52:53 PDT 2011


Revision: 84635
          http://trac.macports.org/changeset/84635
Author:   ryandesign at macports.org
Date:     2011-09-28 23:52:53 -0700 (Wed, 28 Sep 2011)
Log Message:
-----------
xastir: update to 2.0.0, patched to avoid non-portable use of "echo -n"; use MacPorts versions of autoconf and automake

Modified Paths:
--------------
    trunk/dports/science/xastir/Portfile

Added Paths:
-----------
    trunk/dports/science/xastir/files/patch-Makefile.am.diff
    trunk/dports/science/xastir/files/patch-bootstrap.sh.diff
    trunk/dports/science/xastir/files/patch-configure.ac.diff

Modified: trunk/dports/science/xastir/Portfile
===================================================================
--- trunk/dports/science/xastir/Portfile	2011-09-29 06:46:58 UTC (rev 84634)
+++ trunk/dports/science/xastir/Portfile	2011-09-29 06:52:53 UTC (rev 84635)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                xastir
-version             1.9.8
+version             2.0.0
 categories          science
 platforms           darwin
 maintainers         nomaintainer
@@ -16,10 +16,12 @@
 homepage            http://www.xastir.org/
 master_sites        sourceforge:project/xastir/xastir-stable/xastir-${version}
 
-checksums           md5     7598a25ada47e322e0aafec1ca242b0c \
-                    sha1    0832e73fd3b2863561e1eabd4ea97abd2ca3e669 \
-                    rmd160  c5c7d0ab1fe9abfcbda4ddd1db3e97c0548babd5
+checksums           rmd160  43c7f5c1cf9735b0dbe797a3ccc6aead60f7a7bd \
+                    sha256  a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281
 
+depends_build       port:autoconf \
+                    port:automake
+
 depends_lib         port:xorg-libXp \
                     port:xpm \
                     port:xorg-libXt \
@@ -34,10 +36,17 @@
                     port:proj \
                     port:shapelib
 
-patchfiles          patch-acinclude.m4.diff
+patchfiles          patch-Makefile.am.diff \
+                    patch-acinclude.m4.diff \
+                    patch-bootstrap.sh.diff \
+                    patch-configure.ac.diff
 
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/bootstrap.sh
+}
+
 pre-configure {
-    system "cd ${worksrcpath} && sh ./bootstrap.sh"
+    system -W ${worksrcpath} "sh ./bootstrap.sh"
 }
 
 configure.cppflags-append   -I${prefix}/include/db46

Added: trunk/dports/science/xastir/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/science/xastir/files/patch-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/science/xastir/files/patch-Makefile.am.diff	2011-09-29 06:52:53 UTC (rev 84635)
@@ -0,0 +1,15 @@
+--- Makefile.am.orig	2010-09-08 13:13:26.000000000 -0500
++++ Makefile.am	2011-09-29 01:40:00.000000000 -0500
+@@ -72,10 +72,10 @@
+ # documentation is FHS compliant.
+ 
+ install-exec-hook:
+-	-rm -rf ${pkgdatadir}/doc
++	-rm -rf $(DESTDIR)${pkgdatadir}/doc
+ 
+ install-data-hook:
+-	cd $(mapdir) && \
++	cd $(DESTDIR)$(mapdir) && \
+ 	rm -f CC_OpenStreetMap.png && \
+ 	$(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png
+  

Added: trunk/dports/science/xastir/files/patch-bootstrap.sh.diff
===================================================================
--- trunk/dports/science/xastir/files/patch-bootstrap.sh.diff	                        (rev 0)
+++ trunk/dports/science/xastir/files/patch-bootstrap.sh.diff	2011-09-29 06:52:53 UTC (rev 84635)
@@ -0,0 +1,32 @@
+--- bootstrap.sh.orig	2010-01-30 20:12:23.000000000 -0600
++++ bootstrap.sh	2011-09-29 01:26:04.000000000 -0500
+@@ -34,7 +34,7 @@
+ else
+   echo "    2) Checking for 'mkinstalldirs'... Not Found"
+   echo "       Attempting to copy it from system directories'"
+-  (cp /usr/local/share/automake*/mkinstalldirs . 2>/dev/null)
++  (cp @PREFIX@/share/automake*/mkinstalldirs . 2>/dev/null)
+   # Did we succeed?
+   if [ $? ]
+   then
+@@ -52,15 +52,15 @@
+ fi
+ 
+ # Generate derived language files
+-echo -n "    1) Generating derived language files"
++printf "    1) Generating derived language files"
+ (cd config; ../scripts/langPigLatin.pl -split <language-English.sys >language-PigLatin.sys) 
+-echo -n "."
++printf "."
+ (cd config; ../scripts/langElmerFudd.pl -split <language-English.sys >language-ElmerFudd.sys) 
+-echo -n "."
++printf "."
+ (cd config; ../scripts/langMuppetsChef.pl -split <language-English.sys >language-MuppetsChef.sys) 
+-echo -n "."
++printf "."
+ (cd config; ../scripts/langOldeEnglish.pl -split <language-English.sys >language-OldeEnglish.sys) 
+-echo -n "."
++printf "."
+ (cd config; ../scripts/langPirateEnglish.pl -split <language-English.sys >language-PirateEnglish.sys) 
+ echo "."
+ 

Added: trunk/dports/science/xastir/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/xastir/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/science/xastir/files/patch-configure.ac.diff	2011-09-29 06:52:53 UTC (rev 84635)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2010-10-25 22:02:22.000000000 -0500
++++ configure.ac	2011-09-29 01:29:11.000000000 -0500
+@@ -926,7 +926,7 @@
+ echo
+ echo RECOMMENDED OPTIONS:
+ 
+-echo -n "  GraphicsMagick/ImageMagick (Raster maps) : "
++printf "  GraphicsMagick/ImageMagick (Raster maps) : "
+ if test "${use_graphicsmagick}" = "yes"; then 
+   echo "yes (GraphicsMagick)"
+ else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110928/ea100b51/attachment.html>


More information about the macports-changes mailing list