Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2014 10:30:25 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339675 - in head/science/jstrack: . files
Message-ID:  <201401141030.s0EAUPXI004981@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue Jan 14 10:30:24 2014
New Revision: 339675
URL: http://svnweb.freebsd.org/changeset/ports/339675

Log:
  - Convert to USES=tk
  - Convert to new LIB_DEPENDS format
  - STAGE-clean

Added:
  head/science/jstrack/files/patch-paths.tcl   (contents, props changed)
Modified:
  head/science/jstrack/Makefile

Modified: head/science/jstrack/Makefile
==============================================================================
--- head/science/jstrack/Makefile	Tue Jan 14 10:28:34 2014	(r339674)
+++ head/science/jstrack/Makefile	Tue Jan 14 10:30:24 2014	(r339675)
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.jstrack.org/${P
 		http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	5u623l20@gmail.com
-COMMENT=	A freeware hurricane tracking program
+COMMENT=	Freeware hurricane tracking program
 
 LICENSE=	JStrack
 LICENSE_NAME=	JStrack
@@ -16,13 +16,12 @@ LICENSE_TEXT=	It is and always will be f
 		so don't charge money for it, and don't claim that you wrote it
 LICENSE_PERMS=	dist-sell pkg-sell auto-accept
 
-LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm \
-		img.1:${PORTSDIR}/graphics/libimg
+LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm \
+		libimg.so:${PORTSDIR}/graphics/libimg
 RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_TCL_RUN=	85
-USE_TK=		85
+USES=		tk:85
 NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
@@ -30,27 +29,26 @@ SUB_LIST=	WISH=${WISH}
 
 PORTDOCS=	00-README_FIRST.txt HISTORY install.txt jstrackdoc-v2.pdf
 
-NO_STAGE=	yes
+post-patch:
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/paths.tcl
+
 do-install:
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .for f in filt httpfilt tracker
-	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} ${f} ${PREFIX}/lib/${PORTNAME}/ \
+	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ \
 		'! -path *windows_bin*')
 .endfor
-	@${INSTALL_SCRIPT} ${WRKSRC}/*.tcl ${PREFIX}/lib/${PORTNAME}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKSRC}/*.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for f in ${PORTDOCS}
-		@${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
+		@${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .	endfor
-.endif
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${PORTNAME}
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .for d in filt httpfilt tracker tracker/lib tracker/storms/old/2007 tracker/storms/old/2008 tracker/storms/old/2009 tracker/storms/old/2010
-	@${CHMOD} ugo+rx ${PREFIX}/lib/${PORTNAME}/${d}/*.t*
+	@${CHMOD} ugo+rx ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${d}/*.t*
 .endfor
-	@(cd ${PREFIX}/lib/${PORTNAME} && ${TCLSH} autoconfig.tcl && ${RM} paths.tcl.old)
 
 .include <bsd.port.mk>

Added: head/science/jstrack/files/patch-paths.tcl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/jstrack/files/patch-paths.tcl	Tue Jan 14 10:30:24 2014	(r339675)
@@ -0,0 +1,11 @@
+--- paths.tcl.orig	2014-01-14 11:09:14.000000000 +0100
++++ paths.tcl	2014-01-14 11:09:48.000000000 +0100
+@@ -41,7 +41,7 @@
+ # Typical location (multi-user use) for WinXX systems
+ #    set install_dir c:/jstrack
+ # install_dir value determined by autoconfig.tcl:
+-set install_dir "/Users/jim/src/ht"
++set install_dir "%%PREFIX%%/lib/jstrack"
+ # Directory for storm data (must be an absolute path, e.g.,
+ # /usr/local/lib/jstrack or $install_dir/tracker/storms).
+ #



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401141030.s0EAUPXI004981>