From 4fc2baab496f40d42fec59084806dcbbda902003 Mon Sep 17 00:00:00 2001
From: wiedi <wiedi>
Date: Mon, 27 Jan 2014 21:51:03 +0000
Subject: Add missing -lsocket -lnsl on SunOS

---
 mbone/wbd/Makefile         |  4 +++-
 mbone/wbd/distinfo         |  4 ++--
 mbone/wbd/patches/patch-aa | 10 +++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'mbone/wbd')

diff --git a/mbone/wbd/Makefile b/mbone/wbd/Makefile
index 85fe45c8a23..20b5709375c 100644
--- a/mbone/wbd/Makefile
+++ b/mbone/wbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/01/11 14:42:04 adam Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/27 21:51:03 wiedi Exp $
 #
 
 DISTNAME=		wbd-1.0ucl4
@@ -18,6 +18,8 @@ NO_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin
 
+LDFLAGS.SunOS+=		-lsocket -lnsl
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wbd ${DESTDIR}${PREFIX}/bin/wbd
 
diff --git a/mbone/wbd/distinfo b/mbone/wbd/distinfo
index ad8a3bfa477..f135de52fb6 100644
--- a/mbone/wbd/distinfo
+++ b/mbone/wbd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2013/01/15 15:22:54 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/01/27 21:51:03 wiedi Exp $
 
 SHA1 (wbd-1.0ucl4.tar.gz) = 09a399ed435372d7a62fd1c98c6a06aca15cb4e3
 RMD160 (wbd-1.0ucl4.tar.gz) = ae094420243f35edc664b1be5c496e4f504e277e
 Size (wbd-1.0ucl4.tar.gz) = 53591 bytes
-SHA1 (patch-aa) = d66e9a3c0999b723c42e1177968b27bc686317d7
+SHA1 (patch-aa) = e11dd29dfd663b97211d04b1c204041279d64d60
 SHA1 (patch-ab) = 70c932caacddb93aacbf245ea8aab3ed685fed8c
 SHA1 (patch-ac) = 8e72488495f29bc42d9572901d1d766025b11c9e
 SHA1 (patch-comms.c) = e8efcb792cfe245fa3c367ed8a9868544832c0c2
diff --git a/mbone/wbd/patches/patch-aa b/mbone/wbd/patches/patch-aa
index 37ed98c6b59..5a07a5811e8 100644
--- a/mbone/wbd/patches/patch-aa
+++ b/mbone/wbd/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2012/08/21 21:51:07 marino Exp $
+$NetBSD: patch-aa,v 1.4 2014/01/27 21:51:03 wiedi Exp $
 
 Patch hardcoded with libtcl85.  Previously it was hardcoded to libtcl84.
 
 --- makefile.orig	1998-01-29 11:46:41.000000000 +0000
-+++ makefile	2005-12-22 16:43:59.000000000 +0000
-@@ -3,12 +3,13 @@
++++ makefile
+@@ -3,12 +3,13 @@ LEX = flex -I -i
  
  YFLAGS		= -dv
  CFLAGS		= -g $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE
@@ -12,7 +12,7 @@ Patch hardcoded with libtcl85.  Previously it was hardcoded to libtcl84.
 -INCDIR		= /cs/research/mice/starship/common/solaris/include
 +LIBDIR		= ${PREFIX}/lib
 +INCDIR		= ${PREFIIX}/include
-+LIBS            = -ll -ltk85 -ltcl85 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++LIBS            = -ll -ltk85 -ltcl85 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $(LDFLAGS)
  
  # The files needed from the tcl/tk library directories...
 -LIBRARY_TK	= $(LIBDIR)/tk4.2
@@ -22,7 +22,7 @@ Patch hardcoded with libtcl85.  Previously it was hardcoded to libtcl84.
  
  
  # Uncomment these lines for SGI (IRIX 5.3).
-@@ -32,10 +33,10 @@
+@@ -32,10 +33,10 @@ LIBRARY_TCL	= $(LIBDIR)/tcl7.6
  #LIBS		= -ll -ltk4.2 -ltcl7.6 -lm -lX11
  
  # Uncomment these lines for Sun (SunOS 5.5.1).
-- 
cgit v1.2.3