From 053a0f6a18a7de55931313e6b3446cea9fbf52ff Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sun, 1 Oct 2006 14:34:01 +0000
Subject: Fixed pkglint warnings.

---
 games/rocksndiamonds/Makefile   | 18 ++++++++++--------
 games/rocksndiamonds/options.mk | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'games/rocksndiamonds')

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 7e16dab6324..91cb05de13e 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/07/22 23:16:42 heinz Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/01 14:34:01 rillig Exp $
 
 DISTNAME=	rocksndiamonds-3.2.0
 CATEGORIES=	games x11
@@ -14,6 +14,7 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man6
 
 PKG_GROUPS+=	${GAMEGRP}
 PKG_USERS+=	${GAMEOWN}:${GAMEGRP}
+BUILD_DEFS+=	VARBASE SCORE_PATH
 
 SHARESUBDIR=		share/rocksndiamonds
 SHAREDIR=		${PREFIX}/${SHARESUBDIR}
@@ -62,16 +63,17 @@ do-install:
 		${PREFIX}/${PKGMANDIR}/man6/rocksndiamonds.6
 	${INSTALL_DATA_DIR} ${SHAREDIR}
 	# auto-generated PLIST
-	-${RM} -f ${WRKDIR}/PLIST.F ${WRKDIR}/PLIST.D
+	rm -f ${WRKDIR}/PLIST.F ${WRKDIR}/PLIST.D
+	set -e;								\
 	cd ${WRKSRC} &&							\
 	for d in sounds graphics levels music; do 			\
-		${FIND} $${d} -type d -print | { while read subdir; do	\
-			${INSTALL_DATA_DIR}  ${SHAREDIR}/$${subdir};	\
+		find "$${d}" -type d -print | { while read subdir; do	\
+			${INSTALL_DATA_DIR}  ${SHAREDIR}/"$${subdir}";	\
 			${ECHO} "@dirrm ${SHARESUBDIR}/$${subdir}";	\
-		done ; } | ${SORT} -r >> ${WRKDIR}/PLIST.D;		\
-		${FIND} $${d} -type f -print | while read f; do		\
-			${INSTALL_DATA} $${f} ${SHAREDIR}/$${f};	\
-			${ECHO} ${SHARESUBDIR}/$${f} >> ${WRKDIR}/PLIST.F;\
+		done ; } | sort -r >> ${WRKDIR}/PLIST.D;		\
+		find "$${d}" -type f -print | while read f; do		\
+			${INSTALL_DATA} "$${f}" ${SHAREDIR}/"$${f}";	\
+			${ECHO} ${SHARESUBDIR}/"$${f}" >> ${WRKDIR}/PLIST.F;\
 		done ;							\
 	done
 
diff --git a/games/rocksndiamonds/options.mk b/games/rocksndiamonds/options.mk
index 8235a1ae766..1c4f0a2e663 100644
--- a/games/rocksndiamonds/options.mk
+++ b/games/rocksndiamonds/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:43 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2006/10/01 14:34:01 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rocksndiamonds
 PKG_SUPPORTED_OPTIONS=	sdl x11
@@ -7,22 +7,22 @@ PKG_SUGGESTED_OPTIONS=	sdl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msdl)
-.if ${OPSYS} == "Solaris"
+.  if ${OPSYS} == "Solaris"
 BUILD_TARGET=	solaris-sdl
-.else
+.  else
 BUILD_TARGET=	sdl
-.endif
-.include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../net/SDL_net/buildlink3.mk"
+.  endif
+.  include "../../audio/SDL_mixer/buildlink3.mk"
+.  include "../../graphics/SDL_image/buildlink3.mk"
+.  include "../../net/SDL_net/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
-.if ${OPSYS} == "Solaris"
+.  if ${OPSYS} == "Solaris"
 BUILD_TARGET=	solaris
-.else
+.  else
 BUILD_TARGET=	x11
-.endif
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.  endif
+.  include "../../mk/oss.buildlink3.mk"
+.  include "../../mk/x11.buildlink3.mk"
 .endif
-- 
cgit v1.2.3