Re: [UPDATE] sysutils/dfc 3.1.0 -> 3.1.1
Committed with slight tweak (inline): On 11/12/17 08:15, Klemens Nanni wrote: On Sun, Nov 12, 2017 at 03:02:11AM -0500, Brian Callahan wrote: On 11/11/17 23:38, Klemens Nanni wrote: This a bugfix release: - fix a typo in the compilation instructions in the readme file - fix an old bug (4+ years) which messed up colors in HTML export when a configuration file is used - fix a bug which prevented some file systems to be displayed when the filtering option was used - fix a bad implicit fallthrough Continues to work fine on my amd64 machine. Feedback? We're not doing the gettext MODULE any more, so you'll need to fix that. It uses libintl and libiconv, so you'll have to remove devel/gettext from MODULES and put it in LDEPS and resync WANTLIB. It looks like this port also uses msgfmt, so you'll have to add a BDEP on devel/gettext-tools as well. When I ran 'make update-patches', the patches were regen'd. Thanks, should've indeed handled gettext. Updated diff below. Feedback? diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile index d41b5169845..ae1f98cbd62 100644 --- a/sysutils/dfc/Makefile +++ b/sysutils/dfc/Makefile @@ -2,18 +2,22 @@ COMMENT = display file system space usage using graph and colors -DISTNAME = dfc-3.1.0 +DISTNAME = dfc-3.1.1 CATEGORIES = sysutils -REVISION = 0 -MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/ +MASTER_SITES = https://projects.gw-computing.net/attachments/download/615/ HOMEPAGE =https://projects.gw-computing.net/projects/dfc # BSD PERMIT_PACKAGE_CDROM= Yes -MODULES = devel/cmake devel/gettext -WANTLIB = c m +MODULES = devel/cmake +WANTLIB = c iconv intl m + +BUILD_DEPENDS =devel/gettext-tools +LIB_DEPENDS = converters/libiconv \ + devel/gettext devel/gettext implies converters/libiconv, so committed with the line LIB_DEPENDS = devel/gettext ~Brian + NO_TEST = Yes CONFIGURE_ARGS =-DXDG_CONFIG_DIR=${PREFIX}/share/examples \ diff --git a/sysutils/dfc/distinfo b/sysutils/dfc/distinfo index 0bb706d1904..42f31e1bbc0 100644 --- a/sysutils/dfc/distinfo +++ b/sysutils/dfc/distinfo @@ -1,2 +1,2 @@ -SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s= -SIZE (dfc-3.1.0.tar.gz) = 52459 +SHA256 (dfc-3.1.1.tar.gz) = liRm53QH3VvnFaQf/FClT851iniDFUbwOmuyguhpLlQ= +SIZE (dfc-3.1.1.tar.gz) = 52709 diff --git a/sysutils/dfc/patches/patch-CMakeLists_txt b/sysutils/dfc/patches/patch-CMakeLists_txt index bfc526d7ff1..4619270a541 100644 --- a/sysutils/dfc/patches/patch-CMakeLists_txt +++ b/sysutils/dfc/patches/patch-CMakeLists_txt @@ -1,7 +1,8 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 benoit Exp $ CMakeLists.txt.origSun Apr 9 11:36:02 2017 -+++ CMakeLists.txt Tue May 23 10:21:03 2017 -@@ -104,6 +104,7 @@ +Index: CMakeLists.txt +--- CMakeLists.txt.orig CMakeLists.txt +@@ -104,6 +104,7 @@ endif() # Check for libintl find_package(Libintl) @@ -9,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 benoit Exp $ if (LIBINTL_FOUND) option(NLS_ENABLED "Translation support with gettext" on) else() -@@ -191,7 +192,7 @@ +@@ -191,7 +192,7 @@ if(NLS_ENABLED) add_subdirectory(po) include_directories(${LIBINTL_INCLUDE_DIR}) diff --git a/sysutils/dfc/patches/patch-src_platform_services-bsd_c b/sysutils/dfc/patches/patch-src_platform_services-bsd_c index a709f24d064..3e1c1c767cd 100644 --- a/sysutils/dfc/patches/patch-src_platform_services-bsd_c +++ b/sysutils/dfc/patches/patch-src_platform_services-bsd_c @@ -1,7 +1,8 @@ $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.cTue May 23 10:29:07 2017 -@@ -73,7 +73,7 @@ +Index: src/platform/services-bsd.c +--- src/platform/services-bsd.c.orig src/platform/services-bsd.c +@@ -73,7 +73,7 @@ typedef struct statfs statst; * 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. */
Re: [UPDATE] sysutils/dfc 3.1.0 -> 3.1.1
On Sun, Nov 12, 2017 at 03:02:11AM -0500, Brian Callahan wrote: > > On 11/11/17 23:38, Klemens Nanni wrote: > > This a bugfix release: > > > > - fix a typo in the compilation instructions in the readme file > > - fix an old bug (4+ years) which messed up colors in HTML export when a > >configuration file is used > > - fix a bug which prevented some file systems to be displayed when the > >filtering option was used > > - fix a bad implicit fallthrough > > > > Continues to work fine on my amd64 machine. > > > > Feedback? > > We're not doing the gettext MODULE any more, so you'll need to fix that. It > uses libintl and libiconv, so you'll have to remove devel/gettext from > MODULES and put it in LDEPS and resync WANTLIB. > > It looks like this port also uses msgfmt, so you'll have to add a BDEP on > devel/gettext-tools as well. > > When I ran 'make update-patches', the patches were regen'd. Thanks, should've indeed handled gettext. Updated diff below. Feedback? diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile index d41b5169845..ae1f98cbd62 100644 --- a/sysutils/dfc/Makefile +++ b/sysutils/dfc/Makefile @@ -2,18 +2,22 @@ COMMENT = display file system space usage using graph and colors -DISTNAME = dfc-3.1.0 +DISTNAME = dfc-3.1.1 CATEGORIES = sysutils -REVISION = 0 -MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/ +MASTER_SITES = https://projects.gw-computing.net/attachments/download/615/ HOMEPAGE = https://projects.gw-computing.net/projects/dfc # BSD PERMIT_PACKAGE_CDROM= Yes -MODULES = devel/cmake devel/gettext -WANTLIB = c m +MODULES = devel/cmake +WANTLIB = c iconv intl m + +BUILD_DEPENDS =devel/gettext-tools +LIB_DEPENDS = converters/libiconv \ + devel/gettext + NO_TEST = Yes CONFIGURE_ARGS =-DXDG_CONFIG_DIR=${PREFIX}/share/examples \ diff --git a/sysutils/dfc/distinfo b/sysutils/dfc/distinfo index 0bb706d1904..42f31e1bbc0 100644 --- a/sysutils/dfc/distinfo +++ b/sysutils/dfc/distinfo @@ -1,2 +1,2 @@ -SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s= -SIZE (dfc-3.1.0.tar.gz) = 52459 +SHA256 (dfc-3.1.1.tar.gz) = liRm53QH3VvnFaQf/FClT851iniDFUbwOmuyguhpLlQ= +SIZE (dfc-3.1.1.tar.gz) = 52709 diff --git a/sysutils/dfc/patches/patch-CMakeLists_txt b/sysutils/dfc/patches/patch-CMakeLists_txt index bfc526d7ff1..4619270a541 100644 --- a/sysutils/dfc/patches/patch-CMakeLists_txt +++ b/sysutils/dfc/patches/patch-CMakeLists_txt @@ -1,7 +1,8 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 benoit Exp $ CMakeLists.txt.origSun Apr 9 11:36:02 2017 -+++ CMakeLists.txt Tue May 23 10:21:03 2017 -@@ -104,6 +104,7 @@ +Index: CMakeLists.txt +--- CMakeLists.txt.orig CMakeLists.txt +@@ -104,6 +104,7 @@ endif() # Check for libintl find_package(Libintl) @@ -9,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2017/05/23 09:00:53 benoit Exp $ if (LIBINTL_FOUND) option(NLS_ENABLED "Translation support with gettext" on) else() -@@ -191,7 +192,7 @@ +@@ -191,7 +192,7 @@ if(NLS_ENABLED) add_subdirectory(po) include_directories(${LIBINTL_INCLUDE_DIR}) diff --git a/sysutils/dfc/patches/patch-src_platform_services-bsd_c b/sysutils/dfc/patches/patch-src_platform_services-bsd_c index a709f24d064..3e1c1c767cd 100644 --- a/sysutils/dfc/patches/patch-src_platform_services-bsd_c +++ b/sysutils/dfc/patches/patch-src_platform_services-bsd_c @@ -1,7 +1,8 @@ $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.cTue May 23 10:29:07 2017 -@@ -73,7 +73,7 @@ +Index: src/platform/services-bsd.c +--- src/platform/services-bsd.c.orig src/platform/services-bsd.c +@@ -73,7 +73,7 @@ typedef struct statfs statst; * 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. */
Re: [UPDATE] sysutils/dfc 3.1.0 -> 3.1.1
On 11/11/17 23:38, Klemens Nanni wrote: This a bugfix release: - fix a typo in the compilation instructions in the readme file - fix an old bug (4+ years) which messed up colors in HTML export when a configuration file is used - fix a bug which prevented some file systems to be displayed when the filtering option was used - fix a bad implicit fallthrough Continues to work fine on my amd64 machine. Feedback? We're not doing the gettext MODULE any more, so you'll need to fix that. It uses libintl and libiconv, so you'll have to remove devel/gettext from MODULES and put it in LDEPS and resync WANTLIB. It looks like this port also uses msgfmt, so you'll have to add a BDEP on devel/gettext-tools as well. When I ran 'make update-patches', the patches were regen'd. ~Brian diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile index d41b5169845..983750a1996 100644 --- a/sysutils/dfc/Makefile +++ b/sysutils/dfc/Makefile @@ -2,11 +2,10 @@ COMMENT = display file system space usage using graph and colors -DISTNAME = dfc-3.1.0 +DISTNAME = dfc-3.1.1 CATEGORIES = sysutils -REVISION = 0 -MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/ +MASTER_SITES = https://projects.gw-computing.net/attachments/download/615/ HOMEPAGE =https://projects.gw-computing.net/projects/dfc # BSD diff --git a/sysutils/dfc/distinfo b/sysutils/dfc/distinfo index 0bb706d1904..42f31e1bbc0 100644 --- a/sysutils/dfc/distinfo +++ b/sysutils/dfc/distinfo @@ -1,2 +1,2 @@ -SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s= -SIZE (dfc-3.1.0.tar.gz) = 52459 +SHA256 (dfc-3.1.1.tar.gz) = liRm53QH3VvnFaQf/FClT851iniDFUbwOmuyguhpLlQ= +SIZE (dfc-3.1.1.tar.gz) = 52709
[UPDATE] sysutils/dfc 3.1.0 -> 3.1.1
This a bugfix release: - fix a typo in the compilation instructions in the readme file - fix an old bug (4+ years) which messed up colors in HTML export when a configuration file is used - fix a bug which prevented some file systems to be displayed when the filtering option was used - fix a bad implicit fallthrough Continues to work fine on my amd64 machine. Feedback? diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile index d41b5169845..983750a1996 100644 --- a/sysutils/dfc/Makefile +++ b/sysutils/dfc/Makefile @@ -2,11 +2,10 @@ COMMENT = display file system space usage using graph and colors -DISTNAME = dfc-3.1.0 +DISTNAME = dfc-3.1.1 CATEGORIES = sysutils -REVISION = 0 -MASTER_SITES = https://projects.gw-computing.net/attachments/download/614/ +MASTER_SITES = https://projects.gw-computing.net/attachments/download/615/ HOMEPAGE = https://projects.gw-computing.net/projects/dfc # BSD diff --git a/sysutils/dfc/distinfo b/sysutils/dfc/distinfo index 0bb706d1904..42f31e1bbc0 100644 --- a/sysutils/dfc/distinfo +++ b/sysutils/dfc/distinfo @@ -1,2 +1,2 @@ -SHA256 (dfc-3.1.0.tar.gz) = itmLoaloWhvzOi07jyc33t72AZVD0Z0bXr0Xg750D+s= -SIZE (dfc-3.1.0.tar.gz) = 52459 +SHA256 (dfc-3.1.1.tar.gz) = liRm53QH3VvnFaQf/FClT851iniDFUbwOmuyguhpLlQ= +SIZE (dfc-3.1.1.tar.gz) = 52709