[pkgsrc/trunk]: pkgsrc/mail Changes 1.18:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail Changes 1.18:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:28:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/53c9a33cf761
branches:  trunk
changeset: 576130:53c9a33cf761
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 02 12:50:03 2010 +0000

description:
Changes 1.18:
See http://hg.vergenet.net/perdition/perdition/

diffstat:

 mail/perdition-bdb/Makefile        |   10 +--
 mail/perdition-gdbm/Makefile       |    7 +-
 mail/perdition-ldap/Makefile       |    5 +-
 mail/perdition-mysql/Makefile      |    7 +-
 mail/perdition-odbc/Makefile       |    7 +-
 mail/perdition-postgresql/Makefile |    7 +-
 mail/perdition/Makefile            |   13 +--
 mail/perdition/Makefile.common     |   29 ++++-----
 mail/perdition/PLIST               |    4 +-
 mail/perdition/buildlink3.mk       |    8 +-
 mail/perdition/distinfo            |   18 ++----
 mail/perdition/patches/patch-aa    |   17 -----
 mail/perdition/patches/patch-ab    |   17 -----
 mail/perdition/patches/patch-ac    |    8 +-
 mail/perdition/patches/patch-ad    |   13 ----
 mail/perdition/patches/patch-ae    |   13 ----
 mail/perdition/patches/patch-af    |   13 ----
 mail/perdition/patches/patch-ag    |   17 ++---
 mail/perdition/patches/patch-ah    |  109 -------------------------------------
 19 files changed, 55 insertions(+), 267 deletions(-)

diffs (truncated from 510 to 300 lines):

diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition-bdb/Makefile
--- a/mail/perdition-bdb/Makefile       Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition-bdb/Makefile       Wed Jun 02 12:50:03 2010 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2008/09/07 11:24:28 wiz Exp $
-#
-
-PKGREVISION=           4
+# $NetBSD: Makefile,v 1.7 2010/06/02 12:50:03 adam Exp $
 
 PERDITION_COMMENT=     Berkeley DB user database module
 PERDITION_PKGNAME=     bdb
 BUILD_DIRS=            makebdb perdition/db/bdb
 
-BDB_ACCEPTED=          db4
+BDB_ACCEPTED=          db4 db5
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mail/perdition/buildlink3.mk"
-.include "../perdition/Makefile.common"
+.include "../../mail/perdition/Makefile.common"
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition-gdbm/Makefile
--- a/mail/perdition-gdbm/Makefile      Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition-gdbm/Makefile      Wed Jun 02 12:50:03 2010 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:35 joerg Exp $
-#
-
-PKGREVISION=           1
+# $NetBSD: Makefile,v 1.4 2010/06/02 12:50:04 adam Exp $
 
 PERDITION_COMMENT=     GDBM user database module
 PERDITION_PKGNAME=     gdbm
@@ -11,4 +8,4 @@
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../mail/perdition/buildlink3.mk"
-.include "../perdition/Makefile.common"
+.include "../../mail/perdition/Makefile.common"
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition-ldap/Makefile
--- a/mail/perdition-ldap/Makefile      Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition-ldap/Makefile      Wed Jun 02 12:50:03 2010 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:25 wiz Exp $
-#
-
-PKGREVISION=           5
+# $NetBSD: Makefile,v 1.8 2010/06/02 12:50:04 adam Exp $
 
 PERDITION_COMMENT=     LDAP user database module
 PERDITION_PKGNAME=     ldap
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition-mysql/Makefile
--- a/mail/perdition-mysql/Makefile     Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition-mysql/Makefile     Wed Jun 02 12:50:03 2010 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:35 joerg Exp $
-#
-
-PKGREVISION=           2
+# $NetBSD: Makefile,v 1.5 2010/06/02 12:50:04 adam Exp $
 
 PERDITION_COMMENT=     MySQL user database module
 PERDITION_PKGNAME=     mysql
