CVS commit: pkgsrc/mail/alpine

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Mar  2 16:30:09 UTC 2023

Modified Files:
        pkgsrc/mail/alpine: DESCR Makefile

Log Message:
mail/alpine: update DESCR to reflect changes.

Add conflict with mail/pine, beside editors/pico.
It make sense to default to alpine now to provide both pico(1) and
pilot(1) since the original pine is unmaintained.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/mail/alpine/DESCR
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mail/alpine/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/alpine/DESCR
diff -u pkgsrc/mail/alpine/DESCR:1.1.1.1 pkgsrc/mail/alpine/DESCR:1.2
--- pkgsrc/mail/alpine/DESCR:1.1.1.1    Thu May  3 12:11:37 2007
+++ pkgsrc/mail/alpine/DESCR    Thu Mar  2 16:30:09 2023
@@ -5,6 +5,9 @@ configuration, Alpine offers an intentio
 functions geared toward the novice user, but it also has a large
 list of optional "power-user" and personal-preference features.
 
-This package currently only installs the alpine binary, excluding
-the pilot and pico binaries which would cause it to conflict with
-the pine package.
+This package also includes:
+* pico(1), a simple text editor with limited searching,
+  block cut and paste, and spell checking features.
+* pilot(1), a simple, console-based,
+  display-oriented file system navigator. Pilot provides basic file
+  manipulation commands.

Index: pkgsrc/mail/alpine/Makefile
diff -u pkgsrc/mail/alpine/Makefile:1.54 pkgsrc/mail/alpine/Makefile:1.55
--- pkgsrc/mail/alpine/Makefile:1.54    Mon Feb 27 20:08:37 2023
+++ pkgsrc/mail/alpine/Makefile Thu Mar  2 16:30:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2023/02/27 20:08:37 vins Exp $
+# $NetBSD: Makefile,v 1.55 2023/03/02 16:30:09 vins Exp $
 
 DISTNAME=      alpine-2.26
 PKGREVISION=   1
@@ -28,7 +28,8 @@ HOMEPAGE=     https://alpineapp.email/
 COMMENT=       Program for Internet News and E-mail
 LICENSE=       apache-2.0
 
-CONFLICTS+=    pico-[0-9]*      # bin/pico
+CONFLICTS+=    pico-[0-9]*      # bin/{pico,pilot}
+CONFLICTS+=    pine-[0-9]*      # bin/{rpdump,rpload}
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    msgfmt msgmerge xgettext