head	1.4;
access;
symbols
	pkgsrc-2026Q2:1.4.0.180
	pkgsrc-2026Q2-base:1.4
	pkgsrc-2026Q1:1.4.0.178
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.4.0.176
	pkgsrc-2025Q4-base:1.4
	pkgsrc-2025Q3:1.4.0.174
	pkgsrc-2025Q3-base:1.4
	pkgsrc-2025Q2:1.4.0.172
	pkgsrc-2025Q2-base:1.4
	pkgsrc-2025Q1:1.4.0.170
	pkgsrc-2025Q1-base:1.4
	pkgsrc-2024Q4:1.4.0.168
	pkgsrc-2024Q4-base:1.4
	pkgsrc-2024Q3:1.4.0.166
	pkgsrc-2024Q3-base:1.4
	pkgsrc-2024Q2:1.4.0.164
	pkgsrc-2024Q2-base:1.4
	pkgsrc-2024Q1:1.4.0.162
	pkgsrc-2024Q1-base:1.4
	pkgsrc-2023Q4:1.4.0.160
	pkgsrc-2023Q4-base:1.4
	pkgsrc-2023Q3:1.4.0.158
	pkgsrc-2023Q3-base:1.4
	pkgsrc-2023Q2:1.4.0.156
	pkgsrc-2023Q2-base:1.4
	pkgsrc-2023Q1:1.4.0.154
	pkgsrc-2023Q1-base:1.4
	pkgsrc-2022Q4:1.4.0.152
	pkgsrc-2022Q4-base:1.4
	pkgsrc-2022Q3:1.4.0.150
	pkgsrc-2022Q3-base:1.4
	pkgsrc-2022Q2:1.4.0.148
	pkgsrc-2022Q2-base:1.4
	pkgsrc-2022Q1:1.4.0.146
	pkgsrc-2022Q1-base:1.4
	pkgsrc-2021Q4:1.4.0.144
	pkgsrc-2021Q4-base:1.4
	pkgsrc-2021Q3:1.4.0.142
	pkgsrc-2021Q3-base:1.4
	pkgsrc-2021Q2:1.4.0.140
	pkgsrc-2021Q2-base:1.4
	pkgsrc-2021Q1:1.4.0.138
	pkgsrc-2021Q1-base:1.4
	pkgsrc-2020Q4:1.4.0.136
	pkgsrc-2020Q4-base:1.4
	pkgsrc-2020Q3:1.4.0.134
	pkgsrc-2020Q3-base:1.4
	pkgsrc-2020Q2:1.4.0.130
	pkgsrc-2020Q2-base:1.4
	pkgsrc-2020Q1:1.4.0.110
	pkgsrc-2020Q1-base:1.4
	pkgsrc-2019Q4:1.4.0.132
	pkgsrc-2019Q4-base:1.4
	pkgsrc-2019Q3:1.4.0.128
	pkgsrc-2019Q3-base:1.4
	pkgsrc-2019Q2:1.4.0.126
	pkgsrc-2019Q2-base:1.4
	pkgsrc-2019Q1:1.4.0.124
	pkgsrc-2019Q1-base:1.4
	pkgsrc-2018Q4:1.4.0.122
	pkgsrc-2018Q4-base:1.4
	pkgsrc-2018Q3:1.4.0.120
	pkgsrc-2018Q3-base:1.4
	pkgsrc-2018Q2:1.4.0.118
	pkgsrc-2018Q2-base:1.4
	pkgsrc-2018Q1:1.4.0.116
	pkgsrc-2018Q1-base:1.4
	pkgsrc-2017Q4:1.4.0.114
	pkgsrc-2017Q4-base:1.4
	pkgsrc-2017Q3:1.4.0.112
	pkgsrc-2017Q3-base:1.4
	pkgsrc-2017Q2:1.4.0.108
	pkgsrc-2017Q2-base:1.4
	pkgsrc-2017Q1:1.4.0.106
	pkgsrc-2017Q1-base:1.4
	pkgsrc-2016Q4:1.4.0.104
	pkgsrc-2016Q4-base:1.4
	pkgsrc-2016Q3:1.4.0.102
	pkgsrc-2016Q3-base:1.4
	pkgsrc-2016Q2:1.4.0.100
	pkgsrc-2016Q2-base:1.4
	pkgsrc-2016Q1:1.4.0.98
	pkgsrc-2016Q1-base:1.4
	pkgsrc-2015Q4:1.4.0.96
	pkgsrc-2015Q4-base:1.4
	pkgsrc-2015Q3:1.4.0.94
	pkgsrc-2015Q3-base:1.4
	pkgsrc-2015Q2:1.4.0.92
	pkgsrc-2015Q2-base:1.4
	pkgsrc-2015Q1:1.4.0.90
	pkgsrc-2015Q1-base:1.4
	pkgsrc-2014Q4:1.4.0.88
	pkgsrc-2014Q4-base:1.4
	pkgsrc-2014Q3:1.4.0.86
	pkgsrc-2014Q3-base:1.4
	pkgsrc-2014Q2:1.4.0.84
	pkgsrc-2014Q2-base:1.4
	pkgsrc-2014Q1:1.4.0.82
	pkgsrc-2014Q1-base:1.4
	pkgsrc-2013Q4:1.4.0.80
	pkgsrc-2013Q4-base:1.4
	pkgsrc-2013Q3:1.4.0.78
	pkgsrc-2013Q3-base:1.4
	pkgsrc-2013Q2:1.4.0.76
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2013Q1:1.4.0.74
	pkgsrc-2013Q1-base:1.4
	pkgsrc-2012Q4:1.4.0.72
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2012Q3:1.4.0.70
	pkgsrc-2012Q3-base:1.4
	pkgsrc-2012Q2:1.4.0.68
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.66
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.64
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.62
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.60
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.58
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2010Q4:1.4.0.56
	pkgsrc-2010Q4-base:1.4
	pkgsrc-2010Q3:1.4.0.54
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q2:1.4.0.52
	pkgsrc-2010Q2-base:1.4
	pkgsrc-2010Q1:1.4.0.50
	pkgsrc-2010Q1-base:1.4
	pkgsrc-2009Q4:1.4.0.48
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2009Q3:1.4.0.46
	pkgsrc-2009Q3-base:1.4
	pkgsrc-2009Q2:1.4.0.44
	pkgsrc-2009Q2-base:1.4
	pkgsrc-2009Q1:1.4.0.42
	pkgsrc-2009Q1-base:1.4
	pkgsrc-2008Q4:1.4.0.40
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.38
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.36
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.34
	pkgsrc-2008Q2-base:1.4
	cwrapper:1.4.0.32
	pkgsrc-2008Q1:1.4.0.30
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.28
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.26
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.24
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.22
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.20
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.18
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.16
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.14
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.12
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.10
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.8
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.6
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.4
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.2
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.3.0.2
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.1.0.2
	netbsd-1-6-1-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2004.08.11.14.15.18;	author markd;	state Exp;