@@ -12,4 +9,4 @@
 REPLACE_BASH+= perdition/db/mysql/perditiondb_mysql_makedb
 
 .include "../../mk/mysql.buildlink3.mk"
-.include "../perdition/Makefile.common"
+.include "../../mail/perdition/Makefile.common"
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition-odbc/Makefile
--- a/mail/perdition-odbc/Makefile      Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition-odbc/Makefile      Wed Jun 02 12:50:03 2010 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:35 joerg Exp $
-#
-
-PKGREVISION=           1
+# $NetBSD: Makefile,v 1.5 2010/06/02 12:50:04 adam Exp $
 
 PERDITION_COMMENT=     UnixODBC user database module
 PERDITION_PKGNAME=     odbc
@@ -15,4 +12,4 @@
 REPLACE_BASH+= perdition/db/odbc/perditiondb_odbc_makedb
 
 .include "../../databases/unixodbc/buildlink3.mk"
-.include "../perdition/Makefile.common"
+.include "../../mail/perdition/Makefile.common"
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition-postgresql/Makefile
--- a/mail/perdition-postgresql/Makefile        Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition-postgresql/Makefile        Wed Jun 02 12:50:03 2010 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/02/10 19:34:07 joerg Exp $
-#
-
-PKGREVISION=           5
+# $NetBSD: Makefile,v 1.8 2010/06/02 12:50:04 adam Exp $
 
 PERDITION_COMMENT=     PostgreSQL user database module
 PERDITION_PKGNAME=     postgresql
@@ -13,4 +10,4 @@
 REPLACE_BASH+= perdition/db/postgresql/perditiondb_postgresql_makedb
 
 .include "../../mk/pgsql.buildlink3.mk"
-.include "../perdition/Makefile.common"
+.include "../../mail/perdition/Makefile.common"
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/Makefile
--- a/mail/perdition/Makefile   Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition/Makefile   Wed Jun 02 12:50:03 2010 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/07/13 16:26:17 tonnerre Exp $
-#
-
-PKGREVISION=           8
+# $NetBSD: Makefile,v 1.12 2010/06/02 12:50:03 adam Exp $
 
 PERDITION_COMMENT=     main program
 
@@ -11,15 +8,15 @@
 
 OWN_DIRS+=             ${PKG_SYSCONFDIR}
 .for f in Makefile.popmap perdition.conf popmap popmap.re
-CONF_FILES+=           ${EGDIR}/perdition/$f ${PKG_SYSCONFDIR}/${f:.popmap=}
+CONF_FILES+=           ${EGDIR}/perdition/${f} ${PKG_SYSCONFDIR}/${f:.popmap=}
 .endfor
 RCD_SCRIPTS+=          perdition.imap4 perdition.imap4s perdition.pop3 perdition.pop3s
 
 SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   Fixing paths.
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     etc/perdition/perdition.conf
-SUBST_SED.paths=       -e "s|/usr/lib/|${PREFIX}/lib/|g" \
-                       -e "s|/etc/perdition/|${PKG_SYSCONFDIR}/|g"
-SUBST_MESSAGE.paths=   Fixing paths.
+SUBST_SED.paths=       -e "s|/usr/lib/|${PREFIX}/lib/|g"
+SUBST_SED.paths+=      -e "s|/etc/perdition/|${PKG_SYSCONFDIR}/|g"
 
 .include "Makefile.common"
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/Makefile.common
--- a/mail/perdition/Makefile.common    Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition/Makefile.common    Wed Jun 02 12:50:03 2010 +0000
@@ -1,29 +1,28 @@
-# $NetBSD: Makefile.common,v 1.6 2007/09/04 21:04:20 joerg Exp $
-#
+# $NetBSD: Makefile.common,v 1.7 2010/06/02 12:50:03 adam Exp $
 
