Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1501034518204900"
MIME-Version: 1.0
Date: Wed, 26 Jul 2017 02:01:58 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/ezmlm-idx
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20170726020158.F2A60FACD@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1501034518204900
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Wed Jul 26 02:01:58 UTC 2017

Modified Files:
	pkgsrc/mail/ezmlm-idx: Makefile distinfo
	pkgsrc/mail/ezmlm-idx/patches: patch-Makefile
Added Files:
	pkgsrc/mail/ezmlm-idx: PLIST
Removed Files:
	pkgsrc/mail/ezmlm-idx: PLIST.idx

Log Message:
Stop trying to share logic with ezmlm, and don't build catpages.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/ezmlm-idx/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/ezmlm-idx/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/mail/ezmlm-idx/PLIST.idx
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/ezmlm-idx/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/ezmlm-idx/patches/patch-Makefile

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


--_----------=_1501034518204900
Content-Disposition: inline
Content-Length: 6103
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/ezmlm-idx/Makefile
diff -u pkgsrc/mail/ezmlm-idx/Makefile:1.40 pkgsrc/mail/ezmlm-idx/Makefile:1.41
--- pkgsrc/mail/ezmlm-idx/Makefile:1.40	Sat May 27 14:15:26 2017
+++ pkgsrc/mail/ezmlm-idx/Makefile	Wed Jul 26 02:01:58 2017
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2017/05/27 14:15:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.41 2017/07/26 02:01:58 schmonz Exp $
 #
 
-.include "../../mail/ezmlm/Makefile.common"
-
 DISTNAME=		ezmlm-idx-${IDXVERSION}
 PKGREVISION=		1
+CATEGORIES=		mail
 IDXVERSION=		7.2.2
-SITES.${DISTNAME}.tar.gz=	http://untroubled.org/ezmlm/archive/${IDXVERSION}/
+MASTER_SITES=		http://untroubled.org/ezmlm/archive/${IDXVERSION}/
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://untroubled.org/ezmlm/
@@ -15,8 +14,10 @@ LICENSE=		gnu-gpl-v2
 
 CONFLICTS=		ezmlm-[0-9]*
 
-DISTFILES+=		${EZMLM_VERS}.tar.gz
-PLIST_SRC+=		PLIST.idx ${WRKDIR}/PLIST.idx-cf-files
+DEPENDS+=		qmail>=1.03:../../mail/qmail
+
+PLIST_SRC=		${PKGDIR}/../../mail/ezmlm/PLIST ${PKGDIR}/PLIST
+PLIST_SRC+=		${WRKDIR}/PLIST.idxcf
 
 DJB_RESTRICTED=		no
 DJB_CONFIG_CMDS+=	${ECHO} ${DESTDIR:Q} > conf-destdir;		\
@@ -49,10 +50,7 @@ INSTALLATION_DIRS=	bin lib libexec/cgi-b
 INSTALLATION_DIRS+=	share/doc/${PKGBASE} share/examples/${PKGBASE}
 
 post-extract:
