diff options
Diffstat (limited to 'x11-fonts/xfs')
| -rw-r--r-- | x11-fonts/xfs/Makefile | 15 | ||||
| -rw-r--r-- | x11-fonts/xfs/distinfo | 6 | ||||
| -rw-r--r-- | x11-fonts/xfs/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | x11-fonts/xfs/pkg-install | 2 | ||||
| -rw-r--r-- | x11-fonts/xfs/pkg-plist | 9 |
5 files changed, 15 insertions, 28 deletions
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 69954987ba16..de1419eddd92 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfs -PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTVERSION= 1.0.8 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -21,18 +20,16 @@ ALL_TARGET= all config MAN1= xfs.1 -.if !defined(WITHOUT_XFS_CACHE) -USE_XORG+= fontcacheproto x11 -CFLAGS+= -DFONTCACHE -.else post-patch: + ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in +.if defined(WITHOUT_XFS_CACHE) ${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp .endif post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default - @if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config; \ + ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default + @if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \ fi .include <bsd.port.mk> diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index d0f8c8540432..3484d5eac284 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xfs-1.0.5.tar.bz2) = 3fc73b5e39a1fe8b8d96563c8144cffe -SHA256 (xorg/app/xfs-1.0.5.tar.bz2) = f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9 -SIZE (xorg/app/xfs-1.0.5.tar.bz2) = 152131 +MD5 (xorg/app/xfs-1.0.8.tar.bz2) = f10717e45535b64eb45226aac571dac2 +SHA256 (xorg/app/xfs-1.0.8.tar.bz2) = 34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482 +SIZE (xorg/app/xfs-1.0.8.tar.bz2) = 161279 diff --git a/x11-fonts/xfs/files/patch-Makefile.in b/x11-fonts/xfs/files/patch-Makefile.in deleted file mode 100644 index 2fecfe5ad0ee..000000000000 --- a/x11-fonts/xfs/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sat Jul 8 12:35:19 2006 -+++ Makefile.in Sat Jul 8 12:35:21 2006 -@@ -289,7 +289,7 @@ - FSERRORS = /var/log/xfs.log - FONTDIR = $(libdir)/X11/fonts - FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ --config_DATA = config -+#config_DATA = config - EXTRA_DIST = xfs.def config.cpp $(appman_PRE) - CLEANFILES = config $(appman_DATA) - appmandir = $(APP_MAN_DIR) diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install index 183fcb6dd3f9..9979ff9a1e1a 100644 --- a/x11-fonts/xfs/pkg-install +++ b/x11-fonts/xfs/pkg-install @@ -6,7 +6,7 @@ fi PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -XINITCONFDIR=${PKG_PREFIX}/lib/X11/fs +XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs if [ ! -f ${XINITCONFDIR}/config ]; then cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config fi diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 02c0cee1f5f5..e2378ab6db01 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -1,5 +1,6 @@ bin/xfs -@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi -lib/X11/fs/config.default -@exec if [ ! -f %D/lib/X11/fs/config ] ; then cp -p %D/%F %B/config; fi -@dirrmtry lib/X11/fs +@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 +@dirrmtry etc/X11/fs +@dirrmtry etc/X11 |