diff --git a/ports/libidn/libidn.patch b/ports/libidn/libidn.patch index 425e472c..85d9b60c 100644 --- a/ports/libidn/libidn.patch +++ b/ports/libidn/libidn.patch @@ -1,169 +1,12 @@ -diff -Paur --no-dereference -- libidn.upstream/build-aux/config.sub libidn/build-aux/config.sub ---- libidn.upstream/build-aux/config.sub -+++ libidn/build-aux/config.sub -@@ -1365,7 +1365,7 @@ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* | -aros* \ -+ | -aos* | -aros* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -diff -Paur --no-dereference -- libidn.upstream/configure libidn/configure ---- libidn.upstream/configure -+++ libidn/configure -@@ -1,4 +1,124 @@ - #! /bin/sh -+# Make gnulib assume the best about unknown operating systems when cross-compiling. -+export ac_cv_func_calloc_0_nonnull=yes -+export ac_cv_func_chown_works=yes -+export ac_cv_func_getgroups_works=yes -+export ac_cv_func_malloc_0_nonnull=yes -+export gl_cv_func_cbrtl_ieee=yes -+export gl_cv_func_ceilf_ieee=yes -+export gl_cv_func_ceil_ieee=yes -+export gl_cv_func_ceill_ieee=yes -+export gl_cv_func_chown_ctime_works=yes -+export gl_cv_func_chown_slash_works=yes -+export gl_cv_func_exp2l_ieee=yes -+export gl_cv_func_expm1_ieee=yes -+export gl_cv_func_fcntl_f_dupfd_works=yes # Not needed since February 2015 -+export gl_cv_func_fdopendir_works=yes -+export gl_cv_func_floorf_ieee=yes -+export gl_cv_func_fmaf_works=yes -+export gl_cv_func_fmal_works=yes -+export gl_cv_func_fma_works=yes -+export gl_cv_func_fmodf_ieee=yes -+export gl_cv_func_fmod_ieee=yes -+export gl_cv_func_fmodl_ieee=yes -+export gl_cv_func_fpurge_works=yes -+export gl_cv_func_futimens_works=yes -+export gl_cv_func_futimesat_works=yes -+export gl_cv_func_getgroups_works=yes -+export gl_cv_func_gettimeofday_clobber=no -+export gl_cv_func_hypotf_ieee=yes -+export gl_cv_func_hypotl_ieee=yes -+export gl_cv_func_hypot_ieee=yes -+export gl_cv_func_isfinitel_works=yes -+export gl_cv_func_isnanl_works=yes -+export gl_cv_func_linkat_slash=yes -+export gl_cv_func_link_works=yes -+export gl_cv_func_log10f_ieee=yes -+export gl_cv_func_log10_ieee=yes -+export gl_cv_func_log1pf_ieee=yes -+export gl_cv_func_log1p_ieee=yes -+export gl_cv_func_log1pl_ieee=yes -+export gl_cv_func_log2f_ieee=yes -+export gl_cv_func_log2_ieee=yes -+export gl_cv_func_logf_ieee=yes -+export gl_cv_func_log_ieee=yes -+export gl_cv_func_lstat_dereferences_slashed_symlink=yes -+export gl_cv_func_mbrlen_empty_input=yes -+export gl_cv_func_mbrtowc_empty_input=yes -+export gl_cv_func_memchr_works=yes -+export gl_cv_func_memmem_works_fast=yes -+export gl_cv_func_mkdir_trailing_dot_works=yes -+export gl_cv_func_mkdir_trailing_slash_works=yes -+export gl_cv_func_mkfifo_works=yes -+export gl_cv_func_mknod_works=yes -+export gl_cv_func_modff_ieee=yes -+export gl_cv_func_modf_ieee=yes -+export gl_cv_func_modfl_ieee=yes -+export gl_cv_func_nanosleep=yes -+export gl_cv_func_open_directory_works=yes -+export gl_cv_func_perror_works=yes -+export gl_cv_func_printf_directive_a=yes -+export gl_cv_func_printf_directive_f=yes -+export gl_cv_func_printf_directive_n=yes -+export gl_cv_func_printf_enomem=yes -+export gl_cv_func_printf_flag_zero=yes -+export gl_cv_func_printf_infinite_long_double=yes -+export gl_cv_func_printf_infinite=yes -+export gl_cv_func_printf_sizes_c99=yes -+export gl_cv_func_pselect_detects_ebadf=yes -+export gl_cv_func_ptsname_sets_errno=yes -+export gl_cv_func_readlink_works=yes -+export gl_cv_func_realpath_works=yes -+export gl_cv_func_remainderf_ieee=yes -+export gl_cv_func_remainder_ieee=yes -+export gl_cv_func_remainderl_ieee=yes -+export gl_cv_func_rename_dest_works=yes -+export gl_cv_func_rename_link_works=yes -+export gl_cv_func_rename_slash_dst_works=yes -+export gl_cv_func_rename_slash_src_works=yes -+export gl_cv_func_rmdir_works=yes -+export gl_cv_func_roundf_ieee=yes -+export gl_cv_func_round_ieee=yes -+export gl_cv_func_select_detects_ebadf=yes -+export gl_cv_func_setenv_works=yes -+export gl_cv_func_signbit_gcc=yes -+export gl_cv_func_signbit=yes -+export gl_cv_func_sleep_works=yes -+export gl_cv_func_snprintf_directive_n=yes -+export gl_cv_func_snprintf_retval_c99=yes -+export gl_cv_func_snprintf_truncation_c99=yes -+export gl_cv_func_stat_dir_slash=yes -+export gl_cv_func_stat_file_slash=yes -+export gl_cv_func_stpncpy=yes -+export gl_cv_func_strcasestr_linear=yes -+export gl_cv_func_strchrnul_works=yes -+export gl_cv_func_strerror_0_works=yes -+export gl_cv_func_strstr_linear=yes -+export gl_cv_func_strtod_works=yes -+export gl_cv_func_svid_putenv=yes -+export gl_cv_func_symlink_works=yes -+export gl_cv_func_tdelete_works=yes -+export gl_cv_func_truncf_ieee=yes -+export gl_cv_func_trunc_ieee=yes -+export gl_cv_func_truncl_ieee=yes -+export gl_cv_func_tzset_clobber=no -+export gl_cv_func_ungetc_works=yes -+export gl_cv_func_unlink_honors_slashes=yes -+export gl_cv_func_unsetenv_works=yes -+export gl_cv_func_usleep_works=yes -+export gl_cv_func_utimensat_works=yes -+export gl_cv_func_vsnprintf_posix=yes -+export gl_cv_func_vsnprintf_zerosize_c99=yes -+export gl_cv_func_vsprintf_posix=yes -+export gl_cv_func_wcwidth_works=yes -+export gl_cv_func_working_getdelim=yes -+export gl_cv_func_working_mkstemp=yes -+export gl_cv_func_working_mktime=yes -+export gl_cv_func_working_strerror=yes -+export ac_cv_func___fseterr=yes # Only if the OS actually supports this, Sortix does. -+export gl_cv_func_getcwd_null=yes # Only if the OS actually supports this, Sortix does. -+export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does. -+export ac_cv_func_realloc_0_nonnull=yes # TODO: Investigate this, found in flex. - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.69 for GNU Libidn 1.33. - # -diff -Paur --no-dereference -- libidn.upstream/doc/Makefile.in libidn/doc/Makefile.in ---- libidn.upstream/doc/Makefile.in -+++ libidn/doc/Makefile.in -@@ -1502,8 +1502,8 @@ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+.PRECIOUS: Makefile.disabled -+Makefile.disabled: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff -Paur --no-dereference -- libidn.upstream/Makefile.in libidn/Makefile.in --- libidn.upstream/Makefile.in +++ libidn/Makefile.in -@@ -1662,6 +1662,11 @@ +@@ -1955,6 +1955,8 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile -+ -rm -f config.log -+ -rm -f config.status -+ -rm -rf gl/sys -+ -rm -rf lib/gl/sys -+ -rm -f doc/Makefile ++ -rm -rf doc/man ++ -rm -rf doc/texi distclean-am: clean-am distclean-generic distclean-hdr \ distclean-libtool distclean-tags diff --git a/ports/libidn/libidn.port b/ports/libidn/libidn.port index 27e32137..d94836c1 100644 --- a/ports/libidn/libidn.port +++ b/ports/libidn/libidn.port @@ -1,12 +1,13 @@ NAME=libidn BUILD_LIBRARIES='libiconv? libintl?' -VERSION=1.33 +VERSION=1.41 DISTNAME=$NAME-$VERSION COMPRESSION=tar.gz ARCHIVE=$DISTNAME.$COMPRESSION -SHA256SUM=44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 +SHA256SUM=884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945 UPSTREAM_SITE=https://ftp.gnu.org/gnu/libidn UPSTREAM_ARCHIVE=$ARCHIVE +LICENSE='GPL-2.0-or-later OR LGPL-3.0-or-later' BUILD_SYSTEM=configure CONFIGURE_ARGS= MAKE_VARS='V=1' diff --git a/ports/libidn/libidn.rmpatch b/ports/libidn/libidn.rmpatch index b6b2d702..3d24f17e 100644 --- a/ports/libidn/libidn.rmpatch +++ b/ports/libidn/libidn.rmpatch @@ -1,27 +1,8 @@ -rm -rf -- 'doc/Makefile.gdoc' -rm -rf -- 'doc/libidn.html' -rm -rf -- 'doc/libidn.pdf' -rm -rf -- 'doc/libidn.ps' -rm -rf -- 'doc/reference/html/' -rm -rf -- 'doc/reference/html/api-index-full.html' -rm -rf -- 'doc/reference/html/home.png' -rm -rf -- 'doc/reference/html/index.html' -rm -rf -- 'doc/reference/html/index.sgml' -rm -rf -- 'doc/reference/html/intro.html' -rm -rf -- 'doc/reference/html/left-insensitive.png' -rm -rf -- 'doc/reference/html/left.png' -rm -rf -- 'doc/reference/html/libidn-components.png' -rm -rf -- 'doc/reference/html/libidn-idn-free.html' -rm -rf -- 'doc/reference/html/libidn-idna.html' -rm -rf -- 'doc/reference/html/libidn-pr29.html' -rm -rf -- 'doc/reference/html/libidn-punycode.html' -rm -rf -- 'doc/reference/html/libidn-stringprep.html' -rm -rf -- 'doc/reference/html/libidn-tld.html' -rm -rf -- 'doc/reference/html/libidn.devhelp2' -rm -rf -- 'doc/reference/html/right-insensitive.png' -rm -rf -- 'doc/reference/html/right.png' -rm -rf -- 'doc/reference/html/style.css' -rm -rf -- 'doc/reference/html/up-insensitive.png' -rm -rf -- 'doc/reference/html/up.png' +rm -rf -- 'contrib/doxygen/Doxyfile.orig' +rm -rf -- 'doc/man' +rm -rf -- 'doc/reference/html' +rm -rf -- 'doc/reference/libidn-overrides.txt' +rm -rf -- 'doc/reference/libidn-sections.txt' rm -rf -- 'doc/reference/libidn.pdf' -rm -rf -- 'doc/stamp-vti' +rm -rf -- 'doc/stamp-gdoc' +rm -rf -- 'doc/texi'