Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Apr 2017 16:06:13 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r437938 - head/multimedia/tvheadend
Message-ID:  <201704071606.v37G6DEa031231@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Apr  7 16:06:12 2017
New Revision: 437938
URL: https://svnweb.freebsd.org/changeset/ports/437938

Log:
  - Remove always true OSVERSION conditions
  
  Approved by:	portmgr blanket

Modified:
  head/multimedia/tvheadend/Makefile

Modified: head/multimedia/tvheadend/Makefile
==============================================================================
--- head/multimedia/tvheadend/Makefile	Fri Apr  7 16:05:45 2017	(r437937)
+++ head/multimedia/tvheadend/Makefile	Fri Apr  7 16:06:12 2017	(r437938)
@@ -72,13 +72,9 @@ TRANSCODING_CONFIGURE_ENABLE=	libav
 
 XMLTV_RUN_DEPENDS=	p5-xmltv>=0:textproc/p5-xmltv
 
-.include <bsd.port.pre.mk>
-
-.if ( !empty(CC:M*clang*) || ${OSVERSION} >= 1000024 )
 # CLANG also needs -Wno-microsoft which GCC 4.2 does not know
 CFLAGS+=	-Wno-microsoft \
 		-Wno-tautological-constant-out-of-range-compare
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|0.0.0~unknown|${PORTVERSION}-${GH_TAGNAME}|' \
@@ -93,12 +89,10 @@ post-patch:
 	# Remove -Wunused-result because gcc 4.2 on FreeBSD 9.x does not know it
 	@${REINPLACE_CMD} 's|-Wunused-result||' \
 		${WRKSRC}/Makefile
-.if ${OSVERSION} >= 1000000
 	# to suppress clang CC flags on FreeBSD 10+
 	# @${REINPLACE_CMD} 's|clang|clang-options-disabled|' \
 	# to enable clang CC flags, because clang is identified as 'cc' on FreeBSD 10+
 	@${REINPLACE_CMD} 's|clang|cc|' \
 		${WRKSRC}/Makefile
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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