CVS commit: pkgsrc/mail/ezmlm-idx

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat May 27 14:15:26 UTC 2017

Modified Files:
        pkgsrc/mail/ezmlm-idx: Makefile PLIST.idx cf-files.mk distinfo
        pkgsrc/mail/ezmlm-idx/patches: patch-Makefile
Added Files:
        pkgsrc/mail/ezmlm-idx/patches: patch-BIN patch-CGIBIN

Log Message:
Install ezmlm-cgi(1) in libexec/cgi-bin (setuid root, as documented) and
ezcgi.css in ${PKG_SYSCONFDIR}. Provide supporting documentation in
share/doc/ezmlm-idx. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/mail/ezmlm-idx/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/ezmlm-idx/PLIST.idx
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/ezmlm-idx/cf-files.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/ezmlm-idx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/ezmlm-idx/patches/patch-BIN \
    pkgsrc/mail/ezmlm-idx/patches/patch-CGIBIN
cvs rdiff -u -r1.1 -r1.2 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.

Modified files:

Index: pkgsrc/mail/ezmlm-idx/Makefile
diff -u pkgsrc/mail/ezmlm-idx/Makefile:1.39 pkgsrc/mail/ezmlm-idx/Makefile:1.40
--- pkgsrc/mail/ezmlm-idx/Makefile:1.39 Thu May 25 20:41:27 2017
+++ pkgsrc/mail/ezmlm-idx/Makefile      Sat May 27 14:15:26 2017
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2017/05/25 20:41:27 schmonz Exp $
+# $NetBSD: Makefile,v 1.40 2017/05/27 14:15:26 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
 
 DISTNAME=              ezmlm-idx-${IDXVERSION}
+PKGREVISION=           1
 IDXVERSION=            7.2.2
 SITES.${DISTNAME}.tar.gz=      http://untroubled.org/ezmlm/archive/${IDXVERSION}/
 
@@ -19,9 +20,10 @@ PLIST_SRC+=          PLIST.idx ${WRKDIR}/PLIST.i
 
 DJB_RESTRICTED=                no
 DJB_CONFIG_CMDS+=      ${ECHO} ${DESTDIR:Q} > conf-destdir;            \
+                       ${ECHO} ${PREFIX:Q}/libexec/cgi-bin > conf-cgibin; \
                        ${ECHO} ${EGDIR:Q} > conf-egdir;                \
                        ${ECHO} ${PKG_SYSCONFDIR:Q} > conf-etc;         \
-                       ${ECHO} ${PREFIX}/lib/ezmlm > conf-lib;
+                       ${ECHO} ${PREFIX:Q}/lib/ezmlm > conf-lib;
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
@@ -32,7 +34,8 @@ PKG_SYSCONFSUBDIR=    ezmlm
 .include "cf-files.mk"
 .include "cf-dirs.mk"
 
-EGDIR=                 ${PREFIX}/share/examples/ezmlm-idx
+DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
+EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 .for file in ${EZMLM_CF_FILES}
 CONF_FILES+=           ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
 .endfor