branches;
next	1.3;

1.3
date	2004.05.13.18.29.54;	author adam;	state Exp;
branches;
next	1.2;

1.2
date	2003.03.31.16.23.16;	author bouyer;	state Exp;
branches;
next	1.1;

1.1
date	2002.10.27.18.04.06;	author bouyer;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Fix build on Solaris.
@
text
@$NetBSD: patch-ap,v 1.3 2004/05/13 18:29:54 adam 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
@


1.3
log
@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
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- pine/makefile.so5.orig	2004-04-02 23:16:17.000000000 +0000
d19 3
a21 1
@@@@ -69,14 +71,14 @@@@ LDAPOFILES=   addrbook.o adrbkcmd.o args
d23 2
a24 1
 LDCC= $(PICODIR)/cc5.sol
@


1.2
log
@Fix pine/makefile.so5:
Don't use the nonexistent ../pico/cc5.sol as LDCC, set it to ${CC}
Add -lnsl -lsocket to the libraries.
libc-client is in $(CCLIENTLIB) not $(CCLIENTDIR)
@
text
@d1 1
a1 1
$NetBSD: patch-ap,v 1.1 2002/10/27 18:04:06 bouyer Exp $
d3 3
a5 3
--- 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 @@@@
d19 1
a19 3
@@@@ -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
d21 1
a21 3
-LDCC= $(PICODIR)/cc5.sol
+#LDCC= $(PICODIR)/cc5.sol
+LDCC= $(CC)
d29 2
a30 1
+LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) -lnsl -lsocket
d34 2
a35 2
-	     $(STDCFLAGS)
+	     $(STDCFLAGS) -I${CCLIENTINC}
d39 1
a39 1
@@@@ -88,20 +90,20 @@@@
d65 1
a65 1
@@@@ -121,8 +123,8 @@@@
@


1.1
log
@Fix BUILDNAME/BUILDFILE for Solaris, and fix makefile.so5 for pkgsrc.
@
text
@d1 1
a1 1
$NetBSD: $
d4 1
a4 1
+++ pine/makefile.so5	Sat Oct 12 22:21:52 2002
d19 3
a21 1
@@@@ -69,14 +71,13 @@@@
d23 3
a25 1
 LDCC= $(PICODIR)/cc5.sol
d33 1
a33 1
+LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
d42 1
a42 1
@@@@ -88,20 +89,20 @@@@
d60 1
a60 1
+rpload:	rpload.o $(CCLIENTDIR)/libc-client.a
d64 1
a64 1
+rpdump:	rpdump.o $(CCLIENTDIR)/libc-client.a
d68 1
a68 1
@@@@ -121,8 +122,8 @@@@
@