diff --git a/sed/build.sh b/sed/build.sh index 78900f2..85ca872 100755 --- a/sed/build.sh +++ b/sed/build.sh @@ -6,11 +6,11 @@ ########################################################### # Check the following 4 variables before running the script topdir=sed -version=4.2.2 +version=4.7 pkgver=1 -source[0]=ftp://ftp.sunet.se/pub/gnu/sed/$topdir-$version.tar.gz +source[0]=https://mirrors.kernel.org/gnu/sed/$topdir-$version.tar.xz # If there are no patches, simply comment this -patch[0]=sed-4.2.2-fix-gnulib-locale_h.patch +#patch[0]= # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -24,6 +24,9 @@ reg prep prep() { generic_prep + setdir source + # Workaround broken config.guess (fixed upstream 2018-12-21) + ${__gsed} -i 's/`isainfo -b`/32/' build-aux/config.guess } reg build @@ -42,7 +45,6 @@ reg install install() { generic_install DESTDIR - rmdir ${stagedir}${prefix}/${_libdir} doc NEWS ChangeLog BUGS COPYING } diff --git a/sed/meta/ChangeLog b/sed/meta/ChangeLog index 529eb3f..81a1208 100644 --- a/sed/meta/ChangeLog +++ b/sed/meta/ChangeLog @@ -1,4 +1,7 @@ CHANGELOG --------- +* Sun Mar 24 2019 Tom G. Christensen - 4.7-1 +- Update to 4.7 + * Fri Nov 08 2013 Tom G. Christensen - 4.2.2-1 - Update to 4.2.2 diff --git a/sed/src/sed-4.2.2-fix-gnulib-locale_h.patch b/sed/src/sed-4.2.2-fix-gnulib-locale_h.patch deleted file mode 100644 index 7c4d5e0..0000000 --- a/sed/src/sed-4.2.2-fix-gnulib-locale_h.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up sed-4.2.2/lib/locale.in.h.orig sed-4.2.2/lib/locale.in.h ---- sed-4.2.2/lib/locale.in.h.orig 2012-09-13 08:58:19.000000000 +0200 -+++ sed-4.2.2/lib/locale.in.h 2013-04-26 17:38:07.512115000 +0200 -@@ -14,16 +14,30 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - --#ifndef _@GUARD_PREFIX@_LOCALE_H -- - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ - #endif - @PRAGMA_COLUMNS@ - -+#ifdef _GL_ALREADY_INCLUDING_LOCALE_H -+ -+/* Special invocation conventions to handle Solaris header files -+ (through Solaris 10) when combined with gettext's libintl.h. */ -+ -+#@INCLUDE_NEXT@ @NEXT_LOCALE_H@ -+ -+#else -+/* Normal invocation convention. */ -+ -+#ifndef _@GUARD_PREFIX@_LOCALE_H -+ -+#define _GL_ALREADY_INCLUDING_LOCALE_H -+ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_LOCALE_H@ - -+#undef _GL_ALREADY_INCLUDING_LOCALE_H -+ - #ifndef _@GUARD_PREFIX@_LOCALE_H - #define _@GUARD_PREFIX@_LOCALE_H - -@@ -198,4 +212,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale i - #endif - - #endif /* _@GUARD_PREFIX@_LOCALE_H */ -+#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */ - #endif /* _@GUARD_PREFIX@_LOCALE_H */