Received: by mail.netbsd.org (Postfix, from userid 605) id C373F84E08; Mon, 26 Jun 2017 02:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5067784E08 for ; Mon, 26 Jun 2017 02:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id as7R8SYh3Y0y for ; Mon, 26 Jun 2017 02:04:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 997E084D04 for ; Mon, 26 Jun 2017 02:04:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 942E8FAE8; Mon, 26 Jun 2017 02:04:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149844267541690" MIME-Version: 1.0 Date: Mon, 26 Jun 2017 02:04:35 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/mess822 To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20170626020435.942E8FAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_149844267541690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Mon Jun 26 02:04:35 UTC 2017 Modified Files: pkgsrc/mail/mess822: Makefile PLIST distinfo pkgsrc/mail/mess822/patches: patch-Makefile patch-hier.c Removed Files: pkgsrc/mail/mess822/patches: patch-leapsecs__read.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/mess822/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/mess822/PLIST cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/mess822/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/mess822/patches/patch-Makefile \ pkgsrc/mail/mess822/patches/patch-hier.c cvs rdiff -u -r1.1 -r0 pkgsrc/mail/mess822/patches/patch-leapsecs__read.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149844267541690 Content-Disposition: inline Content-Length: 6540 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/mess822/Makefile diff -u pkgsrc/mail/mess822/Makefile:1.27 pkgsrc/mail/mess822/Makefile:1.28 --- pkgsrc/mail/mess822/Makefile:1.27 Mon May 29 23:20:54 2017 +++ pkgsrc/mail/mess822/Makefile Mon Jun 26 02:04:35 2017 @@ -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 @@ HOMEPAGE= http://cr.yp.to/mess822.html 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" Index: pkgsrc/mail/mess822/PLIST diff -u pkgsrc/mail/mess822/PLIST:1.4 pkgsrc/mail/mess822/PLIST:1.5 --- pkgsrc/mail/mess822/PLIST:1.4 Mon Mar 26 14:04:00 2012 +++ pkgsrc/mail/mess822/PLIST Mon Jun 26 02:04:35 2017 @@ -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/man3/mess822_when.3 man/man5/rewriting.5 man/man8/ofmipd.8 man/man8/ofmipname.8 -share/examples/mess822/leapsecs.dat Index: pkgsrc/mail/mess822/distinfo diff -u pkgsrc/mail/mess822/distinfo:1.12 pkgsrc/mail/mess822/distinfo:1.13 --- pkgsrc/mail/mess822/distinfo:1.12 Mon May 29 23:20:54 2017 +++ pkgsrc/mail/mess822/distinfo Mon Jun 26 02:04:35 2017 @@ -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 @@ SHA1 (mess822-smtp-auth-patch.txt) = 985 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 Index: pkgsrc/mail/mess822/patches/patch-Makefile diff -u pkgsrc/mail/mess822/patches/patch-Makefile:1.1 pkgsrc/mail/mess822/patches/patch-Makefile:1.2 --- pkgsrc/mail/mess822/patches/patch-Makefile:1.1 Fri May 26 14:34:43 2017 +++ pkgsrc/mail/mess822/patches/patch-Makefile Mon Jun 26 02:04:35 2017 @@ -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 @@ DESTDIR support. 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 Index: pkgsrc/mail/mess822/patches/patch-hier.c diff -u pkgsrc/mail/mess822/patches/patch-hier.c:1.1 pkgsrc/mail/mess822/patches/patch-hier.c:1.2 --- pkgsrc/mail/mess822/patches/patch-hier.c:1.1 Fri May 26 14:34:43 2017 +++ pkgsrc/mail/mess822/patches/patch-hier.c Mon Jun 26 02:04:35 2017 @@ -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 @@ reasonable permissions. 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 @@ reasonable permissions. - 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 @@ reasonable permissions. + 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); } --_----------=_149844267541690--