CVS commit: pkgsrc/mail/courier-mta

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/courier-mta
From: "Thomas Merkel" <tm%netbsd.org@localhost>
Date: Sat, 16 Mar 2024 14:23:29 +0000

Module Name:    pkgsrc
Committed By:   tm
Date:           Sat Mar 16 14:23:29 UTC 2024

Modified Files:
        pkgsrc/mail/courier-mta: Makefile distinfo
        pkgsrc/mail/courier-mta/patches: patch-aa patch-ad patch-ax

Log Message:
courier-mta: Fix install on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/courier-mta/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/courier-mta/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/courier-mta/patches/patch-aa
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/courier-mta/patches/patch-ad
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/courier-mta/patches/patch-ax

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

Modified files:

Index: pkgsrc/mail/courier-mta/Makefile
diff -u pkgsrc/mail/courier-mta/Makefile:1.66 pkgsrc/mail/courier-mta/Makefile:1.67
--- pkgsrc/mail/courier-mta/Makefile:1.66       Mon Feb 12 21:06:43 2024
+++ pkgsrc/mail/courier-mta/Makefile    Sat Mar 16 14:23:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/02/12 21:06:43 hans Exp $
+# $NetBSD: Makefile,v 1.67 2024/03/16 14:23:28 tm Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
@@ -14,6 +14,8 @@ HOMEPAGE=     https://www.courier-mta.org/
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
 DEPENDS+=      couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
 DEPENDS+=      maildrop>=2.5.0:../../mail/maildrop
+DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
+DEPENDS+=      wget-[0-9]*:../../net/wget
 
 USE_TOOLS+=            gmake perl:run
 USE_LANGUAGES=         c c++

Index: pkgsrc/mail/courier-mta/distinfo
diff -u pkgsrc/mail/courier-mta/distinfo:1.24 pkgsrc/mail/courier-mta/distinfo:1.25
--- pkgsrc/mail/courier-mta/distinfo:1.24       Mon Feb 12 21:06:43 2024
+++ pkgsrc/mail/courier-mta/distinfo    Sat Mar 16 14:23:28 2024
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.24 2024/02/12 21:06:43 hans Exp $
+$NetBSD: distinfo,v 1.25 2024/03/16 14:23:28 tm Exp $
 
 BLAKE2s (courier-1.3.5.tar.bz2) = c642c73d91d1e49661461f2436bde29b3c67e34ccfc495c92ae065f508894aea
 SHA512 (courier-1.3.5.tar.bz2) = 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
 Size (courier-1.3.5.tar.bz2) = 7901040 bytes
-SHA1 (patch-aa) = 1be0b3b0a6ff226533310d94c51abadd4005ee40
+SHA1 (patch-aa) = 285d72739a6d3e295a7e4997bfb41f81e1e0172e
 SHA1 (patch-ab) = 253ceb334093a965753d6a796fcec1940acfc5f0
 SHA1 (patch-ac) = b7147b6c85530161fb1620409119d2d00d4a30dc
-SHA1 (patch-ad) = abff3e30b384af39dabd3c0d721ad9ae10b16481
+SHA1 (patch-ad) = 98157e56265309a82d1fab6c509079c294cf07ce
 SHA1 (patch-ae) = 25cf54b4764da79d7c2a4ee40189b93542a2d1ff
 SHA1 (patch-af) = bd07ca8fa0ce711fb4849bc218ed3b4478b05617
 SHA1 (patch-ag) = 913ea4897d96bf3ad885dd6221edb54f79e34af3
@@ -15,6 +15,6 @@ SHA1 (patch-ai) = ee3ae11ec6342afcd2284f
 SHA1 (patch-aj) = ddffd683d418d10880db4d407657b9995327567a
 SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
 SHA1 (patch-an) = 2b78be9a0e8a9daf528da83007ba865f9b8cc402
-SHA1 (patch-ax) = c7eb48d5aef5a51ae143385d688b092870b56e21
+SHA1 (patch-ax) = 9bd50a5791dc7dc05447c471cab26d61edb1a57d
 SHA1 (patch-ay) = 58da42d53f34394034ddcf2fcf6cd4a82e7c43cd
 SHA1 (patch-configure) = efad44aa1bf7ec5546ce97a01b48933a63b2489e

Index: pkgsrc/mail/courier-mta/patches/patch-aa
diff -u pkgsrc/mail/courier-mta/patches/patch-aa:1.8 pkgsrc/mail/courier-mta/patches/patch-aa:1.9
--- pkgsrc/mail/courier-mta/patches/patch-aa:1.8        Mon Feb 12 21:06:43 2024
+++ pkgsrc/mail/courier-mta/patches/patch-aa    Sat Mar 16 14:23:28 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2024/02/12 21:06:43 hans Exp $
+$NetBSD: patch-aa,v 1.9 2024/03/16 14:23:28 tm Exp $
 
---- courier/Makefile.in.orig   2023-08-04 00:12:02.000000000 +0000
+--- courier/Makefile.in.orig   2023-11-23 21:09:35.000000000 +0000
 +++ courier/Makefile.in
 @@ -101,16 +101,16 @@ host_triplet = @host@
  target_triplet = @target@
@@ -113,8 +113,9 @@ $NetBSD: patch-aa,v 1.8 2024/02/12 21:06
 -      for f in makealiases makehosteddomains makeimapaccess pop3d pop3d-ssl \
 +      for f in makealiases makehosteddomains \
                ; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-               $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
