On Thu, 11 Sep 2003, Jeremy C. Reed wrote:

> I tested new pine under NetBSD (a little), now building under Linux ...

Linux needed a "make" which is in the tools directory but only used when
that environment is used. So I added patches for that too.

There is not a maintainer for these packages, so can anyone test and let
me know if I may commit the below patches?

   Jeremy C. Reed

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 22:54:57
@@ -1,18 +1,12 @@
 # $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
 USE_PKGINSTALL=	YES
@@ -56,7 +50,8 @@
 	@${LN} -sf ${BUILDLINK_DIR}/include/pico ${WRKSRC}/pico

 do-build:
-	cd ${WRKSRC} && ./build ${BUILDNAME} ${LDAPCFLAGS} ${LDAPLIBS}	\
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
+		${LDAPCFLAGS} ${LDAPLIBS}	\
 		PREFIX=${PREFIX}					\
 		CC="${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS}"

Index: mail/pine/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/PLIST,v
retrieving revision 1.3
diff -b -u -r1.3 PLIST
--- mail/pine/PLIST	2002/02/15 10:12:48	1.3
+++ mail/pine/PLIST	2003/09/11 22:54:57
@@ -17,9 +17,7 @@
 share/pine/contrib/utils/sendtoall
 share/pine/contrib/utils/txtcc.sh
 share/examples/pine/dot.pinerc.pgp
-@unexec if cmp -s %D/etc/pine.conf %D/share/examples/pine/pine.conf; then ${RM} -f %D/etc/pine.conf; fi
 share/examples/pine/pine.conf
-@exec if [ ! -f %D/etc/pine.conf ]; then cp -p %D/share/examples/pine/pine.conf %D/etc/; fi
 share/examples/pine/pine.conf.fixed
 @dirrm share/pine/contrib/utils
 @dirrm share/pine/contrib
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 22:54:57
@@ -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 22:54:58
@@ -1,18 +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
 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

@@ -32,7 +26,8 @@

 do-build:
 	cd ${WRKSRC} && \
-	./build ${BUILDNAME} CC="${PKGLIBTOOL} ${BUILDLINK_CC}" \
+	${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
+	  CC="${PKGLIBTOOL} ${BUILDLINK_CC}" \
 	  PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}"

 do-install:
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 22:54:58
@@ -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 14:46:56 2003
+++ mail/pine/Makefile.common	Thu Sep 11 13:34:41 2003
@@ -0,0 +1,19 @@
+# $NetBSD$
+#
+# Common Makefile fragment shared with pine and pico
+
+# MAINTAINER: be sure to update PKGNAME as appropriate
+# for editors/pico/Makefile; see pico/pico.h for version.
+
+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