On Thu, 11 Sep 2003, Hubert Feyrer wrote:

> On Thu, 11 Sep 2003, Jeremy C. Reed wrote:
> > Any advice?
>
> Um, weren't pico and pine always shipped in one distfile?

I am not sure what you mean by "Um". Yes. The point is that pico's
Makefile points to a non-existent DISTNAME (probably on netbsd's distfile
server though).

> Assuming that, a Makefile.common makes sense.
> You could set a PINE_VERSION in there, and then derive pico and pine's
> PKGNAME from that (PKGNAME=pico-${PINE_VERSION}, same for pine)

But pico has a different version name. For example, it was already
pico-4.6 with pine4.56 distfile and it was pico-4.4 with pine4.51
distfile. The name doesn't match up. It is defined in
pico/pico.h.

Also, to add more confusion the installed pilot (which should be in a
different package) is version 2.0.

(But yes, I am now using PINE_VERSION for setting pine's version.)

And more questions...

It is unclear if pico (the editor) was updated too. (I don't want to
compare old source files.)

Is it okay to PKGREVISION=1 ??

(It is same version but built from different distfile.)

And should the pico/buildlink2.mk be changed too?
BUILDLINK_DEPENDS.pico?=        pico>=4.6nb1

I don't think the above matters.

Also, pine's PLIST has old code for installing pine.conf -- that should be
removed -- but is not reflected in patches below.

My patches follow. Please test.

   Jeremy C. Reed
   http://bsd.reedmedia.net/

Index: mail/pine/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/Makefile,v
retrieving revision 1.75
diff -b -u -r1.75 Makefile
--- mail/pine/Makefile	2003/09/04 11:09:11	1.75
+++ mail/pine/Makefile	2003/09/11 19:57:41
@@ -1,17 +1,11 @@
 # $NetBSD: Makefile,v 1.75 2003/09/04 11:09:11 martti Exp $

-DISTNAME=       pine4.56
-PKGNAME=        pine-4.56
+.include "Makefile.common"
+
+PKGNAME=        pine-${PINE_VERSION}
 CATEGORIES=     mail news
-MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
-		ftp://ftp.fu-berlin.de/unix/mail/pine/
-EXTRACT_SUFX=	.tar.bz2

-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.washington.edu/pine/
 COMMENT=	Program for Internet News and E-mail
-
-LICENSE=	pine-license

 BUILD_DEFS+=	PINE_USE_LDAP
 USE_BUILDLINK2=	YES
Index: mail/pine/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/distinfo,v
retrieving revision 1.18
diff -b -u -r1.18 distinfo
--- mail/pine/distinfo	2003/09/04 11:09:11	1.18
+++ mail/pine/distinfo	2003/09/11 19:57:42
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.18 2003/09/04 11:09:11 martti Exp $

-SHA1 (pine4.56.tar.bz2) = 7623cdf1cbc300cffda9e358318aac7ddf39a226
-Size (pine4.56.tar.bz2) = 2830086 bytes
+SHA1 (pine4.58.tar.bz2) = 5522426ef925813218ce1a3fbb939591778b59f1
+Size (pine4.58.tar.bz2) = 2837321 bytes
 SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
 SHA1 (patch-ab) = b430138b9388150aecafb131b00cc9911f8fb35d
 SHA1 (patch-ac) = 439207ab6edea4e3b6148ce777ed717e133565b5
Index: editors/pico/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pico/Makefile,v
retrieving revision 1.42
diff -b -u -r1.42 Makefile
--- editors/pico/Makefile	2003/09/05 19:00:58	1.42
+++ editors/pico/Makefile	2003/09/11 19:57:42
@@ -1,17 +1,12 @@
 # $NetBSD: Makefile,v 1.42 2003/09/05 19:00:58 tron Exp $

-DISTNAME=	pine4.56
+.include "../../mail/pine/Makefile.common"
+
 PKGNAME=	pico-4.6
+PKGREVISION=    1
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
-		ftp://ftp.fu-berlin.de/unix/mail/pine/
-EXTRACT_SUFX=	.tar.bz2

-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.washington.edu/pine/
 COMMENT=	Text editor (ships with Pine), and Pine's text editing lib
-
-LICENSE=	pine-license

 USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
Index: editors/pico/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pico/distinfo,v
retrieving revision 1.11
diff -b -u -r1.11 distinfo
--- editors/pico/distinfo	2003/07/28 14:35:33	1.11
+++ editors/pico/distinfo	2003/09/11 19:57:42
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.11 2003/07/28 14:35:33 adam Exp $

-SHA1 (pine4.56.tar.bz2) = 7623cdf1cbc300cffda9e358318aac7ddf39a226
-Size (pine4.56.tar.bz2) = 2830086 bytes
+SHA1 (pine4.58.tar.bz2) = 5522426ef925813218ce1a3fbb939591778b59f1
+Size (pine4.58.tar.bz2) = 2837321 bytes
 SHA1 (patch-aa) = 13a6268321e3620c9438d19abec92072c7aecab4
 SHA1 (patch-ab) = ff843a907a8bb2015e7e79d5b221b6b024823130
 SHA1 (patch-ac) = 5f648f4e34d78af439ed2ea4953543aab4bd232f

--- /dev/null	Thu Sep 11 12:47:34 2003
+++ mail/pine/Makefile.common	Thu Sep 11 12:23:35 2003
@@ -0,0 +1,18 @@
+# $NetBSD$
+#
+# common for pine, pico
+
+# MAINTAINER: be sure to update PKGNAME as appropriate for pine and pico
+
+PINE_VERSION=	4.58
+DISTNAME=       pine${PINE_VERSION}
+MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
+		ftp://ftp.fu-berlin.de/unix/mail/pine/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.washington.edu/pine/
+
+LICENSE=	pine-license
+
+# XXX: probably more could be added that is the same