From owner-svn-ports-head@freebsd.org Fri Oct 16 11:56:39 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56444A15B65; Fri, 16 Oct 2015 11:56:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 24F1611CE; Fri, 16 Oct 2015 11:56:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9GBucDO003999; Fri, 16 Oct 2015 11:56:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9GBucrP003998; Fri, 16 Oct 2015 11:56:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510161156.t9GBucrP003998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 16 Oct 2015 11:56:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399434 - head/net/openafs 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.20 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: Fri, 16 Oct 2015 11:56:39 -0000 Author: amdmi3 Date: Fri Oct 16 11:56:38 2015 New Revision: 399434 URL: https://svnweb.freebsd.org/changeset/ports/399434 Log: - Extend danfe's fix to unbreak on amd64 as well Suggested by: danfe Approved by: portmgr blanket MFH: 2015Q4 Modified: head/net/openafs/Makefile Modified: head/net/openafs/Makefile ============================================================================== --- head/net/openafs/Makefile Fri Oct 16 11:30:30 2015 (r399433) +++ head/net/openafs/Makefile Fri Oct 16 11:56:38 2015 (r399434) @@ -77,10 +77,6 @@ FUSE_CONFIGURE_OFF= --disable-fuse-clien CFLAGS+= -mstackrealign .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1002000 && ${OSVERSION} < 1100000 -BROKEN= does not build, no support for FreeBSD 10.2 yet -.endif - KERNCONF?= GENERIC KERNCONFDIR?= ${SRC_BASE}/sys/${ARCH}/conf @@ -99,9 +95,11 @@ post-extract: cd ${KERNCONFDIR} && \ /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null # Unbreak on FreeBSD 10.2 (until official support arrives) +.for a in i386 amd64 @${SED} -e 's,101,102, ; /FBSD102_ENV/ { h; s/102/101/; G; }' \ - ${WRKSRC}/src/config/param.i386_fbsd_101.h \ - > ${WRKSRC}/src/config/param.i386_fbsd_102.h + ${WRKSRC}/src/config/param.${a}_fbsd_101.h \ + > ${WRKSRC}/src/config/param.${a}_fbsd_102.h +.endfor @${REINPLACE_CMD} -e '/fbsd_101/ { h; s/101/102/; s/31/32/; x; G; }' \ ${WRKSRC}/src/config/afs_sysnames.h