svn commit: r327634 - in head/astro: ptiger tclgeomap tkgeomap

[Pietro Cerutti]

Author: gahr
Date: Thu Sep 19 15:47:05 2013
New Revision: 327634
URL: http://svnweb.freebsd.org/changeset/ports/327634

Log:
  - Take maintainership (tcltk@)
  - Convert to USES+=tcl
  - Trim Makefile headers
  - Fix run-time (tkgeomap)

Modified:
  head/astro/ptiger/Makefile   (contents, props changed)
  head/astro/tclgeomap/Makefile
  head/astro/tkgeomap/Makefile

Modified: head/astro/ptiger/Makefile
==============================================================================
--- head/astro/ptiger/Makefile	Thu Sep 19 15:35:20 2013	(r327633)
+++ head/astro/ptiger/Makefile	Thu Sep 19 15:47:05 2013	(r327634)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ptiger
-# Date created:		26 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ptiger
 PORTVERSION=	2.2
@@ -11,12 +7,12 @@ PORTREVISION=	3
 CATEGORIES=	astro tk
 MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	tcltk at FreeBSD.org
 COMMENT=	Displays U.S. Census Bureau populated places on a map
 
-LIB_DEPENDS=	tkgeomap.0:${PORTSDIR}/astro/tkgeomap
+LIB_DEPENDS=	libtkgeomap.so:${PORTSDIR}/astro/tkgeomap
 
-USE_TK_RUN=	yes
+USES+=		tk:run
 NO_BUILD=	yes
 
 post-patch:

Modified: head/astro/tclgeomap/Makefile
==============================================================================
--- head/astro/tclgeomap/Makefile	Thu Sep 19 15:35:20 2013	(r327633)
+++ head/astro/tclgeomap/Makefile	Thu Sep 19 15:47:05 2013	(r327634)
@@ -1,19 +1,15 @@
-# New ports collection makefile for:	tclgeomap
-# Date created:		25 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tclgeomap
 PORTVERSION=	2.11.6
 CATEGORIES=	astro tcl
 MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	tcltk at FreeBSD.org
 COMMENT=	Read, manipulate, and display geo data
 
-USE_TCL=	84+
+USES+=		tcl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix

Modified: head/astro/tkgeomap/Makefile
==============================================================================
--- head/astro/tkgeomap/Makefile	Thu Sep 19 15:35:20 2013	(r327633)
+++ head/astro/tkgeomap/Makefile	Thu Sep 19 15:47:05 2013	(r327634)
@@ -1,36 +1,31 @@
-# New ports collection makefile for:	tkgeomap
-# Date created:		25 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tkgeomap
 PORTVERSION=	2.11.6
 CATEGORIES=	astro tk
 MASTER_SITES=	SF
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	tcltk at FreeBSD.org
 COMMENT=	Read, manipulate, and display geo data
 
-LIB_DEPENDS=	tclgeomap.0:${PORTSDIR}/astro/tclgeomap
+LIB_DEPENDS=	libtclgeomap.so:${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} \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-CONFIGURE_ENV=	TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap
-USE_TK=		84+
+MAKE_ENV+=	TCLGEOMAP_LIB="-L ${LOCALBASE}/lib -ltclgeomap"
+USES+=		tk
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-TKPKG=		${PORTNAME}
-PLIST_SUB=	INC=include/${TKPKG} LIB=lib/${TKPKG}
+PLIST_SUB=	INC=include/${PORTNAME} LIB=lib/${PORTNAME}
 USE_LDCONFIG=	yes
 
 MANN=	igeomap.n tkgeomap.n tkgeomap_procs.n wdgeomap.n
 
 post-install:
-	@${LN} -sf ${PREFIX}/lib/lib${TKPKG}.so ${PREFIX}/lib/lib${PORTNAME}.so.0
+	@${LN} -sf ${PREFIX}/lib/lib${PORTNAME}.so ${PREFIX}/lib/lib${PORTNAME}.so.0
 
 post-patch:
 	@${REINPLACE_CMD} -e '/=.*PACKAGE_VERSION/s|$${PACKAGE_VERSION}||g' ${WRKSRC}/configure