>Number:         21889
>Category:       pkg
>Synopsis:       fixes for mail/pine: CONF_FILES, MESSAGE, ncurses
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 15 04:41:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6
>Organization:
http://bsd.reedmedia.net/
>Environment:
	
	
System: NetBSD rainier.reedmedia.net 1.6 NetBSD 1.6 (JCR-20020927) #3: Sat Sep 28 13:40:20 PDT 2002 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/JCR-20020927 i386
Architecture: i386
Machine: i386
>Description:
mail/pine's DESCR has parts that should be moved to MESSAGE.
DESCR also lists pico and mail servers which really are in other packages.

Pine didn't use USE_PKGINSTALL for its pine.conf. Patch provided below
fixes that.

Also, needs ncurses for Linux (and Darwin?).
Patch for Linux did use -lcurses instead of -lncurses. I patched that.
(because on Linux usually -lcurses is a symlink to -lncurses).

Add buildlink2 for ncurses -- maybe this should only be done for
Linux and Darwin?

(Also, PAM needs to be fixed for this. But I will provide in another patch
later. Also, I made a separate c-client package for pine to use
so the servers aren't needed to be installed. I will submit that
later too -- and update version.)
>How-To-Repeat:
	
>Fix:
This is mail/pine/MESSAGE:

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.

? mail/pine/MESSAGE
? mail/pine/TODO
Index: mail/pine/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/DESCR,v
retrieving revision 1.2
diff -b -u -r1.2 DESCR
--- mail/pine/DESCR	2003/05/06 17:41:48	1.2
+++ mail/pine/DESCR	2003/06/15 04:32:00
@@ -2,16 +2,4 @@
 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.
Index: mail/pine/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/Makefile,v
retrieving revision 1.69
diff -b -u -r1.69 Makefile
--- mail/pine/Makefile	2003/06/02 01:18:39	1.69
+++ mail/pine/Makefile	2003/06/15 04:32:00
@@ -19,6 +19,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL= YES
 
 .if defined(PINE_USE_LDAP) && (${PINE_USE_LDAP} == "YES")
 .  include "../../databases/openldap/buildlink2.mk"
@@ -26,6 +27,8 @@
 LDAPLIBS=      LDAPLIBS="-lldap -llber"
 .endif
 
+CONF_FILES=	${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
+
 pre-patch:
 	# Make sure the imap lib that comes with pine isn't
 	# used (see http://www.securityfocus.com/advisories/2646)
@@ -34,7 +37,7 @@
 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}/@' \
 		-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 +65,6 @@
 	    -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
@@ -75,6 +77,7 @@
 .include "../../editors/pico/buildlink2.mk"
 .include "../../mail/imap-uw/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
 
Index: mail/pine/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/distinfo,v
retrieving revision 1.15
diff -b -u -r1.15 distinfo
--- mail/pine/distinfo	2003/06/02 17:44:13	1.15
+++ mail/pine/distinfo	2003/06/15 04:32:00
@@ -3,7 +3,7 @@
 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
Index: mail/pine/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/patches/patch-ab,v
retrieving revision 1.9
diff -b -u -r1.9 patch-ab
--- mail/pine/patches/patch-ab	2002/12/14 10:34:44	1.9
+++ mail/pine/patches/patch-ab	2003/06/15 04:32:01
@@ -24,7 +24,7 @@
 -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)
  
>Release-Note:
>Audit-Trail:
>Unformatted: