[pkgsrc/trunk]: pkgsrc/mail/mess822 Depend on libtai to provide up-to-date le...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/mess822 Depend on libtai to provide up-to-date le...
From: schmonz <schmonz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:24:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b861a4aceb57
branches:  trunk
changeset: 364484:b861a4aceb57
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jun 26 02:04:35 2017 +0000

description:
Depend on libtai to provide up-to-date leapsecs.dat. Build with pkgsrc
libtai rather than the bundled (slightly older) copy. Don't build
catpages, since we won't install them. Bump PKGREVISION.

diffstat:

 mail/mess822/Makefile                       |  20 +++++++++---------
 mail/mess822/PLIST                          |   3 +-
 mail/mess822/distinfo                       |   7 ++---
 mail/mess822/patches/patch-Makefile         |  31 +++++++++++++++++++++++++++-
 mail/mess822/patches/patch-hier.c           |   9 +++----
 mail/mess822/patches/patch-leapsecs__read.c |  16 --------------
 6 files changed, 47 insertions(+), 39 deletions(-)

diffs (181 lines):

diff -r 80cbde52d6ee -r b861a4aceb57 mail/mess822/Makefile
--- a/mail/mess822/Makefile     Mon Jun 26 01:06:07 2017 +0000
+++ b/mail/mess822/Makefile     Mon Jun 26 02:04:35 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2017/05/29 23:20:54 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2017/06/26 02:04:35 schmonz Exp $
 #
 
 DISTNAME=              mess822-0.58
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            mail
 MASTER_SITES=          http://cr.yp.to/software/
 
@@ -11,27 +11,27 @@
 COMMENT=               Library for parsing Internet mail messages
 LICENSE=               public-domain
 
+DEPENDS_LIBTAI+=       libtai>=0.60nb5:../../devel/libtai
+DEPENDS+=              ${DEPENDS_LIBTAI}
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
 
-USE_TOOLS+=            nroff
-
 DJB_RESTRICTED=                no
 
