$NetBSD: patch-ap,v 1.4 2004/08/11 14:15:18 markd Exp $

--- pine/makefile.so5.orig	2004-04-03 11:16:17.000000000 +1200
+++ pine/makefile.so5
@@ -49,9 +49,11 @@ LN=          ln -s
 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
@@ -67,16 +69,16 @@ LDAPOFILES=   addrbook.o adrbkcmd.o args
 # it only has /usr/ucb/cc) then change LDCC to the following line and
 # give that a try.  This is still using the Solaris compiler but
 # leaving out the UCB compatibility includes and libraries.
-LDCC= $(PICODIR)/cc5.sol
+LDCC= $(CC)
 
-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) \
+		-lnsl -lsocket
 
 STDCFLAGS=   -Dconst= -DSV4 -DSYSTYPE=\"SOL\" -DMOUSE
 CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-	     $(LOCALPINECFLAGS) $(STDCFLAGS)
+	     $(LOCALPINECFLAGS) $(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 +90,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
 	$(LDCC) $(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
@@ -121,8 +123,8 @@ os.c:	osdep/os-so5.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