diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2011-02-25 16:52:50 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2011-02-25 16:52:50 +0000 |
| commit | d594ccc94ffa1006a70e7762de037c800e827b24 (patch) | |
| tree | acb2244a21cfbea5c6e08351de94411bf3cb322a /x11-fonts/xfs | |
| parent | 0c4a162c976c91f8789cd750fa2dd434fa12864d (diff) | |
| download | ports-d594ccc94ffa1006a70e7762de037c800e827b24.tar.gz ports-d594ccc94ffa1006a70e7762de037c800e827b24.zip | |
Notes
Diffstat (limited to 'x11-fonts/xfs')
| -rw-r--r-- | x11-fonts/xfs/Makefile | 14 | ||||
| -rw-r--r-- | x11-fonts/xfs/distinfo | 5 | ||||
| -rw-r--r-- | x11-fonts/xfs/pkg-descr | 3 | ||||
| -rw-r--r-- | x11-fonts/xfs/pkg-install | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 80dd5ab90255..f43c4ddf8b4f 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfs -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -15,23 +14,26 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org font server XORG_CAT= app +USE_GMAKE= yes USE_XORG= libfs xfont xtrans USE_RC_SUBR= xfs -ALL_TARGET= all config CONFIGURE_ENV+= ac_cv_path_XMLTO="" MAN1= xfs.1 post-patch: - ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in .if defined(WITHOUT_XFS_CACHE) ${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp .endif +post-build: + @cd ${WRKSRC}/config/ && ${GMAKE} config + post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default + ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config.default @if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \ + ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config; \ fi .include <bsd.port.mk> diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index b5471014360c..b6e6da07048d 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,3 +1,2 @@ -MD5 (xorg/app/xfs-1.1.0.tar.bz2) = 5cfc06a320f74f07a0aa73da62307e9a -SHA256 (xorg/app/xfs-1.1.0.tar.bz2) = 47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d -SIZE (xorg/app/xfs-1.1.0.tar.bz2) = 196532 +SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb +SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188 diff --git a/x11-fonts/xfs/pkg-descr b/x11-fonts/xfs/pkg-descr index a3082dc9d0e9..81d8c54249ae 100644 --- a/x11-fonts/xfs/pkg-descr +++ b/x11-fonts/xfs/pkg-descr @@ -1,4 +1,3 @@ This package contains the X.Org font server. -- Joel Dahl -joel@FreeBSD.org +WWW: http://www.x.org/ diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install index 9979ff9a1e1a..237026033e3d 100644 --- a/x11-fonts/xfs/pkg-install +++ b/x11-fonts/xfs/pkg-install @@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} +PKG_PREFIX=${PKG_PREFIX:=/usr/local} XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs if [ ! -f ${XINITCONFDIR}/config ]; then |