ports/112350: [UPDATE] astro/tkgeomap 2.11.1 -> 2.11.2

[Martin Matuska]

>Number:         112350
>Category:       ports
>Synopsis:       [UPDATE] astro/tkgeomap 2.11.1 -> 2.11.2
>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 May 02 12:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE i386 amd64
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE i386 amd64
>Description:
- USE_TK=82+ (supports WITH_TK_VER=[82|83|84|85])
- added check if installed tclgeomap works with selected tcl version

Tinderbox output for i386 and amd64:

http://i386.vx.sk/logs/6.2-FreeBSD-i386/tkgeomap-2.11.2.log
http://amd64.vx.sk/logs/6.2-FreeBSD-amd64/tkgeomap-2.11.2.log

>How-To-Repeat:
>Fix:
Index: ports/astro/tkgeomap/Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/tkgeomap/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ports/astro/tkgeomap/Makefile	2 Apr 2007 22:56:09 -0000	1.6
+++ ports/astro/tkgeomap/Makefile	2 May 2007 12:41:06 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkgeomap
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.2
 CATEGORIES=	astro tk84
 MASTER_SITES=	SF
 
@@ -15,13 +15,7 @@
 
 LIB_DEPENDS=	tclgeomap.0:${PORTSDIR}/astro/tclgeomap
 
-CONFIGURE_ARGS=	--with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
-		--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
-		--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \
-		--mandir=${MANPREFIX}/man \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
-CONFIGURE_ENV=	TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap
-USE_TK=		yes
+USE_TK=		82+
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 TKPKG=		${PORTNAME}
@@ -30,6 +24,22 @@
 
 MANN=	igeomap.n tkgeomap.n tkgeomap_procs.n wdgeomap.n
 
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS=	--with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
+		--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
+		--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \
+		--mandir=${MANPREFIX}/man \
+		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ENV=	TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap
+
+.if exists(${LOCALBASE}/lib/libtclgeomap.so)
+CHECK!=	${ECHO_CMD} 'puts [package require tclgeomap]' | ${TCLSH}
+.if ${CHECK} != ${PORTVERSION}
+IGNORE=	installed tclgeomap does not work with Tcl ${TCL_VER}
+.endif
+.endif
+
 post-install:
 	@${LN} -sf ${PREFIX}/lib/lib${TKPKG}.so ${PREFIX}/lib/lib${PORTNAME}.so.0
 
@@ -39,4 +49,4 @@
 	@${REINPLACE_CMD} -e '/^package/!s|@PACKAGE_VERSION@||g' ${WRKSRC}/pkgIndex.tcl.in
 	@${REINPLACE_CMD} -e '2s|.*|exit 0|' ${WRKSRC}/mkLinks
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: ports/astro/tkgeomap/distinfo
===================================================================
RCS file: /home/pcvs/ports/astro/tkgeomap/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- ports/astro/tkgeomap/distinfo	24 Jan 2007 12:56:54 -0000	1.3
+++ ports/astro/tkgeomap/distinfo	2 May 2007 12:41:06 -0000
@@ -1,3 +1,3 @@
-MD5 (tkgeomap-2.11.1.tar.gz) = ac9a25e0b926a5535efb35df74dfd247
-SHA256 (tkgeomap-2.11.1.tar.gz) = c6640119efb8576319fed0b6c626432c0a4f3d67ae2bf2cce5ebd97bc537e8e4
-SIZE (tkgeomap-2.11.1.tar.gz) = 239228
+MD5 (tkgeomap-2.11.2.tar.gz) = 0b56d4a6db040c182923d812ff022697
+SHA256 (tkgeomap-2.11.2.tar.gz) = 783f49fc98faa51bc7a6c8d67ddd00a6a43340054c140d083f64420983e3bcd8
+SIZE (tkgeomap-2.11.2.tar.gz) = 239186
>Release-Note:
>Audit-Trail:
>Unformatted: