Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Sep 2015 01:11:41 +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: r397342 - head/multimedia/kodi
Message-ID:  <201509200111.t8K1BfH9097866@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Sep 20 01:11:40 2015
New Revision: 397342
URL: https://svnweb.freebsd.org/changeset/ports/397342

Log:
  multimedia/kodi: minor cleanup
  
  - Convert to USE_GL
  - Convert _VARS option helper
  - Adjust PLIST_SUB outside of conditional
  - Drop 8.x support
  
  Approved by:	portmgr blanket

Modified:
  head/multimedia/kodi/Makefile   (contents, props changed)

Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile	Sat Sep 19 23:38:53 2015	(r397341)
+++ head/multimedia/kodi/Makefile	Sun Sep 20 01:11:40 2015	(r397342)
@@ -31,7 +31,6 @@ LIB_DEPENDS=	libass.so:${PORTSDIR}/multi
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libdrm.so:${PORTSDIR}/graphics/libdrm \
 		libenca.so:${PORTSDIR}/converters/enca \
-		libGLEW.so:${PORTSDIR}/graphics/glew \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -65,16 +64,21 @@ USES=		autoreconf:build gettext gmake ic
 		pkgconfig python:2
 GNU_CONFIGURE=	yes
 USE_XORG=	xt xmu xtst xrandr
-USE_GL=		glu
+USE_GL=		glu glew
 USE_SDL=	image sdl2
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 NOPRECIOUSMAKEVARS=	yes
 INSTALLS_ICONS=	yes
+
 ONLY_FOR_ARCHS=	i386 amd64
+KODI_ARCH_i386=	x86
+KODI_ARCH_amd64=x86_64
 
 WRKSRC=		${WRKDIR}/xbmc-${DISTVERSION}-Helix
 
+PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
+
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC DOCS \
 		LIBBLURAY LIRC MYSQL NFS NONFREE RTMP \
@@ -113,6 +117,8 @@ NFS_LIB_DEPENDS=	libnfs.so:${PORTSDIR}/n
 NFS_CONFIGURE_ENABLE=	nfs
 
 NONFREE_CONFIGURE_ENABLE=	non-free
+NONFREE_VARS=		NO_CDROM="Restricted binary distribution" \
+			NO_PACKAGE="Restricted binary distribution"
 
 RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=	rtmp
@@ -136,25 +142,6 @@ SFTP_CONFIGURE_ENABLE=	ssh
 
 CONFIGURE_ARGS+=	--disable-debug --disable-alsa --disable-pulse
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == i386
-PLIST_SUB+=	ARCH="x86"
-.else
-PLIST_SUB+=	ARCH="x86_64"
-.endif
-
-.if ${OSVERSION} < 900033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-.endif
-
-.if ${PORT_OPTIONS:MNONFREE}
-NO_CDROM=	Restricted binary distribution
-NO_PACKAGE=	${NO_CDROM}
-.endif
-
 post-extract:
 	${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
 	${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \



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