Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Apr 2016 10:42:37 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413190 - head/audio/oss
Message-ID:  <201604131042.u3DAgb84001296@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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