[77804] trunk/dports/sysutils/htop

[ryandesign at macports.org]

Revision: 77804
          http://trac.macports.org/changeset/77804
Author:   ryandesign at macports.org
Date:     2011-04-13 19:06:11 -0700 (Wed, 13 Apr 2011)
Log Message:
-----------
htop: fix version number, fix livecheck, fix git.branch to not always fetch the latest, remove master_sites and checksums since we fetch from git, fix ncurses dependency, indicate license, add patch to fix sort crash (#29118)

Modified Paths:
--------------
    trunk/dports/sysutils/htop/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/htop/files/
    trunk/dports/sysutils/htop/files/patch-htop.c.diff

Modified: trunk/dports/sysutils/htop/Portfile
===================================================================
--- trunk/dports/sysutils/htop/Portfile	2011-04-14 01:57:53 UTC (rev 77803)
+++ trunk/dports/sysutils/htop/Portfile	2011-04-14 02:06:11 UTC (rev 77804)
@@ -4,10 +4,13 @@
 PortSystem          1.0
 
 name                htop
-version             0.8.3
-revision            1
+epoch               1
+version             0.8.2.1
+git.branch          77edf8ddae9682e356e5
 categories          sysutils
 maintainers         nomaintainer
+license             GPL-2
+
 description         an interactive process viewer
 long_description    This is htop, ${description}. It is a text-mode \
                     application (for console or X terminals).
@@ -16,15 +19,14 @@
 platforms           darwin
 
 depends_build       port:autoconf port:automake port:libtool
-depends_run         port:ncurses
 
-master_sites        sourceforge
+depends_lib         port:ncurses
+
 fetch.type          git
 git.url             git://github.com/AndyA/htop-osx.git
-git.branch          origin/osx
-checksums           sha1    2a0bf90f160b3d019e26712c94db612d6ff9a429 \
-                    rmd160  ac1707c2f27ac1c6576601765bda4335e49d6aea
 
+patchfiles          patch-htop.c.diff
+
 pre-configure {
     system "cd ${worksrcpath} && sh autogen.sh"
 }
@@ -32,5 +34,5 @@
 # "String.h" vs <string.h> on case-insensitive FS (#21036)
 build.args          {DEFAULT_INCLUDES="-iquote ."}
 
-livecheck.url       http://htop.sourceforge.net/index.php?page=downloads
-livecheck.regex     The latest version is <b>(\\d+(\\.\\d+)+)
+livecheck.url       https://github.com/AndyA/htop-osx/raw/osx/configure.ac
+livecheck.regex     {\[htop\],\[([0-9.]+)\]}

Added: trunk/dports/sysutils/htop/files/patch-htop.c.diff
===================================================================
--- trunk/dports/sysutils/htop/files/patch-htop.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/htop/files/patch-htop.c.diff	2011-04-14 02:06:11 UTC (rev 77804)
@@ -0,0 +1,22 @@
+https://github.com/AndyA/htop-osx/issues/2
+https://trac.macports.org/ticket/29118
+--- htop.c.orig 2010-01-13 18:04:07.000000000 +0100
++++ htop.c  2010-01-13 15:29:55.000000000 +0100
+@@ -651,7 +651,7 @@
+          
+          Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr);
+ 
+-         char* fuFunctions[2] = {"Set    ", "Cancel "};
++         char* fuFunctions[] = {"Set    ", "Cancel ", NULL};
+          void* set = pickFromVector(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar);
+          if (set) {
+             unsigned long new = AffinityPanel_getAffinity(affinityPanel);
+@@ -690,7 +690,7 @@
+       {
+          Panel* sortPanel = Panel_new(0, 0, 0, 0, LISTITEM_CLASS, true, ListItem_compare);
+          Panel_setHeader(sortPanel, "Sort by");
+-         char* fuFunctions[2] = {"Sort  ", "Cancel "};
++         char* fuFunctions[] = {"Sort  ", "Cancel ", NULL};
+          ProcessField* fields = pl->fields;
+          for (int i = 0; fields[i]; i++) {
+             char* name = String_trim(Process_fieldTitles[fields[i]]);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110413/61d4f49c/attachment-0001.html>