diff options
| -rw-r--r-- | x11-wm/fvwm2-beta/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/fvwm2-beta/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm2-beta/pkg-plist | 4 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/pkg-plist | 4 |
6 files changed, 18 insertions, 8 deletions
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile index 860a22c18a8e..af46cce63cfb 100644 --- a/x11-wm/fvwm2-beta/Makefile +++ b/x11-wm/fvwm2-beta/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fvwm -PORTVERSION= 2.3.32 +PORTVERSION= 2.3.33 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -52,7 +52,10 @@ post-extract: 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; \ + fi @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \ ${PREFIX}/lib/X11/fvwm2/pixmaps diff --git a/x11-wm/fvwm2-beta/distinfo b/x11-wm/fvwm2-beta/distinfo index 97431d3e049f..4292218a8469 100644 --- a/x11-wm/fvwm2-beta/distinfo +++ b/x11-wm/fvwm2-beta/distinfo @@ -1,2 +1,2 @@ -MD5 (fvwm-2.3.32.tar.gz) = 8a85cdd5aa462c116628142924604ea3 +MD5 (fvwm-2.3.33.tar.gz) = 8b77d1a568e0779b00497444808bf30a MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist index 164e824ecd5c..dae80dd5a19f 100644 --- a/x11-wm/fvwm2-beta/pkg-plist +++ b/x11-wm/fvwm2-beta/pkg-plist @@ -8,7 +8,9 @@ bin/fvwm2 bin/fvwm24_convert bin/fvwmbug 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/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 860a22c18a8e..af46cce63cfb 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fvwm -PORTVERSION= 2.3.32 +PORTVERSION= 2.3.33 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -52,7 +52,10 @@ post-extract: 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; \ + fi @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \ ${PREFIX}/lib/X11/fvwm2/pixmaps diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo index 97431d3e049f..4292218a8469 100644 --- a/x11-wm/fvwm2-devel/distinfo +++ b/x11-wm/fvwm2-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (fvwm-2.3.32.tar.gz) = 8a85cdd5aa462c116628142924604ea3 +MD5 (fvwm-2.3.33.tar.gz) = 8b77d1a568e0779b00497444808bf30a MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist index 164e824ecd5c..dae80dd5a19f 100644 --- a/x11-wm/fvwm2-devel/pkg-plist +++ b/x11-wm/fvwm2-devel/pkg-plist @@ -8,7 +8,9 @@ bin/fvwm2 bin/fvwm24_convert bin/fvwmbug 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 |