diff options
| author | bapt <bapt@FreeBSD.org> | 2014-09-02 15:49:53 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-09-02 15:49:53 +0000 |
| commit | cce22129e37c91fbc1b485056b45f76f5ded9474 (patch) | |
| tree | 9f59ccf292a899f7988bd295eae52348df70a44e | |
| parent | b0f81f0b56f90449932d7ae477209eaa44a81a83 (diff) | |
| download | FreeBSD-ports-cce22129e37c91fbc1b485056b45f76f5ded9474.zip FreeBSD-ports-cce22129e37c91fbc1b485056b45f76f5ded9474.tar.gz | |
Use @sample
Get rid of @cwd
| -rw-r--r-- | x11/wdm/Makefile | 6 | ||||
| -rw-r--r-- | x11/wdm/pkg-plist | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 8fb2e04..2c6f0a4 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -3,7 +3,7 @@ PORTNAME= wdm PORTVERSION= 1.28 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11 windowmaker MASTER_SITES= http://voins.program.ru/wdm/:wdm \ http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \ @@ -72,8 +72,8 @@ post-patch: 's|/etc/X11/wdm|${WDMDIR}|g' ${WRKSRC}/doc/wdmLogin.man post-install: - @${MV} ${STAGEDIR}${WDMDIR}/wdm-config ${STAGEDIR}${WDMDIR}/wdm-config.dist - @${MV} ${STAGEDIR}${WDMDIR}/Xsetup_0 ${STAGEDIR}${WDMDIR}/Xsetup_0.dist + @${MV} ${STAGEDIR}${WDMDIR}/wdm-config ${STAGEDIR}${WDMDIR}/wdm-config.sample + @${MV} ${STAGEDIR}${WDMDIR}/Xsetup_0 ${STAGEDIR}${WDMDIR}/Xsetup_0.sample .for file in beastie.xpm daemon1-HQ-1280x960.jpg @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${STAGEDIR}${WDMDIR}/pixmaps .endfor diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist index 7a6ea7c..4546c64 100644 --- a/x11/wdm/pkg-plist +++ b/x11/wdm/pkg-plist @@ -12,9 +12,7 @@ lib/X11/wdm/Xservers.ws lib/X11/wdm/Xsession lib/X11/wdm/Xsession.XFree86 lib/X11/wdm/Xsession.orig -@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) +@sample lib/X11/wdm/Xsetup_0.sample lib/X11/wdm/pixmaps/Eagle.xpm lib/X11/wdm/pixmaps/Earth.jpg lib/X11/wdm/pixmaps/Earth200x130.xpm @@ -24,9 +22,7 @@ lib/X11/wdm/pixmaps/StarsLogo.jpg lib/X11/wdm/pixmaps/beastie.xpm lib/X11/wdm/pixmaps/daemon1-HQ-1280x960.jpg lib/X11/wdm/pixmaps/gnuLogo.xpm -@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) +@sample lib/X11/wdm/wdm-config.sample lib/X11/wdm/wdm-config.in lib/X11/wdm/wdmReconfig man/man1/wdm.1.gz @@ -40,10 +36,7 @@ share/locale/fr_FR/LC_MESSAGES/wdm.mo share/locale/ja/LC_MESSAGES/wdm.mo share/locale/ru/LC_MESSAGES/wdm.mo @dirrmtry lib/X11/wdm/pixmaps -@exec mkdir -p %D/lib/X11/wdm/authdir @dirrmtry lib/X11/wdm/authdir @dirrmtry lib/X11/wdm -%%PAM%%@cwd %%LOCALBASE%% -%%PAM%%etc/pam.d/wdm -@cwd / +%%PAM%%%%LOCALBASE%%/etc/pam.d/wdm @dirrmtry /var/run/wdm |
