Fix BUILDNAME/BUILDFILE for Solaris, and fix makefile.so5 for pkgsrc.

3 files changed, 79 insertions, 4 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 802926a8e69..d42137d9478 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2002/10/08 23:34:13 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2002/10/27 18:04:05 bouyer Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -79,8 +79,8 @@ do-install:
 .include "../../mk/bsd.pkg.mk"
 
 .if ${OPSYS} == "SunOS"
-BUILDNAME= gs5
-BUILDFILE= gs5
+BUILDNAME= so5
+BUILDFILE= sol
 .elif ${OPSYS} == "Linux"
 BUILDNAME= lrh
 BUILDFILE= lnx
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index ab8911979be..35797f1b92e 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/07/28 05:49:28 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2002/10/27 18:04:05 bouyer Exp $
 
 SHA1 (pine4.44.tar.gz) = 0657a5bd51cacc300260224320ee114c0b2b26e5
 Size (pine4.44.tar.gz) = 3478476 bytes
@@ -11,3 +11,4 @@ SHA1 (patch-af) = 7e359f5f91fb93b0544d72ee15d2300b22c0f4d2
 SHA1 (patch-ag) = 7823df3628374ab633ce3a99c6c2a3bd7255b13f
 SHA1 (patch-al) = 8d0c9ba6cab0794d592e6f0e9d188e062743c7ad
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
+SHA1 (patch-ap) = c6e45964ad8415d78e819af83b38add6055179c6
diff --git a/mail/pine/patches/patch-ap b/mail/pine/patches/patch-ap
new file mode 100644
index 00000000000..2cbc505f005
--- /dev/null
+++ b/mail/pine/patches/patch-ap
@@ -0,0 +1,74 @@
+$NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer Exp $
+
+--- pine/makefile.so5.orig	Wed Oct 24 00:24:51 2001
++++ pine/makefile.so5	Sat Oct 12 22:21:52 2002
+@@ -49,9 +49,11 @@
+ MAKE=        make
+ OPTIMIZE=    # -O
+ 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
+@@ -69,14 +71,13 @@
+ # leaving out the UCB compatibility includes and libraries.
+ LDCC= $(PICODIR)/cc5.sol
+ 
+-STDLIBS=     -ltermlib
+-LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
+-LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-             `cat $(CCLIENTDIR)/LDFLAGS`
++STDLIBS=     -lssl -lcrypto -lpam -ltermlib
++LOCLIBS=     -lpico -lc-client
++LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
+ 
+ STDCFLAGS=   -Dconst= -DSV4 -DSYSTYPE=\"SOL\" -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 \
+@@ -88,20 +89,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
+ 	$(LDCC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
+ 
+-rpload:	rpload.o $(CCLIENTDIR)/c-client.a
++rpload:	rpload.o $(CCLIENTDIR)/libc-client.a
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
+ 
+-rpdump:	rpdump.o $(CCLIENTDIR)/c-client.a
++rpdump:	rpdump.o $(CCLIENTDIR)/libc-client.a
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
+ 
+ pine-use:	pine-use.c
+@@ -121,8 +122,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