[csw-devel] SF.net SVN: gar:[4800] csw/mgar/pkg/ncdu/trunk

[skayser at users.sourceforge.net]

Revision: 4800
          http://gar.svn.sourceforge.net/gar/?rev=4800&view=rev
Author:   skayser
Date:     2009-05-10 18:50:35 +0000 (Sun, 10 May 2009)

Log Message:
-----------
ncdu: version bump + related patches, added changelog

Modified Paths:
--------------
    csw/mgar/pkg/ncdu/trunk/Makefile
    csw/mgar/pkg/ncdu/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/ncdu/trunk/files/changelog.CSW
    csw/mgar/pkg/ncdu/trunk/files/gar-base.diff

Modified: csw/mgar/pkg/ncdu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ncdu/trunk/Makefile	2009-05-10 18:20:20 UTC (rev 4799)
+++ csw/mgar/pkg/ncdu/trunk/Makefile	2009-05-10 18:50:35 UTC (rev 4800)
@@ -1,5 +1,5 @@
 GARNAME = ncdu
-GARVERSION = 1.4
+GARVERSION = 1.5
 CATEGORIES = utils
 
 DESCRIPTION = Ncurses version of the famous old 'du' unix
@@ -19,8 +19,24 @@
 
 TEST_SCRIPTS = 
 
-EXTRA_INC = /opt/csw/include/ncurses
+EXTRA_INC = /opt/csw/include/ncursesw
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
+# - Autoconf check and replacement for non-POSIX dirfd()
+# See http://sf.net/tracker/?func=detail&aid=2789779&group_id=200175&atid=972449
+# - Fix for non-void return in src/delete.c:void delete_process()
+# See http://sf.net/tracker/?func=detail&aid=2789781&group_id=200175&atid=972449
+PATCHFILES=gar-base.diff
+
 include gar/category.mk
+
+pre-configure-modulated:
+	@cd $(WORKSRC) && autoconf
+	@$(MAKECOOKIE)
+
+post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
+post-install-modulated:
+	@ginstall -d $(DOCDEST)
+	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/ncdu/trunk/checksums
===================================================================
--- csw/mgar/pkg/ncdu/trunk/checksums	2009-05-10 18:20:20 UTC (rev 4799)
+++ csw/mgar/pkg/ncdu/trunk/checksums	2009-05-10 18:50:35 UTC (rev 4800)
@@ -1 +1,2 @@
-07f01579f7c9852033139ae9fa2414c9  download/ncdu-1.4.tar.gz
+6596993c949abab8e579c401dbe50089  download/gar-base.diff
+90a69cc3b2e9f0324eb14e6ce1df0f22  download/ncdu-1.5.tar.gz

Added: csw/mgar/pkg/ncdu/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/ncdu/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/ncdu/trunk/files/changelog.CSW	2009-05-10 18:50:35 UTC (rev 4800)
@@ -0,0 +1,5 @@
+ncdu (1.5,REV=2009.05.10)
+
+  * Updated to 1.5 (Closes: #3565).
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Sun, 10 May 2009 18:42:27 +0200

Added: csw/mgar/pkg/ncdu/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/ncdu/trunk/files/gar-base.diff	                        (rev 0)
+++ csw/mgar/pkg/ncdu/trunk/files/gar-base.diff	2009-05-10 18:50:35 UTC (rev 4800)
@@ -0,0 +1,43 @@
+diff --speed-large-files --minimal -Nru ncdu-1.5.orig/src/delete.c ncdu-1.5/src/delete.c
+--- ncdu-1.5.orig/src/delete.c	2009-05-02 10:42:17.000000000 +0200
++++ ncdu-1.5/src/delete.c	2009-05-10 18:57:49.873038400 +0200
+@@ -213,8 +213,10 @@
+   /* confirm */
+   seloption = 1;
+   while(state == DS_CONFIRM && !noconfirm)
+-    if(input_handle(0))
+-      return browse_init(root);
++    if(input_handle(0)) {
++      browse_init(root);
++      return;
++    }
+ 
+   /* chdir */
+   if(path_chdir(getpath(root->parent)) < 0) {
+diff -ur ncdu-1.5.orig/configure.in ncdu-1.5/configure.in
+--- ncdu-1.5.orig/configure.in	2009-05-10 19:38:59.182413272 +0200
++++ ncdu-1.5/configure.in	2009-05-02 13:09:18.000000000 +0200
+@@ -27,6 +27,9 @@
+   [getcwd gettimeofday memset fnmatch chdir rmdir unlink lstat getcwd],[],
+   AC_MSG_ERROR([required function missing]))
+ 
++# dirfd is a glibc extension and available on Solaris
++AC_CHECK_FUNCS([dirfd])
++
+ AC_OUTPUT([Makefile src/Makefile doc/Makefile])
+ 
+ echo ""
+diff -ur ncdu-1.5.orig/src/path.h ncdu-1.5/src/path.h
+--- ncdu-1.5.orig/src/path.h	2009-05-10 19:38:59.209594590 +0200
++++ ncdu-1.5/src/path.h	2009-05-02 10:42:17.000000000 +0200
+@@ -44,4 +44,10 @@
+ /* works exactly the same as chdir() */
+ extern int   path_chdir(const char *);
+ 
++#ifndef HAVE_DIRFD 
++#if defined(__sun__) || defined(__sun)
++#define dirfd(a) ((a)->dd_fd)
++#endif
++#endif
++
+ #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.