summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-01-18 17:33:15 +0000
committerjschauma <jschauma@pkgsrc.org>2003-01-18 17:33:15 +0000
commit00ed2a209a71a4d155a548d11cba340c8c38713d (patch)
tree2dda86e5826ddcd5fb0849fb3f66b9fe11a4471a /wm
parenta8c9d30b9caf3b07d44d1d4d7f55376fe4b0ec1e (diff)
downloadpkgsrc-00ed2a209a71a4d155a548d11cba340c8c38713d.tar.gz
Change the way the PLIST is created to address problems pointed out in
PR pkg/19766. Also, since we know what we're removing, we can simply -print | xargs rm these directories, thus circumventing the hack with the temporary file. This ought to work on all OPSYSs. Bump pkg version (no PKGREVISION, since this package is custom tailored).
Diffstat (limited to 'wm')
-rw-r--r--wm/sawfish-themes/Makefile26
1 files changed, 14 insertions, 12 deletions
diff --git a/wm/sawfish-themes/Makefile b/wm/sawfish-themes/Makefile
index 1c1d988e0f1..7d89ef9d341 100644
--- a/wm/sawfish-themes/Makefile
+++ b/wm/sawfish-themes/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/12/11 07:30:51 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/18 17:33:15 jschauma Exp $
-DISTNAME= sawfish-themes-0.1
+DISTNAME= sawfish-themes-0.2
CATEGORIES= x11 wm
DYNAMIC_MASTER_SITES= yes
DISTFILES= ${SAWFISH_THEMES}
@@ -32,25 +32,27 @@ pre-fetch:
@${ECHO} "==========================================================="
@sleep 5
+pre-extract:
+ @${MKDIR} ${WRKSRC}
+
+post-extract:
+ @${MV} ${WRKDIR}/* ${WRKSRC} 2>/dev/null || ${TRUE}
+
# here's what we do:
# - some themes contain .xvpics - let's clean those up
-# (Solaris can only '-print' (not '-print0' or -'printx'), thus tmpfile
# - create a PLIST
# - dirrm directives need to be reversed in case of subdirs
pre-install:
@${RM} -f ${PLIST_SRC}
@${TOUCH} ${PLIST_SRC}
- @cd ${WRKDIR} && \
+ @cd ${WRKSRC} && \
${FIND} . \( -type d -name ".xvpics" -or -name "CVS" \) \
- -print > ${WRKDIR}/.goners
- @for i in `${CAT} ${WRKDIR}/.goners`; do \
- ${RM} -fr -- "${WRKDIR}/$$i"; \
- done
- @cd ${WRKDIR} && \
- ${FIND} . \( -type f ! -name ".*" ! -name "PLIST" \) \
+ -print | xargs ${RM} -fr
+ @cd ${WRKSRC} && \
+ ${FIND} . \( -type f -or -type l \) \
-print | \
${SED} -e 's,^\.,share/sawfish/themes,' >> ${PLIST_SRC}
- @cd ${WRKDIR} && \
+ @cd ${WRKSRC} && \
${FIND} -d . \( -type d ! -name "." \) \
-print | \
${SED} -e 's,^\.,@dirrm share/sawfish/themes,' >> \
@@ -59,7 +61,7 @@ pre-install:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${THEMES_DIR}
- cd ${WRKDIR} && ${PAX} -s ,^./[.].*,, \
+ cd ${WRKSRC} && ${PAX} -s ,^./[.].*,, \
-s ,^./PLIST,, -rw . ${PREFIX}/${THEMES_DIR}
.include "files/themes.sawfish"