Make changes suggested by Jeremy C. Reed in PR pkg/21889:

- move parts of DESCR to MESSAGE
- USE_PKGINSTALL
- add ncurses-buildlink
- on linux, link with -lncurses rather than -lcurses

While there, shuffle some definitions around to match overall order.

5 files changed, 39 insertions, 35 deletions

diff --git a/mail/pine/DESCR b/mail/pine/DESCR
index 4d6fd456da5..f32e3e1c766 100644
--- a/mail/pine/DESCR
+++ b/mail/pine/DESCR
@@ -2,16 +2,4 @@ Pine is a tool for reading, sending, and managing electronic messages.
 It was designed specifically with novice computer users in mind, but can
 be tailored to accommodate the needs of "power users" as well.  Pine uses
 Internet message protocols (e.g.  RFC-822, SMTP, MIME, IMAP, NNTP) and
-runs on Unix and PCs.  This package also includes the Pico editor, the
-IMAP daemon, a POP2 server, and a POP3 server.
-
-If you want to use the spell checking feature of pine, set the
-environment variable SPELL to "/usr/pkg/bin/ispell -l".
-
-An optional configuration file "pine.conf" can be put into /usr/pkg/etc
-to set system wide defaults.  The format of this file is identical to the
-.pinerc file that is auto-generated by pine in your home directory.
-
-Also included in /usr/pkg/share/examples/pine/dot.pinerc.pgp.sample are
-example entries needed to add to your .pinerc to activate the pgp add on
-scripts pgpdecode, pgpencode, and pgpsign.
+runs on Unix and PCs. 
diff --git a/mail/pine/MESSAGE b/mail/pine/MESSAGE
new file mode 100644
index 00000000000..a7155455767
--- /dev/null
+++ b/mail/pine/MESSAGE
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/06/28 18:16:02 jschauma Exp $
+
+If you want to use the spell checking feature of pine, set the
+environment variable SPELL to "${PREFIX}/bin/ispell -l".
+
+The optional configuration file "${PKG_SYSCONFDIR}/pine.conf" can be
+used to set system wide defaults.  The format of this file is identical
+to the .pinerc file that is auto-generated by pine in your home directory.
+
+Also included in ${PREFIX}/share/examples/pine/dot.pinerc.pgp.sample are
+example entries needed to add to your .pinerc to activate the pgp add on
+scripts pgpdecode, pgpencode, and pgpsign.
+===========================================================================
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 4392d6d4be7..ea0cd73854a 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2003/06/02 01:18:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.70 2003/06/28 18:16:03 jschauma Exp $
 
 DISTNAME=       pine4.53
 PKGNAME=        pine-4.53
@@ -15,10 +15,26 @@ COMMENT=	Program for Internet News and E-mail
 LICENSE=	pine-license
 
 BUILD_DEFS+=	PINE_USE_LDAP
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+
+CONF_FILES=    ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK2=	YES
+.if ${OPSYS} == "SunOS"
+BUILDNAME= so5
+BUILDFILE= sol
+.elif ${OPSYS} == "Linux"
+BUILDNAME= lrh
+BUILDFILE= lnx
+.elif ${OPSYS} == "Darwin"
+BUILDNAME= osx
+BUILDFILE= osx
+.else
+BUILDNAME= neb
+BUILDFILE= neb
+.endif
 
 .if defined(PINE_USE_LDAP) && (${PINE_USE_LDAP} == "YES")
 .  include "../../databases/openldap/buildlink2.mk"
@@ -34,7 +50,7 @@ pre-patch:
 do-configure:
 	${CP} -f ${WRKSRC}/pine/osdep/os-${BUILDFILE}.h ${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig
 	${SED} \
-		-e 's@/usr/local/lib/@${PREFIX}/etc/@' \
+		-e 's@/usr/local/lib/@${PKG_SYSCONFDIR}/etc/@' \
 		-e 's@DEFAULT_DEBUG.*2@DEFAULT_DEBUG 0@' \
 		<${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig >${WRKSRC}/pine/osdep/os-${BUILDFILE}.h
 	@${RM} -rf ${WRKSRC}/pico
@@ -62,7 +78,6 @@ do-install:
 	    -e 's|^\(sort-key\)=.*$$|\1=Arrival/Reverse|g' \
 	    >${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/pine
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pine/contrib
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pine/contrib/utils
@@ -72,22 +87,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/utils/* ${PREFIX}/share/pine/contrib/utils
 	${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
 
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../editors/pico/buildlink2.mk"
 .include "../../mail/imap-uw/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
-
-.if ${OPSYS} == "SunOS"
-BUILDNAME= so5
-BUILDFILE= sol
-.elif ${OPSYS} == "Linux"
-BUILDNAME= lrh
-BUILDFILE= lnx
-.elif ${OPSYS} == "Darwin"
-BUILDNAME= osx
-BUILDFILE= osx
-.else
-BUILDNAME= neb
-BUILDFILE= neb
-.endif
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 6fa4654d21b..d066b78a042 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2003/06/02 17:44:13 kim Exp $
+$NetBSD: distinfo,v 1.16 2003/06/28 18:16:03 jschauma Exp $
 
 SHA1 (pine4.53.tar.bz2) = 99aed9dd3173a00a8bfd986d96c292b287ace5b2
 Size (pine4.53.tar.bz2) = 2793349 bytes
 SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
-SHA1 (patch-ab) = a50d95f25b0a5b2b994bd08acfe9c0c70c497b17
+SHA1 (patch-ab) = 30956059b70bdb3081f8d3ddc184c3a480d50a56
 SHA1 (patch-ac) = 439207ab6edea4e3b6148ce777ed717e133565b5
 SHA1 (patch-ad) = daca835a9b82fe4041fbfe90b435382ef9a609ce
 SHA1 (patch-ae) = 370f46eb2c1868663d9c8c927c89b644d1118ca2
diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab
index 6f7e823106e..c0b0206655d 100644
--- a/mail/pine/patches/patch-ab
+++ b/mail/pine/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 2002/12/14 10:34:44 tron Exp $
+$NetBSD: patch-ab,v 1.10 2003/06/28 18:16:04 jschauma Exp $
 
 --- pine/makefile.lnx.orig	Tue Sep 10 23:34:39 2002
 +++ pine/makefile.lnx	Sat Dec 14 11:10:00 2002
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.9 2002/12/14 10:34:44 tron Exp $
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
 -LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 -             `cat $(CCLIENTDIR)/LDFLAGS`
-+STDLIBS=     -lssl -lcrypto -lpam -lcurses
++STDLIBS=     -lssl -lcrypto -lpam -lncurses
 +LOCLIBS=     -lpico -lc-client
 +LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)