Fix build on Linux. No change to NetBSD or SunOS, so no PKGREVISION bump.

5 files changed, 114 insertions, 5 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index ea703bdf102..e11b7d11e93 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2002/06/21 14:16:48 abs Exp $
+# $NetBSD: Makefile,v 1.61 2002/07/18 14:18:48 abs Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -34,11 +34,11 @@ pre-patch:
 	${RM} -fr ${WRKSRC}/imap
 
 do-configure:
-	${CP} -f ${WRKSRC}/pine/osdep/os-${BUILDNAME}.h ${WRKSRC}/pine/osdep/os-${BUILDNAME}.h.orig
+	${CP} -f ${WRKSRC}/pine/osdep/os-${BUILDFILE}.h ${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig
 	${SED} \
 		-e 's@/usr/local/lib/@${PREFIX}/etc/@' \
 		-e 's@DEFAULT_DEBUG.*2@DEFAULT_DEBUG 0@' \
-		<${WRKSRC}/pine/osdep/os-${BUILDNAME}.h.orig >${WRKSRC}/pine/osdep/os-${BUILDNAME}.h
+		<${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig >${WRKSRC}/pine/osdep/os-${BUILDFILE}.h
 	@${RM} -rf ${WRKSRC}/pico
 	@${LN} -sf ${LOCALBASE}/include/pico ${WRKSRC}/pico
 
@@ -77,8 +77,11 @@ do-install:
 .include "../../mk/bsd.pkg.mk"
 .if ${OPSYS} == "SunOS"
 BUILDNAME= gs5
+BUILDFILE= gs5
 .elif ${OPSYS} == "Linux"
-BUILDNAME= lrh  
+BUILDNAME= lrh
+BUILDFILE= lnx
 .else
 BUILDNAME= neb
+BUILDFILE= neb
 .endif
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 90189e56a1d..c4611c597d9 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.7 2002/01/13 21:52:33 hubertf Exp $
+$NetBSD: distinfo,v 1.8 2002/07/18 14:18:48 abs Exp $
 
 SHA1 (pine4.44.tar.gz) = 0657a5bd51cacc300260224320ee114c0b2b26e5
 Size (pine4.44.tar.gz) = 3478476 bytes
 SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
+SHA1 (patch-ab) = c177e0917522391ec75ceffd8518b9c7b816b734
 SHA1 (patch-ac) = 409cfbcbbbdfa9aff67d52eb7877569dd07c6e9f
+SHA1 (patch-ad) = daca835a9b82fe4041fbfe90b435382ef9a609ce
+SHA1 (patch-ae) = 370f46eb2c1868663d9c8c927c89b644d1118ca2
 SHA1 (patch-al) = 8d0c9ba6cab0794d592e6f0e9d188e062743c7ad
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab
new file mode 100644
index 00000000000..47df1d68d0e
--- /dev/null
+++ b/mail/pine/patches/patch-ab
@@ -0,0 +1,72 @@
+--- pine/makefile.lnx.orig	Tue Oct 23 23:24:48 2001
++++ pine/makefile.lnx	Mon Jul  8 16:02:59 2002
+@@ -47,9 +47,11 @@
+ MAKE=        make
+ OPTIMIZE=    # -O2
+ PROFILE=     # -pg
+-DEBUG=       -g -DDEBUG
++DEBUG=       -DDEBUG # -g
+ 
+-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
+@@ -60,14 +62,13 @@
+ LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
+ 	      mailview.o other.o pine.o strings.o takeaddr.o
+ 
+-STDLIBS=     -lncurses
+-LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
+-LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-             `cat $(CCLIENTDIR)/LDFLAGS`
++STDLIBS=     -lssl -lcrypto -lpam -lcurses
++LOCLIBS=     -lpico -lc-client
++LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
+ 
+ STDCFLAGS=   -DLNX -DSYSTYPE=\"LNX\" -DMOUSE
+ 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 \
+@@ -79,20 +80,20 @@
+ 	$(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
+@@ -112,8 +113,8 @@
+ 
+ $(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-ad b/mail/pine/patches/patch-ad
new file mode 100644
index 00000000000..fdbf431112c
--- /dev/null
+++ b/mail/pine/patches/patch-ad
@@ -0,0 +1,22 @@
+--- pine/signals.c.orig	Mon Jul  8 14:27:47 2002
++++ pine/signals.c	Mon Jul  8 14:28:13 2002
+@@ -108,7 +108,9 @@
+     if(CUSHION_SIG){
+ 	signal(SIGILL,  auger_in_signal); 
+ 	signal(SIGTRAP, auger_in_signal);
++#ifdef SIGEMT
+ 	signal(SIGEMT,  auger_in_signal);
++#endif
+ 	signal(SIGBUS,  auger_in_signal);
+ 	signal(SIGSEGV, auger_in_signal);
+ 	signal(SIGSYS,  auger_in_signal);
+@@ -196,7 +198,9 @@
+     }
+ 
+     signal(SIGTRAP, blockem ? SIG_IGN : SIG_DFL);
++#ifdef SIGEMT
+     signal(SIGEMT,  blockem ? SIG_IGN : SIG_DFL);
++#endif
+     signal(SIGBUS,  blockem ? SIG_IGN : SIG_DFL);
+     signal(SIGSEGV, blockem ? SIG_IGN : SIG_DFL);
+     signal(SIGSYS,  blockem ? SIG_IGN : SIG_DFL);
diff --git a/mail/pine/patches/patch-ae b/mail/pine/patches/patch-ae
new file mode 100644
index 00000000000..0dabdafb860
--- /dev/null
+++ b/mail/pine/patches/patch-ae
@@ -0,0 +1,9 @@
+--- pine/osdep/os-lnx.h.orig	Mon Jul  8 14:38:13 2002
++++ pine/osdep/os-lnx.h	Mon Jul  8 14:39:12 2002
+@@ -283,5 +283,6 @@
+ #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
+ #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
+ 
++#include <sys/time.h>		/* Needed by gettimeofday */
+ 
+ #endif /* _OS_INCLUDED */