Build on Darwin.

4 files changed, 90 insertions, 2 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index e11b7d11e93..1f123339b71 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2002/07/18 14:18:48 abs Exp $
+# $NetBSD: Makefile,v 1.62 2002/07/28 05:49:28 schmonz Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -81,6 +81,9 @@ BUILDFILE= gs5
 .elif ${OPSYS} == "Linux"
 BUILDNAME= lrh
 BUILDFILE= lnx
+.elif ${OPSYS} == "Darwin"
+BUILDNAME= osx
+BUILDFILE= osx
 .else
 BUILDNAME= neb
 BUILDFILE= neb
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index c4611c597d9..ab8911979be 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/07/18 14:18:48 abs Exp $
+$NetBSD: distinfo,v 1.9 2002/07/28 05:49:28 schmonz Exp $
 
 SHA1 (pine4.44.tar.gz) = 0657a5bd51cacc300260224320ee114c0b2b26e5
 Size (pine4.44.tar.gz) = 3478476 bytes
@@ -7,5 +7,7 @@ SHA1 (patch-ab) = c177e0917522391ec75ceffd8518b9c7b816b734
 SHA1 (patch-ac) = 409cfbcbbbdfa9aff67d52eb7877569dd07c6e9f
 SHA1 (patch-ad) = daca835a9b82fe4041fbfe90b435382ef9a609ce
 SHA1 (patch-ae) = 370f46eb2c1868663d9c8c927c89b644d1118ca2
+SHA1 (patch-af) = 7e359f5f91fb93b0544d72ee15d2300b22c0f4d2
+SHA1 (patch-ag) = 7823df3628374ab633ce3a99c6c2a3bd7255b13f
 SHA1 (patch-al) = 8d0c9ba6cab0794d592e6f0e9d188e062743c7ad
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
diff --git a/mail/pine/patches/patch-af b/mail/pine/patches/patch-af
new file mode 100644
index 00000000000..63d1a596cf2
--- /dev/null
+++ b/mail/pine/patches/patch-af
@@ -0,0 +1,72 @@
+$NetBSD: patch-af,v 1.7 2002/07/28 05:49:29 schmonz Exp $
+
+--- pine/makefile.osx.orig	Wed Oct 24 15:42:24 2001
++++ pine/makefile.osx
+@@ -50,7 +50,9 @@ OPTIMIZE=    # -O
+ PROFILE=     # -pg
+ DEBUG=       -g -DDEBUG
+ 
+-CCLIENTDIR=  ../c-client
++CCLIENTDIR=  ${PREFIX}
++CCLIENTINC=  ${CCLIENTDIR}/include/c-client
++CCLIENTLIB=  ${CCLIENTDIR}/lib
+ PICODIR=     ../pico
+ 
+ # Only need to uncomment next two lines if you run make from this directory
+@@ -61,15 +63,14 @@ PICODIR=     ../pico
+ LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
+ 	      mailview.o other.o pine.o strings.o takeaddr.o
+ 
+-STDLIBS=
+-LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
+-LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-             `cat $(CCLIENTDIR)/LDFLAGS`
++STDLIBS=     -lssl -lcrypto
++LOCLIBS=     -lpico -lc-client
++LIBS=        -L$(PREFIX)/lib $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
+ 
+ # Use BSDDEF instead of BSD because other systems use BSD internally.
+ STDCFLAGS=   -Dconst= -DSYSTYPE=\"OSX\"
+ CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
+-	     $(STDCFLAGS)
++	     $(STDCFLAGS) -I${CCLIENTINC}
+ 
+ OFILES=	addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
+ 	folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
+@@ -81,20 +82,20 @@ HFILES=	headers.h os.h pine.h context.h 
+ 	$(PICODIR)/headers.h $(PICODIR)/estruct.h \
+ 	$(PICODIR)/edef.h $(PICODIR)/efunc.h \
+ 	$(PICODIR)/pico.h $(PICODIR)/os.h \
+-	$(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
+-	$(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
++	$(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
++	$(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
+ 
+ all:	pine rpload rpdump
+ 
+-pine:  $(OFILES) $(LOCLIBS)
++pine:  $(OFILES)
+ 	echo "char datestamp[]="\"`date`\"";" > date.c
+ 	echo "char hoststamp[]="\"`hostname`\"";" >> date.c
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
+ 
+-rpload:	rpload.o $(CCLIENTDIR)/c-client.a
++rpload:	rpload.o $(CCLIENTLIB)/libc-client.a
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
+ 
+-rpdump:	rpdump.o $(CCLIENTDIR)/c-client.a
++rpdump:	rpdump.o $(CCLIENTLIB)/libc-client.a
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
+ 
+ pine-use:	pine-use.c
+@@ -114,8 +115,8 @@ os.c:	osdep/os-osx.c
+ 
+ $(OFILES):						$(HFILES)
+ addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
+-context.o:						$(CCLIENTDIR)/misc.h
+-send.o:							$(CCLIENTDIR)/smtp.h
++context.o:						$(CCLIENTINC)/misc.h
++send.o:							$(CCLIENTINC)/smtp.h
+ #$(LDAPOFILES):						$(LDAPLIBS)
+ 
+ helptext.c:	pine.hlp
diff --git a/mail/pine/patches/patch-ag b/mail/pine/patches/patch-ag
new file mode 100644
index 00000000000..a05837b7628
--- /dev/null
+++ b/mail/pine/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.5 2002/07/28 05:49:29 schmonz Exp $
+
+--- pine/osdep/os-osx.h.orig	Tue Feb  6 19:53:14 2001
++++ pine/osdep/os-osx.h
+@@ -298,5 +298,6 @@ void free();
+ #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
+ #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
+ 
++#include <sys/unistd.h>         /* needed for F_OK and friends              */
+ 
+ #endif /* _OS_INCLUDED */