On Fri, Jun 08, 2018 at 03:20:07PM +0200, Hiltjo Posthuma wrote:
> On Fri, Jun 08, 2018 at 02:50:57PM +0200, Solene Rapenne wrote:
> >
> > Hiltjo Posthuma writes:
> >
> > > Hi,
> > >
> > > This is a stab at updating hypermail to 2.3.0.
> > >
> > > A few patches are not needed anymore.
> > >
> > > I'm sure I made some stupid mistakes.
> > >
> > > Briefly tested on amd64.
> > >
> >
> > There is no MASTER_SITES defined so we can't download the distfiles.
> >
> > Also, I found an extra patch which add patches/patch-configure.orig
> > which should be removed.
> >
> > Does using the new version requires changes for 2.1.8 users?
> >
>
Hi,
Below is an updated patch. Differences with the previous sent version:
- Some whitespaces are removed as found by portcheck.
- Some patches are updated to apply more cleanly using make update-patches.
diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index 606658d13a4..5db58295b97 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -2,14 +2,14 @@
COMMENT= generate a cross-referenced HTML mail archive
-VERSION= 2.1.8
+VERSION= 2.3.0
DISTNAME= hypermail-${VERSION}
-REVISION = 1
CATEGORIES= mail www
HOMEPAGE= http://www.hypermail-project.org/
-MASTER_SITES= http://www.linklevel.net/distfiles/
+MASTER_SITES= ${HOMEPAGE}
+WRKDIST= ${WRKDIR}/hypermail
LIB_DEPENDS+= devel/pcre
@@ -19,7 +19,8 @@ WANTLIB= c m pcre
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/src/pcre
-CONFIGURE_ARGS= --with-htmldir=${PREFIX}/share/doc/hypermail
+CONFIGURE_ARGS= --with-htmldir=${PREFIX}/share/doc/hypermail \
+ --disable-i18n
CONFIGURE_ENV= CFLAGS="${CFLAGS} -DHAVE_VFSCANF" \
INCLUDES="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -40,7 +41,7 @@ CONFIGURE_ARGS +=--without-gdbm
NO_TEST= Yes
-DOCS= *.html *.png attachments.txt
+DOCS= *.html *.png attachments.txt
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/src/hypermail ${PREFIX}/bin
diff --git a/mail/hypermail/distinfo b/mail/hypermail/distinfo
index fd3b511d028..dec0fca4631 100644
--- a/mail/hypermail/distinfo
+++ b/mail/hypermail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hypermail-2.1.8.tar.gz) = Y5TFrfVltYSSr7SiZ90sNfKeV18IAhzQs7s8epgAu4c=
-SIZE (hypermail-2.1.8.tar.gz) = 1238173
+SHA256 (hypermail-2.3.0.tar.gz) = YZk4sM9U6ueG827yN/EG73v/elxpkEyjKv2NR78WBdE=
+SIZE (hypermail-2.3.0.tar.gz) = 1280010
diff --git a/mail/hypermail/patches/patch-Makefile_in b/mail/hypermail/patches/patch-Makefile_in
index ecb3587bcb7..4790dd9239a 100644
--- a/mail/hypermail/patches/patch-Makefile_in
+++ b/mail/hypermail/patches/patch-Makefile_in
@@ -1,6 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2003/03/06 20:51:39 brad Exp $
---- Makefile.in.orig Wed Mar 5 23:31:52 2003
-+++ Makefile.in Wed Mar 5 23:32:23 2003
+$OpenBSD$
+
+Use base pcre library.
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
@@ -28,9 +28,9 @@ INSTALL_PROG=@INSTALL@
# Compiler to use
diff --git a/mail/hypermail/patches/patch-configure b/mail/hypermail/patches/patch-configure
index 7be42e70b24..2f32c73ffc3 100644
--- a/mail/hypermail/patches/patch-configure
+++ b/mail/hypermail/patches/patch-configure
@@ -1,7 +1,11 @@
$OpenBSD: patch-configure,v 1.5 2013/04/19 20:20:36 sthen Exp $
---- configure.orig Fri Feb 14 00:42:38 2003
-+++ configure Fri Apr 19 21:11:22 2013
-@@ -544,14 +544,11 @@ fi
+
+Use base pcre library.
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -546,14 +546,11 @@ fi
@@ -16,7 +20,7 @@ $OpenBSD: patch-configure,v 1.5 2013/04/19 20:20:36 sthen Exp $
ac_aux_dir=
-@@ -2014,11 +2011,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
+@@ -2016,11 +2013,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
GDBM_LIB="-lgdbm"
else
echo "$ac_t""no" 1>&6
diff --git a/mail/hypermail/patches/patch-docs_hmrc_4 b/mail/hypermail/patches/patch-docs_hmrc_4
index dcf31ee1ea9..0892f25fd2d 100644
--- a/mail/hypermail/patches/patch-docs_hmrc_4
+++ b/mail/hypermail/patches/patch-docs_hmrc_4
@@ -1,14 +1,13 @@
-$OpenBSD: patch-docs_hmrc_4,v 1.7 2013/04/19 20:20:36 sthen Exp $
---- docs/hmrc.4.orig Thu Apr 24 18:29:11 2003
-+++ docs/hmrc.4 Fri Apr 19 21:11:22 2013
+$OpenBSD$
+
+Use the proper hmrc man page category number 5 for file formats.
+
+Index: docs/hmrc.4
+--- docs/hmrc.4.orig
++++ docs/hmrc.4
@@ -1,4 +1,4 @@
--.TH hmrc 4 "February 01, 2002"
-+.TH hmrc 5 "February 01, 2002"
+-.TH hmrc 4 "February 04, 2004"
++.TH hmrc 5 "February 04, 2004"
.SH NAME
hmrc \- Hypermail configuration file
.SH DESCRIPTION
-@@ -617,4 +617,3 @@ files so appropriate information can be filled in at r
- %D - Date META TAG - Not valid on index pages
- %S - Subject META TAG
- .nr
--.TP
diff --git a/mail/hypermail/patches/patch-docs_hmrc_html b/mail/hypermail/patches/patch-docs_hmrc_html
index 551243e6d8b..bd078059bda 100644
--- a/mail/hypermail/patches/patch-docs_hmrc_html
+++ b/mail/hypermail/patches/patch-docs_hmrc_html
@@ -1,7 +1,11 @@
-$OpenBSD: patch-docs_hmrc_html,v 1.4 2013/04/19 20:20:36 sthen Exp $
---- docs/hmrc.html.orig Thu Apr 24 18:29:11 2003
-+++ docs/hmrc.html Fri Apr 19 21:11:22 2013
-@@ -1228,7 +1228,7 @@ directories more than one level deep (e.g. with '%y/%m
+$OpenBSD$
+
+Use the proper hmrc man page category number 5 for file formats.
+
+Index: docs/hmrc.html
+--- docs/hmrc.html.orig
++++ docs/hmrc.html
+@@ -1373,7 +1373,7 @@ if that is what you use to specify the archive directo
<blockquote>
<strong>hypermail(1)</strong>,
diff --git a/mail/hypermail/patches/patch-docs_hypermail_1 b/mail/hypermail/patches/patch-docs_hypermail_1
index 05150a2d777..67dd5929bc0 100644
--- a/mail/hypermail/patches/patch-docs_hypermail_1
+++ b/mail/hypermail/patches/patch-docs_hypermail_1
@@ -1,17 +1,16 @@
-$OpenBSD: patch-docs_hypermail_1,v 1.4 2002/09/03 23:22:50 brad Exp $
---- docs/hypermail.1.orig Sun Sep 1 22:53:56 2002
-+++ docs/hypermail.1 Sun Sep 1 22:55:12 2002
-@@ -163,7 +163,7 @@ sign, such as:
- Settings are read in this order: from the program's hard-wired internal defaults, from environment variables, from command-line options, from the configuration file.
+$OpenBSD$
+
+Use the proper hmrc man page category number 5 for file formats.
+
+Index: docs/hypermail.1
+--- docs/hypermail.1.orig
++++ docs/hypermail.1
+@@ -235,7 +235,7 @@ sign, such as:
+ Settings are read in this order: from the program's hard-wired internal defaults, from environment variables, from the configuration file, from command-line options.
.LP
See
-.B hmrc.4
+.B hmrc.5
for more information on configuration file usage.
.LP
- Below is a list of variables that Hypermail understands. Boolean numbers can have the value of
-@@ -546,4 +546,3 @@ David Bau <davidbau@hotmail.com>
- Brian Kirkby <bkirkby@Concentrico.net>
- William King <William.King@dadaboom.com>
- .nr
--.TP
+ Below is a partial list of variables that Hypermail understands. A full list is available in the file hmrc.html, or you can also look in setup.c. Boolean numbers can have the value of
diff --git a/mail/hypermail/patches/patch-docs_hypermail_html b/mail/hypermail/patches/patch-docs_hypermail_html
deleted file mode 100644
index ae10b9a0258..00000000000
--- a/mail/hypermail/patches/patch-docs_hypermail_html
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-docs_hypermail_html,v 1.3 2013/04/19 20:20:36 sthen Exp $
---- docs/hypermail.html.orig Thu Apr 10 21:31:21 2003
-+++ docs/hypermail.html Fri Apr 19 21:11:22 2013
-@@ -590,7 +590,7 @@ Hypermail development is currently being fostered by
- <BLOCKQUOTE>
- <STRONG>hypermail(1)</STRONG>,
-
--<STRONG>hmrc(4)</STRONG>,
-+<STRONG>hmrc(5)</STRONG>,
-
- <STRONG><A HREF="hmrc.html">Hypermail List Configuration File</A></STRONG>.
-
diff --git a/mail/hypermail/patches/patch-src_Makefile_in b/mail/hypermail/patches/patch-src_Makefile_in
index 39ad07fb811..4ad43684a41 100644
--- a/mail/hypermail/patches/patch-src_Makefile_in
+++ b/mail/hypermail/patches/patch-src_Makefile_in
@@ -1,6 +1,10 @@
-$OpenBSD: patch-src_Makefile_in,v 1.5 2003/11/02 19:37:57 margarida Exp $
---- src/Makefile.in.orig 2003-11-02 19:09:04.000000000 +0000
-+++ src/Makefile.in 2003-11-02 19:09:53.000000000 +0000
+$OpenBSD$
+
+Use base pcre library.
+
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
@@ -29,10 +29,10 @@ SPLINTFLAGS=-Ipcre
#WNOERROR=-Werror
#WARNINGS=$(WNOERROR) -ansi -pedantic -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Dlint
@@ -22,4 +26,4 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 2003/11/02 19:37:57 margarida Exp $
+all: @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
pcre/.libs/libpcre.a:
- @cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
+ @cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; rm -f .libs/lib*.so*
diff --git a/mail/hypermail/patches/patch-src_parse_c b/mail/hypermail/patches/patch-src_parse_c
index f265bb4e5b5..a7512dda941 100644
--- a/mail/hypermail/patches/patch-src_parse_c
+++ b/mail/hypermail/patches/patch-src_parse_c
@@ -1,7 +1,9 @@
-$OpenBSD: patch-src_parse_c,v 1.4 2005/04/03 11:05:07 espie Exp $
---- src/parse.c.orig Tue Jul 1 16:20:48 2003
-+++ src/parse.c Sun Apr 3 12:58:45 2005
-@@ -57,7 +57,7 @@
+$OpenBSD$
+
+Index: src/parse.c
+--- src/parse.c.orig
++++ src/parse.c
+@@ -61,7 +61,7 @@
#include "../lcc/lcc_extras.h"
No comments:
Post a Comment