-PERDITION_VERSION=     1.17
-DISTNAME=              perdition-${PERDITION_VERSION}
-CATEGORIES=            mail
-MASTER_SITES=          http://www.vergenet.net/linux/perdition/download/1.17/
+DISTNAME=      perdition-${PERDITION_VERSION}
+CATEGORIES=    mail
+MASTER_SITES=  http://www.vergenet.net/linux/perdition/download/${PERDITION_VERSION}/
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.vergenet.net/linux/perdition/
-COMMENT=               IMAP/POP3 proxy redirector (${PERDITION_COMMENT})
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.vergenet.net/linux/perdition/
+COMMENT=       IMAP/POP3 proxy redirector (${PERDITION_COMMENT})
 
+PERDITION_VERSION=     1.18
+
+USE_LIBTOOL=           yes
+USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake
-USE_PKGLOCALEDIR=      yes
-USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-PKG_SYSCONFSUBDIR=     perdition
-
 CONFIGURE_ARGS+=       --disable-daemon-map
 CONFIGURE_ARGS+=       --localstatedir=/var
+PKG_SYSCONFSUBDIR=     perdition
 
 EGDIR=                 ${PREFIX}/share/examples
 INSTALL_AM_MAKEFLAGS=  sysconfdir=${EGDIR}
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
-.ifdef PERDITION_PKGNAME
+.if defined(PERDITION_PKGNAME)
 PKGNAME=               ${DISTNAME:S/-/-${PERDITION_PKGNAME}-/}
 DEPENDS+=              perdition-${PERDITION_VERSION}{,nb*}:../../mail/perdition
 BUILD_DIRS?=           perdition/db/${PERDITION_PKGNAME}
@@ -32,7 +31,7 @@
 PERDITION_SKIP_DISABLE?=${PERDITION_PKGNAME}
 .for f in mysql odbc pg gdbm bdb ldap ldap-doc
 .  if empty(PERDITION_SKIP_DISABLE:M$f)
-CONFIGURE_ARGS+=       --disable-$f
+CONFIGURE_ARGS+=       --disable-${f}
 .  endif
 .endfor
 
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/PLIST
--- a/mail/perdition/PLIST      Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition/PLIST      Wed Jun 02 12:50:03 2010 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:04:39 joerg Exp $
-include/jain.h
-lib/libjain.la
+@comment $NetBSD: PLIST,v 1.7 2010/06/02 12:50:03 adam Exp $
 lib/libperditiondb_nis.la
 lib/libperditiondb_posix_regex.la
 man/man5/perditiondb.5
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/buildlink3.mk
--- a/mail/perdition/buildlink3.mk      Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition/buildlink3.mk      Wed Jun 02 12:50:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/02 12:50:03 adam Exp $
 
 BUILDLINK_TREE+=       perdition
 
@@ -6,13 +6,13 @@
 PERDITION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.perdition+=      perdition>=1.17
-BUILDLINK_ABI_DEPENDS.perdition?=      perdition>=1.17nb1
+BUILDLINK_ABI_DEPENDS.perdition+=      perdition>=1.17nb1
 BUILDLINK_PKGSRCDIR.perdition?=        ../../mail/perdition
 
 # The following are included in Makefile.common for "configure"'s sake.
 #.include "../../devel/popt/buildlink3.mk"
-#.include "../../devel/vanessa_adt/buildlink3.mk"
-#.include "../../devel/vanessa_logger/buildlink3.mk"
+.include "../../devel/vanessa_adt/buildlink3.mk"
+.include "../../devel/vanessa_logger/buildlink3.mk"
 #.include "../../devel/vanessa_socket/buildlink3.mk"
 .endif # PERDITION_BUILDLINK3_MK
 
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/distinfo
--- a/mail/perdition/distinfo   Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition/distinfo   Wed Jun 02 12:50:03 2010 +0000
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/07/13 16:26:17 tonnerre Exp $
+$NetBSD: distinfo,v 1.8 2010/06/02 12:50:03 adam Exp $
 