+-              $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
 -      rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/sqwebmail/webgpg` $(DESTDIR)$(sbindir)/webgpg
++              $(LN_S) `realpath $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
        $(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared
 -      chmod 755 $(DESTDIR)$(sysconfdir)/shared

Index: pkgsrc/mail/courier-mta/patches/patch-ad
diff -u pkgsrc/mail/courier-mta/patches/patch-ad:1.7 pkgsrc/mail/courier-mta/patches/patch-ad:1.8
--- pkgsrc/mail/courier-mta/patches/patch-ad:1.7        Mon Feb 12 21:06:43 2024
+++ pkgsrc/mail/courier-mta/patches/patch-ad    Sat Mar 16 14:23:28 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.7 2024/02/12 21:06:43 hans Exp $
+$NetBSD: patch-ad,v 1.8 2024/03/16 14:23:28 tm Exp $
 
---- courier/filters/Makefile.in.orig   2023-04-23 22:07:56.000000000 +0000
+--- courier/filters/Makefile.in.orig   2023-11-18 22:20:03.000000000 +0000
 +++ courier/filters/Makefile.in
 @@ -461,6 +461,7 @@ SUBDIRS = libfilter perlfilter
  CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-ad,v 1.7 2024/02/12 21:06
  bin_SCRIPTS = verifysmtp
  filtersocketdir = $(localstatedir)/filters
  allfiltersocketdir = $(localstatedir)/allfilters
-@@ -1435,8 +1436,6 @@ install-exec-hook:
+@@ -1435,18 +1436,14 @@ install-exec-hook:
  install-data-hook:
        -$(mkinstalldirs) $(DESTDIR)$(filtersocketdir)
        -$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir)
@@ -28,7 +28,9 @@ $NetBSD: patch-ad,v 1.7 2024/02/12 21:06
        -$(mkinstalldirs) $(DESTDIR)$(sbindir)
        -$(mkinstalldirs) $(DESTDIR)$(bindir)
        chmod 500 $(DESTDIR)$(datadir)/filterctl
-@@ -1445,8 +1444,6 @@ install-data-hook:
+       rm -f $(DESTDIR)$(sbindir)/filterctl
+-      $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/filterctl` $(DESTDIR)$(sbindir)/filterctl
++      $(LN_S) `realpath $(DESTDIR)$(datadir)/filterctl` $(DESTDIR)$(sbindir)/filterctl
        chmod 755 $(DESTDIR)$(filterbindir)
        chmod 750 $(DESTDIR)$(filtersocketdir)
        chmod 750 $(DESTDIR)$(allfiltersocketdir)

Index: pkgsrc/mail/courier-mta/patches/patch-ax
diff -u pkgsrc/mail/courier-mta/patches/patch-ax:1.4 pkgsrc/mail/courier-mta/patches/patch-ax:1.5
--- pkgsrc/mail/courier-mta/patches/patch-ax:1.4        Mon Feb 12 21:06:43 2024
+++ pkgsrc/mail/courier-mta/patches/patch-ax    Sat Mar 16 14:23:29 2024
@@ -1,17 +1,34 @@
-$NetBSD: patch-ax,v 1.4 2024/02/12 21:06:43 hans Exp $
+$NetBSD: patch-ax,v 1.5 2024/03/16 14:23:29 tm Exp $
 
---- courier/module.esmtp/Makefile.in.orig      2023-04-24 02:29:24.000000000 +0000
+--- courier/module.esmtp/Makefile.in.orig      2023-11-18 22:20:17.000000000 +0000
 +++ courier/module.esmtp/Makefile.in
-@@ -1238,17 +1238,11 @@ install-data-local:
-       test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) `realpath --relative-to $(sbindir) -m 
$(moduledir)/courieresmtpd` $(DESTDIR)$(sbindir)/courieresmtpd
+@@ -1128,8 +1128,8 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-databinSCRIPTS \
+-      install-modulePROGRAMS
++install-data-am: install-modulePROGRAMS install-databinSCRIPTS \
++      install-data-local
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
+@@ -1235,20 +1235,14 @@ install-data-hook:
+       test `id -u` = 0 || exit 0 ; cd $(DESTDIR)$(moduledir) || exit 1 ; chown @mailuser@ . ; chgrp @mailgroup@ .
+ 
+ install-data-local:
+-      test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) `realpath --relative-to $(sbindir) -m 
$(moduledir)/courieresmtpd` $(DESTDIR)$(sbindir)/courieresmtpd
++      test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) `realpath 
$(DESTDIR)$(moduledir)/courieresmtpd` $(DESTDIR)$(sbindir)/courieresmtpd
        -$(mkinstalldirs) $(DESTDIR)$(bindir)
-       test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) `realpath -m --relative-to $(bindir) $(moduledir)/addcr` $(DESTDIR)$(bindir)/addcr
+-      test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) `realpath -m --relative-to $(bindir) $(moduledir)/addcr` $(DESTDIR)$(bindir)/addcr
 -      -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtpacceptmailfor.dir
 -      -$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtppercentrelay.dir
++      test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) `realpath $(DESTDIR)$(moduledir)/addcr` $(DESTDIR)$(bindir)/addcr
        -$(mkinstalldirs) $(DESTDIR)$(sbindir)
        for f in $(databin_SCRIPTS) ; do \
                rm -f $(DESTDIR)$(sbindir)/$$f ; \
-               $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
+-              $(LN_S) `realpath -m --relative-to $(sbindir) $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
++              $(LN_S) `realpath $(datadir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
        cat </dev/null >>$(DESTDIR)$(sysconfdir)/esmtpauthclient
 -      chmod 600 $(DESTDIR)$(sysconfdir)/esmtpauthclient
 -      test `id -u` = 0 || exit 0; \

Prev by Date: CVS commit: pkgsrc/mail/courier-imap
Next by Date: CVS commit: pkgsrc/audio/libmad
Previous by Thread: CVS commit: pkgsrc/mail/courier-imap
Next by Thread: CVS commit: pkgsrc/audio/libmad
Indexes:

Home | Main Index | Thread Index | Old Index