>Number:         22892
>Category:       pkg
>Synopsis:       Various portability fixes to net/archie
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 22 15:12:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        N/A
>Organization:
British Broadcasting Corporation
>Environment:
SunOS build1 5.9 Generic_112233-01 sun4u sparc SUNW,UltraSPARC-IIi-cEngine
>Description:
Compiler/install fixes to get net/archie building + installing on SunOS.

Tested on SunOS-5.9/sparc and NetBSD-1.6ZC/sparc64.
>How-To-Repeat:
===> Building for archie-1.4.1
cc -O -I.  -DARCHIE_HOST=\"archie.rutgers.edu\"   -c aquery.c
"./pfs.h", line 216: syntax error before or at: restrict
"./pfs.h", line 216: warning: no explicit type given
"./pfs.h", line 216: Non-pointer types cannot be restrict qualified
"./pfs.h", line 216: cannot recover from previous errors
cc: acomp failed for aquery.c
*** Error code 2

etc...
>Fix:
http://www.perkin.org.uk/projects/netbsd/archie.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/archie/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	2003/07/17 22:50:59	1.10
+++ Makefile	2003/09/22 15:08:39
@@ -13,4 +13,12 @@
 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"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/archie/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/04/21 11:23:09	1.2
+++ distinfo	2003/09/22 15:08:39
@@ -2,5 +2,5 @@
 
 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
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/archie/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	1999/07/08 00:38:25	1.3
+++ patches/patch-aa	2003/09/22 15:08:39
@@ -1,16 +1,8 @@
 $NetBSD: patch-aa,v 1.3 1999/07/08 00:38:25 tron 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 @@
  #
  #	* 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 @@
  
  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)
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: