Update to dfc-3.1.0.
This commit is contained in:
benoit
parent
08a05cf63a
commit
592381ddc6
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2014/11/01 22:45:06 benoit Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2017/05/23 09:00:53 benoit Exp $
|
||||
|
||||
COMMENT = display file system space usage using graph and colors
|
||||
|
||||
DISTNAME = dfc-3.0.5
|
||||
DISTNAME = dfc-3.1.0
|
||||
CATEGORIES = sysutils
|
||||
|
||||
MASTER_SITES = http://projects.gw-computing.net/attachments/download/467/
|
||||
HOMEPAGE = http://projects.gw-computing.net/projects/dfc
|
||||
MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/
|
||||
HOMEPAGE = https://projects.gw-computing.net/projects/dfc
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (dfc-3.0.5.tar.gz) = PJR6HWvFM0exZDkh3L9Mb4/n62Fn/B9OlDY2bwNthXo=
|
||||
SIZE (dfc-3.0.5.tar.gz) = 43310
|
||||
SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s=
|
||||
SIZE (dfc-3.1.0.tar.gz) = 52459
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/04/12 10:22:34 benoit Exp $
|
||||
--- CMakeLists.txt.orig Mon Apr 8 15:14:28 2013
|
||||
+++ CMakeLists.txt Fri Apr 12 11:39:15 2013
|
||||
@@ -70,6 +70,7 @@ endif()
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 benoit Exp $
|
||||
--- CMakeLists.txt.orig Sun Apr 9 11:36:02 2017
|
||||
+++ CMakeLists.txt Tue May 23 10:21:03 2017
|
||||
@@ -104,6 +104,7 @@
|
||||
|
||||
# Check for libintl
|
||||
find_package(Libintl)
|
||||
+find_library(LIBICONV_LIBRARIES NAMES iconv)
|
||||
if (LIBINTL_FOUND)
|
||||
option(NLS_ENABLED "Translation support with gettext" on)
|
||||
option(NLS_ENABLED "Translation support with gettext" on)
|
||||
else()
|
||||
@@ -134,7 +135,7 @@ if(NLS_ENABLED)
|
||||
add_subdirectory(po)
|
||||
@@ -191,7 +192,7 @@
|
||||
add_subdirectory(po)
|
||||
|
||||
include_directories(${LIBINTL_INCLUDE_DIR})
|
||||
- target_link_libraries(${EXECUTABLE_NAME} ${LIBINTL_LIBRARIES})
|
||||
+ target_link_libraries(${EXECUTABLE_NAME} ${LIBICONV_LIBRARIES} ${LIBINTL_LIBRARIES})
|
||||
include_directories(${LIBINTL_INCLUDE_DIR})
|
||||
- target_link_libraries(${EXECUTABLE_NAME} ${LIBINTL_LIBRARIES})
|
||||
+ target_link_libraries(${EXECUTABLE_NAME} ${LIBICONV_LIBRARIES} ${LIBINTL_LIBRARIES})
|
||||
endif()
|
||||
|
||||
set(DFC_DOC_FILES
|
||||
# link libraries
|
||||
|
||||
12
sysutils/dfc/patches/patch-src_platform_services-bsd_c
Normal file
12
sysutils/dfc/patches/patch-src_platform_services-bsd_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_platform_services-bsd_c,v 1.1 2017/05/23 09:00:53 benoit Exp $
|
||||
--- src/platform/services-bsd.c.orig Tue May 23 10:28:40 2017
|
||||
+++ src/platform/services-bsd.c Tue May 23 10:29:07 2017
|
||||
@@ -73,7 +73,7 @@
|
||||
* df(1) manual page. However, df and df -a have the same output on 2 machines
|
||||
* on which I could test. Use this workaround for now.
|
||||
*/
|
||||
-#if defined(__APPLE__)
|
||||
+#if defined(__APPLE__) || defined(__OpenBSD__)
|
||||
#ifndef MNT_IGNORE
|
||||
#define MNT_IGNORE 0
|
||||
#endif
|
||||
@ -1,50 +0,0 @@
|
||||
$OpenBSD: patch-src_util_c,v 1.1 2013/12/13 16:42:35 naddy Exp $
|
||||
--- src/util.c.orig Thu Oct 3 15:23:34 2013
|
||||
+++ src/util.c Fri Dec 13 17:36:45 2013
|
||||
@@ -167,35 +167,29 @@ sanitizestr(const char *str)
|
||||
* Get the width of tty and return it.
|
||||
* Return 0 if stdout is not a tty.
|
||||
*/
|
||||
+
|
||||
+#if !defined(TIOCGWINSZ) && defined(TIOCGSIZE)
|
||||
+#define TIOCGWINSZ TIOCGSIZE
|
||||
+#define winsize ttysize
|
||||
+#define ws_col ts_cols
|
||||
+#endif
|
||||
+
|
||||
int
|
||||
getttywidth(void)
|
||||
{
|
||||
int width = 0;
|
||||
-#ifdef TIOCGSIZE
|
||||
- struct ttysize win;
|
||||
-#elif defined(TIOCGWINSZ)
|
||||
+#if defined(TIOCGWINSZ)
|
||||
struct winsize win;
|
||||
-#endif /* TIOCGSIZE */
|
||||
+#endif /* TIOCGWINSZ */
|
||||
|
||||
if (!isatty(STDOUT_FILENO))
|
||||
return 0;
|
||||
/* NOTREACHED */
|
||||
|
||||
-#ifdef TIOCGSIZE
|
||||
- if (ioctl(STDOUT_FILENO, TIOCGSIZE, &win) == 0)
|
||||
-#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||
- width = win.ts_cols;
|
||||
-#else
|
||||
- width = win.ws_col;
|
||||
-#endif /* __APPLE__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
|
||||
-#elif defined(TIOCGWINSZ)
|
||||
+#if defined(TIOCGWINSZ)
|
||||
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == 0)
|
||||
-#if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||
- width = win.ts_cols;
|
||||
-#else
|
||||
width = win.ws_col;
|
||||
-#endif /* __APPLE__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
|
||||
-#endif /* TIOCGSIZE */
|
||||
+#endif /* TIOCGWINSZ */
|
||||
return width == 0 ? 80 : width;
|
||||
/* NOTREACHED */
|
||||
}
|
||||
@ -1,16 +1,19 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2013/01/14 15:52:22 benoit Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2017/05/23 09:00:53 benoit Exp $
|
||||
@bin bin/dfc
|
||||
man/fr/
|
||||
man/fr/man1/
|
||||
@man man/fr/man1/dfc.1
|
||||
@man man/man1/dfc.1
|
||||
man/nl/
|
||||
man/nl/man1/
|
||||
@man man/nl/man1/dfc.1
|
||||
share/doc/dfc/
|
||||
share/doc/dfc/AUTHORS
|
||||
share/doc/dfc/CHANGELOG
|
||||
share/doc/dfc/HACKING
|
||||
share/doc/dfc/AUTHORS.md
|
||||
share/doc/dfc/CHANGELOG.md
|
||||
share/doc/dfc/HACKING.md
|
||||
share/doc/dfc/LICENSE
|
||||
share/doc/dfc/README
|
||||
share/doc/dfc/TRANSLATORS
|
||||
share/doc/dfc/README.md
|
||||
share/doc/dfc/TRANSLATORS.md
|
||||
share/examples/dfc/
|
||||
@sample ${SYSCONFDIR}/xdg/
|
||||
@sample ${SYSCONFDIR}/xdg/dfc/
|
||||
@ -18,4 +21,7 @@ share/examples/dfc/dfcrc
|
||||
@sample ${SYSCONFDIR}/xdg/dfc/dfcrc
|
||||
share/examples/dfc/fr/
|
||||
share/examples/dfc/fr/dfcrc
|
||||
share/examples/dfc/nl/
|
||||
share/examples/dfc/nl/dfcrc
|
||||
share/locale/fr/LC_MESSAGES/dfc.mo
|
||||
share/locale/nl/LC_MESSAGES/dfc.mo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user