Fix DEPENDs line. Use static PLIST, since the contents are not subject

to change.

2 files changed, 47 insertions, 15 deletions

diff --git a/wm/aquaified/Makefile b/wm/aquaified/Makefile
index 1d663818d05..77bb03feb2f 100644
--- a/wm/aquaified/Makefile
+++ b/wm/aquaified/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/05 22:10:41 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/06 00:02:50 wiz Exp $
+#
 
 DISTNAME=	aquaified-0.30
 CATEGORIES=	x11 wm
@@ -8,27 +9,17 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://themes.freshmeat.net/projects/aquaified/
 COMMENT=	Aquaified is a theme for the Sawfish window manager.
 
-DEPENDS+=	sawfish:../../wm/sawfish
+DEPENDS+=	sawfish>=1.0.1:../../wm/sawfish
 
 NO_BUILD=	yes
 NO_CHECKSUM=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/Aquaified
 
-PLIST_SRC=	${WRKDIR}/PLIST
 THEME_DATADIR=	share/sawfish/themes
 INST_DATADIR=	${PREFIX}/${THEME_DATADIR}
 
-.include "../../mk/bsd.prefs.mk"
-
 do-install:
-	@${RM} -f ${PLIST_SRC}
-	@${TOUCH} ${PLIST_SRC}
-	@${MKDIR} ${INST_DATADIR}/Aquaified
-	${ECHO} "Installing Aquaified in ${INST_DATADIR}.";
-	cd ${WRKSRC}/Aquaified; for FILE in *; do \
-	    ${INSTALL_DATA} "$$FILE" ${INST_DATADIR}/Aquaified; \
-	    ${ECHO} "${THEME_DATADIR}/Aquaified/$$FILE" >>${PLIST_SRC}; \
-	done
-	@${ECHO} "@dirrm ${THEME_DATADIR}/Aquaified" >>${PLIST_SRC}
+	@${INSTALL_DATA_DIR} ${INST_DATADIR}/Aquaified
+	@cd ${WRKSRC} && ${INSTALL_DATA} * ${INST_DATADIR}/Aquaified
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/aquaified/PLIST b/wm/aquaified/PLIST
new file mode 100644
index 00000000000..0777a15d519
--- /dev/null
+++ b/wm/aquaified/PLIST
@@ -0,0 +1,41 @@
+@comment $NetBSD: PLIST,v 1.1 2002/10/06 00:02:50 wiz Exp $
+share/sawfish/themes/Aquaified/README
+share/sawfish/themes/Aquaified/bottom_left_corner.png
+share/sawfish/themes/Aquaified/bottom_left_corner2.png
+share/sawfish/themes/Aquaified/bottom_right_corner.png
+share/sawfish/themes/Aquaified/bottom_right_corner2.png
+share/sawfish/themes/Aquaified/close_button.png
+share/sawfish/themes/Aquaified/close_button2.png
+share/sawfish/themes/Aquaified/close_button_clicked.png
+share/sawfish/themes/Aquaified/close_button_over.png
+share/sawfish/themes/Aquaified/horizontal_border.png
+share/sawfish/themes/Aquaified/horizontal_border2.png
+share/sawfish/themes/Aquaified/max_button.png
+share/sawfish/themes/Aquaified/max_button2.png
+share/sawfish/themes/Aquaified/max_button_clicked.png
+share/sawfish/themes/Aquaified/max_button_over.png
+share/sawfish/themes/Aquaified/menu_button.png
+share/sawfish/themes/Aquaified/menu_button2.png
+share/sawfish/themes/Aquaified/menu_button_clicked.png
+share/sawfish/themes/Aquaified/menu_button_over.png
+share/sawfish/themes/Aquaified/menu_button_shaped.png
+share/sawfish/themes/Aquaified/menu_button_shaped2.png
+share/sawfish/themes/Aquaified/menu_button_shaped_over.png
+share/sawfish/themes/Aquaified/min_button.png
+share/sawfish/themes/Aquaified/min_button2.png
+share/sawfish/themes/Aquaified/min_button_clicked.png
+share/sawfish/themes/Aquaified/min_button_over.png
+share/sawfish/themes/Aquaified/theme.jl
+share/sawfish/themes/Aquaified/title.png
+share/sawfish/themes/Aquaified/title2.png
+share/sawfish/themes/Aquaified/top_left_corner.png
+share/sawfish/themes/Aquaified/top_left_corner2.png
+share/sawfish/themes/Aquaified/top_left_corner_shaped.png
+share/sawfish/themes/Aquaified/top_left_corner_shaped2.png
+share/sawfish/themes/Aquaified/top_right_corner.png
+share/sawfish/themes/Aquaified/top_right_corner2.png
+share/sawfish/themes/Aquaified/top_right_corner_shaped.png
+share/sawfish/themes/Aquaified/top_right_corner_shaped2.png
+share/sawfish/themes/Aquaified/vertical_border.png
+share/sawfish/themes/Aquaified/vertical_border2.png
+@dirrm share/sawfish/themes/Aquaified