ports/150596: astro/xtide update to 2.11

[Armin Pirkovitsch]

>Number:         150596
>Category:       ports
>Synopsis:       astro/xtide update to 2.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 15 17:00:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Armin Pirkovitsch
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/Makefile /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/Makefile
--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/Makefile	2010-05-04 07:59:35.000000000 +0200
+++ /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/Makefile	2010-09-15 17:58:40.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xtide
-PORTVERSION=	2.10
-PORTREVISION=	4
+PORTVERSION=	2.11
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -32,8 +31,8 @@
 PLIST_DIRS=	%%DATADIR%%
 
 .if defined(WITHOUT_X11)
-PKGNAMESUFFIX=  -nox11
-ALL_TARGET= 	tide xttpd
+PKGNAMESUFFIX=	-nox11
+ALL_TARGET=	tide xttpd
 .else
 USE_XORG=	xpm xaw
 USE_GNOME=	gnometarget
@@ -47,8 +46,8 @@
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@cd $(DISTDIR);${TAR} xzf ${DISTDIR}/harmonics-dwf-20091227-free.tar.bz2
-	@$(MV) $(DISTDIR)/harmonics-dwf-20091227-free.tcd \
+	@cd ${DISTDIR};${TAR} xzf ${DISTDIR}/harmonics-dwf-20091227-free.tar.bz2
+	@${MV} ${DISTDIR}/harmonics-dwf-20091227-free.tcd \
 		 ${WRKSRC}/harmonics.tcd
 
 post-patch:
diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/distinfo /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/distinfo
--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/distinfo	2010-05-04 07:59:35.000000000 +0200
+++ /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/distinfo	2010-09-14 16:34:02.000000000 +0200
@@ -1,6 +1,6 @@
-MD5 (xtide-2.10.tar.bz2) = a14d9db748a86bed37769f38c4320ddd
-SHA256 (xtide-2.10.tar.bz2) = 3b19ae183149c07733580b1ce5e7c2d330efecb4e8817fafed9a74daf4388ab5
-SIZE (xtide-2.10.tar.bz2) = 393882
+MD5 (xtide-2.11.tar.bz2) = 1d85890bb13b3345154e0f68831b7ebd
+SHA256 (xtide-2.11.tar.bz2) = a7a3f27b5f49b498c497d1e595c772cfb902892fdf87d386cbbea13f4d7924b3
+SIZE (xtide-2.11.tar.bz2) = 431228
 MD5 (libtcd-2.2.4.tar.bz2) = 7fe3a0604a048b604497bbbf055958f3
 SHA256 (libtcd-2.2.4.tar.bz2) = 601da0d17758127161869ecfb02eff6915f2d2ba797682dcdd29575fc284f820
 SIZE (libtcd-2.2.4.tar.bz2) = 250070
diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/files/patch-Global.cc /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/files/patch-Global.cc
--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/files/patch-Global.cc	2007-03-26 13:25:55.000000000 +0200
+++ /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/files/patch-Global.cc	2010-09-14 16:51:54.000000000 +0200
@@ -1,6 +1,15 @@
---- Global.cc.orig	Thu Mar 15 09:58:01 2007
-+++ Global.cc	Fri Mar 23 02:31:17 2007
-@@ -241,10 +241,10 @@
+--- Global.cc.orig	2010-09-14 16:49:16.000000000 +0200
++++ Global.cc	2010-09-14 16:50:18.000000000 +0200
+@@ -203,7 +203,7 @@
+ #ifdef UseLocalFiles
+   static const char confFile[] = "xtide.conf";
+ #else
+-  static const char confFile[] = "/etc/xtide.conf";
++  static const char confFile[] = "%%PREFIX%%/etc/xtide.conf";
+ #endif
+   static bool firstCall (true);
+   static SafeVector<Dstr> xtideConfLines (2U);
+@@ -390,10 +390,10 @@
      break;
    case Error::NO_HFILE_PATH:
      text_out += "NO_HFILE_PATH\n\
diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/files/patch-HarmonicsPath.cc /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/files/patch-HarmonicsPath.cc
--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/files/patch-HarmonicsPath.cc	2008-01-03 12:39:33.000000000 +0100
+++ /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/files/patch-HarmonicsPath.cc	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- HarmonicsPath.cc.orig	Fri Dec  7 08:13:13 2007
-+++ HarmonicsPath.cc	Sun Dec 23 00:41:28 2007
-@@ -31,7 +31,7 @@
- #ifdef UseLocalFiles
- static const char confFile[] = "xtide.conf";
- #else
--static const char confFile[] = "/etc/xtide.conf";
-+static const char confFile[] = "%%PREFIX%%/etc/xtide.conf";
- #endif
- 
- 
diff -Nur /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/files/patch-wvsrtv.cc /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/files/patch-wvsrtv.cc
--- /mnt/ad12/tinderbox/portstrees/FreeBSD/ports/astro/xtide/files/patch-wvsrtv.cc	2007-03-26 13:25:55.000000000 +0200
+++ /mnt/ad12/tinderbox/portstrees/Playground/ports/astro/xtide/files/patch-wvsrtv.cc	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- wvsrtv.cc.orig	Thu Jan  4 11:35:43 2007
-+++ wvsrtv.cc	Fri Mar 23 02:32:59 2007
-@@ -651,7 +651,7 @@
-           }
-           if (dir[0] == '\0') {
-             FILE *configfile;
--            if ((configfile = fopen ("/etc/xtide.conf", "r"))) {
-+            if ((configfile = fopen ("%%PREFIX%%/etc/xtide.conf", "r"))) {
-               if (!fgets (dir, 512, configfile)) {
-                 fclose (configfile);
-                 return 0;


>Release-Note:
>Audit-Trail:
>Unformatted: