Changes 4.60:

     * In PC-Pine, add ability to do piping, Sending-Filters,
       Display-Filters, and other operations where external command
       execution is possible.
     * Control margins in Message Viewing screen with Viewer-Margin-Left
       and Viewer-Margin-Right
     * Display flowed text well
     * Send flowed text when possible, with the ability to turn this
       behavior off through the new feature Quell-Flowed-Text
     * Add keywords to folders using the Keywords option to set them up
       and the Flag Command to set or clear them for particular messages.
     * In Mac OS X, view and send attachments and URLs according to how
       the system defines handling them, without relying on the existence
       of a mailcap or mime.types file
     * For PC-Pine, add a separate window that contains new mail
       notifications for all folders currently opened (in PC-Pine Config menu).
     * Reply or Forward using a Role by turning on the
       Alternate-Role-Menu option
     * More IMAP connection caching: control it with options
       Stay-Open-Folders, Preopen-Stayopen-Folders,
       Max-Remote-Connections, and Offer-Expunge-On-Stayopen-Folders
     * New feature Offer-Expunge-On-Inbox
     * An attempt is made to convert incoming UTF-8 messages to the
       user's character set
     * Added support for HOME and END keys in message view and message
       index
     * Prevent canonicalization of news server names by setting
       Mult-Newsrc-Hostnames-as-Typed
     * Remove hostname from NNTP Path header with Hide-NNTP-Path option
     * Support for External Categorizer Commands in Rules
     * Improved interface when editing rules with many comma-separated
       values
     * More control over mail checking frequency with
       Quell-Mailchecks-Composing-Except-Inbox,
       Quell-Mailchecks-Composing-Inbox, and
       Mail-Check-Interval-Noncurrent
     * More control over filtering of control characters to screen with
       Pass-C1-Control-Characters-as-is option
     * New Export and Unexport commands in FOLDER LIST screen
     * Now possible to use message size in Rule Patterns
     * As a convenience, a shortcut for the command line argument
       "-feature-list=feature" is "-feature", for example,
       "-signature-at-bottom" or "-no-signature-at-bottom"
     * Add PC-Pine command-line argument "-registry noset"
     * Add command-line argument "-nowrite_passfile"
     * Add feature Quell-Attachment-Extension-Warn
     * Add features Quell-Filtering-Messages and
       Quell-Filtering-Done-Message
     * Add feature Quell-Charset-Warning
     * Add feature Maildrops-Preserve-State
     * Don't remove whitespace from the end of lines, a behavior which
       can be turned off through the new feature
       Strip-Whitespace-Before-Send
     * Double dollar sign escapes special meaning of dollar sign in both
       Unix Pine and PC-Pine (Using Environment Variables)
     * RedHat and Debian ports more closely obey the Linux Hierarchy
       Standard
     * Improve performance of Select command when using Narrow or Broaden
       and talking to an IMAP server
     * Add feature Disable-Terminal-Reset-For-Display-Filters
     * When displaying a message with QP encoding errors, instead of just
       reporting "Non-hexadecimal character in QP encoding" and then
      giving up, attempt to do the best possible
     * Add feature Show-Sort
     * Add feature Downgrade-Multipart-To-Text
     * Add feature Dead-Letter-Files
     * Port named "soc" is an attempt to use native Solaris compiler
     * Add ability to justify the full message from the composer by doing
       Control-W Control-J
     * Bug fixes

9 files changed, 76 insertions, 77 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index ac75699e839..a74f432c97e 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2004/05/07 20:00:53 reed Exp $
+# $NetBSD: Makefile,v 1.88 2004/05/13 18:29:54 adam Exp $
 
-DISTNAME=       pine4.58
-PKGNAME=        pine-4.58
-PKGREVISION=	4
+DISTNAME=       pine4.60
+PKGNAME=        pine-4.60
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 4411c044a5c..d21d5da3706 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.20 2004/01/20 10:16:38 hubertf Exp $
+$NetBSD: distinfo,v 1.21 2004/05/13 18:29:54 adam Exp $
 
-SHA1 (pine4.58.tar.bz2) = 5522426ef925813218ce1a3fbb939591778b59f1
-Size (pine4.58.tar.bz2) = 2837321 bytes
+SHA1 (pine4.60.tar.bz2) = 7276fad1325a7d6c96a80454e12dcc05e2ad8b78
+Size (pine4.60.tar.bz2) = 2996963 bytes
 SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
-SHA1 (patch-ab) = b430138b9388150aecafb131b00cc9911f8fb35d
-SHA1 (patch-ac) = 439207ab6edea4e3b6148ce777ed717e133565b5
+SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953
+SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b
 SHA1 (patch-ad) = ef1203c67e9add295e782c2ee2b0fde2a4f6073b
-SHA1 (patch-ae) = 370f46eb2c1868663d9c8c927c89b644d1118ca2
-SHA1 (patch-af) = 689a911d7c018003fb50446311a495bdf63edcb5
-SHA1 (patch-ag) = de8c787e9ab60a2d374609f5868d63ab478933db
-SHA1 (patch-al) = db18ea904d1585e23efc91f8b896834eec10b4e2
+SHA1 (patch-ae) = 0faf3a4161cba517a559a776d2a3a7fcb5116570
+SHA1 (patch-af) = 7d591ccb77992a0642724c6928b181e0404d7cfb
+SHA1 (patch-ag) = 74d7e2dc9b986148825335f6f2b52bde963f9a67
+SHA1 (patch-al) = d150f8c765f87ba7c66f88e7e51974003027456a
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
-SHA1 (patch-ap) = c6827c6b9b90d77cdc61643e8b7f3e1e7e57ff32
+SHA1 (patch-ap) = fc33140471abd7fdc35e6c347e82d97b55d52dbe
diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab
index c4091976160..a9bbd1a11da 100644
--- a/mail/pine/patches/patch-ab
+++ b/mail/pine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2003/09/04 11:09:12 martti Exp $
+$NetBSD: patch-ab,v 1.12 2004/05/13 18:29:54 adam 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 @@
+--- pine/makefile.lnx.orig	2003-11-25 06:47:42.000000000 +0000
++++ pine/makefile.lnx
+@@ -47,9 +47,11 @@ LN=          ln -s
  MAKE=        make
  OPTIMIZE=    # -O2
  PROFILE=     # -pg
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.11 2003/09/04 11:09:12 martti Exp $
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -60,14 +62,13 @@
+@@ -60,14 +62,13 @@ PICODIR=     ../pico
  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
  	      mailview.o other.o pine.o strings.o takeaddr.o
  
@@ -30,12 +30,12 @@ $NetBSD: patch-ab,v 1.11 2003/09/04 11:09:12 martti Exp $
  
  STDCFLAGS=   -DLNX -DSYSTYPE=\"LNX\" -DMOUSE
  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
