Make it compile on solaris.

3 files changed, 55 insertions, 3 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 12d85727fdb..c72b15ae5f3 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 1999/11/22 08:57:24 tron Exp $
+# $NetBSD: Makefile,v 1.33 2000/01/04 16:58:50 bouyer Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -22,7 +22,7 @@ do-configure:
 	@${LN} -sf ${LOCALBASE}/include/pico ${WRKSRC}/pico
 
 do-build:
-	cd ${WRKSRC} && ./build neb PREFIX=${PREFIX}
+	cd ${WRKSRC} && ./build ${BUILDNAME} PREFIX=${PREFIX}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
@@ -45,3 +45,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine/
 
 .include "../../mk/bsd.pkg.mk"
+.if ${OPSYS} == "SunOS"
+BUILDNAME= gs5
+.else
+BUILDNAME= neb
+.endif
diff --git a/mail/pine/files/patch-sum b/mail/pine/files/patch-sum
index 8dcd9ffa1ec..884f7e28729 100644
--- a/mail/pine/files/patch-sum
+++ b/mail/pine/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/11/11 17:40:18 tv Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/04 16:58:50 bouyer Exp $
 
+MD5 (patch-aa) = cde5388cc742d06c2cbb3c418c03121d
 MD5 (patch-ab) = aee9be029c8880cb76b34b3203d53045
 MD5 (patch-ac) = 684eb92939714a82184a0ac695a69858
 MD5 (patch-af) = 250a49244b2c1c7cf8a44cc1aa2e5dae
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
new file mode 100644
index 00000000000..7226679d7ac
--- /dev/null
+++ b/mail/pine/patches/patch-aa
@@ -0,0 +1,46 @@
+$NetBSD: patch-aa,v 1.8 2000/01/04 16:58:50 bouyer Exp $
+
+--- pine/makefile.gs5.old	Thu Aug 27 18:49:57 1998
++++ pine/makefile.gs5	Thu Dec  2 19:03:32 1999
+@@ -47,9 +47,9 @@
+ RM=          rm -f
+ LN=          ln -s
+ MAKE=        make
+-OPTIMIZE=    # -O
++OPTIMIZE=    -O2
+ PROFILE=     # -pg
+-DEBUG=       -g -DDEBUG
++DEBUG=       # -g -DDEBUG
+ 
+ CCLIENTDIR=  ../c-client
+ PICODIR=     ../pico
+@@ -72,9 +72,9 @@
+ # LDCC= $(PICODIR)/cc5.sol
+ 
+ STDLIBS=     -ltermlib
+-LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
+-LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-             `cat $(CCLIENTDIR)/LDFLAGS`
++LOCLIBS=     -lpico $(CCLIENTDIR)/c-client.a
++LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
++              `cat $(CCLIENTDIR)/LDFLAGS`
+ 
+ STDCFLAGS=   -DSV4 -DSYSTYPE=\"GSO\" -DMOUSE
+ CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
+@@ -93,13 +93,13 @@
+ 	$(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
+ 	$(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
+ 
+-pine:  $(OFILES) $(LOCLIBS)
++pine:  $(OFILES)
+ 	echo "char datestamp[]="\"`date`\"";" > date.c
+ 	echo "char hoststamp[]="\"`uname -n`\"";" >> date.c
+ 	$(LDCC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
+ 
+-abookcpy:	abookcpy.o $(LOCLIBES)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(LIBS)
++abookcpy:	abookcpy.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(CCLIENTDIR)/c-client.a 
+ 
+ pine-use:	pine-use.c
+ 	$(CC) -o pine-use pine-use.c