@@ -40,8 +43,10 @@ CONF_FILES+=         ${EGDIR}/${file} ${PKG_SYS
 OWN_DIRS+=             ${PKG_SYSCONFDIR}/${dir}
 .endfor
 
-INSTALLATION_DIRS=     bin lib ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
-INSTALLATION_DIRS+=    share/examples/ezmlm-idx
+SPECIAL_PERMS+=                ${PREFIX}/libexec/cgi-bin/ezmlm-cgi ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 04755
+
+INSTALLATION_DIRS=     bin lib libexec/cgi-bin ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
+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
@@ -53,11 +58,14 @@ pre-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${PKG_SYSCONFDIR}
 
 post-install:
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+.      for file in BLURB CHANGES FAQ INSTALL README README.mysql README.pgsql README.std THANKS TODO UPGRADE DOWNGRADE
+       ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${DOCDIR}/${file}
+.      endfor
        ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/ezcgirc ${DESTDIR}${EGDIR}/ezcgirc
-       ${INSTALL_DATA} ${WRKSRC}/ezmlmrc ${DESTDIR}${EGDIR}/ezmlmrc
-       ${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${DESTDIR}${EGDIR}/ezmlmglrc
-       ${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${DESTDIR}${EGDIR}/ezmlmsubrc
+.      for file in ezcgi.css ezcgirc ezmlmglrc ezmlmrc ezmlmsubrc
+       ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${EGDIR}/${file}
+.      endfor
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/ezmlm-idx/PLIST.idx
diff -u pkgsrc/mail/ezmlm-idx/PLIST.idx:1.8 pkgsrc/mail/ezmlm-idx/PLIST.idx:1.9
--- pkgsrc/mail/ezmlm-idx/PLIST.idx:1.8 Thu May 25 20:41:27 2017
+++ pkgsrc/mail/ezmlm-idx/PLIST.idx     Sat May 27 14:15:26 2017
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.idx,v 1.8 2017/05/25 20:41:27 schmonz Exp $
+@comment $NetBSD: PLIST.idx,v 1.9 2017/05/27 14:15:26 schmonz Exp $
 bin/ezmlm-accept
 bin/ezmlm-archive
-bin/ezmlm-cgi
 bin/ezmlm-check
 bin/ezmlm-checksub
 bin/ezmlm-clean
@@ -26,6 +25,7 @@ ${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
@@ -51,4 +51,17 @@ 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

Index: pkgsrc/mail/ezmlm-idx/cf-files.mk
diff -u pkgsrc/mail/ezmlm-idx/cf-files.mk:1.1 pkgsrc/mail/ezmlm-idx/cf-files.mk:1.2
--- pkgsrc/mail/ezmlm-idx/cf-files.mk:1.1       Thu May 25 20:41:27 2017
+++ pkgsrc/mail/ezmlm-idx/cf-files.mk   Sat May 27 14:15:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: cf-files.mk,v 1.1 2017/05/25 20:41:27 schmonz Exp $
+# $NetBSD: cf-files.mk,v 1.2 2017/05/27 14:15:26 schmonz Exp $
 #
 EZMLM_CF_FILES+=       ch_GB/ezmlmrc
 EZMLM_CF_FILES+=       ch_GB/text/bottom
@@ -201,6 +201,7 @@ EZMLM_CF_FILES+=    es/text/unsub-bad
 EZMLM_CF_FILES+=       es/text/unsub-confirm
 EZMLM_CF_FILES+=       es/text/unsub-nop
 EZMLM_CF_FILES+=       es/text/unsub-ok
+EZMLM_CF_FILES+=       ezcgi.css
 EZMLM_CF_FILES+=       ezcgirc
 EZMLM_CF_FILES+=       ezmlmglrc
 EZMLM_CF_FILES+=       ezmlmrc

Index: pkgsrc/mail/ezmlm-idx/distinfo
diff -u pkgsrc/mail/ezmlm-idx/distinfo:1.22 pkgsrc/mail/ezmlm-idx/distinfo:1.23
--- pkgsrc/mail/ezmlm-idx/distinfo:1.22 Thu May 25 20:44:23 2017
+++ pkgsrc/mail/ezmlm-idx/distinfo      Sat May 27 14:15:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2017/05/25 20:44:23 schmonz Exp $
+$NetBSD: distinfo,v 1.23 2017/05/27 14:15:26 schmonz Exp $
 
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
@@ -6,8 +6,10 @@ Size (ezmlm-0.53.tar.gz) = 62693 bytes
 SHA1 (ezmlm-idx-7.2.2.tar.gz) = f24248551b20388cfc23d8474cd2114d0cefbf90
 RMD160 (ezmlm-idx-7.2.2.tar.gz) = 323b22e532651924231e1043dbfaaa2cb35d2afb
 Size (ezmlm-idx-7.2.2.tar.gz) = 742451 bytes
+SHA1 (patch-BIN) = 7024a403c703f2172882683bad316eaea2956f99
+SHA1 (patch-CGIBIN) = e49ab9c2db9ed8d3e2691414ec433b74a6eaadb9
 SHA1 (patch-ETC) = 1529f149f8e67af611e40187d395a3e1294f51a8
 SHA1 (patch-MAN) = 6a50aedaf61e4d15af74d36088a9963f1563afb2
-SHA1 (patch-Makefile) = 65cacc41eacc0de118b5f3bc7fadbaef8b6c7c82
+SHA1 (patch-Makefile) = eb9f7f8d0a754e45d23d13828af07afe92425fce
 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.1 pkgsrc/mail/ezmlm-idx/patches/patch-Makefile:1.2
--- pkgsrc/mail/ezmlm-idx/patches/patch-Makefile:1.1    Thu May 25 20:44:23 2017
+++ pkgsrc/mail/ezmlm-idx/patches/patch-Makefile        Sat May 27 14:15:26 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2017/05/25 20:44:23 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/05/27 14:15:26 schmonz Exp $
 
 DESTDIR support.
 
 --- Makefile.orig      2014-05-15 02:54:21.000000000 +0000
 +++ Makefile
-@@ -965,12 +965,12 @@ libcompile idxthread.c error.h alloc.h s
+@@ -965,12 +965,13 @@ libcompile idxthread.c error.h alloc.h s
  
  install: \
  it man installer conf-bin conf-etc conf-lang conf-lib conf-man BIN ETC LIB MAN
@@ -15,6 +15,7 @@ DESTDIR support.
 -      rm -f "`head -n 1 conf-etc`"/default
 -      ln -sf "`head -n 1 conf-lang`" "`head -n 1 conf-etc`"/default
 +      ./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
 +      ./installer "`head -1 conf-destdir``head -n 1 conf-man`" < MAN
 +      ./installer "`head -1 conf-destdir``head -n 1 conf-lib`" < LIB

Added files:

Index: pkgsrc/mail/ezmlm-idx/patches/patch-BIN
diff -u /dev/null pkgsrc/mail/ezmlm-idx/patches/patch-BIN:1.1
--- /dev/null   Sat May 27 14:15:27 2017
+++ pkgsrc/mail/ezmlm-idx/patches/patch-BIN     Sat May 27 14:15:26 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-BIN,v 1.1 2017/05/27 14:15:26 schmonz Exp $
+
+Install CGI program in a hier(7)-like place.
+
+--- BIN.orig   2014-05-15 02:54:21.000000000 +0000
++++ BIN
+@@ -1,7 +1,6 @@
+ d:::755:::
+ c:::755:/:ezmlm-accept:
+ c:::755:/:ezmlm-archive:
+-c:::755:/:ezmlm-cgi:
+ c:::755:/:ezmlm-check:
+ c:::755:/:ezmlm-checksub:
+ c:::755:/:ezmlm-clean:
Index: pkgsrc/mail/ezmlm-idx/patches/patch-CGIBIN
diff -u /dev/null pkgsrc/mail/ezmlm-idx/patches/patch-CGIBIN:1.1
--- /dev/null   Sat May 27 14:15:27 2017
+++ pkgsrc/mail/ezmlm-idx/patches/patch-CGIBIN  Sat May 27 14:15:26 2017
@@ -0,0 +1,9 @@
+$NetBSD: patch-CGIBIN,v 1.1 2017/05/27 14:15:26 schmonz Exp $
+
+Install CGI program in a hier(7)-like place.
+
+--- CGIBIN.orig        2017-05-27 13:49:05.000000000 +0000
++++ CGIBIN
+@@ -0,0 +1,2 @@
++d:::755:::
++c:::755:/:ezmlm-cgi: