From owner-svn-ports-all@freebsd.org Sun Sep 20 01:11:56 2015 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 EAFF6A02239; Sun, 20 Sep 2015 01:11:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.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 C32041DAD; Sun, 20 Sep 2015 01:11:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8K1BueQ000489; Sun, 20 Sep 2015 01:11:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8K1Bub5000488; Sun, 20 Sep 2015 01:11:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201509200111.t8K1Bub5000488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 20 Sep 2015 01:11:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397343 - head/multimedia/plexhometheater 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.20 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: Sun, 20 Sep 2015 01:11:57 -0000 Author: jbeich Date: Sun Sep 20 01:11:55 2015 New Revision: 397343 URL: https://svnweb.freebsd.org/changeset/ports/397343 Log: multimedia/plexhometheater: minor cleanup - Convert to USE_GL - Adjust PLIST_SUB outside of conditional - Drop 8.x support - OPSYS/OSVERSION also defined in .options.mk Approved by: portmgr blanket Modified: head/multimedia/plexhometheater/Makefile (contents, props changed) Modified: head/multimedia/plexhometheater/Makefile ============================================================================== --- head/multimedia/plexhometheater/Makefile Sun Sep 20 01:11:40 2015 (r397342) +++ head/multimedia/plexhometheater/Makefile Sun Sep 20 01:11:55 2015 (r397343) @@ -34,7 +34,6 @@ LIB_DEPENDS= libass.so:${PORTSDIR}/multi libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ - libGLEW.so:${PORTSDIR}/graphics/glew \ libhal.so:${PORTSDIR}/sysutils/hal \ libjasper.so:${PORTSDIR}/graphics/jasper \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ @@ -78,14 +77,18 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCAL CFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_XORG= xt xmu xtst xrandr -USE_GL= glu +USE_GL= glu glew USE_SDL= image sdl mixer INSTALLS_ICONS= yes + ONLY_FOR_ARCHS= i386 amd64 +PLEX_ARCH_i386= x86 +PLEX_ARCH_amd64=x86_64 WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} SUB_FILES= ${PORTNAME}.sh pkg-message +PLIST_SUB= ARCH=${PLEX_ARCH_${ARCH}} DESKTOP_ENTRIES="Plex Home Theater" \ "${COMMENT}" \ @@ -109,18 +112,7 @@ LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comm PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:BOOL=true -.include - -.if ${ARCH} == i386 -PLIST_SUB+= ARCH="x86" -.else -PLIST_SUB+= ARCH="x86_64" -.endif - -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 900033 -USE_BINUTILS= yes -MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin -.endif +.include post-patch: @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/FFMPEG_ARCH/' \ @@ -146,4 +138,4 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*.so ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin -.include +.include