Fix build on Solaris. From Jonathan Perkin in PR 22892.

3 files changed, 22 insertions, 22 deletions

diff --git a/net/archie/Makefile b/net/archie/Makefile
index 52b87bfb9a7..7aea2fcad07 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:50:59 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/22 16:24:27 wiz Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/07/21 00:04:13 fenner Exp
 #
 
@@ -13,4 +13,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.bunyip.com/products/archie/
 COMMENT=	Prospero client for the archie service
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS:M*BSD}
+LDFLAGS+=	-lcompat
+.elif ${OPSYS} == "SunOS"
+LDFLAGS+=	-lsocket -lnsl
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/archie/distinfo b/net/archie/distinfo
index f5b0e599419..da73aba4d17 100644
--- a/net/archie/distinfo
+++ b/net/archie/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/09/22 16:24:27 wiz Exp $
 
 SHA1 (c-archie-1.4.1-FIXED.tar.Z) = 9ed8a0f6b7faf561128224bcebc554b50a811dcc
 Size (c-archie-1.4.1-FIXED.tar.Z) = 166623 bytes
-SHA1 (patch-aa) = e32fedd0535ea5409ee70430cc0ff12c79a766b9
+SHA1 (patch-aa) = 1f92eaf7ec418f67a21bfacc1472d4f139226576
 SHA1 (patch-ab) = 95b273f6d92d98218dbedef49377923820122ecf
diff --git a/net/archie/patches/patch-aa b/net/archie/patches/patch-aa
index c8a3c7655c1..8209785b1ef 100644
--- a/net/archie/patches/patch-aa
+++ b/net/archie/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/07/08 00:38:25 tron Exp $
+$NetBSD: patch-aa,v 1.4 2003/09/22 16:24:28 wiz Exp $
 
---- Makefile.orig	Tue Oct 27 00:11:04 1992
-+++ Makefile	Thu Jul  8 02:35:35 1999
-@@ -2,14 +2,14 @@
- # Makefile for the minimal build for an archie Prospero client.
- #
- # Your C compiler:
--#CC=cc
-+CC=cc
- 
- # For most systems, these OPTIONS will suffice.  Exceptions:
- #
+--- Makefile.orig	1992-10-26 23:11:04.000000000 +0000
++++ Makefile	2003-09-22 16:05:37.399992470 +0100
+@@ -9,7 +9,7 @@
  #	* If you're on a Stardent, add  -43
  #	* If you're running EP/IX, you may need to add  -systype bsd43
  #	  but try it without it first.
@@ -41,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 1999/07/08 00:38:25 tron Exp $
  #
  #	* If you need the PW library (e.g. A/UX), add -lPW
 -LDFLAGS=
-+LDFLAGS= -lcompat
++#LDFLAGS=
  # If you're using ISC, use:
  #LDFLAGS= -linet
  # If you're using Wallongong TCP/IP on an AT&T box, use:
@@ -54,14 +46,14 @@ $NetBSD: patch-aa,v 1.3 1999/07/08 00:38:25 tron Exp $
  
  VERSION=1.4.1
  VMS_VERSION=`echo $(VERSION) | sed -e 's,\\.,_,g'`
-@@ -84,6 +84,10 @@
- 	vlalloc.o vl_comp.o
+@@ -85,6 +85,10 @@
  
  all: archie
-+
-+install:
-+	install -c -s archie  ${PREFIX}/bin/archie
-+	install -c archie.man ${PREFIX}/man/man1/archie.1
  
++install:
++	${BSD_INSTALL_PROGRAM} archie  ${PREFIX}/bin/archie
++	${BSD_INSTALL_MAN} archie.man ${PREFIX}/man/man1/archie.1
++
  archie: $(OBJS)
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+