From owner-svn-ports-head@freebsd.org  Mon Jan  9 09:39:47 2017
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 34594CA54EB;
 Mon,  9 Jan 2017 09:39:47 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 047F418D7;
 Mon,  9 Jan 2017 09:39:46 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v099dkfK094576;
 Mon, 9 Jan 2017 09:39:46 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v099dk7S094575;
 Mon, 9 Jan 2017 09:39:46 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201701090939.v099dk7S094575@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: Mon, 9 Jan 2017 09:39:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r430926 - head/audio/mp3c
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.23
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: Mon, 09 Jan 2017 09:39:47 -0000

Author: amdmi3
Date: Mon Jan  9 09:39:45 2017
New Revision: 430926
URL: https://svnweb.freebsd.org/changeset/ports/430926

Log:
  - Fix license
  - Use GNU_CONFIGURE
  - Remove always true OSVERSION based condition

Modified:
  head/audio/mp3c/Makefile

Modified: head/audio/mp3c/Makefile
==============================================================================
--- head/audio/mp3c/Makefile	Mon Jan  9 09:09:10 2017	(r430925)
+++ head/audio/mp3c/Makefile	Mon Jan  9 09:39:45 2017	(r430926)
@@ -10,15 +10,16 @@ MASTER_SITES=	ftp://ftp.wspse.de/linux/w
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD to mp3c converter with a console frontend
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	mp3info:audio/mp3info \
 		cdrecord:sysutils/cdrtools
 
 USES=		ncurses
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=${PREFIX}"
+GNU_CONFIGURE=	yes
+
+DEFAULT_CDROM_DEVICE?=	cd0
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
@@ -26,14 +27,6 @@ OPTIONS_SUB=	yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000031
-DEFAULT_CDROM_DEVICE=	cd0
-.else
-DEFAULT_CDROM_DEVICE=	acd0
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|rcd0d|${DEFAULT_CDROM_DEVICE}|g' \
 		-e 's|/dev/cdrom|/dev/${DEFAULT_CDROM_DEVICE}|g' \
@@ -42,4 +35,4 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/cdrip.sh ${STAGEDIR}${LOCALBASE}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>