Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Sep 2014 14:17:19 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368177 - in head/sysutils/xfsprogs: . files
Message-ID:  <201409141417.s8EEHJ5l032763@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sun Sep 14 14:17:18 2014
New Revision: 368177
URL: http://svnweb.freebsd.org/changeset/ports/368177
QAT: https://qat.redports.org/buildarchive/r368177/

Log:
  - Switch to USES=libtool:build
  - Avoid USE_AUTOTOOLS
  - Check for timer_create instead of lio_listio to detect librt

Deleted:
  head/sysutils/xfsprogs/files/patch-buildmacros
Modified:
  head/sysutils/xfsprogs/Makefile

Modified: head/sysutils/xfsprogs/Makefile
==============================================================================
--- head/sysutils/xfsprogs/Makefile	Sun Sep 14 14:09:38 2014	(r368176)
+++ head/sysutils/xfsprogs/Makefile	Sun Sep 14 14:17:18 2014	(r368177)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfsprogs
 PORTVERSION=	2.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 		ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
@@ -17,13 +17,10 @@ LICENSE=	LGPL21 GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-USES=		gettext gmake libtool readline
-USE_AUTOTOOLS=	autoconf libtoolize
+USES=		gettext gmake libtool:build readline
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
-			LIBTOOL=${LIBTOOL} OPTIMIZER=" "
-MAKE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}"
-CONFIGURE_ARGS+=	--disable-shared --enable-readline
+CONFIGURE_ENV=	OPTIMIZER=" "
+CONFIGURE_ARGS=	--disable-shared --enable-readline
 ALL_TARGET=
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -33,13 +30,10 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e '/utmp/d' \
 		${WRKSRC}/quota/report.c ${WRKSRC}/quota/util.c
-	@${FIND} ${WRKDIR} -name "*.m4" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/local|'${LOCALBASE}'|g'
-	@${RM} -f ${WRKSRC}/configure
-
-post-configure:
-	@${FIND} ${WRKSRC}/include -name "builddefs" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|LIBRT =|LIBRT = -lrt|g'
+	@${REINPLACE_CMD} \
+		-e 's|/usr/local|${LOCALBASE}|g' \
+		-e 's/lio_listio/timer_create/' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|$$(PKG_DOC_DIR)|$$(DESTDIR)&|g' ${WRKSRC}/Makefile
 .for dir in db doc fsck growfs io logprint mdrestore mkfs quota repair rtcp
 	@${REINPLACE_CMD} -E 's,PKG_(BIN|DOC|INC|SBIN)_DIR,DESTDIR)$$(&,g' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409141417.s8EEHJ5l032763>