[Midnightbsd-cvs] mports [19172] trunk/x11-fonts/xfs: fix xfs build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu May 28 22:40:34 EDT 2015


Revision: 19172
          http://svnweb.midnightbsd.org/mports/?rev=19172
Author:   laffer1
Date:     2015-05-28 22:40:33 -0400 (Thu, 28 May 2015)
Log Message:
-----------
fix xfs build

Modified Paths:
--------------
    trunk/x11-fonts/xfs/Makefile
    trunk/x11-fonts/xfs/distinfo
    trunk/x11-fonts/xfs/files/xfs.in
    trunk/x11-fonts/xfs/pkg-plist

Removed Paths:
-------------
    trunk/x11-fonts/xfs/pkg-install

Modified: trunk/x11-fonts/xfs/Makefile
===================================================================
--- trunk/x11-fonts/xfs/Makefile	2015-05-29 02:37:34 UTC (rev 19171)
+++ trunk/x11-fonts/xfs/Makefile	2015-05-29 02:40:33 UTC (rev 19172)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	xfs
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
@@ -10,13 +10,11 @@
 LICENSE=	mit
 
 XORG_CAT=	app
-USE_GMAKE=	yes
+USES=		gmake
 USE_XORG=	libfs xfont xtrans
 USE_RC_SUBR=	xfs
 CONFIGURE_ARGS=	--without-xmlto --without-fop
 
-MAN1=		xfs.1
-
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
 .if defined(WITHOUT_XFS_CACHE)
@@ -24,12 +22,11 @@
 .endif
 
 post-build:
-	@cd ${WRKSRC}/config/ && ${GMAKE} config
+	@cd ${WRKSRC}/config/ && ${MAKE_CMD} 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
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/fs
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config \
+		${STAGEDIR}${PREFIX}/etc/X11/fs/config.sample
 
 .include <bsd.port.mk>

Modified: trunk/x11-fonts/xfs/distinfo
===================================================================
--- trunk/x11-fonts/xfs/distinfo	2015-05-29 02:37:34 UTC (rev 19171)
+++ trunk/x11-fonts/xfs/distinfo	2015-05-29 02:40:33 UTC (rev 19172)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
-SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
+SHA256 (xorg/app/xfs-1.1.4.tar.bz2) = a40b75e674c091464f85739292b6bf24e2d153f4a2ac456d3ea6b8a64e269ffa
+SIZE (xorg/app/xfs-1.1.4.tar.bz2) = 239623

Modified: trunk/x11-fonts/xfs/files/xfs.in
===================================================================
--- trunk/x11-fonts/xfs/files/xfs.in	2015-05-29 02:37:34 UTC (rev 19171)
+++ trunk/x11-fonts/xfs/files/xfs.in	2015-05-29 02:40:33 UTC (rev 19172)
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="xfs"
-rcvar=`set_rcvar`
+rcvar=xfs_enable
 
 # Set defaults
 [ -z "$xfs_enable" ] && xfs_enable="NO"

Deleted: trunk/x11-fonts/xfs/pkg-install
===================================================================
--- trunk/x11-fonts/xfs/pkg-install	2015-05-29 02:37:34 UTC (rev 19171)
+++ trunk/x11-fonts/xfs/pkg-install	2015-05-29 02:40:33 UTC (rev 19172)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs
-if [ ! -f ${XINITCONFDIR}/config ]; then
-	cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config
-fi

Modified: trunk/x11-fonts/xfs/pkg-plist
===================================================================
--- trunk/x11-fonts/xfs/pkg-plist	2015-05-29 02:37:34 UTC (rev 19171)
+++ trunk/x11-fonts/xfs/pkg-plist	2015-05-29 02:40:33 UTC (rev 19172)
@@ -1,6 +1,3 @@
 bin/xfs
- at 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
- at exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
- at dirrmtry etc/X11/fs
- at dirrmtry etc/X11
+ at sample etc/X11/fs/config.sample
+man/man1/xfs.1.gz



More information about the Midnightbsd-cvs mailing list