[97586] trunk/dports/x11/xdiskusage

ryandesign at macports.org ryandesign at macports.org
Sun Sep 9 09:19:43 PDT 2012


Revision: 97586
          https://trac.macports.org/changeset/97586
Author:   ryandesign at macports.org
Date:     2012-09-09 09:19:43 -0700 (Sun, 09 Sep 2012)
Log Message:
-----------
xdiskusage: fix configure failure with clang by running autoreconf, and therefore move configure patch to configure.in; fix build failure with clang, using a patch from freebsd; increase revision to rebuild with fltk 1.3; allow 64-bit builds

Modified Paths:
--------------
    trunk/dports/x11/xdiskusage/Portfile

Added Paths:
-----------
    trunk/dports/x11/xdiskusage/files/patch-configure.in.diff
    trunk/dports/x11/xdiskusage/files/patch-xdiskusage.C.diff

Removed Paths:
-------------
    trunk/dports/x11/xdiskusage/files/patch-configure.diff

Modified: trunk/dports/x11/xdiskusage/Portfile
===================================================================
--- trunk/dports/x11/xdiskusage/Portfile	2012-09-09 16:18:19 UTC (rev 97585)
+++ trunk/dports/x11/xdiskusage/Portfile	2012-09-09 16:19:43 UTC (rev 97586)
@@ -4,7 +4,7 @@
 
 name			xdiskusage
 version			1.48
-revision        	1
+revision		2
 categories		x11
 platforms		darwin
 maintainers		nomaintainer
@@ -18,10 +18,12 @@
 
 depends_lib		port:fltk
 
-# fltk is 32-bit only
-supported_archs i386 ppc
+patchfiles		patch-configure.in.diff \
+				patch-xdiskusage.C.diff
 
-patchfiles      patch-configure.diff
+# fix configure error with clang:
+# error: C++ requires a type specifier for all declarations
+use_autoreconf	yes
 
 destroot.destdir	prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man
 

Deleted: trunk/dports/x11/xdiskusage/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/xdiskusage/files/patch-configure.diff	2012-09-09 16:18:19 UTC (rev 97585)
+++ trunk/dports/x11/xdiskusage/files/patch-configure.diff	2012-09-09 16:19:43 UTC (rev 97586)
@@ -1,24 +0,0 @@
---- configure.orig	1999-01-10 06:25:37.000000000 +1100
-+++ configure	2011-04-21 18:35:22.000000000 +1000
-@@ -1804,9 +1804,9 @@
- 
- if test -n "$GXX"; then
-     # GNU C compiler
--    CFLAGS="-Wall -O2"
-+    CFLAGS+=" -Wall"
-     CFLAGS_D="-Wall -g -DDEBUG"
--    CXXFLAGS="-Wall -O2"
-+    CXXFLAGS+=" -Wall"
-     CXXFLAGS_D="-Wall -g -DDEBUG"
- else
- if test "`(uname) 2>/dev/null`" = IRIX; then
-@@ -1830,9 +1830,7 @@
-   fi
- else
-     # generic C compiler:
--    CFLAGS="-O"
-     CFLAGS_D="-g -DDEBUG"
--    CXXFLAGS="-O"
-     CXXFLAGS_D="-g -DDEBUG"
- fi
- fi

Copied: trunk/dports/x11/xdiskusage/files/patch-configure.in.diff (from rev 97580, trunk/dports/x11/xdiskusage/files/patch-configure.diff)
===================================================================
--- trunk/dports/x11/xdiskusage/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/x11/xdiskusage/files/patch-configure.in.diff	2012-09-09 16:19:43 UTC (rev 97586)
@@ -0,0 +1,24 @@
+--- configure.in.orig	2000-08-18 03:05:45.000000000 -0500
++++ configure.in	2011-04-21 18:35:22.000000000 +1000
+@@ -16,9 +16,9 @@
+ dnl# add warnings and optimization to compiler switches:
+ if test -n "$GXX"; then
+     # GNU C compiler
+-    CFLAGS="-Wall -O2"
++    CFLAGS+=" -Wall"
+     CFLAGS_D="-Wall -g -DDEBUG"
+-    CXXFLAGS="-Wall -O2"
++    CXXFLAGS+=" -Wall"
+     CXXFLAGS_D="-Wall -g -DDEBUG"
+ else
+ if test "`(uname) 2>/dev/null`" = IRIX; then
+@@ -42,9 +42,7 @@
+   fi
+ else
+     # generic C compiler:
+-    CFLAGS="-O"
+     CFLAGS_D="-g -DDEBUG"
+-    CXXFLAGS="-O"
+     CXXFLAGS_D="-g -DDEBUG"
+ fi
+ fi

Added: trunk/dports/x11/xdiskusage/files/patch-xdiskusage.C.diff
===================================================================
--- trunk/dports/x11/xdiskusage/files/patch-xdiskusage.C.diff	                        (rev 0)
+++ trunk/dports/x11/xdiskusage/files/patch-xdiskusage.C.diff	2012-09-09 16:19:43 UTC (rev 97586)
@@ -0,0 +1,42 @@
+--- xdiskusage.C.orig	2004-09-21 07:23:14.000000000 +0200
++++ xdiskusage.C	2011-06-21 21:34:20.000000000 +0200
+@@ -392,8 +392,8 @@
+       strncpy(pathbuf, path, 1024);
+       for (int i=0; i<10; i++) {
+ 	char *p = (char*)fl_filename_name(pathbuf);
+-	int i = readlink(pathbuf, p, 1024-(p-pathbuf));
+-	if (i < 0) {
++	int j = readlink(pathbuf, p, 1024-(p-pathbuf));
++	if (j < 0) {
+ 	  if (errno != EINVAL) {
+ 	    strcat(pathbuf, ": no such file");
+ 	    fl_alert(pathbuf);
+@@ -401,8 +401,8 @@
+ 	  }
+ 	  break;
+ 	}
+-	if (*p == '/') {memmove(pathbuf, p, i); p = pathbuf;}
+-	p[i] = 0;
++	if (*p == '/') {memmove(pathbuf, p, j); p = pathbuf;}
++	p[j] = 0;
+ 	path = pathbuf;
+       }
+     }
+@@ -988,7 +988,7 @@
+ void OutputWindow::sort_cb(Fl_Widget* o, void*v) {
+   OutputWindow* d = (OutputWindow*)(o->window());
+   int (*compare)(const Node*, const Node*);
+-  switch ((int)v) {
++  switch ((unsigned long)v) {
+   case 's': compare = largestfirst; break;
+   case 'r': compare = smallestfirst; break;
+   case 'a': compare = alphabetical; break;
+@@ -1001,7 +1001,7 @@
+ 
+ void OutputWindow::columns_cb(Fl_Widget* o, void*v) {
+   OutputWindow* d = (OutputWindow*)(o->window());
+-  int n = (int)v;
++  unsigned long n = (unsigned long)v;
+   ::ncols = n;
+   if (n == d->ncols) return;
+   if (d->current_depth > d->root_depth+n-1) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120909/0ca5865a/attachment-0001.html>


More information about the macports-changes mailing list