summaryrefslogtreecommitdiff
path: root/x11/wdm
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2001-03-27 10:03:22 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2001-03-27 10:03:22 +0000
commitd82eb1f666d0ab46c3868383ecb366f8e784ad51 (patch)
treecb13deb37a96cb889d9f26d99e603b755be88eef /x11/wdm
parentLatest bug fixes, FOR GREAT JUSTICE !! (diff)
Preserve wdm-config at install/deinstall time.
Notes
Notes: svn path=/head/; revision=40428
Diffstat (limited to 'x11/wdm')
-rw-r--r--x11/wdm/Makefile14
-rw-r--r--x11/wdm/pkg-plist8
2 files changed, 18 insertions, 4 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 6982223d3076..a69cfcf4dc8b 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -51,7 +51,19 @@ pre-everything:
post-patch:
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man
+pre-install:
+ @if [ -e ${PREFIX}/lib/X11/wdm/wdm-config ]; then \
+ ${MV} ${PREFIX}/lib/X11/wdm/wdm-config \
+ ${PREFIX}/lib/X11/wdm/wdm-config.preserve; \
+ fi
+
post-install:
- ${INSTALL_DATA} ${_DISTDIR}/${DAEMONPIC} ${PREFIX}/lib/X11/wdm/pixmaps
+ @${CP} ${PREFIX}/lib/X11/wdm/wdm-config \
+ ${PREFIX}/lib/X11/wdm/wdm-config.dist;
+ @if [ -e ${PREFIX}/lib/X11/wdm/wdm-config.preserve ]; then \
+ ${MV} ${PREFIX}/lib/X11/wdm/wdm-config.preserve \
+ ${PREFIX}/lib/X11/wdm/wdm-config; \
+ fi
+ @${INSTALL_DATA} ${_DISTDIR}/${DAEMONPIC} ${PREFIX}/lib/X11/wdm/pixmaps
.include <bsd.port.mk>
diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist
index fc70ed25e62c..d70434ab12b1 100644
--- a/x11/wdm/pkg-plist
+++ b/x11/wdm/pkg-plist
@@ -22,11 +22,13 @@ lib/X11/wdm/pixmaps/Stars.jpg
lib/X11/wdm/pixmaps/StarsLogo.jpg
lib/X11/wdm/pixmaps/daemon1-HQ-1280x960.jpg
lib/X11/wdm/pixmaps/gnuLogo.xpm
-lib/X11/wdm/wdm-config
+@unexec if cmp -s %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config; then rm -f %D/lib/X11/wdm/wdm-config; fi
+lib/X11/wdm/wdm-config.dist
+@exec [ -f %D/lib/X11/wdm/wdm-config ] || (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config)
lib/X11/wdm/wdm-config.in
lib/X11/wdm/wdmReconfig
-@dirrm lib/X11/wdm/pixmaps
+@unexec rmdir %D/lib/X11/wdm/pixmaps 2>/dev/null || true
@exec mkdir -p %D/lib/X11/wdm/authdir
@unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null || true
@dirrm lib/X11/wdm/authdir
-@dirrm lib/X11/wdm
+@unexec rmdir %D/lib/X11/wdm 2>/dev/null || true