- various pkglint cleanups

- add user-destdir support

- this should fix PR/41004

2 files changed, 27 insertions, 24 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 06de2e19c92..41800ad34ad 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.106 2009/03/21 21:20:28 jnemeth Exp $
+# $NetBSD: Makefile,v 1.107 2009/03/21 21:30:58 jnemeth Exp $
 
 PKGNAME=	sendmail-${DIST_VERS}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	The well known Mail Transport Agent
 
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
 
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "options.mk"
 .include "../../mail/sendmail/Makefile.common"
@@ -17,14 +17,18 @@ MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 SMRSH_CMDDIR?=	${PREFIX}/libexec/sm.bin
-PLIST_SUBST+=	SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
+PLIST_SUBST+=	SMRSH_CMDDIR=${SMRSH_CMDDIR}
 RCD_SCRIPTS=	sendmail smmsp
 
+BUILD_DEFS+=	VARBASE
+
 # Not OWN_DIRS, so that the admin doesn't get a suggestion to delete the
 # queue dirs if they are nonempty at deinstall (probably undesirable).
 #
-MAKE_DIRS_PERMS+=	/var/spool/clientmqueue smmsp smmsp 0770
-MAKE_DIRS_PERMS+=	/var/spool/mqueue ${ROOT_USER} ${ROOT_GROUP} 0700
+MAKE_DIRS_PERMS+=	/${VARBASE}/spool/clientmqueue smmsp smmsp 0770
+MAKE_DIRS_PERMS+=	/${VARBASE}/spool/mqueue ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+
+SPECIAL_PERMS+=		libexec/sendmail/sendmail ${REAL_ROOT_USER} smmsp 2555
 
 PKG_GROUPS=		smmsp
 PKG_USERS=		smmsp:smmsp
@@ -80,23 +84,22 @@ post-build:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
-		${DESTDIR:Q}${PREFIX}/share/examples/sendmail/
-	cd ${WRKSRC}/cf && pax -rw -pp -pm -s',^.*\.orig$$,,' . ${DESTDIR:Q}${PREFIX}/share/sendmail
-	chown -R ${BINOWN}:${BINGRP} ${DESTDIR:Q}${PREFIX}/share/sendmail
+		${DESTDIR}${PREFIX}/share/examples/sendmail/
+	cd ${WRKSRC}/cf && pax -rw -pp -pm -s',^.*\.orig$$,,' . ${DESTDIR}${PREFIX}/share/sendmail
 
 	${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | tr \  . | tr \/ - | sed s/sun4./sun4/`/libsm/libsm.a \
-		${DESTDIR:Q}${PREFIX}/lib
+		${DESTDIR}${PREFIX}/lib
 
 	${INSTALL_DATA} \
 		${WRKSRC}/obj.`${UNAME} -srm | tr \  . | tr \/ - | sed s/sun4./sun4/`/libsmutil/libsmutil.a \
-		${DESTDIR:Q}${PREFIX}/lib
+		${DESTDIR}${PREFIX}/lib
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmap*.pl \
-		${DESTDIR:Q}${PREFIX}/share/examples/sendmail/
-	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DESTDIR:Q}${PREFIX}/share/doc/sendmail
-	${INSTALL_DATA} ${WRKSRC}/cf/README ${DESTDIR:Q}${PREFIX}/share/doc/sendmail
-	${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${DESTDIR:Q}${PREFIX}/share/doc/sendmail
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${DESTDIR:Q}${PREFIX}/share/doc/sendmail
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DESTDIR:Q}${PREFIX}/share/doc/sendmail
+		${DESTDIR}${PREFIX}/share/examples/sendmail/
+	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DESTDIR}${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/cf/README ${DESTDIR}${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${DESTDIR}${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${DESTDIR}${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DESTDIR}${PREFIX}/share/doc/sendmail
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 45de8f1a2bf..418ca1bd0d1 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2008/07/15 19:02:11 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.48 2009/03/21 21:30:58 jnemeth Exp $
 #
 # used by mail/libmilter/Makefile
 # used by mail/sendmail/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
 		ftp://ftp.ayamura.org/pub/sendmail/
 
-OWNER=		jnemeth@NetBSD.org
+OWNER?=		jnemeth@NetBSD.org
 HOMEPAGE=	http://www.sendmail.org/
 
 LICENSE=	sendmail-license
@@ -22,17 +22,17 @@ PATCHDIR=	${.CURDIR}/../../mail/sendmail/patches
 
 DIST_VERS=	8.14.3
 
-MAKE_ENV+=	BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
-		BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
-		BUILDLINK_DIR=${BUILDLINK_DIR:Q} \
-		SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
+MAKE_ENV+=	BSD_BINOWN=${BINOWN} BSD_BINGRP=${BINGRP} \
+		BSD_MANOWN=${MANOWN} BSD_MANGRP=${MANGRP} \
+		BUILDLINK_DIR=${BUILDLINK_DIR} \
+		SMRSH_CMDDIR=${SMRSH_CMDDIR}
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
 BUILD_DEFS+=	SMRSH_CMDDIR
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_TOOLS+=	gm4
-MAKE_ENV+=	M4=${TOOLS_M4:Q}
+MAKE_ENV+=	M4=${TOOLS_M4}
 
 .PHONY: make-sendmail-siteconfig
 make-sendmail-siteconfig: