<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[125906] trunk/dports/x11/sunclock</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/125906">125906</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-09-28 23:17:13 -0700 (Sun, 28 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>sunclock: Version bump and build without imake</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11sunclockPortfile">trunk/dports/x11/sunclock/Portfile</a></li>
<li><a href="#trunkdportsx11sunclockfilesgzFilepatch">trunk/dports/x11/sunclock/files/gzFile.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11sunclockPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/sunclock/Portfile (125905 => 125906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/sunclock/Portfile 2014-09-29 05:59:05 UTC (rev 125905)
+++ trunk/dports/x11/sunclock/Portfile 2014-09-29 06:17:13 UTC (rev 125906)
</span><span class="lines">@@ -3,11 +3,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name sunclock
</span><del>-version 3.50pre1
-revision 4
-extract.suffix .tgz
</del><ins>+version 3.57
</ins><span class="cx"> categories x11
</span><span class="cx"> maintainers nomaintainer
</span><ins>+license GPL-2
</ins><span class="cx"> description shows Earth's surface illuminated by the Sun
</span><span class="cx"> long_description \
</span><span class="cx"> This program is a clock that shows which portion of the \
</span><span class="lines">@@ -17,26 +16,58 @@
</span><span class="cx"> local time zone and UTC displayed.
</span><span class="cx"> homepage http://www.arvernes.com/wiki/index.php/Sunclock
</span><span class="cx"> platforms darwin
</span><del>-master_sites ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \
- openbsd:distfiles
-checksums md5 6e07964a99848018432825c5b3297cc6
-depends_lib port:jpeg port:xpm port:zlib
</del><span class="cx">
</span><ins>+distname ${name}_${version}.orig
+worksrcdir ${name}-${version}
+master_sites debian:s/${name}
+checksums rmd160 42ef99381405745bf2be13ad9c05c9f07e5ff1cd \
+ sha256 f3b3499b4a84c7a31411d2a9043e2d9171b745ec29a991ef9930ce582b9d41ab
+
+depends_lib port:jpeg port:xpm port:zlib port:libpng port:xorg-libX11
</ins><span class="cx"> patchfiles gzFile.patch
</span><span class="cx">
</span><del>-pre-configure {
- reinplace "s|DESTDIR=/usr|DESTDIR=${prefix}|" "${worksrcpath}/Imakefile"
- reinplace "s|MANDIR=/X11R6|MANDIR=/share|" "${worksrcpath}/Imakefile"
- reinplace "s|BINDIR=/X11R6/bin|BINDIR=/bin|" "${worksrcpath}/Imakefile"
- reinplace "s|#JLIBDIR=-L/usr/lib|JLIBDIR=-L${prefix}/lib|" "${worksrcpath}/Imakefile"
- reinplace "s|#JINC=-I/usr/include|JINC=-I${prefix}/include|" "${worksrcpath}/Imakefile"
</del><ins>+post-patch {
+ reinplace "/#include <malloc.h>/d" ${worksrcpath}/tildepath.c
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_xmkmf yes
</del><ins>+use_configure no
</ins><span class="cx">
</span><del>-pre-build {
- reinplace "s|INCROOT = /usr/X11R6/include|INCROOT = ${prefix}/include|" "${worksrcpath}/Makefile"
- reinplace "s|#include <malloc.h>||" "${worksrcpath}/tildepath.c"
</del><ins>+set datadir ${prefix}/share/${name}
+set docdir ${prefix}/share/doc/${name}
+
+configure.cflags-append -Wall -DZLIB
+configure.cflags-append {-DSHAREDIR=\\\"${datadir}\\\"}
+configure.cflags-append {-DEMXBINDIR=\\\"${prefix}/bin\\\"}
+configure.cflags-append {-DDOCDIR=\\\"${docdir}\\\"}
+configure.ldflags-append -lXpm -ljpeg -lpng -lz -lX11
+
+# I hate Tcl
+build.env-append prefix=${prefix} datadir=${datadir} docdir=${docdir}
+
+build.pre_args -f Makefile.noimake
+build.target all
+build.args \
+ DESTDIR=${prefix} \
+ MANDIR=/share/man/man1 \
+ XAPPLOADDIR=/share/X11/app-defaults \
+ XBINDIR=/bin \
+ CC=${configure.cc} \
+ CFLAGS="[join ${configure.cflags}] [get_canonical_archflags] ${configure.optflags}" \
+ LFLAGS="${configure.ldflags} [get_canonical_archflags]"
+
+destroot {
+ xinstall -m 755 -W ${worksrcpath} sunclock editkit/emx ${destroot}${prefix}/bin
+ xinstall -m 644 -W ${worksrcpath} sunclock.man ${destroot}${prefix}/share/man/man1/sunclock.1
+
+ xinstall -d -m 755 ${destroot}${datadir}
+ xinstall -m 644 -W ${worksrcpath} Sunclockrc ${destroot}${datadir}
+
+ xinstall -d -m 755 ${destroot}${datadir}/earthmaps/vmf
+ eval xinstall -m 644 [glob ${worksrcpath}/vmf/*.vmf] ${destroot}${datadir}/earthmaps/vmf
+
+ xinstall -d -m 755 ${destroot}${datadir}/earthmaps/i18n
+ eval xinstall -m 644 [glob ${worksrcpath}/i18n/Sunclock.??] ${destroot}${datadir}/earthmaps/i18n
+
+ xinstall -d -m 755 ${destroot}${docdir}
+ xinstall -m 644 -W ${worksrcpath}/editkit MANUAL.emacs README ${destroot}${docdir}
</ins><span class="cx"> }
</span><del>-
-destroot.destdir DESTDIR=${destroot}${prefix} DOCHTMLDIR=/share/doc
</del></span></pre></div>
<a id="trunkdportsx11sunclockfilesgzFilepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/sunclock/files/gzFile.patch (125905 => 125906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/sunclock/files/gzFile.patch 2014-09-29 05:59:05 UTC (rev 125905)
+++ trunk/dports/x11/sunclock/files/gzFile.patch 2014-09-29 06:17:13 UTC (rev 125906)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- readvmf.c.orig 2001-08-12 00:03:18.000000000 +1000
-+++ readvmf.c 2012-06-02 04:04:18.000000000 +1000
-@@ -334,7 +334,7 @@ pixmap_image()
</del><ins>+--- readvmf.c.orig 2008-08-22 06:58:52.000000000 -0700
++++ readvmf.c 2014-09-28 22:23:14.000000000 -0700
+@@ -340,7 +340,7 @@ pixmap_image()
</ins><span class="cx"> char *
</span><span class="cx"> getdata(fd)
</span><span class="cx"> #ifdef ZLIB
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx"> #else
</span><span class="cx"> FILE *fd;
</span><span class="cx"> #endif
</span><del>-@@ -426,7 +426,7 @@ struct Sundata * Context;
</del><ins>+@@ -433,7 +433,7 @@ struct Sundata * Context;
</ins><span class="cx"> double theta, phi;
</span><del>- char *str;
</del><ins>+ char *str, *ptr;
</ins><span class="cx"> #ifdef ZLIB
</span><span class="cx"> - gzFile * fd;
</span><span class="cx"> + gzFile fd;
</span><ins>+ int plen;
+ char *zpath;
</ins><span class="cx"> #else
</span><del>- FILE *fd;
- #endif
</del></span></pre>
</div>
</div>
</body>
</html>