Date: Wed, 5 Jul 2000 23:55:46 -0700 (PDT) From: kbyanc@posi.net To: FreeBSD-gnats-submit@freebsd.org Cc: pine@freebsd.ady.ro Subject: ports/19731: update port mail/pine4 to depend on mail/cclient Message-ID: <200007060655.XAA18751@gateway.posi.net>
next in thread | raw e-mail | index | archive | help
>Number: 19731
>Category: ports
>Synopsis: update port mail/pine4 to depend on mail/cclient
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 06 00:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Kelly Yancey
>Release: FreeBSD 4.0-STABLE i386
>Organization:
>Environment:
>Description:
This patch updates the mail/pine4 port to use the new mail/cclient
port. Pine has historically built against an internal copy of the
c-client library. This patch is advantagious in that
a) c-client development has progressed beyond what is
shipped with pine. (It would appear that all new
development work is being done via UW's imap server
codebase.) This patch allows pine to utilize
improvements/bugfixes in the c-client library.
b) c-client is built as a shared library and this patch
changes the pine build to link against this shared
library. As a resule, pine binaries are approximately
550k smaller. On the other hand, the c-client library
itself is a good 650k. The real benefit here is that
c-client may be shared amonst multiple binaries (i.e.
imap-uw, php, and perl scripts using the
p5-Mail-CClient module), thereby potentially reducing
the overall disk and memory usage.
The only 'feature' arguably lost is that pine is no longer
stand-alone. Previously the pine binary was all one needed to run
pine; now you need pine and the c-client library. However, I would
be surprised if anyone uses the 'feature'.
Patches for pine4-ssl, imap-uw, and more are in the pipeline...
-Kelly
>How-To-Repeat:
>Fix:
diff -ruN mail/pine4.orig/Makefile mail/pine4/Makefile
--- mail/pine4.orig/Makefile Wed Jul 5 20:28:10 2000
+++ mail/pine4/Makefile Wed Jul 5 21:17:43 2000
@@ -20,6 +20,8 @@
MAN1= pine.1 pico.1 pilot.1
+LIB_DEPENDS= c-client4.7:${PORTSDIR}/mail/cclient
+
# Define "WITH_LDAP" to include ldap support.
# If the ldap port is installed somewhere other than /usr/local, define
# LDAP_PREFIX as well.
diff -ruN mail/pine4.orig/patches/patch-al mail/pine4/patches/patch-al
--- mail/pine4.orig/patches/patch-al Wed Jul 5 20:28:10 2000
+++ mail/pine4/patches/patch-al Wed Jul 5 21:22:43 2000
@@ -1,5 +1,5 @@
---- build.orig Fri Feb 19 18:30:54 1999
-+++ build Wed Oct 13 17:53:42 1999
+--- build.orig Mon Nov 15 14:16:25 1999
++++ build Wed Jul 5 21:22:26 2000
@@ -80,8 +80,9 @@
pine The Pine mailer. Once compiled this should work just fine on
your system with no other files than this binary, and no
@@ -12,22 +12,36 @@
pico The standalone editor similar to the Pine message composer.
This is a very simple straight forward text editor.
-@@ -278,10 +279,10 @@
+@@ -277,17 +278,17 @@
+ esac
+ fi
- if [ -s c-client ] ; then rm -f c-client ; fi
- ln -s imap/c-client c-client
+- if [ -s c-client ] ; then rm -f c-client ; fi
+- ln -s imap/c-client c-client
- if [ -s mtest ] ; then rm -f mtest ; fi
- ln -s imap/mtest mtest
- if [ -s imapd ] ; then rm -f imapd ; fi
- ln -s imap/imapd imapd
+- echo "Making c-client library, mtest and imapd"
+- eval echo make "$makeargs" "$K1" "$K2" $ccltarg
+- cd $PHOME/imap
+- eval make "$makeargs" "$K1" "$K2" $ccltarg
+- echo ''
++# if [ -s c-client ] ; then rm -f c-client ; fi
++# ln -s imap/c-client c-client
+# if [ -s mtest ] ; then rm -f mtest ; fi
+# ln -s imap/mtest mtest
+# if [ -s imapd ] ; then rm -f imapd ; fi
+# ln -s imap/imapd imapd
- echo "Making c-client library, mtest and imapd"
- eval echo make "$makeargs" "$K1" "$K2" $ccltarg
- cd $PHOME/imap
-@@ -303,14 +304,14 @@
++# echo "Making c-client library, mtest and imapd"
++# eval echo make "$makeargs" "$K1" "$K2" $ccltarg
++# cd $PHOME/imap
++# eval make "$makeargs" "$K1" "$K2" $ccltarg
++# echo ''
+
+ echo "Making Pico and Pilot"
+ cd $PHOME/pico
+@@ -304,14 +305,14 @@
cd $PHOME/bin
rm -f pine mtest imapd pico pilot
if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
@@ -45,8 +59,16 @@
case $maketarg in
mnt) echo "Fixing stacksizes ..."
fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -325,10 +326,10 @@
- make clean
+@@ -321,15 +322,15 @@
+
+
+ clean) # This only sort of works
+- echo "Cleaning c-client and imapd"
+- cd $PHOME/imap
+- make clean
++# echo "Cleaning c-client and imapd"
++# cd $PHOME/imap
++# make clean
echo "Cleaning Pine"
cd $PHOME/pine
- make -f makefile.ult clean
diff -ruN mail/pine4.orig/patches/patch-ax mail/pine4/patches/patch-ax
--- mail/pine4.orig/patches/patch-ax Wed Dec 31 16:00:00 1969
+++ mail/pine4/patches/patch-ax Wed Jul 5 23:13:05 2000
@@ -0,0 +1,28 @@
+--- pine/makefile.bsf.orig Thu Aug 27 09:49:51 1998
++++ pine/makefile.bsf Wed Jul 5 22:10:10 2000
+@@ -50,7 +50,7 @@
+ PROFILE= # -pg
+ DEBUG= -DDEBUG # -g
+
+-CCLIENTDIR= ../c-client
++CCLIENTDIR= $(PREFIX)/include/c-client
+ PICODIR= ../pico
+
+ # Only need to uncomment next two lines if you run make from this directory
+@@ -61,12 +61,11 @@
+ LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
+ other.o pine.o takeaddr.o
+
+-STDLIBS= -ltermlib
+-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
+-LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+- `cat $(CCLIENTDIR)/LDFLAGS`
++STDLIBS= -ltermlib -lpam -L$(PREFIX)/lib -lc-client4
++LOCLIBS= $(PICODIR)/libpico.a
++LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
+
+-STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
++STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include
+ CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
+ $(STDCFLAGS)
+
diff -ruN mail/pine4.orig/patches/patch-ay mail/pine4/patches/patch-ay
--- mail/pine4.orig/patches/patch-ay Wed Dec 31 16:00:00 1969
+++ mail/pine4/patches/patch-ay Wed Jul 5 21:57:30 2000
@@ -0,0 +1,18 @@
+--- pine/headers.h.orig Tue Feb 9 14:53:20 1999
++++ pine/headers.h Wed Jul 5 21:57:02 2000
+@@ -59,12 +59,12 @@
+ #include "../pico/headers.h"
+
+
+-#include "../c-client/mail.h"
++#include "c-client/mail.h"
+
+ #include "os.h"
+
+-#include "../c-client/rfc822.h"
+-#include "../c-client/misc.h"
++#include "c-client/rfc822.h"
++#include "c-client/misc.h"
+
+ #ifdef ENABLE_LDAP
+
diff -ruN mail/pine4.orig/patches/patch-az mail/pine4/patches/patch-az
--- mail/pine4.orig/patches/patch-az Wed Dec 31 16:00:00 1969
+++ mail/pine4/patches/patch-az Wed Jul 5 22:21:53 2000
@@ -0,0 +1,77 @@
+--- pine/osdep/os-bsf.h.orig Wed Oct 7 14:51:40 1998
++++ pine/osdep/os-bsf.h Wed Jul 5 22:03:54 2000
+@@ -40,7 +40,7 @@
+ #ifndef _OS_INCLUDED
+ #define _OS_INCLUDED
+
+-#include "../c-client/osdep.h"
++#include "c-client/osdep.h"
+
+
+ /*----------------------------------------------------------------------
+--- pine/abookcpy.c.orig Wed Jul 5 22:13:36 2000
++++ pine/abookcpy.c Wed Jul 5 22:13:56 2000
+@@ -63,7 +63,7 @@
+ FILE *fp;
+ int trimsize;
+
+-#include "../c-client/linkage.c"
++#include "c-client/linkage.c"
+
+ trimsize = parse_args(argc, argv, &local, &remote);
+
+--- pine/pine.c.orig Wed Jul 5 22:16:28 2000
++++ pine/pine.c Mon Sep 20 16:17:58 1999
+@@ -40,7 +40,7 @@
+ ----------------------------------------------------------------------*/
+
+ #include "headers.h"
+-#include "../c-client/imap4r1.h"
++#include "c-client/imap4r1.h"
+
+
+ /*
+@@ -299,7 +299,7 @@
+ #endif
+
+ /*------- Set up c-client drivers -------*/
+-#include "../c-client/linkage.c"
++#include "c-client/linkage.c"
+
+ /*------- ... then tune the drivers just installed -------*/
+ #ifdef DOS
+--- pine/adrbklib.c.orig Wed Jul 5 22:18:28 2000
++++ pine/adrbklib.c Wed Jul 5 22:18:46 2000
+@@ -41,7 +41,7 @@
+
+ #include "headers.h"
+ #include "adrbklib.h"
+-#include "../c-client/imap4r1.h" /* for LEVELSTATUS() */
++#include "c-client/imap4r1.h" /* for LEVELSTATUS() */
+
+ /*
+ * We don't want any end of line fixups to occur, so include "b" in DOS modes.
+--- pine/mailindx.c.orig Wed Jul 5 22:19:38 2000
++++ pine/mailindx.c Wed Jul 5 22:19:49 2000
+@@ -50,7 +50,7 @@
+ ====*/
+
+ #include "headers.h"
+-#include "../c-client/imap4r1.h"
++#include "c-client/imap4r1.h"
+
+ /*
+ * Some common Command Bindings
+--- pine/send.c.orig Wed Jul 5 22:21:18 2000
++++ pine/send.c Wed Jul 5 22:21:37 2000
+@@ -47,8 +47,8 @@
+ ====*/
+
+ #include "headers.h"
+-#include "../c-client/smtp.h"
+-#include "../c-client/nntp.h"
++#include "c-client/smtp.h"
++#include "c-client/nntp.h"
+
+
+ #ifndef TCPSTREAM
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200007060655.XAA18751>