From 2411f7a63934cf527e549ae91fa3ca21e6611b64 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Tue, 21 Feb 2006 10:15:35 +0000
Subject: [PATCH] Fixed pkglint warnings. Now it builds on Solaris, too.

---
 mail/wl/Makefile     | 36 +++++++++++++++++++-----------------
 mail/wl/PLIST.header | 14 +++++++-------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index 9003c46efa495..c89909e0bcb00 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/21 10:15:35 rillig Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 
 MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX:Q}
-MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/wl
+MAKE_FLAGS+=	PIXMAPDIR=${PREFIX:Q}/share/wl
 INSTALL_TARGET=	install install-info
 INFO_FILES=	wl.info wl-ja.info
 
@@ -31,26 +31,28 @@ EXAMPLESDIR=	${PREFIX}/share/examples/wl
 PLIST_SRC=	${WRKDIR}/PLIST
 
 post-build:
-	@{ \
-		${CAT} ${PKGDIR}/PLIST.header; \
-		${FIND} ${WRKSRC} -name '*.elc' -print | \
+	@set -e; \
+	{ \
+		${CAT} ${PKGDIR:Q}/PLIST.header; \
+		${FIND} ${WRKSRC:Q} -name '*.elc' -print | \
 		while read f; do \
-			g=$$(basename $$f); \
-			echo '$${EMACS_LISPPREFIX}/wl/'$${g%.elc}.el; \
-			echo '$${EMACS_LISPPREFIX}/wl/'$$g; \
+			g=`basename "$$f"`; \
+			${ECHO} '$${EMACS_LISPPREFIX}/wl/'$${g%.elc}.el; \
+			${ECHO} '$${EMACS_LISPPREFIX}/wl/'$$g; \
 		done | ${SORT}; \
-		${CAT} ${PKGDIR}/PLIST.footer; \
-	} >${PLIST_SRC}
+		${CAT} ${PKGDIR:Q}/PLIST.footer; \
+	} > ${PLIST_SRC}
 
 post-install:
-	@${INSTALL_DATA_DIR} ${DOCDIR}/en ${DOCDIR}/ja
-	@for f in BUGS NEWS README; do \
-		${INSTALL_DATA} ${WRKSRC}/$$f ${DOCDIR}/en; \
-		${INSTALL_DATA} ${WRKSRC}/$${f}.ja ${DOCDIR}/ja; \
+	@${INSTALL_DATA_DIR} ${DOCDIR:Q}/en ${DOCDIR:Q}/ja
+	@set -e; \
+	for f in BUGS NEWS README; do \
+		${INSTALL_DATA} ${WRKSRC:Q}/"$$f" ${DOCDIR:Q}/en; \
+		${INSTALL_DATA} ${WRKSRC:Q}/"$$f".ja ${DOCDIR:Q}/ja; \
 	done
-	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}/en ${EXAMPLESDIR}/ja
-	@${INSTALL_DATA} ${WRKSRC}/samples/en/dot.* ${EXAMPLESDIR}/en
-	@${INSTALL_DATA} ${WRKSRC}/samples/ja/dot.* ${EXAMPLESDIR}/ja
+	@${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/en ${EXAMPLESDIR:Q}/ja
+	@${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en
+	@${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wl/PLIST.header b/mail/wl/PLIST.header
index 99dcd39e98e15..e0461bc7e7ce1 100644
--- a/mail/wl/PLIST.header
+++ b/mail/wl/PLIST.header
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST.header,v 1.5 2005/04/11 18:06:00 hira Exp $
+@comment $NetBSD: PLIST.header,v 1.6 2006/02/21 10:15:35 rillig Exp $
 share/doc/wl/en/BUGS
 share/doc/wl/en/NEWS
 share/doc/wl/en/README
 share/doc/wl/ja/BUGS.ja
 share/doc/wl/ja/NEWS.ja
 share/doc/wl/ja/README.ja
+share/examples/wl/en/dot.addresses
+share/examples/wl/en/dot.folders
+share/examples/wl/en/dot.wl
+share/examples/wl/ja/dot.addresses
+share/examples/wl/ja/dot.folders
+share/examples/wl/ja/dot.wl
 ${FOR_emacs21}share/wl/access.xpm
 ${FOR_emacs21}share/wl/archive.xpm
 ${FOR_emacs21}share/wl/closed.xpm
@@ -89,9 +95,3 @@ share/wl/wl-stable-logo.img
 share/wl/wl-stable-logo.xbm
 share/wl/wl-stable-xmas-logo.img
 share/wl/wl-stable-xmas-logo.xbm
-share/examples/wl/en/dot.addresses
-share/examples/wl/en/dot.folders
-share/examples/wl/en/dot.wl
-share/examples/wl/ja/dot.addresses
-share/examples/wl/ja/dot.folders
-share/examples/wl/ja/dot.wl