git: 27d0ac6f1bf5 - main - x11-fonts/fntsample: Update to 5.4

[Po-Chuan Hsieh]

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=27d0ac6f1bf5099875d8ca3ad3b430089b712c4a

commit 27d0ac6f1bf5099875d8ca3ad3b430089b712c4a
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-08-08 14:35:26 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-08-08 14:54:00 +0000

    x11-fonts/fntsample: Update to 5.4
    
    Changes:        https://github.com/eugmes/fntsample/releases
---
 x11-fonts/fntsample/Makefile                      |  3 +--
 x11-fonts/fntsample/distinfo                      |  6 +++---
 x11-fonts/fntsample/files/patch-CMakeLists.txt    | 25 +++++------------------
 x11-fonts/fntsample/files/patch-po-CMakeLists.txt | 11 ----------
 x11-fonts/fntsample/files/patch-src-read_blocks.c | 10 +++++++++
 5 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index ffc9743e6ae5..569c10fe90d1 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -1,9 +1,8 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 
 PORTNAME=	fntsample
-PORTVERSION=	5.3
+PORTVERSION=	5.4
 DISTVERSIONPREFIX=	release/
-PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://unicode.org/Public/13.0.0/ucd/:unidata
 DISTFILES=	Blocks.txt:unidata
diff --git a/x11-fonts/fntsample/distinfo b/x11-fonts/fntsample/distinfo
index e8c4db410725..5fd2a6590e48 100644
--- a/x11-fonts/fntsample/distinfo
+++ b/x11-fonts/fntsample/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1624189679
+TIMESTAMP = 1628103062
 SHA256 (Blocks.txt) = 81a82b6a9fcf1a9c12f588d7a1decd73a9afdc4cac95b0eb7e576e7942d6c19f
 SIZE (Blocks.txt) = 10346
-SHA256 (eugmes-fntsample-release-5.3_GH0.tar.gz) = e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
-SIZE (eugmes-fntsample-release-5.3_GH0.tar.gz) = 56508
+SHA256 (eugmes-fntsample-release-5.4_GH0.tar.gz) = 69eb3d83bce78b6610f4a8f19d089059079ebc475c36d456ebcb4c8add431166
+SIZE (eugmes-fntsample-release-5.4_GH0.tar.gz) = 62162
diff --git a/x11-fonts/fntsample/files/patch-CMakeLists.txt b/x11-fonts/fntsample/files/patch-CMakeLists.txt
index 214c58167999..964dcb3e4665 100644
--- a/x11-fonts/fntsample/files/patch-CMakeLists.txt
+++ b/x11-fonts/fntsample/files/patch-CMakeLists.txt
@@ -1,23 +1,8 @@
---- CMakeLists.txt.orig	2018-12-26 07:13:37 UTC
+--- CMakeLists.txt.orig	2021-08-01 16:18:33 UTC
 +++ CMakeLists.txt
-@@ -44,8 +44,6 @@ add_compile_options(-Wall -W -Wwrite-str
- 
- configure_file(config.h.in config.h @ONLY)
- configure_file(fntsample.1.in fntsample.1 @ONLY)
--configure_file(pdfoutline.1.in pdfoutline.1 @ONLY)
--configure_file(pdfoutline.pl pdfoutline @ONLY)
- 
- include_directories(fntsample
-   ${CMAKE_CURRENT_BINARY_DIR}
-@@ -81,11 +79,7 @@ target_link_libraries(fntsample
- 
- install(TARGETS fntsample DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/pdfoutline"
--        DESTINATION ${CMAKE_INSTALL_BINDIR})
--
- install(FILES "${PROJECT_BINARY_DIR}/fntsample.1"
--              "${PROJECT_BINARY_DIR}/pdfoutline.1"
-         DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+@@ -39,5 +39,4 @@ string(TIMESTAMP DATE "%Y-%m-%d" UTC)
+ include(PoFileUtils)
  
+ add_subdirectory(src)
+-add_subdirectory(scripts)
  add_subdirectory(po)
diff --git a/x11-fonts/fntsample/files/patch-po-CMakeLists.txt b/x11-fonts/fntsample/files/patch-po-CMakeLists.txt
deleted file mode 100644
index ff058c624e73..000000000000
--- a/x11-fonts/fntsample/files/patch-po-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/CMakeLists.txt.orig	2018-12-26 07:13:37 UTC
-+++ po/CMakeLists.txt
-@@ -6,7 +6,7 @@ function(process_po_files _langs)
-   foreach(_lang ${_langs})
-     set(_po_file "${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.po")
-     set(_gmo_file "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo")
--    set(_gmo_file_tgt "${_lang}.gmo")
-+    set(_gmo_file_tgt "${_lang}_gmo")
- 
-     add_custom_command(OUTPUT ${_gmo_file}
-       COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} ${_po_file} -o ${_gmo_file}
diff --git a/x11-fonts/fntsample/files/patch-src-read_blocks.c b/x11-fonts/fntsample/files/patch-src-read_blocks.c
new file mode 100644
index 000000000000..0c9a42eea1b9
--- /dev/null
+++ b/x11-fonts/fntsample/files/patch-src-read_blocks.c
@@ -0,0 +1,10 @@
+--- src/read_blocks.c.orig	2021-08-01 16:18:33 UTC
++++ src/read_blocks.c
+@@ -13,6 +13,7 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#define _POSIX_C_SOURCE 200809L
+ #include "unicode_blocks.h"
+ #include <stdio.h>
+ #include <stdlib.h>