-SHA1 (perdition-1.17.tar.gz) = 5e04f172db4a7ee2af5b7a28c19c231f955243fc
-RMD160 (perdition-1.17.tar.gz) = cc3c4679390132ece6858eca6483ffddead568e4
-Size (perdition-1.17.tar.gz) = 552149 bytes
-SHA1 (patch-aa) = 17c6bf55f77187cad59f779e6fbcd85d6921eab1
-SHA1 (patch-ab) = 7d7b8458c104437e83934b3b0fea573bd54aced0
-SHA1 (patch-ac) = 5096afa901f6f5766d9a8b0d2481c8f9c1356fe1
-SHA1 (patch-ad) = 7b53169a8571141016fa79e1fbf55439579c4d77
-SHA1 (patch-ae) = a3a41d06a7a63d479f4c8de29b6d7ee2a745dd87
-SHA1 (patch-af) = 0fa5a853c69ff6869e3a752fc592228d6e782079
-SHA1 (patch-ag) = 350cfc64f98611455292d4d052463e6828588338
-SHA1 (patch-ah) = 6a88d3c73cc5e5b88a58b057c58fdbe182f2d0d4
+SHA1 (perdition-1.18.tar.gz) = 60d76e2fca810fa1a12bebe369fc3e7d3452ebbb
+RMD160 (perdition-1.18.tar.gz) = 82065dcfb7f05d7bebcf98b72334f676d4fd5dad
+Size (perdition-1.18.tar.gz) = 602933 bytes
+SHA1 (patch-ac) = 01934fb919cc8ac7699e07e407d6e26706e98fbd
+SHA1 (patch-ag) = 3840c9b4ed6e6d286c1cbeebad7184f9ccdaac2a
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/patches/patch-aa
--- a/mail/perdition/patches/patch-aa   Wed Jun 02 12:43:37 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/31 21:07:30 tv Exp $
-
---- makegdbm/Makefile.in.orig  2005-06-22 02:32:35.000000000 -0400
-+++ makegdbm/Makefile.in
-@@ -144,10 +144,10 @@ EXTRA_DIST = makegdbm.1
- makegdbm_SOURCES =          makegdbm.c         options.c         options.h
- 
- 
--makegdbm_LDADD = -L../libjain -L../libjain/.libs/ -ljain -lgdbm -lpopt @dmalloc_lib@
-+makegdbm_LDADD = -L$(prefix)/lib -ljain -lgdbm -lpopt @dmalloc_lib@
- 
- 
--INCLUDES = -I$(top_srcdir)/libjain
-+INCLUDES = -I$(prefix)/include
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/patches/patch-ab
--- a/mail/perdition/patches/patch-ab   Wed Jun 02 12:43:37 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/03/01 22:49:42 wiz Exp $
-
---- makebdb/Makefile.in.orig   2005-06-22 06:32:35.000000000 +0000
-+++ makebdb/Makefile.in
-@@ -144,10 +144,10 @@ EXTRA_DIST = makebdb.1
- makebdb_SOURCES =          makebdb.c         options.c         options.h
- 
- 
--makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt @dmalloc_lib@
-+makebdb_LDADD = -L$(prefix)/lib -ljain -ldb4 -lpopt @dmalloc_lib@
- 
- 
--INCLUDES = -I$(top_srcdir)/libjain
-+INCLUDES = -I$(prefix)/include
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff -r eca1605120a5 -r 53c9a33cf761 mail/perdition/patches/patch-ac
--- a/mail/perdition/patches/patch-ac   Wed Jun 02 12:43:37 2010 +0000
+++ b/mail/perdition/patches/patch-ac   Wed Jun 02 12:50:03 2010 +0000
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of the "apache22" package to version 2...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-Try-Tiny to 0.06
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of the "apache22" package to version 2...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-Try-Tiny to 0.06
Indexes:
Home | Main Index | Thread Index | Old Index