SunOS needs -lsocket -lnsl.

9 files changed, 32 insertions, 20 deletions

diff --git a/misc/wdic/Makefile b/misc/wdic/Makefile
index 7bb43fb1241..0cded0693c2 100644
--- a/misc/wdic/Makefile
+++ b/misc/wdic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/08 09:57:40 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/09/23 14:53:03 jperkin Exp $
 #
 
 DISTNAME=		wdic_wob_v3.0
@@ -14,6 +14,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}
 
+LDFLAGS.SunOS+=		-lsocket -lnsl
+
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/misc/wdic/distinfo b/misc/wdic/distinfo
index 223b557fa2e..2d71be330b9 100644
--- a/misc/wdic/distinfo
+++ b/misc/wdic/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/01/03 16:46:07 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/09/23 14:53:03 jperkin Exp $
 
 SHA1 (wdic_wob_v3.0.tar.gz) = 63621be8f7fa12b24d6f318e7bb8fcbac82d38da
 RMD160 (wdic_wob_v3.0.tar.gz) = aba08a48dda7cf08902fe7e4820731d0caf406db
 Size (wdic_wob_v3.0.tar.gz) = 2885 bytes
-SHA1 (patch-aa) = 08f66e30af85a117673e7076a8e1cebc2048f489
+SHA1 (patch-aa) = ae02cde47a0004219557eabdd197daf3940f53cd
 SHA1 (patch-ab) = 14e26a1cbd1e9ceac68546f252e8493f48421142
diff --git a/misc/wdic/patches/patch-aa b/misc/wdic/patches/patch-aa
index addca2f28e9..dc01afad5bf 100644
--- a/misc/wdic/patches/patch-aa
+++ b/misc/wdic/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/07 14:48:09 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2014/09/23 14:53:03 jperkin Exp $
 
---- Makefile.orig	2005-03-07 19:36:49.000000000 +0900
+--- Makefile.orig	2005-01-03 12:19:09.000000000 +0000
 +++ Makefile
 @@ -1,5 +1,5 @@
  all:
 -	gcc -o wdic -ggdb wdic_wob_v3.0.c
-+	${CC} -o wdic ${CFLAGS} wdic_wob_v3.0.c
++	${CC} -o wdic ${CFLAGS} wdic_wob_v3.0.c ${LDFLAGS}
  
  clean:
  	rm -f *.o wdic
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index 23ce2e94372..38f9aab8f02 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/23 17:18:12 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/09/23 14:50:03 jperkin Exp $
 #
 
 DISTNAME=		bounce-0.0
@@ -16,6 +16,8 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
 BUILD_TARGET=		bounce
 
+LDFLAGS.SunOS+=		-lsocket -lnsl
+
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 do-install:
diff --git a/net/bounce/distinfo b/net/bounce/distinfo
index eab3269d9b9..24feeecd737 100644
--- a/net/bounce/distinfo
+++ b/net/bounce/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/12/18 21:45:29 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/09/23 14:50:03 jperkin Exp $
 
 SHA1 (bounce-0.0.tar.gz) = 3b0a7306ba80b29f70131e914f344ce67b4691e4
 RMD160 (bounce-0.0.tar.gz) = 6d3151fdafa5751cf7c1be16d149af8fce1d148c
 Size (bounce-0.0.tar.gz) = 3439 bytes
 SHA1 (patch-aa) = 89469c2b8608796006a817dcbb5e5b3bf21007ef
-SHA1 (patch-ab) = 880ee39f5b4d57775bd2beaf9644d047328e6db7
+SHA1 (patch-ab) = 199f3c84c5389a97b4e18f81d1c771717a0ffdd2
diff --git a/net/bounce/patches/patch-ab b/net/bounce/patches/patch-ab
index 25fca93768d..b1936076e03 100644
--- a/net/bounce/patches/patch-ab
+++ b/net/bounce/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2005/08/27 20:27:32 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2014/09/23 14:50:03 jperkin Exp $
 
---- Makefile.in.orig	2000-02-18 13:56:52.000000000 -0800
+--- Makefile.in.orig	2000-02-18 21:56:52.000000000 +0000
 +++ Makefile.in
-@@ -1,4 +1,3 @@
+@@ -1,7 +1,6 @@
 -CFLAGS = -Wall -Werror -ansi
  PREFIX = /usr/local
  bounce: bounce.o
- 	gcc -o bounce bounce.o
+-	gcc -o bounce bounce.o
++	${CC} -o bounce bounce.o ${LDFLAGS}
+ install:	bounce bounce.1
+ 		mkdir -p ${PREFIX}/bin
+ 		mkdir -p ${PREFIX}/man/man1
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index e490811537e..444f3d2bfef 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/23 17:18:17 asau Exp $
+# $NetBSD: Makefile,v 1.23 2014/09/23 14:59:24 jperkin Exp $
 #
 
 DISTNAME=	dhid-5.2
@@ -12,6 +12,8 @@ COMMENT=	Dynamic Host Information System client daemon
 
 RCD_SCRIPTS=	dhid
 
+LDFLAGS.SunOS+=	-lsocket -lnsl
+
 INSTALLATION_DIRS=	sbin share/doc/dhid
 
 do-install:
diff --git a/net/dhid/distinfo b/net/dhid/distinfo
index 3932602f0a2..75af9462892 100644
--- a/net/dhid/distinfo
+++ b/net/dhid/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.6 2014/09/23 14:59:24 jperkin Exp $
 
 SHA1 (dhid-5.2.tar.gz) = 92252834c1d84d19470b438fec53894abfd245e5
 RMD160 (dhid-5.2.tar.gz) = 04cfb6a779ca761957f9a945ea876f31fa011326
 Size (dhid-5.2.tar.gz) = 16485 bytes
-SHA1 (patch-aa) = eb5d1a06790fd99c26fab30e006350c13659d0b7
+SHA1 (patch-aa) = 6e6268ecbbcd432e612c3c84f3872eda100d7f38
 SHA1 (patch-ab) = 096401626fdc628f126749933fe27d9e67c25595
diff --git a/net/dhid/patches/patch-aa b/net/dhid/patches/patch-aa
index 15051561112..e393cbb7b81 100644
--- a/net/dhid/patches/patch-aa
+++ b/net/dhid/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2003/07/03 00:08:54 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2014/09/23 14:59:24 jperkin Exp $
 
---- Makefile.orig	Wed Sep 12 12:12:02 2001
+--- Makefile.orig	2001-09-12 10:12:02.000000000 +0000
 +++ Makefile
-@@ -29,8 +29,8 @@
+@@ -29,9 +29,9 @@ CC=cc
  
  # Add -lnsl and -lsocket to LIBS in SysV systems 
  #
 -CFLAGS=-I/usr/local/include -DQRC=1 -Wall 
 -LFLAGS=-L/usr/local/lib
+-LIBS=-lgmp
 +CFLAGS=-I${LOCALBASE}/include -DQRC=1  -DLOCALBASE=\"${LOCALBASE}\"
 +LFLAGS=-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
- LIBS=-lgmp
++LIBS=-lgmp ${LDFLAGS}
  
  # Use these and comment the above if you wish to compile dhid without 
+ # secure public key authentication or don't have the GMP library