FreeBSD 10 is not FreeBSD 1.

8 files changed, 129 insertions, 6 deletions

diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index b945aa4b7c8..34ef19a0376 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2012/01/23 20:19:00 sbd Exp $
+$NetBSD: distinfo,v 1.18 2014/06/30 17:45:32 asau Exp $
 
 SHA1 (libggi-2.2.2.src.tar.bz2) = aa439b21fb040b5b52ae18099a0c3cb02e50110f
 RMD160 (libggi-2.2.2.src.tar.bz2) = e76d22f06231e0aa1f752e33951802f243b7f0aa
 Size (libggi-2.2.2.src.tar.bz2) = 1071939 bytes
-SHA1 (patch-aa) = e09aa0c5e6f2a09ba08b94ea37154f5f25f67006
+SHA1 (patch-aa) = 6c95eaf290d0b2f12f8f026dc3138d74acade317
 SHA1 (patch-ab) = 5ab8c53bf89a1527a0e01311d48b93af61d54a1b
 SHA1 (patch-ad) = 0764cbec555ea68fa55952be8b21fc8508fe97f5
 SHA1 (patch-display_fbdev_Makefile.in) = 88b3965f2ae2637b22e1e1b7f1b441de3c2b36da
diff --git a/graphics/libggi/patches/patch-aa b/graphics/libggi/patches/patch-aa
index 500f51f99ac..c522e2f72f3 100644
--- a/graphics/libggi/patches/patch-aa
+++ b/graphics/libggi/patches/patch-aa
@@ -1,7 +1,34 @@
-$NetBSD: patch-aa,v 1.8 2010/01/30 15:19:26 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2014/06/30 17:45:32 asau Exp $
 
 --- configure.orig	2007-01-26 20:28:56.000000000 +0000
 +++ configure
+@@ -7528,7 +7528,7 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -8372,7 +8372,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -8395,7 +8395,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123]|freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
 @@ -22245,7 +22245,7 @@ _ACEOF
  
  
diff --git a/graphics/libggigcp/distinfo b/graphics/libggigcp/distinfo
index 67e81d6226e..03c7f7c1acf 100644
--- a/graphics/libggigcp/distinfo
+++ b/graphics/libggigcp/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/01/30 15:33:25 tnn Exp $
+$NetBSD: distinfo,v 1.7 2014/06/30 17:45:40 asau Exp $
 
 SHA1 (libggigcp-1.0.2.src.tar.bz2) = 4e36a901d1f740cce04939cbdeb7c6272abfa1f8
 RMD160 (libggigcp-1.0.2.src.tar.bz2) = d7bdc789afcd78ee73660cc07f670c1a217fa1ab
 Size (libggigcp-1.0.2.src.tar.bz2) = 365368 bytes
 SHA1 (patch-aa) = bc17d429b4a956b0bd92c9beb8ae5b453e19ad36
+SHA1 (patch-configure) = 8f73750612a1ab6d1ada50e35cae68205c94d553
diff --git a/graphics/libggigcp/patches/patch-configure b/graphics/libggigcp/patches/patch-configure
new file mode 100644
index 00000000000..6b4d2c39517
--- /dev/null
+++ b/graphics/libggigcp/patches/patch-configure
@@ -0,0 +1,31 @@
+$NetBSD: patch-configure,v 1.1 2014/06/30 17:45:40 asau Exp $
+
+--- configure.orig	2014-06-30 09:44:33.000000000 +0000
++++ configure
+@@ -7349,7 +7349,7 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -8193,7 +8193,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -8216,7 +8216,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123]|freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
diff --git a/graphics/libggimisc/distinfo b/graphics/libggimisc/distinfo
index 777ccd033a9..99a2f133034 100644
--- a/graphics/libggimisc/distinfo
+++ b/graphics/libggimisc/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/01/30 15:29:44 tnn Exp $
+$NetBSD: distinfo,v 1.5 2014/06/30 17:45:48 asau Exp $
 
 SHA1 (libggimisc-2.2.2.src.tar.bz2) = 2c93b1a219c10ddf318d658ab73ac02de515ee80
 RMD160 (libggimisc-2.2.2.src.tar.bz2) = db433d5dc74cae1674bdb5e88b443523db6bffe2
 Size (libggimisc-2.2.2.src.tar.bz2) = 320084 bytes
 SHA1 (patch-aa) = 63c855311941d688a9c3db8d5b219833fcfad7db
+SHA1 (patch-configure) = f2f600e91a35a00a02b3c2ae4c124ad81fbe0519
diff --git a/graphics/libggimisc/patches/patch-configure b/graphics/libggimisc/patches/patch-configure
new file mode 100644
index 00000000000..8cde7193455
--- /dev/null
+++ b/graphics/libggimisc/patches/patch-configure
@@ -0,0 +1,31 @@
+$NetBSD: patch-configure,v 1.1 2014/06/30 17:45:48 asau Exp $
+
+--- configure.orig	2014-06-30 09:52:02.000000000 +0000
++++ configure
+@@ -7367,7 +7367,7 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -8211,7 +8211,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -8234,7 +8234,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123]|freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
diff --git a/graphics/libggiwmh/distinfo b/graphics/libggiwmh/distinfo
index e455968f938..492d4e77c4a 100644
--- a/graphics/libggiwmh/distinfo
+++ b/graphics/libggiwmh/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/01/30 15:36:36 tnn Exp $
+$NetBSD: distinfo,v 1.7 2014/06/30 17:45:55 asau Exp $
 
 SHA1 (libggiwmh-0.3.2.src.tar.bz2) = 7b334358f375943f511a3208347f05e268545192
 RMD160 (libggiwmh-0.3.2.src.tar.bz2) = b3bddfaac1e4375ff75e0ee5e7ac6cd19a7ee49c
 Size (libggiwmh-0.3.2.src.tar.bz2) = 316669 bytes
 SHA1 (patch-aa) = 2d94dca32b26b55042a12abb2a0d47da1a88908c
+SHA1 (patch-configure) = 2fe7d25d50ca0300bbdb1aeeed5fb0f68eb9a814
diff --git a/graphics/libggiwmh/patches/patch-configure b/graphics/libggiwmh/patches/patch-configure
new file mode 100644
index 00000000000..9313a1d1441
--- /dev/null
+++ b/graphics/libggiwmh/patches/patch-configure
@@ -0,0 +1,31 @@
+$NetBSD: patch-configure,v 1.1 2014/06/30 17:45:55 asau Exp $
+
+--- configure.orig	2014-06-30 10:02:55.000000000 +0000
++++ configure
+@@ -7362,7 +7362,7 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -8206,7 +8206,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -8229,7 +8229,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123]|freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi