From owner-svn-ports-head@freebsd.org  Fri Sep  4 21:33:46 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 3F4419CB773;
 Fri,  4 Sep 2015 21:33:46 +0000 (UTC)
 (envelope-from amdmi3@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 0E19218FA;
 Fri,  4 Sep 2015 21:33:45 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t84LXj5V068645;
 Fri, 4 Sep 2015 21:33:45 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t84LXj6x068641;
 Fri, 4 Sep 2015 21:33:45 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509042133.t84LXj6x068641@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 4 Sep 2015 21:33:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396143 - head/multimedia/gmerlin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Sep 2015 21:33:46 -0000

Author: amdmi3
Date: Fri Sep  4 21:33:45 2015
New Revision: 396143
URL: https://svnweb.freebsd.org/changeset/ports/396143

Log:
  - Switch to options helpers
  - Drop 8.x support

Modified:
  head/multimedia/gmerlin/Makefile

Modified: head/multimedia/gmerlin/Makefile
==============================================================================
--- head/multimedia/gmerlin/Makefile	Fri Sep  4 21:33:39 2015	(r396142)
+++ head/multimedia/gmerlin/Makefile	Fri Sep  4 21:33:45 2015	(r396143)
@@ -32,6 +32,7 @@ INSTALL_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
+LDFLAGS+=	-Wl,--add-needed
 
 INFO=		gmerlin
 
@@ -47,6 +48,7 @@ CDDB_LIB_DEPENDS=	libcddb.so:${PORTSDIR}
 CDDB_CONFIGURE_OFF=	--disable-cddb
 CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 CDIO_CONFIGURE_OFF=	--disable-libcdio
+CDIO_BROKEN=		fails to build with new libcdio
 ESOUND_USE=		gnome=esound
 ESOUND_CONFIGURE_OFF=	--disable-esd
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
@@ -65,16 +67,6 @@ QUICKTIME_CONFIGURE_OFF=--disable-lqt
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 TIFF_CONFIGURE_OFF=	--disable-libtiff
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCDIO}
-BROKEN=	Fails to build with new libcdio
-.endif
-
-.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
-LDFLAGS+=	-Wl,--add-needed
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/LIBS/s|-ldl || ; \