From bfb33da14ed00530d3bed620bce72b94cc468644 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Tue, 14 Jan 2014 10:30:24 +0000 Subject: [PATCH] - Convert to USES=tk - Convert to new LIB_DEPENDS format - STAGE-clean --- science/jstrack/Makefile | 32 +++++++++++++-------------- science/jstrack/files/patch-paths.tcl | 11 +++++++++ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 science/jstrack/files/patch-paths.tcl diff --git a/science/jstrack/Makefile b/science/jstrack/Makefile index 3ccfa929d8bf..5d22a7c7a3a2 100644 --- a/science/jstrack/Makefile +++ b/science/jstrack/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://www.jstrack.org/${PORTNAME}/downloads/ \ 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 free, and [Jim Graham] wrote it...\ 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 diff --git a/science/jstrack/files/patch-paths.tcl b/science/jstrack/files/patch-paths.tcl new file mode 100644 index 000000000000..c73b0727fe69 --- /dev/null +++ b/science/jstrack/files/patch-paths.tcl @@ -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). + #