pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/gtexinfo
Module Name: pkgsrc
Committed By: adam
Date: Fri Nov 1 08:37:29 UTC 2024
Modified Files:
pkgsrc/devel/gtexinfo: Makefile distinfo
Added Files:
pkgsrc/devel/gtexinfo/patches: patch-configure patch-info_Makefile.in
patch-info_filesys.h patch-tp_Texinfo_XS_configure
Removed Files:
pkgsrc/devel/gtexinfo/patches: patch-ab patch-ac
Log Message:
gtexinfo: ignore check for macOS 14.4+ iconv bug; use gmake to fix parallel build; pkglint fixes
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/devel/gtexinfo/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/gtexinfo/distinfo
cvs rdiff -u -r1.17 -r0 pkgsrc/devel/gtexinfo/patches/patch-ab
cvs rdiff -u -r1.13 -r0 pkgsrc/devel/gtexinfo/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gtexinfo/patches/patch-configure \
pkgsrc/devel/gtexinfo/patches/patch-info_Makefile.in \
pkgsrc/devel/gtexinfo/patches/patch-info_filesys.h \
pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_XS_configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/gtexinfo/Makefile
diff -u pkgsrc/devel/gtexinfo/Makefile:1.124 pkgsrc/devel/gtexinfo/Makefile:1.125
--- pkgsrc/devel/gtexinfo/Makefile:1.124 Mon Oct 21 15:23:45 2024
+++ pkgsrc/devel/gtexinfo/Makefile Fri Nov 1 08:37:29 2024
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.124 2024/10/21 15:23:45 mef Exp $
+# $NetBSD: Makefile,v 1.125 2024/11/01 08:37:29 adam Exp $
-DISTNAME= texinfo-7.1.1
-PKGNAME= g${DISTNAME}
-CATEGORIES= devel sysutils
-MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.gnu.org/software/texinfo/texinfo.html
-COMMENT= GNU info documentation utilities
-LICENSE= gnu-gpl-v3
+DISTNAME= texinfo-7.1.1
+PKGNAME= g${DISTNAME}
+CATEGORIES= devel sysutils
+MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.gnu.org/software/texinfo/texinfo.html
+COMMENT= GNU info documentation utilities
+LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
+TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
# otherwise, package installs copies of them itself
-DEPENDS+= p5-Locale-libintl-[0-9]*:../../misc/p5-Locale-libintl
-DEPENDS+= p5-Text-Unidecode-[0-9]*:../../textproc/p5-Text-Unidecode
-DEPENDS+= p5-Unicode-EastAsianWidth-[0-9]*:../../converters/p5-Unicode-EastAsianWidth
+DEPENDS+= p5-Locale-libintl-[0-9]*:../../misc/p5-Locale-libintl
+DEPENDS+= p5-Text-Unidecode-[0-9]*:../../textproc/p5-Text-Unidecode
+DEPENDS+= p5-Unicode-EastAsianWidth-[0-9]*:../../converters/p5-Unicode-EastAsianWidth
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
GNU_CONFIGURE_STRICT= no # otherwise MiscXS.pm won't be installed
CONFIGURE_ARGS+= --with-external-libintl-perl
@@ -25,17 +27,11 @@ CONFIGURE_ARGS+= --enable-perl-xs
CONFIGURE_ARGS+= PERL_EXT_CFLAGS=${CFLAGS:Q}
CONFIGURE_ARGS+= PERL_EXT_LDFLAGS=${LDFLAGS:Q}
# embedded into texindex
-CONFIGURE_ARGS+= ac_cv_path_TI_AWK=${AWK}
-
-# cc1: fatal error: ./parsetexi/Parsetexi.c: No such file or directory
-MAKE_JOBS_SAFE= no
-
-USE_LIBTOOL= yes
+CONFIGURE_ARGS+= ac_cv_path_TI_AWK=${AWK:Q}
INFO_FILES= yes
TEST_TARGET= check
PLIST_SRC= ${PKGDIR}/PLIST
-USE_TOOLS+= perl:run
# Replace deeply nested config.sub files (in vendored perl libraries)
OVERRIDE_DIRDEPTH= 4
@@ -49,7 +45,6 @@ REPLACE_SH+= util/texi2dvi
.include "options.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk" # for EXTERN.h in XSParagraph
.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/gtexinfo/distinfo
diff -u pkgsrc/devel/gtexinfo/distinfo:1.65 pkgsrc/devel/gtexinfo/distinfo:1.66
--- pkgsrc/devel/gtexinfo/distinfo:1.65 Mon Oct 21 15:23:45 2024
+++ pkgsrc/devel/gtexinfo/distinfo Fri Nov 1 08:37:29 2024
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.65 2024/10/21 15:23:45 mef Exp $
+$NetBSD: distinfo,v 1.66 2024/11/01 08:37:29 adam Exp $
BLAKE2s (texinfo-7.1.1.tar.gz) = 000380367a4f268ddedd48c7def9d97075af3d33b3bf0dfcd7f2870c9646e3e5
SHA512 (texinfo-7.1.1.tar.gz) = 617e819865efc812e163288b92b72c3693615cb8a42bd4badf8ddc163560166c609b37b479c5c589d3386cd0478e7f0abeebb503f95aeab4585f3bcf3781c203
Size (texinfo-7.1.1.tar.gz) = 12191267 bytes
-SHA1 (patch-ab) = 080583e20117c34516321f9266f6a2fac1acda33
-SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148
+SHA1 (patch-configure) = 207dc69f65b29db3ba937bd82a664c27f237fd57
SHA1 (patch-gnulib_lib_malloc_dynarray-skeleton.c) = 6e683e689bfc7573bf9d62d2bc9a1abb64d521df
SHA1 (patch-gnulib_lib_mbiter.h) = 3d932f20f69ec2531a2b797dcc02252e19ace163
SHA1 (patch-gnulib_lib_mbuiter.h) = a248a56818e46ca501f9dc57415c40f766a065f8
+SHA1 (patch-info_Makefile.in) = f4366eaa56aac30f6ed1e537c1d71f8e61c1c2e9
+SHA1 (patch-info_filesys.h) = 7cc1819ac02deae957f95b84b11bed20609d0235
+SHA1 (patch-tp_Texinfo_XS_configure) = 9aa1b01463cee53bb137e545719fdbbe41b9a175
SHA1 (patch-util_texi2dvi) = 72be61e607a393edf0cbd67747f7e0b360441466
Added files:
Index: pkgsrc/devel/gtexinfo/patches/patch-configure
diff -u /dev/null pkgsrc/devel/gtexinfo/patches/patch-configure:1.1
--- /dev/null Fri Nov 1 08:37:29 2024
+++ pkgsrc/devel/gtexinfo/patches/patch-configure Fri Nov 1 08:37:29 2024
@@ -0,0 +1,39 @@
+$NetBSD: patch-configure,v 1.1 2024/11/01 08:37:29 adam Exp $
+
+Ignore iconv bug check for macOS for the sake of PLIST consistency.
+This check has been introduced in gtexinfo 7.1.1.
+
+--- configure.orig 2024-09-07 17:33:21.000000000 +0000
++++ configure
+@@ -13469,6 +13469,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#if 0
+ /* Test against macOS 14.4 bug: Failures are not distinguishable from
+ successful returns.
+ POSIX:2018 says: "The iconv() function shall ... return the number of
+@@ -13498,6 +13499,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#endif
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+@@ -39577,6 +39579,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#if 0
+ /* Test against macOS 14.4 bug: Failures are not distinguishable from
+ successful returns.
+ POSIX:2018 says: "The iconv() function shall ... return the number of
+@@ -39606,6 +39609,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#endif
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
Index: pkgsrc/devel/gtexinfo/patches/patch-info_Makefile.in
diff -u /dev/null pkgsrc/devel/gtexinfo/patches/patch-info_Makefile.in:1.1
--- /dev/null Fri Nov 1 08:37:29 2024
+++ pkgsrc/devel/gtexinfo/patches/patch-info_Makefile.in Fri Nov 1 08:37:29 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-info_Makefile.in,v 1.1 2024/11/01 08:37:29 adam Exp $
+
+Append PKGSRC_INFOPATH to CPPFLAGS.
+
+--- info/Makefile.in.orig 2023-10-18 13:06:46.000000000 +0000
++++ info/Makefile.in
+@@ -1873,7 +1873,8 @@ AM_CPPFLAGS = \
+ -I$(top_builddir)/gnulib/lib \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DINFODIR=\"$(infodir)\" \
+- -DINFODIR2=\"$(datadir)/info\"
++ -DINFODIR2=\"$(datadir)/info\" \
++ -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
+
+
+ # for various gnulib modules
Index: pkgsrc/devel/gtexinfo/patches/patch-info_filesys.h
diff -u /dev/null pkgsrc/devel/gtexinfo/patches/patch-info_filesys.h:1.1
--- /dev/null Fri Nov 1 08:37:29 2024
+++ pkgsrc/devel/gtexinfo/patches/patch-info_filesys.h Fri Nov 1 08:37:29 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-info_filesys.h,v 1.1 2024/11/01 08:37:29 adam Exp $
+
+Use PKGSRC_INFOPATH.
+
+--- info/filesys.h.orig 2014-12-29 11:29:54.000000000 +0000
++++ info/filesys.h
+@@ -68,7 +68,7 @@ extern int is_dir_name (char *filename);
+
+ /* The default value of INFOPATH. */
+ #if !defined (DEFAULT_INFOPATH)
+-# define DEFAULT_INFOPATH
"PATH:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
++# define DEFAULT_INFOPATH ".:" PKGSRC_INFOPATH
":PATH:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info"
+ #endif /* !DEFAULT_INFOPATH */
+
+ #if !defined (S_ISREG) && defined (S_IFREG)
Index: pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_XS_configure
diff -u /dev/null pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_XS_configure:1.1
--- /dev/null Fri Nov 1 08:37:29 2024
+++ pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_XS_configure Fri Nov 1 08:37:29 2024
@@ -0,0 +1,39 @@
+$NetBSD: patch-tp_Texinfo_XS_configure,v 1.1 2024/11/01 08:37:29 adam Exp $
+
+Ignore iconv bug check for macOS for the sake of PLIST consistency.
+This check has been introduced in gtexinfo 7.1.1.
+
+--- tp/Texinfo/XS/configure.orig 2024-09-07 17:27:38.000000000 +0000
++++ tp/Texinfo/XS/configure
+@@ -8597,6 +8597,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#if 0
+ /* Test against macOS 14.4 bug: Failures are not distinguishable from
+ successful returns.
+ POSIX:2018 says: "The iconv() function shall ... return the number of
+@@ -8626,6 +8627,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#endif
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+@@ -11338,6 +11340,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#if 0
+ /* Test against macOS 14.4 bug: Failures are not distinguishable from
+ successful returns.
+ POSIX:2018 says: "The iconv() function shall ... return the number of
+@@ -11367,6 +11370,7 @@ int result = 0;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
++#endif
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
Home |
Main Index |
Thread Index |
Old Index