Subject: pkg/6400: Patches for pine-4.05; pine-4.03 no longer available
To: None <gnats-bugs@gnats.netbsd.org>
From: None <fb@enteract.com>
List: netbsd-bugs
Date: 11/05/1998 06:36:21
>Number: 6400
>Category: pkg
>Synopsis: Patches for pine-4.05, pico-3.4
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: gnats-admin (GNATS administrator)
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Nov 5 04:50:01 1998
>Last-Modified:
>Originator: Frederick Bruckman
>Organization:
>Release: Nov. 1, 1998
>Environment:
System: NetBSD handy.localnet 1.3H NetBSD 1.3H (HANDY) #2: Mon Nov 2 00:35:57 CST 1998
fredb@handy.localnet:/usr/src/sys/arch/i386/compile/HANDY i386
>Description:
The pico-3.2 package requires pine-4.03, which is no longer available.
>How-To-Repeat:
cd /usr/pkgsrc/editors/pico; make fetch
>Fix:
Here's a patch for pine-4.05. The files patch/patch-am and patch-an have
apparently been incorporated into the release, and are therefore no longer
necessary. The only other change, besides the version numbers, is to accomodate
the pine developers' inexplicable substitution of "EXTRALIBES" for "EXTRALIBS".
It will be necessary to follow this patch with "make fetch" and "make makesum"
in both editors/pico and mail/pine. (I forgot to save the old checksums for the
patch. Sorry.)
--- pkgsrc/editors/pico/Makefile.orig Thu Sep 10 06:25:51 1998
+++ pkgsrc/editors/pico/Makefile Thu Nov 5 04:31:11 1998
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.12 1998/09/10 03:38:45 tv Exp $
#
-DISTNAME= pine4.03
-PKGNAME= pico-3.2
+DISTNAME= pine4.05
+PKGNAME= pico-3.4
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
@@ -11,7 +11,7 @@
USE_LIBTOOL= yes
-CONFLICTS= pico-2.9 pine-3.96 pico-3.0
+CONFLICTS= pico-2.9 pine-3.96 pico-3.0 pico-3.2
do-build:
cd ${WRKSRC} && ./build neb CC="${LIBTOOL} ${CC}" PREFIX=${PREFIX}
--- pkgsrc/mail/pine/Makefile.orig Sun Oct 4 06:24:16 1998
+++ pkgsrc/mail/pine/Makefile Thu Nov 5 04:40:44 1998
@@ -2,8 +2,8 @@
# FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
#
-DISTNAME= pine4.02
-PKGNAME= pine-4.02
+DISTNAME= pine4.05
+PKGNAME= pine-4.05
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
@@ -13,9 +13,9 @@
HOMEPAGE= http://www.washington.edu/pine/
# This pkg doesn't build pico or libpico; the pico pkg does that part.
-DEPENDS= pico-3.2:../../editors/pico
+DEPENDS= pico-3.4:../../editors/pico
-CONFLICTS= pine-3.96 pine-4.00
+CONFLICTS= pine-3.96 pine-4.00 pine-4.02
do-configure:
${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
--- pkgsrc/mail/pine/patches/patch-ac.orig Fri Aug 7 06:24:21 1998
+++ pkgsrc/mail/pine/patches/patch-ac Thu Nov 5 04:54:45 1998
@@ -22,9 +22,9 @@
STDLIBS= -ltermlib
-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS= $(EXTRALIBS) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+LOCLIBS= -lpico $(CCLIENTDIR)/c-client.a
-+LIBS= -L$(PREFIX)/lib -R$(PREFIX)/lib/ $(EXTRALIBS) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
++LIBS= -L$(PREFIX)/lib -R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
`cat $(CCLIENTDIR)/LDFLAGS`
STDCFLAGS= -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
--- pkgsrc/mail/pine/patches/patch-am.orig Fri Aug 7 06:24:22 1998
+++ pkgsrc/mail/pine/patches/patch-am Thu Nov 5 05:28:18 1998
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.4 1998/08/07 11:09:49 agc Exp $
-
-Revision history
-
-==========================================
-Patches for Pine 4.02 from Pavel Kankovsky
-==========================================
-
---- ./pine/mailpart.c.noparanoia Mon Jul 20 21:18:49 1998
-+++ ./pine/mailpart.c Thu Jul 30 15:41:08 1998
-@@ -1230,7 +1230,10 @@
-
- /* warning: overload "err" use */
- if(err = rfc2231_get_param(param, att_name, NULL, NULL)){
-- strcpy(filename, err);
-+ if (strlen(err) >= sizeof(filename))
-+ strcpy(filename, "CAUTION! ORIGINAL FILENAME TOO LONG");
-+ else
-+ strcpy(filename, err);
- fs_give((void **) &err);
- }
-
--- pkgsrc/mail/pine/patches/patch-an.orig Fri Aug 7 06:24:24 1998
+++ pkgsrc/mail/pine/patches/patch-an Thu Nov 5 05:28:23 1998
@@ -1,32 +0,0 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 11:09:50 agc Exp $
-
-Revision history
-
-==========================================
-Patches for Pine 4.02 from Pavel Kankovsky
-==========================================
-
---- pine/mailview.c.noparanoia Fri Jul 17 09:10:35 1998
-+++ pine/mailview.c Thu Jul 30 22:11:46 1998
-@@ -940,7 +940,7 @@
- sstrcpy(&p, body_type_names(type));
- if(full && subtype){
- *p++ = '/';
-- sstrcpy(&p, subtype);
-+ sstrcpy(&p, strsquish(tmp_20k_buf + 500, subtype, 20));
- }
-
- switch(type) {
-@@ -1558,6 +1558,10 @@
- }
-
- gf_filter_init();
-+ if(F_OFF(F_PASS_CONTROL_CHARS, ps_global)){
-+ gf_link_filter(gf_escape_filter, NULL);
-+ gf_link_filter(gf_control_filter, NULL);
-+ }
- gf_link_filter(gf_wrap, gf_wrap_filter_opt(width, width, 0, 0));
- gf_link_filter(gf_line_test, gf_line_test_opt(quote_editorial, NULL));
- return(gf_pipe(gc, pc));
-
-
>Audit-Trail:
>Unformatted: