diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-12-16 21:53:33 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-12-16 21:53:33 +0800 |
| commit | eef8009ca0e30f49bed14b9778b539eb8532f7d4 (patch) | |
| tree | 0867c84790d95d71113d7af4ed26ae7870787ece /x11-fonts/xfs | |
| parent | b69725f9ac34e0404740c63b57e8ada5fb7028f3 (diff) | |
| download | xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.tar xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.tar.gz xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.tar.bz2 xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.tar.lz xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.tar.xz xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.tar.zst xorg-devel-ports-eef8009ca0e30f49bed14b9778b539eb8532f7d4.zip | |
Sync with ports.
Mostly fixes related to staging.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1333 058c260c-8361-11dd-a0ac-aa2bafec7d09
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 be18e10..0fa5429 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 e2378ab..e175b97 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 |