aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2001-03-29 19:19:19 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2001-03-29 19:19:19 +0000
commit3f3d7628f06c66b6a2637bd79b255d0e7fc2f440 (patch)
tree42db56d2c3a2f779d96a8aaaef850a7491e20bc8 /x11
parent6816dbc9b436d606d98d0d90a697034c2bef7b28 (diff)
downloadports-3f3d7628f06c66b6a2637bd79b255d0e7fc2f440.tar.gz
ports-3f3d7628f06c66b6a2637bd79b255d0e7fc2f440.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/wdm/Makefile12
-rw-r--r--x11/wdm/pkg-plist6
2 files changed, 15 insertions, 3 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index a69cfcf4dc8b..c87c7294faba 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -56,14 +56,24 @@ pre-install:
${MV} ${PREFIX}/lib/X11/wdm/wdm-config \
${PREFIX}/lib/X11/wdm/wdm-config.preserve; \
fi
+ @if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0 ]; then \
+ ${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0 \
+ ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve; \
+ fi
post-install:
@${CP} ${PREFIX}/lib/X11/wdm/wdm-config \
- ${PREFIX}/lib/X11/wdm/wdm-config.dist;
+ ${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
+ @${CP} ${PREFIX}/lib/X11/wdm/Xsetup_0 \
+ ${PREFIX}/lib/X11/wdm/Xsetup_0.dist
+ @if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve ]; then \
+ ${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve \
+ ${PREFIX}/lib/X11/wdm/Xsetup_0; \
+ 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 d70434ab12b1..3654c9b8facb 100644
--- a/x11/wdm/pkg-plist
+++ b/x11/wdm/pkg-plist
@@ -12,7 +12,9 @@ lib/X11/wdm/Xservers.ws
lib/X11/wdm/Xsession
lib/X11/wdm/Xsession.XFree86
lib/X11/wdm/Xsession.in
-lib/X11/wdm/Xsetup_0
+@unexec if cmp -s %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0; then rm -f %D/lib/X11/wdm/Xsetup_0; fi
+lib/X11/wdm/Xsetup_0.dist
+@exec [ -f %D/lib/X11/wdm/Xsetup_0 ] || (cp %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0)
lib/X11/wdm/pixmaps/Eagle.xpm
lib/X11/wdm/pixmaps/Earth.jpg
lib/X11/wdm/pixmaps/Earth200x130.xpm
@@ -30,5 +32,5 @@ lib/X11/wdm/wdmReconfig
@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
+@unexec rmdir %D/lib/X11/wdm/authdir 2>/dev/null || true
@unexec rmdir %D/lib/X11/wdm 2>/dev/null || true