* Fix build on Solaris

* Patches are regen

6 files changed, 49 insertions, 15 deletions

diff --git a/www/lhs/Makefile b/www/lhs/Makefile
index dea1cc911f4..4eab43fcba8 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/28 06:30:19 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/12/26 17:12:57 ryoon Exp $
 #
 
 DISTNAME=	lhs-0.1
@@ -18,6 +18,8 @@ BUILD_DEFS+=	IPV6_READY
 MAKE_ENV+=	OPENSSL_ROOT=${BUILDLINK_PREFIX.openssl}
 MAKE_ENV+=	DEFAULT_ROOT_DIR=${PREFIX}/share/httpd/htdocs
 
+LIBS+=		-lsocket
+
 INSTALLATION_DIRS=	sbin
 
 do-install:
diff --git a/www/lhs/distinfo b/www/lhs/distinfo
index ad244e83992..deb1d8c2ba6 100644
--- a/www/lhs/distinfo
+++ b/www/lhs/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:08:33 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/12/26 17:12:57 ryoon Exp $
 
 SHA1 (lhs-0.1.tar.gz) = 74fbb0a982cd00c668c9f07b7c3c583759f14fd6
 RMD160 (lhs-0.1.tar.gz) = 176d8149d11383fc4d82e4a13991f156f3ab42ca
 Size (lhs-0.1.tar.gz) = 10665 bytes
-SHA1 (patch-aa) = 02c2bdd8e28c2e209ba60fe85065519b128c1eb4
-SHA1 (patch-ab) = 23fef016758618b8b6fdda949c7094aa8256c4fd
-SHA1 (patch-ac) = 14b197556274187aefda11c67dd800d5dd58537b
+SHA1 (patch-aa) = 682df4329c32b01438221ba78055761468ede8fa
+SHA1 (patch-ab) = 83591e01fc71e4d487b5a4b5d598a60f83d22fa9
+SHA1 (patch-ac) = 66e697aa31f17519c700bd7ba857c1faefe7dda6
+SHA1 (patch-configure) = 87b38dd13938dc9756530d34497502924ccff121
diff --git a/www/lhs/patches/patch-aa b/www/lhs/patches/patch-aa
index b6e430b0de1..caf86d15fec 100644
--- a/www/lhs/patches/patch-aa
+++ b/www/lhs/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $
+$NetBSD: patch-aa,v 1.2 2012/12/26 17:12:57 ryoon Exp $
 
---- Makefile.in.orig	Sun Feb 25 14:42:39 2001
-+++ Makefile.in	Tue Jun 18 12:58:26 2002
+--- Makefile.in.orig	2001-02-25 14:42:39.000000000 +0000
++++ Makefile.in
 @@ -1,7 +1,7 @@
 -CC = gcc -O2 -Wall
 -LIBS = #LIBS#
diff --git a/www/lhs/patches/patch-ab b/www/lhs/patches/patch-ab
index 92f03b1f093..d0633225706 100644
--- a/www/lhs/patches/patch-ab
+++ b/www/lhs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $
+$NetBSD: patch-ab,v 1.2 2012/12/26 17:12:57 ryoon Exp $
 
---- lhs.h	2002/06/18 11:49:31	1.1
-+++ lhs.h	2002/06/18 11:50:29
+--- lhs.h.orig	2001-02-25 14:48:00.000000000 +0000
++++ lhs.h
 @@ -7,7 +7,10 @@
  
  #define VERSION "lhs/0.1"
diff --git a/www/lhs/patches/patch-ac b/www/lhs/patches/patch-ac
index 5a89d7c8f03..bc6d63f5d55 100644
--- a/www/lhs/patches/patch-ac
+++ b/www/lhs/patches/patch-ac
@@ -1,8 +1,20 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $
+$NetBSD: patch-ac,v 1.2 2012/12/26 17:12:57 ryoon Exp $
 
---- lhs.c	2002/06/18 11:54:40	1.1
-+++ lhs.c	2002/06/18 11:54:05
-@@ -592,7 +592,7 @@
+* Include sys/filio.h for FIONBIO etc.
+
+--- lhs.c.orig	2001-02-27 17:37:10.000000000 +0000
++++ lhs.c
+@@ -25,6 +25,9 @@
+ #include <openssl/err.h>
+ #endif
+ #include "lhs.h"
++#if defined (__sun)
++#include <sys/filio.h>
++#endif
+ 
+ #define debug(x...) { if (verbose) printf(x); }
+ 
+@@ -592,7 +595,7 @@ void usage(char *a0)
  "  -s version   set SSL protocol version (default: SSLv2)\n"
  "  -c filename  load certificate file (default: lhs.pem)\n"
  #endif
diff --git a/www/lhs/patches/patch-configure b/www/lhs/patches/patch-configure
new file mode 100644
index 00000000000..78ada54092c
--- /dev/null
+++ b/www/lhs/patches/patch-configure
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2012/12/26 17:12:57 ryoon Exp $
+
+* Catch LIBS from pkgsrc Makefile
+
+--- configure.orig	2001-02-25 14:24:03.000000000 +0000
++++ configure
+@@ -1,5 +1,4 @@
+ #!/bin/sh
+-LIBS=
+ rm -f Makefile config.h
+ if [ -f /usr/include/netinet/ip6.h ]; then
+   echo "#define USE_IPV6" >> config.h
+@@ -10,4 +9,4 @@ if [ -f /usr/include/openssl/ssl.h ]; th
+   echo "openssl includes found."
+   LIBS="$LIBS -lssl -lcrypto"
+ fi
+-sed "s/#LIBS#/$LIBS/g" < Makefile.in > Makefile
+\ No newline at end of file
++sed "s/#LIBS#/$LIBS/g" < Makefile.in > Makefile