svn commit: r372753 - in head/mail/elm: . files

Mikhail Teterin mi at FreeBSD.org
Tue Nov 18 23:22:54 UTC 2014 

Author: mi
Date: Tue Nov 18 23:22:52 2014
New Revision: 372753
URL: https://svnweb.freebsd.org/changeset/ports/372753
QAT: https://qat.redports.org/buildarchive/r372753/

Log:
  Resurrect this port from oblivion by:
  
  	* Fixing it up to support staging
  	* Defining LICENSE-knobs
  	* Patching to avoid errors from the picky clang
  	  (many other warnings remain)
  
  Take maintainership, bump PORTREVISION.
  
  Sponsored by:	United Marsupials

Added:
  head/mail/elm/
     - copied from r366719, head/mail/elm/
  head/mail/elm/files/patch-MANIFEST   (contents, props changed)
  head/mail/elm/files/patch-picky-cc   (contents, props changed)
Modified:
  head/mail/elm/Makefile
  head/mail/elm/pkg-descr
  head/mail/elm/pkg-plist

Modified: head/mail/elm/Makefile
==============================================================================
--- head/mail/elm/Makefile	Sun Aug 31 03:56:03 2014	(r366719)
+++ head/mail/elm/Makefile	Tue Nov 18 23:22:52 2014	(r372753)
@@ -3,17 +3,20 @@
 
 PORTNAME=	elm
 PORTVERSION=	2.5.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://instinct.org/elm/files/tarballs/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	mi at aldan.algebra.com
 COMMENT=	Once-popular mail user agent, version 2.5.x
 
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+LICENSE=	ELM
+LICENSE_NAME=	Elm(tm) Mail System General Public License
+LICENSE_FILE=	${WRKSRC}/NOTICE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-MAKE_JOBS_UNSAFE=	yes
+BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
 
 CFLAGS+=	-D_SIZE_T
 
@@ -24,11 +27,12 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=		PREFIX="${PREFIX}"
 CONFIGURE_ARGS=		-d
-MAKE_FLAGS=		CATMAN=catman-none
-MAN1=			answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
-			frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
-			printmail.1 readmsg.1 mmencode.1
-MLINKS=			frm.1 nfrm.1 newmail.1 wnewmail.1
+MAKE_ARGS+=		CATMAN=catman-none
+MAKE_ARGS+=		DESTBIN="${STAGEDIR}${PREFIX}/bin"
+MAKE_ARGS+=		DESTLIB="${STAGEDIR}${PREFIX}/lib"
+MAKE_ARGS+=		LIB="${STAGEDIR}${PREFIX}/lib"
+MAKE_ARGS+=		MAN="${STAGEDIR}${PREFIX}/man/man1"
+MAKE_ARGS+=	-B
+EXTRACT_AFTER_ARGS=	--exclude gencat
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Added: head/mail/elm/files/patch-MANIFEST
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/elm/files/patch-MANIFEST	Tue Nov 18 23:22:52 2014	(r372753)
@@ -0,0 +1,14 @@
+--- MANIFEST	2005-08-18 09:20:14.000000000 -0400
++++ MANIFEST	2014-11-18 18:10:37.000000000 -0500
+@@ -155,11 +155,4 @@
+ nls/LANGS
+ nls/Makefile
+-nls/gencat/Copyright
+-nls/gencat/Makefile
+-nls/gencat/README
+-nls/gencat/dumpmsg.c
+-nls/gencat/gencat.c
+-nls/gencat/gencat.h
+-nls/gencat/genlib.c
+ src/Makefile.SH
+ src/depend.out

