From owner-svn-ports-head@FreeBSD.ORG Sun Sep 14 14:17:19 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1FA07B1; Sun, 14 Sep 2014 14:17:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73CFEB3B; Sun, 14 Sep 2014 14:17:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8EEHJtC032764; Sun, 14 Sep 2014 14:17:19 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8EEHJ5l032763; Sun, 14 Sep 2014 14:17:19 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409141417.s8EEHJ5l032763@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 14 Sep 2014 14:17:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368177 - in head/sysutils/xfsprogs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Sep 2014 14:17:19 -0000 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' \