From a4a3672689e91fdd1110d3948b019d1e401d42ca Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 8 Nov 2013 18:43:42 +0100
Subject: [PATCH] sed: update to 4.2.2

---
 sed/build.sh                                |  8 ++--
 sed/meta/ChangeLog                          |  4 ++
 sed/meta/pkgdef                             |  1 +
 sed/meta/relnotes                           | 27 -------------
 sed/src/sed-4.2.2-fix-gnulib-locale_h.patch | 42 +++++++++++++++++++++
 5 files changed, 52 insertions(+), 30 deletions(-)
 create mode 100644 sed/meta/ChangeLog
 delete mode 100644 sed/meta/relnotes
 create mode 100644 sed/src/sed-4.2.2-fix-gnulib-locale_h.patch

diff --git a/sed/build.sh b/sed/build.sh
index 8689d03..78900f2 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.1.5
+version=4.2.2
 pkgver=1
-source[0]=$topdir-$version.tar.gz
+source[0]=ftp://ftp.sunet.se/pub/gnu/sed/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=sed-4.2.2-fix-gnulib-locale_h.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -18,6 +18,7 @@ source[0]=$topdir-$version.tar.gz
 # Global settings
 export CPPFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+gnu_link sed
 
 reg prep
 prep()
@@ -41,6 +42,7 @@ 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
new file mode 100644
index 0000000..529eb3f
--- /dev/null
+++ b/sed/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Fri Nov 08 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 4.2.2-1
+- Update to 4.2.2
diff --git a/sed/meta/pkgdef b/sed/meta/pkgdef
index 1976f1f..baa0ac6 100644
--- a/sed/meta/pkgdef
+++ b/sed/meta/pkgdef
@@ -8,6 +8,7 @@ pkgver="$pkgver"
 files(-,root,bin)
 default_docs
 $_bindir
+$_gnudir
 $_sharedir/locale
 $_mandir
 $_infodir
diff --git a/sed/meta/relnotes b/sed/meta/relnotes
deleted file mode 100644
index bd83629..0000000
--- a/sed/meta/relnotes
+++ /dev/null
@@ -1,27 +0,0 @@
-PACKAGE DETAILS
----------------
-Name:	    %%PKGNAME%%
-Version:    %%SOURCE_AND_VER%%
-Vendor:	    %%VENDOR%%
-Packager:   %%PKGEDBY%%
-
-Source (sha1sum):
-%%SOURCE_SHA1SUM%%
-
-BUILD DETAILS
--------------
-Compiler:
-%%COMPILER%%
-
-Environment:
-%%ENVIRONMENT%%
-
-Configure:
-%%CONFIGURE%%
-
-KNOWN DEPENDENCIES
-------------------
-%%DEPENDENCIES%%
-
-ERRORS/MISCELLANEOUS
---------------------
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
new file mode 100644
index 0000000..7c4d5e0
--- /dev/null
+++ b/sed/src/sed-4.2.2-fix-gnulib-locale_h.patch
@@ -0,0 +1,42 @@
+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 <http://www.gnu.org/licenses/>.  */
+ 
+-#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 */