Added: head/mail/elm/files/patch-picky-cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/elm/files/patch-picky-cc	Tue Nov 18 23:22:52 2014	(r372753)
@@ -0,0 +1,105 @@
+--- src/alias.c	2005-08-18 08:49:24.000000000 -0400
++++ src/alias.c	2014-11-18 16:44:56.000000000 -0500
+@@ -706,4 +706,5 @@
+ }
+ 
++void
+ alias()
+ {
+--- src/a_sort.c	2005-08-18 08:49:24.000000000 -0400
++++ src/a_sort.c	2014-11-18 17:01:12.000000000 -0500
+@@ -35,5 +35,6 @@
+ #include "s_aliases.h"
+ 
+-char *alias_sort_name();
++char *alias_sort_name(int longname);
++static void alias_old_current(long iindex);
+ 
+ sort_aliases(entries, visible, are_in_aliases)
+@@ -180,4 +181,5 @@
+ }
+ 
++static void
+ alias_old_current(iindex)
+ long iindex;
+--- src/calendar.c	2005-08-18 08:49:24.000000000 -0400
++++ src/calendar.c	2014-11-18 17:06:11.000000000 -0500
+@@ -46,4 +46,5 @@
+ #include "s_error.h"
+ 
++void
+ scan_calendar()
+ {
+--- src/elm.c	2005-08-18 08:49:24.000000000 -0400
++++ src/elm.c	2014-11-18 17:10:28.000000000 -0500
+@@ -66,4 +66,5 @@
+ long bytes();
+ char *format_long(), *parse_arguments();
++static void debug_message(void);
+ 
+ main(argc, argv)
+@@ -594,5 +595,5 @@
+ }
+ 
+-
++static void
+ debug_message()
+ {
+--- src/fileio.c	2005-08-18 08:49:24.000000000 -0400
++++ src/fileio.c	2014-11-18 17:13:06.000000000 -0500
+@@ -66,5 +66,5 @@
+ }
+ 
+-
++void
+ copy_message(dest_file, msgnum, cm_options)
+ FILE *dest_file;
+--- src/read_rc.c	2005-08-18 08:49:24.000000000 -0400
++++ src/read_rc.c	2014-11-18 17:15:13.000000000 -0500
+@@ -68,4 +68,5 @@
+ 
+ extern opts_menu *find_cfg_opts();
++static void do_rc(FILE *file, int lcl);
+ 
+ #define metachar(c)	(c == '+' || c == '%' || c == '=')
+@@ -323,5 +324,5 @@
+ }
+ 
+-
++static void
+ do_rc(file, lcl)
+ FILE *file;
+--- src/screen.c	2005-08-18 08:49:24.000000000 -0400
++++ src/screen.c	2014-11-18 17:16:50.000000000 -0500
+@@ -253,4 +253,5 @@
+ }
+ 
++void
+ show_current()
+ {
+--- src/strings.c	2005-08-18 08:49:24.000000000 -0400
++++ src/strings.c	2014-11-18 17:18:56.000000000 -0500
+@@ -166,4 +166,5 @@
+ }
+ 
++void
+ split_word(buffer, first, rest)
+ char *buffer, *first, *rest;
+--- utils/answer.c	2005-08-18 08:49:24.000000000 -0400
++++ utils/answer.c	2014-11-18 17:21:52.000000000 -0500
+@@ -52,6 +52,7 @@
+ 
+ char *get_alias_address(), *get_token(), *strip_parens(), *shift_lower();
++static void open_alias_file(void);
+ 
+-static char *quit_word, *exit_word, *done_word, *bye_word;
++static const char *quit_word, *exit_word, *done_word, *bye_word;
+ 
+ main(argc, argv)
+@@ -272,5 +273,5 @@
+ }
+ 
+-	    
++static void   
+ open_alias_file()
+ {

Modified: head/mail/elm/pkg-descr
==============================================================================
--- head/mail/elm/pkg-descr	Sun Aug 31 03:56:03 2014	(r366719)
+++ head/mail/elm/pkg-descr	Tue Nov 18 23:22:52 2014	(r372753)
@@ -1,2 +1,4 @@
 Elm is an interactive screen-oriented mailer program  that
 supersedes mail and mailx.  This is the 2.5.x distribution.
+
+WWW: http://instinct.org/elm/

Modified: head/mail/elm/pkg-plist
==============================================================================
--- head/mail/elm/pkg-plist	Sun Aug 31 03:56:03 2014	(r366719)
+++ head/mail/elm/pkg-plist	Tue Nov 18 23:22:52 2014	(r372753)
@@ -27,3 +27,17 @@ lib/help-attach
 lib/help-selfolder
 lib/mime-types
 lib/mlists.eg
+man/man1/elm.1.gz
+man/man1/elmalias.1.gz
+man/man1/fastmail.1.gz
+man/man1/frm.1.gz
+man/man1/listalias.1.gz
+man/man1/messages.1.gz
+man/man1/newalias.1.gz
+man/man1/printmail.1.gz
+man/man1/wnewmail.1.gz
+man/man1/newmail.1.gz
+man/man1/answer.1.gz
+man/man1/checkalias.1.gz
+man/man1/mmencode.1.gz
+man/man1/readmsg.1.gz

More information about the svn-ports-head mailing list