diff options
author | tv <tv> | 1999-11-11 17:40:16 +0000 |
---|---|---|
committer | tv <tv> | 1999-11-11 17:40:16 +0000 |
commit | 4058acc7a2051023a354ef003f16f0481693f692 (patch) | |
tree | 652f86d178d5e374a713711e32fbe34159fc3cda | |
parent | 87fe42a278999affe43cf7f600ad22f402559388 (diff) | |
download | pkgsrc-4058acc7a2051023a354ef003f16f0481693f692.tar.gz |
Update Pico to 3.6, Pine to 4.20. Also move pine.conf and pine.conf.fixed
to .../share/examples/pine and copy pine.conf to .../etc only if it doesn't
exist.
-rw-r--r-- | editors/pico/Makefile | 6 | ||||
-rw-r--r-- | editors/pico/files/md5 | 4 | ||||
-rw-r--r-- | editors/pico/files/patch-sum | 8 | ||||
-rw-r--r-- | editors/pico/patches/patch-aa | 4 | ||||
-rw-r--r-- | editors/pico/patches/patch-ab | 8 | ||||
-rw-r--r-- | editors/pico/patches/patch-ac | 21 | ||||
-rw-r--r-- | editors/pico/pkg/PLIST | 4 | ||||
-rw-r--r-- | mail/pine/Makefile | 15 | ||||
-rw-r--r-- | mail/pine/files/md5 | 4 | ||||
-rw-r--r-- | mail/pine/files/patch-sum | 10 | ||||
-rw-r--r-- | mail/pine/patches/patch-ab | 10 | ||||
-rw-r--r-- | mail/pine/patches/patch-ak | 8 | ||||
-rw-r--r-- | mail/pine/patches/patch-al | 23 | ||||
-rw-r--r-- | mail/pine/patches/patch-tabkey | 26 | ||||
-rw-r--r-- | mail/pine/pkg/PLIST | 9 |
15 files changed, 76 insertions, 84 deletions
diff --git a/editors/pico/Makefile b/editors/pico/Makefile index 3fe5fd67c19..15a0f073bd5 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 1999/05/02 03:16:58 tv Exp $ +# $NetBSD: Makefile,v 1.16 1999/11/11 17:40:16 tv Exp $ # -DISTNAME= pine4.10 -PKGNAME= pico-3.5 +DISTNAME= pine4.20 +PKGNAME= pico-3.6 CATEGORIES= editors MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ diff --git a/editors/pico/files/md5 b/editors/pico/files/md5 index 4285ab5091d..2411ba9f96d 100644 --- a/editors/pico/files/md5 +++ b/editors/pico/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.9 1999/05/02 03:16:59 tv Exp $ +$NetBSD: md5,v 1.10 1999/11/11 17:40:17 tv Exp $ -MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd +MD5 (pine4.20.tar.gz) = 9b60a049e3575fc0b1a201f5f0105f14 diff --git a/editors/pico/files/patch-sum b/editors/pico/files/patch-sum index 682fcccd742..97b4376bed6 100644 --- a/editors/pico/files/patch-sum +++ b/editors/pico/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:44 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/11 17:40:17 tv Exp $ -MD5 (patch-aa) = 75f47ebd9508f1e72af26d07de76f8f9 -MD5 (patch-ab) = d0cbf4e7d1119fb5f040ae88a716d938 -MD5 (patch-ac) = e0c088a790d608c9ef0e387c552a0532 +MD5 (patch-aa) = cc2914e60f45e6c431f5225d75ad45df +MD5 (patch-ab) = c3011e2ac8f241ae76ecbed1a7c88293 +MD5 (patch-ac) = be4c35a3c79a469da96ff1f1c1a9f17d MD5 (patch-ad) = cb38f893ce88b8a3a78b29af793e4c40 diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa index b09a82e37ba..21d82a54091 100644 --- a/editors/pico/patches/patch-aa +++ b/editors/pico/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 1999/05/02 03:16:59 tv Exp $ +$NetBSD: patch-aa,v 1.9 1999/11/11 17:40:17 tv Exp $ --- pico/makefile.neb.orig Mon Jun 29 18:23:50 1998 +++ pico/makefile.neb Sun Sep 27 12:30:46 1998 @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.8 1999/05/02 03:16:59 tv Exp $ - $(RANLIB) libpico.a +libpico.la: $(OFILES) + $(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \ -+ -version-info 2:0 ++ -version-info 3:0 clean: rm -f *.a *.o *~ pico_os.c os.h pico pilot diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab index d7107f57689..3179591bd6f 100644 --- a/editors/pico/patches/patch-ab +++ b/editors/pico/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:33 agc Exp $ +$NetBSD: patch-ab,v 1.4 1999/11/11 17:40:17 tv Exp $ ---- pico/osdep/unix.orig Sat Jul 18 20:21:36 1998 -+++ pico/osdep/unix Sat Jul 18 20:21:52 1998 -@@ -1268,7 +1268,7 @@ +--- pico/osdep/unix.orig Mon Sep 13 15:35:36 1999 ++++ pico/osdep/unix Thu Nov 11 11:04:09 1999 +@@ -2301,7 +2301,7 @@ errstr(err) int err; { diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac index e0d8e4e35b6..d81ce5449bc 100644 --- a/editors/pico/patches/patch-ac +++ b/editors/pico/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 1998/08/07 10:40:33 agc Exp $ +$NetBSD: patch-ac,v 1.4 1999/11/11 17:40:17 tv Exp $ ---- build.orig Sat Jul 18 20:22:16 1998 -+++ build Sat Jul 18 20:23:48 1998 -@@ -254,41 +254,20 @@ +--- build.orig Thu Nov 11 11:04:15 1999 ++++ build Thu Nov 11 11:13:47 1999 +@@ -276,28 +276,12 @@ esac fi @@ -31,17 +31,12 @@ $NetBSD: patch-ac,v 1.3 1998/08/07 10:40:33 agc Exp $ cd $PHOME if [ ! -d bin ] ; then mkdir bin; fi cd $PHOME/bin -- rm -f pine mtest imapd pico pilot -- if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi -- if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi -- if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi -+ rm -f pico pilot - if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi +@@ -309,8 +293,6 @@ if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi cd $PHOME echo '' - echo "Links to executables are in bin directory:" - size bin/pine bin/mtest bin/imapd bin/pico bin/pilot - echo "Done" - ;; - + case $maketarg in + mnt) echo "Fixing stacksizes ..." + fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST index de320bc9be0..715e3910141 100644 --- a/editors/pico/pkg/PLIST +++ b/editors/pico/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 1999/05/02 03:16:59 tv Exp $ +@comment $NetBSD: PLIST,v 1.10 1999/11/11 17:40:17 tv Exp $ bin/pico bin/pilot include/pico/ebind.h @@ -12,6 +12,6 @@ include/pico/pico.h include/pico/resource.h @dirrm include/pico lib/libpico.a -lib/libpico.so.2.0 +lib/libpico.so.3.0 man/man1/pico.1 man/man1/pilot.1 diff --git a/mail/pine/Makefile b/mail/pine/Makefile index a03a23cdec6..9e8f099ff7e 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 1999/05/02 03:16:59 tv Exp $ +# $NetBSD: Makefile,v 1.30 1999/11/11 17:40:17 tv Exp $ # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp # -DISTNAME= pine4.10 -PKGNAME= pine-4.10 +DISTNAME= pine4.20 +PKGNAME= pine-4.20 CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.washington.edu/pine/ # This pkg doesn't build pico or libpico; the pico pkg does that part. -DEPENDS= pico-3.5:../../editors/pico +DEPENDS= pico-3.6:../../editors/pico do-configure: ${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig @@ -30,15 +30,16 @@ do-install: ${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/ ${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pine - ${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/share/examples/pine/ + ${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/share/examples/pine/dot.pinerc.pgp ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1 ( ${ECHO} '# (This file is not part of the pine distribution! - HF)' ; \ ${PREFIX}/bin/pine -conf ) | ${SED} \ -e 's|^\(use-only-domain-name\)=.*$$|\1=No|g' \ -e 's|^\(feature-list\)=.*$$|\1=enable-mail-check-cue,enable-suspend,expanded-view-of-addressbooks,include-header-in-reply,include-text-in-reply,show-selected-in-boldface,signature-at-bottom|g' \ -e 's|^\(sort-key\)=.*$$|\1=Arrival/Reverse|g' \ - >${PREFIX}/etc/pine.conf - ${INSTALL_DATA} ${FILESDIR}/pine.conf.fixed ${PREFIX}/etc/ + >${PREFIX}/share/examples/pine/pine.conf + ${INSTALL_DATA} ${FILESDIR}/pine.conf.fixed ${PREFIX}/share/examples/pine/ + @[ -f ${PREFIX}/etc/pine.conf ] || ${CP} ${PREFIX}/share/examples/pine/pine.conf ${PREFIX}/etc/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pine ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine/ diff --git a/mail/pine/files/md5 b/mail/pine/files/md5 index fe9eacd7fb5..52b7b0379de 100644 --- a/mail/pine/files/md5 +++ b/mail/pine/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.8 1999/05/02 03:16:59 tv Exp $ +$NetBSD: md5,v 1.9 1999/11/11 17:40:18 tv Exp $ -MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd +MD5 (pine4.20.tar.gz) = 9b60a049e3575fc0b1a201f5f0105f14 diff --git a/mail/pine/files/patch-sum b/mail/pine/files/patch-sum index 2349bf5c044..8dcd9ffa1ec 100644 --- a/mail/pine/files/patch-sum +++ b/mail/pine/files/patch-sum @@ -1,9 +1,9 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:06 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/11 17:40:18 tv Exp $ -MD5 (patch-ab) = 3cfe30df83b25fbc4f7ad6b70316e186 +MD5 (patch-ab) = aee9be029c8880cb76b34b3203d53045 MD5 (patch-ac) = 684eb92939714a82184a0ac695a69858 MD5 (patch-af) = 250a49244b2c1c7cf8a44cc1aa2e5dae -MD5 (patch-ak) = ceabe676385ad0fbe64c768c0e7499ad -MD5 (patch-al) = 22ec311f0ff74c06e7da2e1491be767b +MD5 (patch-ak) = c92a63154ab9a4e02c0d1f38f4ab7dbb +MD5 (patch-al) = f8180bea4caf97873f5403d762a64bed MD5 (patch-am) = 9945aa8499ca29930a1ab9b0ec000f0d -MD5 (patch-tabkey) = 987c2bfa75bab130d5d54734b308d170 +MD5 (patch-tabkey) = 918d8281bc5049765f27f7308a83fc47 diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab index cf1cff6ffed..eb90bd240be 100644 --- a/mail/pine/patches/patch-ab +++ b/mail/pine/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 1998/08/07 11:09:47 agc Exp $ +$NetBSD: patch-ab,v 1.5 1999/11/11 17:40:18 tv Exp $ ---- pine/abookcpy.c.orig Sun Jul 19 00:20:02 1998 -+++ pine/abookcpy.c Sun Jul 19 00:22:20 1998 +--- pine/abookcpy.c.orig Wed Jun 23 15:15:26 1999 ++++ pine/abookcpy.c Thu Nov 11 12:00:12 1999 @@ -48,6 +48,7 @@ void trim_addrbook_data PROTO((MAILSTREAM *, int)); void write_fake_headers PROTO((char *, char *, char *)); @@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 11:09:47 agc Exp $ int noshow_error = 0; -@@ -411,20 +412,6 @@ - rfc822_header(where, fake_env, fake_body); +@@ -416,20 +417,6 @@ + rfc822_header(where+strlen(where), fake_env, fake_body); mail_free_envelope(&fake_env); mail_free_body(&fake_body); -} diff --git a/mail/pine/patches/patch-ak b/mail/pine/patches/patch-ak index 676dcfd2d08..a6aa54a08dc 100644 --- a/mail/pine/patches/patch-ak +++ b/mail/pine/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.4 1998/08/07 11:09:48 agc Exp $ +$NetBSD: patch-ak,v 1.5 1999/11/11 17:40:18 tv Exp $ ---- imap/Makefile.orig Sat Jul 18 22:13:09 1998 -+++ imap/Makefile Sat Jul 18 22:13:27 1998 -@@ -274,8 +274,6 @@ +--- imap/Makefile.orig Thu Sep 30 02:03:17 1999 ++++ imap/Makefile Thu Nov 11 12:00:35 1999 +@@ -417,8 +417,6 @@ bundled: @echo Building bundled tools... $(CD) mtest;$(MAKE) diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al index bb8867f72dd..a79628cb906 100644 --- a/mail/pine/patches/patch-al +++ b/mail/pine/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.4 1998/08/07 11:09:49 agc Exp $ +$NetBSD: patch-al,v 1.5 1999/11/11 17:40:18 tv Exp $ ---- build.orig Sat Jul 18 22:14:00 1998 -+++ build Sat Jul 18 22:14:35 1998 -@@ -258,20 +258,12 @@ +--- build.orig Fri Feb 19 18:30:54 1999 ++++ build Thu Nov 11 12:04:59 1999 +@@ -280,20 +280,12 @@ ln -s imap/c-client c-client if [ -s mtest ] ; then rm -f mtest ; fi ln -s imap/mtest mtest @@ -23,17 +23,12 @@ $NetBSD: patch-al,v 1.4 1998/08/07 11:09:49 agc Exp $ echo "Making Pine". cd $PHOME/pine eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg -@@ -282,13 +274,8 @@ - rm -f pine mtest imapd pico pilot - if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi - if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi -- if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi -- if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi -- if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi +@@ -309,8 +301,6 @@ + if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi cd $PHOME echo '' - echo "Links to executables are in bin directory:" - size bin/pine bin/mtest bin/imapd bin/pico bin/pilot - echo "Done" - ;; - + case $maketarg in + mnt) echo "Fixing stacksizes ..." + fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot diff --git a/mail/pine/patches/patch-tabkey b/mail/pine/patches/patch-tabkey index cf159ea0447..1692f277304 100644 --- a/mail/pine/patches/patch-tabkey +++ b/mail/pine/patches/patch-tabkey @@ -1,8 +1,8 @@ -$NetBSD: patch-tabkey,v 1.4 1998/08/07 11:09:50 agc Exp $ +$NetBSD: patch-tabkey,v 1.5 1999/11/11 17:40:18 tv Exp $ ---- pine/mailcmd.c.orig Sun Jul 19 01:00:42 1998 -+++ pine/mailcmd.c Sun Jul 19 01:06:24 1998 -@@ -316,9 +316,7 @@ +--- pine/mailcmd.c.orig Mon Oct 11 18:13:50 1999 ++++ pine/mailcmd.c Thu Nov 11 12:03:40 1999 +@@ -320,9 +320,7 @@ } else{ prompt[0] = '\0'; @@ -13,7 +13,7 @@ $NetBSD: patch-tabkey,v 1.4 1998/08/07 11:09:50 agc Exp $ char nextfolder[MAXPATH]; strcpy(nextfolder, state->cur_folder); -@@ -445,14 +443,7 @@ +@@ -465,14 +463,7 @@ char ret = 'n'; int in_inbox = !strucmp(state->cur_folder,state->inbox_name); @@ -29,18 +29,18 @@ $NetBSD: patch-tabkey,v 1.4 1998/08/07 11:09:50 agc Exp $ char nextfolder[MAXPATH]; MAILSTREAM *nextstream = NULL; long recent_cnt; -@@ -463,8 +454,8 @@ - state->context_current, &recent_cnt))){ - if(!in_inbox){ - sprintf(prompt, "No more %ss. Return to \"%s\"", +@@ -490,8 +481,8 @@ + }; + + sprintf(prompt, "No more %ss. Return to \"%s\"? ", - (state->context_current->use&CNTXT_INCMNG) - ? "incoming folder" : "news group", + NEWS_TEST(state->context_current) + ? "news group" : "folder", state->inbox_name); - ret = want_to(prompt, 'y', 'x', NO_HELP, WT_NORM); - if(ret == 'y'){ -@@ -475,15 +466,15 @@ + + ret = radio_buttons(prompt, -FOOTER_ROWS(state), +@@ -512,15 +503,15 @@ } else q_status_message1(SM_ORDER, 0, 2, "No more %ss", @@ -60,7 +60,7 @@ $NetBSD: patch-tabkey,v 1.4 1998/08/07 11:09:50 agc Exp $ nextfolder, recent_cnt ? long2string(recent_cnt) : "some"); -@@ -1248,12 +1239,9 @@ +@@ -1350,12 +1341,9 @@ } if(!state->nr_mode diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST index 37d28b91bc7..3953d2291dd 100644 --- a/mail/pine/pkg/PLIST +++ b/mail/pine/pkg/PLIST @@ -1,13 +1,14 @@ -@comment $NetBSD: PLIST,v 1.7 1998/07/31 17:51:21 tv Exp $ +@comment $NetBSD: PLIST,v 1.8 1999/11/11 17:40:18 tv Exp $ bin/abookcpy bin/pine bin/pgpdecode bin/pgpencrypt bin/pgpsign -etc/pine.conf -etc/pine.conf.fixed man/man1/pine.1 share/doc/pine/tech-notes.txt -share/examples/pine/dot.pinerc.pgp.sample +share/examples/pine/dot.pinerc.pgp +share/examples/pine/pine.conf +share/examples/pine/pine.conf.fixed +@exec if [ ! -f %D/etc/pine.conf ]; then cp -p %D/share/examples/pine/pine.conf %D/etc/; fi @dirrm share/doc/pine @dirrm share/examples/pine |