-	${GREP} -v '^#' < cf-files.mk | ${CUT} -f2 | ${SED} -e 's|^|share/examples/ezmlm-idx/|g' > ${WRKDIR}/PLIST.idx-cf-files
-	${MV} ${WRKSRC}/* ${WRKDIR}/${EZMLM_VERS}
-	${RMDIR} ${WRKSRC}
-	${MV} ${WRKDIR}/${EZMLM_VERS} ${WRKSRC}
+	${GREP} -v '^#' < cf-files.mk | ${CUT} -f2 | ${SED} -e 's|^|share/examples/ezmlm-idx/|g' > ${WRKDIR}/PLIST.idxcf
 
 pre-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PKG_SYSCONFDIR}

Index: pkgsrc/mail/ezmlm-idx/distinfo
diff -u pkgsrc/mail/ezmlm-idx/distinfo:1.23 pkgsrc/mail/ezmlm-idx/distinfo:1.24
--- pkgsrc/mail/ezmlm-idx/distinfo:1.23	Sat May 27 14:15:26 2017
+++ pkgsrc/mail/ezmlm-idx/distinfo	Wed Jul 26 02:01:58 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2017/05/27 14:15:26 schmonz Exp $
+$NetBSD: distinfo,v 1.24 2017/07/26 02:01:58 schmonz Exp $
 
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
@@ -10,6 +10,6 @@ SHA1 (patch-BIN) = 7024a403c703f21728826
 SHA1 (patch-CGIBIN) = e49ab9c2db9ed8d3e2691414ec433b74a6eaadb9
 SHA1 (patch-ETC) = 1529f149f8e67af611e40187d395a3e1294f51a8
 SHA1 (patch-MAN) = 6a50aedaf61e4d15af74d36088a9963f1563afb2
-SHA1 (patch-Makefile) = eb9f7f8d0a754e45d23d13828af07afe92425fce
+SHA1 (patch-Makefile) = 954e09eb022cbd38ba5ceb8c20a2c0519c360a08
 SHA1 (patch-ezmlm-dispatch.c) = 0543922ecef47c0de9f424a23f0bff61809bad1d
 SHA1 (patch-test-getconfopt.c) = 45ae841a73df56ea1bd029041f4ca2e5239bb35d

Index: pkgsrc/mail/ezmlm-idx/patches/patch-Makefile
diff -u pkgsrc/mail/ezmlm-idx/patches/patch-Makefile:1.2 pkgsrc/mail/ezmlm-idx/patches/patch-Makefile:1.3
--- pkgsrc/mail/ezmlm-idx/patches/patch-Makefile:1.2	Sat May 27 14:15:26 2017
+++ pkgsrc/mail/ezmlm-idx/patches/patch-Makefile	Wed Jul 26 02:01:58 2017
@@ -1,19 +1,21 @@
-$NetBSD: patch-Makefile,v 1.2 2017/05/27 14:15:26 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/07/26 02:01:58 schmonz Exp $
 
-DESTDIR support.
+DESTDIR support, and don't build catpages.
 
 --- Makefile.orig	2014-05-15 02:54:21.000000000 +0000
 +++ Makefile
-@@ -965,12 +965,13 @@ libcompile idxthread.c error.h alloc.h s
+@@ -964,13 +964,14 @@ libcompile idxthread.c error.h alloc.h s
+ 	./libcompile idxthread.c
  
  install: \
- it man installer conf-bin conf-etc conf-lang conf-lib conf-man BIN ETC LIB MAN
+-it man installer conf-bin conf-etc conf-lang conf-lib conf-man BIN ETC LIB MAN
 -	./installer "`head -n 1 conf-bin`" < BIN
 -	./installer "`head -n 1 conf-etc`" < ETC
 -	./installer "`head -n 1 conf-man`" < MAN
 -	./installer "`head -n 1 conf-lib`" < LIB
 -	rm -f "`head -n 1 conf-etc`"/default
 -	ln -sf "`head -n 1 conf-lang`" "`head -n 1 conf-etc`"/default
++it installer conf-bin conf-etc conf-lang conf-lib conf-man BIN ETC LIB MAN
 +	./installer "`head -1 conf-destdir``head -n 1 conf-bin`" < BIN
 +	./installer "`head -1 conf-destdir``head -n 1 conf-cgibin`" < CGIBIN
 +	./installer "`head -1 conf-destdir``head -n 1 conf-egdir`" < ETC

Added files:

Index: pkgsrc/mail/ezmlm-idx/PLIST
diff -u /dev/null pkgsrc/mail/ezmlm-idx/PLIST:1.1
--- /dev/null	Wed Jul 26 02:01:58 2017
+++ pkgsrc/mail/ezmlm-idx/PLIST	Wed Jul 26 02:01:58 2017
@@ -0,0 +1,67 @@
+@comment $NetBSD: PLIST,v 1.1 2017/07/26 02:01:58 schmonz Exp $
+bin/ezmlm-accept
+bin/ezmlm-archive
+bin/ezmlm-check
+bin/ezmlm-checksub
+bin/ezmlm-clean
+bin/ezmlm-confirm
+bin/ezmlm-cron
+bin/ezmlm-dispatch
+bin/ezmlm-gate
+bin/ezmlm-get
+bin/ezmlm-glconf
+bin/ezmlm-idx
+bin/ezmlm-import
+bin/ezmlm-issubn
+bin/ezmlm-limit
+bin/ezmlm-moderate
+bin/ezmlm-request
+bin/ezmlm-rmtab
+bin/ezmlm-split
+bin/ezmlm-store
+bin/ezmlm-to40x-mysql
+bin/ezmlm-tstdig
+${PLIST.mysql}lib/ezmlm/sub-mysql.so
+${PLIST.pgsql}lib/ezmlm/sub-pgsql.so
+${PLIST.sqlite3}lib/ezmlm/sub-sqlite3.so
+lib/ezmlm/sub-std.so
+libexec/cgi-bin/ezmlm-cgi
+man/man1/ezmlm-accept.1
+man/man1/ezmlm-archive.1
+man/man1/ezmlm-cgi.1
+man/man1/ezmlm-check.1
+man/man1/ezmlm-checksub.1
+man/man1/ezmlm-clean.1
+man/man1/ezmlm-confirm.1
+man/man1/ezmlm-cron.1
+man/man1/ezmlm-dispatch.1
+man/man1/ezmlm-gate.1
+man/man1/ezmlm-get.1
+man/man1/ezmlm-glconf.1
+man/man1/ezmlm-idx.1
+man/man1/ezmlm-import.1
+man/man1/ezmlm-issubn.1
+man/man1/ezmlm-limit.1
+man/man1/ezmlm-moderate.1
+man/man1/ezmlm-request.1
+man/man1/ezmlm-rmtab.1
+man/man1/ezmlm-split.1
+man/man1/ezmlm-store.1
+man/man1/ezmlm-tstdig.1
+man/man5/ezmlmglrc.5
+man/man5/ezmlmrc.5
+man/man5/ezmlmsubrc.5
+share/doc/ezmlm-idx/BLURB
+share/doc/ezmlm-idx/CHANGES
+share/doc/ezmlm-idx/CHANGES
+share/doc/ezmlm-idx/DOWNGRADE
+share/doc/ezmlm-idx/FAQ
+share/doc/ezmlm-idx/INSTALL
+share/doc/ezmlm-idx/README
+share/doc/ezmlm-idx/README.mysql
+share/doc/ezmlm-idx/README.pgsql
+share/doc/ezmlm-idx/README.std
+share/doc/ezmlm-idx/THANKS
+share/doc/ezmlm-idx/TODO
+share/doc/ezmlm-idx/UPGRADE
+share/examples/ezmlm-idx/default


--_----------=_1501034518204900--