--	     $(STDCFLAGS)
-+	     $(STDCFLAGS) -I${CCLIENTINC}
+-	     $(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 \
-@@ -79,20 +80,20 @@
+@@ -79,20 +80,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 \
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.11 2003/09/04 11:09:12 martti Exp $
  	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
  
  pine-use:	pine-use.c
-@@ -112,8 +113,8 @@
+@@ -112,8 +113,8 @@ os.c:	osdep/os-lnx.c
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 269717da1d9..1cec3f678a7 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.18 2003/06/02 17:44:14 kim Exp $
+$NetBSD: patch-ac,v 1.19 2004/05/13 18:29:54 adam Exp $
 
---- pine/makefile.neb.orig	2002-09-10 17:39:23.000000000 -0400
-+++ pine/makefile.neb	2003-06-02 13:40:25.000000000 -0400
-@@ -47,9 +47,11 @@
+--- pine/makefile.neb.orig	2003-11-25 06:47:56.000000000 +0000
++++ pine/makefile.neb
+@@ -47,9 +47,11 @@ LN=          ln -s
  MAKE=        make
  OPTIMIZE=    # -O
  PROFILE=     # -pg
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.18 2003/06/02 17:44:14 kim Exp $
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -60,14 +62,13 @@
+@@ -60,14 +62,13 @@ PICODIR=     ../pico
  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
  	      mailview.o other.o pine.o strings.o takeaddr.o
  
@@ -30,12 +30,12 @@ $NetBSD: patch-ac,v 1.18 2003/06/02 17:44:14 kim Exp $
  
  STDCFLAGS=   -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
--	     $(STDCFLAGS)
-+	     $(STDCFLAGS) -I${CCLIENTINC}
+-	     $(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 \
-@@ -79,20 +80,20 @@
+@@ -79,20 +80,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 \
@@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.18 2003/06/02 17:44:14 kim Exp $
  	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
  
  pine-use:	pine-use.c
-@@ -112,8 +113,8 @@
+@@ -112,8 +113,8 @@ os.c:	osdep/os-neb.c
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
diff --git a/mail/pine/patches/patch-ae b/mail/pine/patches/patch-ae
index 835650e8848..b1977706f98 100644
--- a/mail/pine/patches/patch-ae
+++ b/mail/pine/patches/patch-ae
@@ -1,7 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2002/11/26 21:41:09 cjep Exp $
---- 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 @@
+$NetBSD: patch-ae,v 1.7 2004/05/13 18:29:54 adam Exp $
+
+--- pine/osdep/os-lnx.h.orig	2003-05-23 16:07:00.000000000 +0000
++++ pine/osdep/os-lnx.h
+@@ -295,5 +295,6 @@
  #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
  #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
  
diff --git a/mail/pine/patches/patch-af b/mail/pine/patches/patch-af
index c2a18578bce..5fe5ac6e05e 100644
--- a/mail/pine/patches/patch-af
+++ b/mail/pine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2002/12/14 10:34:44 tron Exp $
+$NetBSD: patch-af,v 1.9 2004/05/13 18:29:54 adam Exp $
 
---- pine/makefile.osx.orig	Fri Sep 20 20:22:23 2002
-+++ pine/makefile.osx	Sat Dec 14 11:18:00 2002
-@@ -50,7 +50,9 @@
+--- pine/makefile.osx.orig	2003-12-17 22:12:52.000000000 +0000
++++ pine/makefile.osx
+@@ -50,7 +50,9 @@ OPTIMIZE=    # -O
  PROFILE=     # -pg
  DEBUG=       -g -DDEBUG -DDEBUGJOURNAL
  
@@ -13,14 +13,15 @@ $NetBSD: patch-af,v 1.8 2002/12/14 10:34:44 tron Exp $
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -61,15 +63,14 @@
+@@ -61,16 +63,14 @@ PICODIR=     ../pico
  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`
+-             -framework Carbon -framework ApplicationServices \
+-	     `cat $(CCLIENTDIR)/LDFLAGS`
 +STDLIBS=     -lssl -lcrypto
 +LOCLIBS=     -lpico -lc-client
 +LIBS=        -L$(PREFIX)/lib $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
@@ -28,12 +29,12 @@ $NetBSD: patch-af,v 1.8 2002/12/14 10:34:44 tron Exp $
  # Use BSDDEF instead of BSD because other systems use BSD internally.
  STDCFLAGS=   -Dconst= -DSYSTYPE=\"OSX\"
  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
--	     $(STDCFLAGS)
-+	     $(STDCFLAGS) -I${CCLIENTINC}
+-	     $(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 \
-@@ -81,20 +82,20 @@
+@@ -82,20 +82,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 \
@@ -59,7 +60,7 @@ $NetBSD: patch-af,v 1.8 2002/12/14 10:34:44 tron Exp $
  	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
  
  pine-use:	pine-use.c
-@@ -114,8 +115,8 @@
+@@ -115,8 +115,8 @@ os.c:	osdep/os-osx.c
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h
diff --git a/mail/pine/patches/patch-ag b/mail/pine/patches/patch-ag
index af5c7916351..48a1ce3a328 100644
--- a/mail/pine/patches/patch-ag
+++ b/mail/pine/patches/patch-ag
@@ -1,11 +1,12 @@
-$NetBSD: patch-ag,v 1.6 2003/07/28 15:44:12 adam Exp $
+$NetBSD: patch-ag,v 1.7 2004/05/13 18:29:54 adam Exp $
 
---- pine/osdep/os-osx.h.orig	2003-05-23 18:07:02.000000000 +0200
-+++ pine/osdep/os-osx.h	2003-07-28 14:14:03.000000000 +0200
-@@ -310,5 +310,6 @@
+--- pine/osdep/os-osx.h.orig	2003-12-17 22:20:52.000000000 +0000
++++ pine/osdep/os-osx.h
+@@ -310,6 +310,7 @@ void free();
  #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
  #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
  
 +#include <sys/unistd.h>         /* needed for F_OK and friends              */
- 
- #endif /* _OS_INCLUDED */
+ /* The following are changed to avoid OSX conflicts */
+ #define Fixed      PineFixed
+ #define Handle     PineHandle
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index e5d2e03f875..f6021ad36bb 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.13 2002/12/14 10:34:45 tron Exp $
+$NetBSD: patch-al,v 1.14 2004/05/13 18:29:54 adam Exp $
 
---- build.orig	Mon Dec  9 18:54:38 2002
-+++ build	Sat Dec 14 11:22:59 2002
-@@ -362,71 +362,6 @@
+--- build.orig	2004-05-07 19:32:32.000000000 +0000
++++ build
+@@ -380,71 +380,6 @@ case $maketarg in
  	  echo "Including SSL functionality"
  	fi
  
@@ -72,10 +72,10 @@ $NetBSD: patch-al,v 1.13 2002/12/14 10:34:45 tron Exp $
 -        echo ''
 -
          echo "Making Pine and rpload/rpdump".
-         cd "$PHOME/pine"
-         eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
-@@ -449,8 +384,6 @@
-         if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
+ 	if [ "$ALTDOCPATHS" = "1" ]
+ 	then
+@@ -487,8 +422,6 @@ case $maketarg in
+ 	fi
          cd "$PHOME"
          echo ''
 -        echo "Links to executables are in bin directory:"
@@ -83,11 +83,11 @@ $NetBSD: patch-al,v 1.13 2002/12/14 10:34:45 tron Exp $
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -476,18 +409,11 @@
+@@ -514,18 +447,11 @@ case $maketarg in
  
  
      clean) # This only sort of works 
--        rm -f c-client mtest mailutil imapd ipopd
+-        rm -f c-client mtest mailutil imapd ipopd .pine.sedargs
 -        echo "Cleaning c-client and imapd"
 -	cd "$PHOME/imap"
 -	make clean
diff --git a/mail/pine/patches/patch-ap b/mail/pine/patches/patch-ap
index 15645cfde4b..0a6d465b3df 100644
--- a/mail/pine/patches/patch-ap
+++ b/mail/pine/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
+$NetBSD: patch-ap,v 1.3 2004/05/13 18:29:54 adam Exp $
 
---- pine/makefile.so5.orig	Wed Oct 24 00:24:51 2001
-+++ pine/makefile.so5	Sun Mar 30 16:43:46 2003
-@@ -49,9 +49,11 @@
+--- pine/makefile.so5.orig	2004-04-02 23:16:17.000000000 +0000
++++ pine/makefile.so5
+@@ -49,9 +49,11 @@ LN=          ln -s
  MAKE=        make
  OPTIMIZE=    # -O
  PROFILE=     # -pg
@@ -16,13 +16,9 @@ $NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -67,16 +69,16 @@
- # 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
+@@ -69,14 +71,14 @@ LDAPOFILES=   addrbook.o adrbkcmd.o args
  # leaving out the UCB compatibility includes and libraries.
--LDCC= $(PICODIR)/cc5.sol
-+#LDCC= $(PICODIR)/cc5.sol
-+LDCC= $(CC)
+ LDCC= $(PICODIR)/cc5.sol
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
@@ -30,16 +26,17 @@ $NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
 -             `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
++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) \
--	     $(STDCFLAGS)
-+	     $(STDCFLAGS) -I${CCLIENTINC}
+-	     $(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 @@
+@@ -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 \
@@ -65,7 +62,7 @@ $NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
  	$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
  
  pine-use:	pine-use.c
-@@ -121,8 +123,8 @@
+@@ -121,8 +123,8 @@ os.c:	osdep/os-so5.c
  
  $(OFILES):						$(HFILES)
  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o:	adrbklib.h