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

4 files changed, 17 insertions, 17 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 2a6f6c69eb8..fe8095a84ad 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -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-bin ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGM
 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}
diff --git a/mail/ezmlm-idx/PLIST.idx b/mail/ezmlm-idx/PLIST
index 0e991f5274c..61262c70bf4 100644
--- a/mail/ezmlm-idx/PLIST.idx
+++ b/mail/ezmlm-idx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.idx,v 1.9 2017/05/27 14:15:26 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.1 2017/07/26 02:01:58 schmonz Exp $
 bin/ezmlm-accept
 bin/ezmlm-archive
 bin/ezmlm-check
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index 2c2ed9cdae3..706902c7e1e 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -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) = 7024a403c703f2172882683bad316eaea2956f99
 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
diff --git a/mail/ezmlm-idx/patches/patch-Makefile b/mail/ezmlm-idx/patches/patch-Makefile
index 3c3828aebb4..0b994ffc071 100644
--- a/mail/ezmlm-idx/patches/patch-Makefile
+++ b/mail/ezmlm-idx/patches/patch-Makefile
@@ -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