diff options
| -rw-r--r-- | x11-wm/fvwm2/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/fvwm2/pkg-plist | 4 | ||||
| -rw-r--r-- | x11-wm/fvwm24/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/fvwm24/pkg-plist | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 50d2680815ba..2bf7f4ffffab 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -30,7 +30,10 @@ MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ post-install: @${MKDIR} ${PREFIX}/etc - @${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc + @${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc.dist + @if [ ! -e ${PREFIX}/etc/system.fvwm2rc ]; then \ + ${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc.dist; \ + fi @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \ ${PREFIX}/lib/X11/fvwm2/pixmaps diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist index 4d668ebfbf70..dcf1731633e5 100644 --- a/x11-wm/fvwm2/pkg-plist +++ b/x11-wm/fvwm2/pkg-plist @@ -1,7 +1,9 @@ bin/FvwmCommand bin/fvwm2 bin/xpmroot -etc/system.fvwm2rc +@unexec if cmp -s %D/etc/system.fvwm2rc %D/etc/system.fvwm2rc.dist; then rm -f %D/etc/system.fvwm2rc; fi +etc/system.fvwm2rc.dist +@exec [ -f %B/system.fvwm2rc ] || cp %B/%f %B/system.fvwm2rc lib/X11/fvwm2/pixmaps/Jlock.xpm lib/X11/fvwm2/pixmaps/Jnews.xpm lib/X11/fvwm2/pixmaps/Jrecycle.xpm diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index 50d2680815ba..2bf7f4ffffab 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -30,7 +30,10 @@ MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ post-install: @${MKDIR} ${PREFIX}/etc - @${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc + @${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc.dist + @if [ ! -e ${PREFIX}/etc/system.fvwm2rc ]; then \ + ${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc.dist; \ + fi @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \ ${PREFIX}/lib/X11/fvwm2/pixmaps diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist index 4d668ebfbf70..dcf1731633e5 100644 --- a/x11-wm/fvwm24/pkg-plist +++ b/x11-wm/fvwm24/pkg-plist @@ -1,7 +1,9 @@ bin/FvwmCommand bin/fvwm2 bin/xpmroot -etc/system.fvwm2rc +@unexec if cmp -s %D/etc/system.fvwm2rc %D/etc/system.fvwm2rc.dist; then rm -f %D/etc/system.fvwm2rc; fi +etc/system.fvwm2rc.dist +@exec [ -f %B/system.fvwm2rc ] || cp %B/%f %B/system.fvwm2rc lib/X11/fvwm2/pixmaps/Jlock.xpm lib/X11/fvwm2/pixmaps/Jnews.xpm lib/X11/fvwm2/pixmaps/Jrecycle.xpm |