CVS commit: pkgsrc/mail/qmail

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Aug  3 03:20:57 UTC 2017

Modified Files:
        pkgsrc/mail/qmail: Makefile

Log Message:
Let binary packages built with MANZ install to completion by informing
install-destdir and instcheck about the .gz extensions. While here,
handle INSTALL and SENDMAIL docs on case-insensitive filesystems in a
more straightforward way. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/mail/qmail/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/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.90 pkgsrc/mail/qmail/Makefile:1.91
--- pkgsrc/mail/qmail/Makefile:1.90     Tue Aug  1 02:53:59 2017
+++ pkgsrc/mail/qmail/Makefile  Thu Aug  3 03:20:57 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.90 2017/08/01 02:53:59 schmonz Exp $
+# $NetBSD: Makefile,v 1.91 2017/08/03 03:20:57 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           30
+PKGREVISION=           31
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
@@ -96,17 +96,11 @@ SUBST_SED.logging+= -e 's|""|${QUEUE_EXT
 SUBST_MESSAGE.logging= Setting QUEUE_EXTRA.
 .endif
 
-CASECLASH=             .doc.caseclash
 SUBST_CLASSES+=                caseclash
 SUBST_STAGE.caseclash= do-configure
 SUBST_FILES.caseclash= hier.c
-SUBST_SED.caseclash=   -e 's|"INSTALL"|"INSTALL${CASECLASH}"|g'
-SUBST_SED.caseclash+=  -e 's|"SENDMAIL"|"SENDMAIL${CASECLASH}"|g'
-SUBST_CLASSES+=                caseclash2
-SUBST_STAGE.caseclash2=        post-install
-SUBST_FILES.caseclash2=        hier.c
-SUBST_SED.caseclash2=  -e 's|"INSTALL${CASECLASH}"|"INSTALL"|g'
-SUBST_SED.caseclash2+= -e 's|"SENDMAIL${CASECLASH}"|"SENDMAIL"|g'
+SUBST_SED.caseclash=   -e 's|"doc","INSTALL"|".","doc/INSTALL"|g'
+SUBST_SED.caseclash+=  -e 's|"doc","SENDMAIL"|".","doc/SENDMAIL"|g'
 
 SUBST_CLASSES+=                catpages
 SUBST_STAGE.catpages=  do-configure
@@ -114,6 +108,13 @@ SUBST_FILES.catpages=      hier.c
 SUBST_SED.catpages=    -e 's|.*"man/cat[0-9]".*||g'
 SUBST_SED.catpages+=   -e 's|.*"tcp-environ\.5".*||g'  # also in ucspi-tcp
 
+.if defined(MANZ)
+SUBST_CLASSES+=                manzpages
+SUBST_STAGE.manzpages= post-build
+SUBST_FILES.manzpages= hier_destdir.c
+SUBST_SED.manzpages=   -e 's|\(.*"man/man[0-9]",".*\.[0-9]\)|\1.gz|g'
+.endif
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     README.*
@@ -144,8 +145,9 @@ post-extract:
        for i in ${READMES}; do                                         \
                ${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE};             \
        done
+       mkdir ${WRKSRC}/doc &&                                          \
        for i in INSTALL SENDMAIL; do                                   \
-               ${MV} ${WRKSRC}/$$i ${WRKSRC}/$$i${CASECLASH};          \
+               ${MV} ${WRKSRC}/$$i ${WRKSRC}/doc/$$i;                  \
        done
 
 post-patch:
@@ -175,10 +177,6 @@ post-install:
 
        cd ${WRKSRC} && ${MAKE} instcheck install-destdir
 
-       for i in INSTALL SENDMAIL; do                                   \
-               ${MV} ${DESTDIR}${DOCDIR}/$$i${CASECLASH} ${DESTDIR}${DOCDIR}/$$i || ${TRUE}; \
-       done
-
        for i in ${REJECTUTILS}; do                                     \
                ${INSTALL_PROGRAM} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/bin/$$i; \
        done