Stop treating FreeBSD 10 like FreeBSD 1.

3 files changed, 101 insertions, 1 deletions

diff --git a/graphics/djview4/distinfo b/graphics/djview4/distinfo
index f12f18ca189..44763689bdc 100644
--- a/graphics/djview4/distinfo
+++ b/graphics/djview4/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2012/02/16 04:44:25 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2014/04/04 18:25:51 asau Exp $
 
 SHA1 (djview-4.8.tar.gz) = 266d207afb63a1ee63eed054190bf88888fda572
 RMD160 (djview-4.8.tar.gz) = a1ae72440d13c6da57325571cf304882de3825b7
 Size (djview-4.8.tar.gz) = 883481 bytes
 SHA1 (patch-aa) = 0362d5c89e1e9facd2cc1a0bc48b63ce94848508
 SHA1 (patch-ab) = 35c8954f49e087669495d1defae9ad2e819aaeab
+SHA1 (patch-config_libtool.m4) = 1aa8f470e2b9ee8df9d847036e524f6a9e8002d6
+SHA1 (patch-configure) = 9f4df4c2e4e2ebfbc1f4ddff1c93f390052ee266
 SHA1 (patch-src_qdjvuwidget.cpp) = c8666e41f5ae9a8ccc9118e18b0bae7b15f54674
diff --git a/graphics/djview4/patches/patch-config_libtool.m4 b/graphics/djview4/patches/patch-config_libtool.m4
new file mode 100644
index 00000000000..e243d895b9f
--- /dev/null
+++ b/graphics/djview4/patches/patch-config_libtool.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-config_libtool.m4,v 1.1 2014/04/04 18:25:51 asau Exp $
+
+--- config/libtool.m4.orig	2011-08-17 14:24:20.000000000 +0000
++++ config/libtool.m4
+@@ -2286,7 +2286,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -2297,7 +2297,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
+@@ -4723,7 +4723,7 @@ _LT_EOF
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+@@ -5685,7 +5685,7 @@ if test "$_lt_caught_CXX_error" != yes; 
+         esac
+         ;;
+ 
+-      freebsd[[12]]*)
++      freebsd[[12]]|freebsd[[12]].*)
+         # C++ shared libraries reported to be fairly broken before
+ 	# switch to ELF
+         _LT_TAGVAR(ld_shlibs, $1)=no
diff --git a/graphics/djview4/patches/patch-configure b/graphics/djview4/patches/patch-configure
new file mode 100644
index 00000000000..d7c2fd44533
--- /dev/null
+++ b/graphics/djview4/patches/patch-configure
@@ -0,0 +1,58 @@
+$NetBSD: patch-configure,v 1.1 2014/04/04 18:25:51 asau Exp $
+
+--- configure.orig	2014-04-03 17:59:03.942029000 +0000
++++ configure
+@@ -9242,7 +9242,7 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -10117,7 +10117,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -10128,7 +10128,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
+@@ -11824,7 +11824,7 @@ if test -z "$aix_libpath"; then aix_libp
+         esac
+         ;;
+ 
+-      freebsd[12]*)
++      freebsd[12]|freebsd[12].*)
+         # C++ shared libraries reported to be fairly broken before
+ 	# switch to ELF
+         ld_shlibs_CXX=no
+@@ -13585,7 +13585,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -13596,7 +13596,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