From owner-svn-ports-all@freebsd.org Wed Apr 13 10:42:38 2016 Return-Path: Delivered-To: svn-ports-all@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 0AA58B0F2C6; Wed, 13 Apr 2016 10:42:38 +0000 (UTC) (envelope-from jbeich@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 CFAD6166C; Wed, 13 Apr 2016 10:42:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3DAgb8G001297; Wed, 13 Apr 2016 10:42:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3DAgb84001296; Wed, 13 Apr 2016 10:42:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604131042.u3DAgb84001296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 13 Apr 2016 10:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413190 - head/audio/oss X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2016 10:42:38 -0000 Author: jbeich Date: Wed Apr 13 10:42:36 2016 New Revision: 413190 URL: https://svnweb.freebsd.org/changeset/ports/413190 Log: audio/oss: convert to CONFIGURE_OUTSOURCE PR: 208294 Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D4157 Modified: head/audio/oss/Makefile (contents, props changed) Modified: head/audio/oss/Makefile ============================================================================== --- head/audio/oss/Makefile Wed Apr 13 10:41:49 2016 (r413189) +++ head/audio/oss/Makefile Wed Apr 13 10:42:36 2016 (r413190) @@ -15,11 +15,12 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= gawk:lang/gawk USES= tar:bzip2 kmod pkgconfig +HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes +CONFIGURE_ENV= HOSTCC="${CC}" ALL_TARGET= all install USE_GNOME= gtk20 USE_RC_SUBR= oss -WRKSRC= ${WRKDIR}/build -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} SUB_FILES= pkg-install pkg-deinstall ONLY_FOR_ARCHS= amd64 i386 @@ -31,15 +32,13 @@ OSS_CONF_FILES= oss_audigyls oss_audiolo oss_sbpci oss_sbxfi oss_trident oss_usb oss_userdev \ oss_ymf7xx osscore -PROTO_DIR= ${WRKSRC}/prototype +PROTO_DIR= ${INSTALL_WRKSRC}/prototype PROTO_ETCDIR= ${PROTO_DIR}/etc PROTO_BINDIR= ${PROTO_DIR}/usr/bin PROTO_SBINDIR= ${PROTO_DIR}/usr/sbin PROTO_MANDIR= ${PROTO_DIR}/usr/share/man PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss -CONFIGURE_ENV= CC="${CC}" HOSTCC="${CC}" - OPTIONS_DEFINE= VORBIS OPTIONS_DEFAULT=VORBIS @@ -59,11 +58,6 @@ post-patch: -name make.local -or -name soundoff -or -name soundon | \ ${XARGS} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -do-configure: - ${MKDIR} ${WRKSRC} - (cd ${WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${PATCH_WRKSRC}/configure) - do-install: ${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${STAGEDIR}${PREFIX}/bin/ # @${ECHO_CMD} "OSSLIBDIR=${PREFIX}/lib/oss" > ${PROTO_ETCDIR}/oss.conf