From 060f2532b02a61237869ad8910055d1821f4e714 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@gmail.com>
Date: Sun, 4 Oct 2015 12:44:08 +0000
Subject: [PATCH] devel/popt

---
 devel/popt/distinfo                 |  3 ++
 devel/popt/patches/patch-zz-minix-a | 15 ++++++++
 devel/popt/patches/patch-zz-minix-b | 29 +++++++++++++++
 devel/popt/patches/patch-zz-minix-c | 57 +++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+)
 create mode 100644 devel/popt/patches/patch-zz-minix-a
 create mode 100644 devel/popt/patches/patch-zz-minix-b
 create mode 100644 devel/popt/patches/patch-zz-minix-c

diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index 076268959..1d2577020 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -6,3 +6,6 @@ Size (popt-1.16.tar.gz) = 702769 bytes
 SHA1 (patch-aa) = 7edb4bbd7fe044da9f388159fdc22327377e267e
 SHA1 (patch-lookup3.c) = 7643b577c0913742fc4333c4469d606d81b6aa98
 SHA1 (patch-poptint.h) = c26b97bdeedf8a057009dfca985eb9287220f54b
+SHA1 (patch-zz-minix-a) = 2ab9d08e2fc8dc07202a33e21d5595d6479a2401
+SHA1 (patch-zz-minix-b) = 5321a1a4572555005e63e6a5af97892db7a38148
+SHA1 (patch-zz-minix-c) = 86137b8927325dc856ebc4e7e5a3a7a61f402690
diff --git a/devel/popt/patches/patch-zz-minix-a b/devel/popt/patches/patch-zz-minix-a
new file mode 100644
index 000000000..d0db33fd8
--- /dev/null
+++ b/devel/popt/patches/patch-zz-minix-a
@@ -0,0 +1,15 @@
+--- poptconfig.c.orig	Sun Oct  4 12:34:19 2015
++++ poptconfig.c	Sun Oct  4 12:35:21 2015
+@@ -42,10 +42,10 @@
+ /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
+ #endif	/* __LCLINT__ */
+ 
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__minix)
+ #include <sys/param.h>
+ #endif
+-#if !defined(__GLIBC__) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100)
++#if !defined(__GLIBC__) && !defined(__minix) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100)
+ /* Return nonzero if PATTERN contains any metacharacters.
+    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+ static int
diff --git a/devel/popt/patches/patch-zz-minix-b b/devel/popt/patches/patch-zz-minix-b
new file mode 100644
index 000000000..239384fdb
--- /dev/null
+++ b/devel/popt/patches/patch-zz-minix-b
@@ -0,0 +1,29 @@
+--- config.rpath.orig	Sun Oct  4 12:36:32 2015
++++ config.rpath	Sun Oct  4 12:37:46 2015
+@@ -203,7 +203,7 @@
+         ld_shlibs=no
+       fi
+       ;;
+-    netbsd*)
++    minix* | netbsd*)
+       ;;
+     solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+@@ -405,7 +405,7 @@
+       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+       hardcode_libdir_separator=:
+       ;;
+-    netbsd*)
++    minix* | netbsd*)
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       ;;
+@@ -582,7 +582,7 @@
+   knetbsd*-gnu)
+     library_names_spec='$libname$shrext'
+     ;;
+-  netbsd*)
++  minix* | netbsd*)
+     library_names_spec='$libname$shrext'
+     ;;
+   newsos6)
diff --git a/devel/popt/patches/patch-zz-minix-c b/devel/popt/patches/patch-zz-minix-c
new file mode 100644
index 000000000..dbc2ba91a
--- /dev/null
+++ b/devel/popt/patches/patch-zz-minix-c
@@ -0,0 +1,57 @@
+--- configure.orig	Sun Oct  4 12:38:55 2015
++++ configure	Sun Oct  4 12:41:52 2015
+@@ -5826,7 +5826,7 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -6233,7 +6233,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++minix* | netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -9626,7 +9626,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -10215,7 +10215,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11193,6 +11193,18 @@
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++minix*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Minix ld.elf_so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
+   ;;
+ 
+ netbsd*)