diff options
| author | zeising <zeising@FreeBSD.org> | 2013-12-16 19:11:09 +0800 |
|---|---|---|
| committer | zeising <zeising@FreeBSD.org> | 2013-12-16 19:11:09 +0800 |
| commit | 30e10e1d3c1d2aba115571f87754d3a229fa9391 (patch) | |
| tree | 2df88f8b6e2af92b78ac24eb382268b7c290efab /x11-fonts/xfs | |
| parent | da7a4c20a4d3dae187b71915971ffc8f2332f201 (diff) | |
| download | freebsd-ports-graphics-30e10e1d3c1d2aba115571f87754d3a229fa9391.tar.gz freebsd-ports-graphics-30e10e1d3c1d2aba115571f87754d3a229fa9391.tar.zst freebsd-ports-graphics-30e10e1d3c1d2aba115571f87754d3a229fa9391.zip | |
Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG=
to /etc/make.conf to get the old version.
Update several xorg related ports, including:
x11/libxcb 1.9.1 -> 1.9.3
graphics/libdrm 2.4.46 -> 2.4.50
x11/pixman 0.30.2 -> 0.32.4
x11/xkeyboard-config 2.9 -> 2.10.1
x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0
Fix dissapearing cursor in xf86-video-vmware [2]
Stagify all x11@-owned ports
Bump portrevisions for xf86-* ports due to xserver version change.
Fix fallout from updates where needed.
Thanks to: all testersi, bdrewery and the FreeBSD x11@ team
exp-run by: bdrewery [1]
PR: ports/184684 [1], ports/181385 [2]
Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2]
Approved by: portmgr (bdrewery), core (jhb) [0]
Diffstat (limited to 'x11-fonts/xfs')
| -rw-r--r-- | x11-fonts/xfs/Makefile | 9 | ||||
| -rw-r--r-- | x11-fonts/xfs/pkg-plist | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index be18e10df1b..0fa5429a5b2 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -14,9 +14,6 @@ USE_XORG= libfs xfont xtrans USE_RC_SUBR= xfs CONFIGURE_ARGS= --without-xmlto --without-fop -MAN1= xfs.1 - -NO_STAGE= yes post-patch: ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in .if defined(WITHOUT_XFS_CACHE) @@ -27,9 +24,7 @@ post-build: @cd ${WRKSRC}/config/ && ${GMAKE} config post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config.default - @if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config; \ - fi + ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.default + ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config; \ .include <bsd.port.mk> diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index e2378ab6db0..e175b97fd85 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -1,4 +1,5 @@ bin/xfs +man/man1/xfs.1.gz @unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi etc/X11/fs/config.default @exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi |