pkgsrc/mail/pine/patches/patch-ab

$NetBSD: patch-ab,v 1.11 2003/09/04 11:09:12 martti Exp $

--- pine/makefile.lnx.orig	Tue Sep 10 23:34:39 2002
+++ pine/makefile.lnx	Sat Dec 14 11:10:00 2002
@@ -47,9 +47,11 @@
 MAKE=        make
 OPTIMIZE=    # -O2
 PROFILE=     # -pg
-DEBUG=       -g -DDEBUG -DDEBUGJOURNAL
+DEBUG=       -DDEBUG -DDEBUGJOURNAL # -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 -lncurses
+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