Compile and install the abookcpy program. (Perhaps c-client should be

made into a shared library, too, if more pine subprograms appear.)

4 files changed, 53 insertions, 3 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index bc350309e82..87798ed5afb 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/07/19 03:39:17 tv Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/19 04:33:06 tv Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -27,6 +27,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/pine/abookcpy ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/
diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab
new file mode 100644
index 00000000000..43cc166c881
--- /dev/null
+++ b/mail/pine/patches/patch-ab
@@ -0,0 +1,31 @@
+--- pine/abookcpy.c.orig	Sun Jul 19 00:20:02 1998
++++ pine/abookcpy.c	Sun Jul 19 00:22:20 1998
+@@ -48,6 +48,7 @@
+ void  trim_addrbook_data PROTO((MAILSTREAM *, int));
+ void  write_fake_headers PROTO((char *, char *, char *));
+ char *err_desc PROTO((int));
++#define err_desc(err) strerror(err)
+ 
+ int noshow_error = 0;
+ 
+@@ -411,20 +412,6 @@
+     rfc822_header(where, fake_env, fake_body);
+     mail_free_envelope(&fake_env);
+     mail_free_body(&fake_body);
+-}
+-
+-
+-extern char *sys_errlist[];
+-
+-char *
+-err_desc(err)
+-    int err;
+-{
+-    static char buffer[50];
+-
+-    strcpy(buffer, sys_errlist[err]);
+-
+-    return((char *)buffer);
+ }
+ 
+ 
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 433c94ad821..5ddc6a3d9bc 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,5 +1,5 @@
 --- pine/makefile.neb.orig	Fri May  8 19:28:46 1998
-+++ pine/makefile.neb	Sat Jul 18 23:02:32 1998
++++ pine/makefile.neb	Sun Jul 19 00:22:00 1998
 @@ -45,9 +45,12 @@
  RM=          rm -f
  LN=          ln -s
@@ -26,3 +26,20 @@
               `cat $(CCLIENTDIR)/LDFLAGS`
  
  STDCFLAGS=   -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
+@@ -82,13 +85,15 @@
+ 	$(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
+ 	$(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
+ 
++all: pine abookcpy
++
+ pine:  $(OFILES) $(LOCLIBS)
+ 	echo "char datestamp[]="\"`date`\"";" > date.c
+ 	echo "char hoststamp[]="\"`hostname`\"";" >> date.c
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
+ 
+ abookcpy:	abookcpy.o $(LOCLIBES)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(CCLIENTDIR)/c-client.a -lcrypt
+ 
+ pine-use:	pine-use.c
+ 	$(CC) -o pine-use pine-use.c
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index ff1c9d1a5af..42f13ffbd41 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 1998/07/19 03:39:19 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/07/19 04:33:07 tv Exp $
+bin/abookcpy
 bin/pine
 bin/pgpdecode
 bin/pgpencrypt