-EGDIR=                 ${PREFIX}/share/examples/mess822
-CFLAGS+=               -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}
-CONF_FILES+=           ${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
-
 DJB_BUILD_TARGETS=     install instcheck
 
 AUTO_MKDIRS=           yes
 
-SUBST_FILES.djbware+=  cdb_seek.c leapsecs_read.c
+SUBST_FILES.djbware+=  cdb_seek.c
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     hier.c
 SUBST_SED.paths=       -e 's,@PKGMANDIR@,${PKGMANDIR},g'
 
+pre-build:
+       cp ${BUILDLINK_DIR}/include/*.h ${WRKSRC}
+       cp ${BUILDLINK_DIR}/lib/*.a ${WRKSRC}
+
+.include "../../devel/libtai/buildlink3.mk"
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 80cbde52d6ee -r b861a4aceb57 mail/mess822/PLIST
--- a/mail/mess822/PLIST        Mon Jun 26 01:06:07 2017 +0000
+++ b/mail/mess822/PLIST        Mon Jun 26 02:04:35 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/03/26 14:04:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/06/26 02:04:35 schmonz Exp $
 bin/822date
 bin/822field
 bin/822header
@@ -27,4 +27,3 @@
 man/man5/rewriting.5
 man/man8/ofmipd.8
 man/man8/ofmipname.8
-share/examples/mess822/leapsecs.dat
diff -r 80cbde52d6ee -r b861a4aceb57 mail/mess822/distinfo
--- a/mail/mess822/distinfo     Mon Jun 26 01:06:07 2017 +0000
+++ b/mail/mess822/distinfo     Mon Jun 26 02:04:35 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2017/05/29 23:20:54 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2017/06/26 02:04:35 schmonz Exp $
 
 SHA1 (mess822-0.58.tar.gz) = ef3380c793c852d40688c108d164234ecf8a5362
 RMD160 (mess822-0.58.tar.gz) = 40fbcb5af92882e133ab3653c6119022180caedb
@@ -8,7 +8,6 @@
 RMD160 (mess822-smtp-auth-patch.txt) = 1284dcba571b0593696722e27c8b68292279b7a2
 SHA512 (mess822-smtp-auth-patch.txt) = 6c8c3317fee977f091245f428225b34fc6a229814a6f4fee59249407ae3367afae7feff62c324d93b19b900fac03bbb7f28dff12f36995fc7c20c0ae87afeac3
 Size (mess822-smtp-auth-patch.txt) = 30031 bytes
-SHA1 (patch-Makefile) = bc5df5f91e8451a0cf414ec1e2de83d1244f119f
-SHA1 (patch-hier.c) = 9333469af2636d97917bfff768954e36a8026733
-SHA1 (patch-leapsecs__read.c) = e9325df21f6dd114c0bc9327708c82f8b692c1d5
+SHA1 (patch-Makefile) = 2726cd0d67ee6aeef32f7cfb2528c1c0e9d1c7d5
+SHA1 (patch-hier.c) = 82c95e1884bc13788361903349e7d262a34c336b
 SHA1 (patch-strerr__sys.c) = 81ad05a71e8caa01302768c2bd7837c644adbeb3
diff -r 80cbde52d6ee -r b861a4aceb57 mail/mess822/patches/patch-Makefile
--- a/mail/mess822/patches/patch-Makefile       Mon Jun 26 01:06:07 2017 +0000
+++ b/mail/mess822/patches/patch-Makefile       Mon Jun 26 02:04:35 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.1 2017/05/26 14:34:43 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/06/26 02:04:35 schmonz Exp $
 
-DESTDIR support.
+DESTDIR support. Don't make catpages. Use pkgsrc libtai.
 
 --- Makefile.orig      1998-09-05 02:33:37.000000000 +0000
 +++ Makefile
@@ -43,3 +43,30 @@
        stralloc.a alloc.a error.a str.a 
  
  instcheck.o: \
+@@ -380,7 +388,7 @@ compile instcheck.c strerr.h error.h rea
+       ./compile instcheck.c
+ 
+ it: \
+-prog man
++prog
+ 
+ leapsecs_add.o: \
+ compile leapsecs_add.c leapsecs.h tai.h uint64.h
+@@ -398,16 +406,7 @@ leapsecs_sub.o: \
+ compile leapsecs_sub.c leapsecs.h tai.h uint64.h
+       ./compile leapsecs_sub.c
+ 
+-libtai.a: \
+-makelib tai_now.o tai_pack.o tai_unpack.o caldate_fmjd.o \
+-caldate_mjd.o caldate_fmt.o caldate_scan.o leapsecs_read.o \
+-leapsecs_init.o leapsecs_add.o leapsecs_sub.o caltime_tai.o \
+-caltime_utc.o caltime_fmt.o caltime_scan.o
+-      ./makelib libtai.a tai_now.o tai_pack.o tai_unpack.o \
+-      caldate_fmjd.o caldate_mjd.o caldate_fmt.o caldate_scan.o \
+-      leapsecs_read.o leapsecs_init.o leapsecs_add.o \
+-      leapsecs_sub.o caltime_tai.o caltime_utc.o caltime_fmt.o \
+-      caltime_scan.o
++libtai.a:
+ 
+ load: \
+ make-load warn-auto.sh systype
diff -r 80cbde52d6ee -r b861a4aceb57 mail/mess822/patches/patch-hier.c
--- a/mail/mess822/patches/patch-hier.c Mon Jun 26 01:06:07 2017 +0000
+++ b/mail/mess822/patches/patch-hier.c Mon Jun 26 02:04:35 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-hier.c,v 1.1 2017/05/26 14:34:43 schmonz Exp $
+$NetBSD: patch-hier.c,v 1.2 2017/06/26 02:04:35 schmonz Exp $
 
 Install docs following hier(7), don't install catpages, and set
 reasonable permissions.
@@ -35,7 +35,7 @@
  
    c(auto_home,"lib","mess822.a",-1,-1,0644);
    c(auto_home,"include","mess822.h",-1,-1,0644);
-@@ -30,41 +26,23 @@ void hier()
+@@ -30,41 +26,21 @@ void hier()
    c(auto_home,"bin","822received",-1,-1,0755);
    c(auto_home,"bin","822print",-1,-1,0755);
  
@@ -74,6 +74,8 @@
 -  c(auto_home,"man/cat3","mess822_quote.0",-1,-1,0644);
 -  c(auto_home,"man/cat3","mess822_token.0",-1,-1,0644);
 -  c(auto_home,"man/cat3","mess822_when.0",-1,-1,0644);
+-
+-  c("/etc",".","leapsecs.dat",-1,-1,0644);
 +  c(auto_home,"@PKGMANDIR@/man1","iftocc.1",-1,-1,0644);
 +  c(auto_home,"@PKGMANDIR@/man1","new-inject.1",-1,-1,0644);
 +  c(auto_home,"@PKGMANDIR@/man1","822field.1",-1,-1,0644);
@@ -91,7 +93,4 @@
 +  c(auto_home,"@PKGMANDIR@/man3","mess822_quote.3",-1,-1,0644);
 +  c(auto_home,"@PKGMANDIR@/man3","mess822_token.3",-1,-1,0644);
 +  c(auto_home,"@PKGMANDIR@/man3","mess822_when.3",-1,-1,0644);
- 
--  c("/etc",".","leapsecs.dat",-1,-1,0644);
-+  c(auto_home,"share/examples/mess822","leapsecs.dat",-1,-1,0644);
  }
diff -r 80cbde52d6ee -r b861a4aceb57 mail/mess822/patches/patch-leapsecs__read.c
--- a/mail/mess822/patches/patch-leapsecs__read.c       Mon Jun 26 01:06:07 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-leapsecs__read.c,v 1.1 2017/05/26 14:34:43 schmonz Exp $
-
-Fix to the included libtai, brought over from devel/libtai:
-
-#include <unistd.h> in leapsecs_read.c so we can read leapsecs.dat.
-
---- leapsecs_read.c.orig       1998-09-04 22:33:37.000000000 -0400
-+++ leapsecs_read.c
-@@ -2,6 +2,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <unistd.h>
- extern int errno;
- #include "tai.h"
- #include "leapsecs.h"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated mail/mess822 to 0.58nb7
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/libowfat to 0.31
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated mail/mess822 to 0.58nb7
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/libowfat to 0.31
Indexes:
Home | Main Index | Thread Index | Old Index