Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Jan 2017 09:39:46 +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: r430926 - head/audio/mp3c
Message-ID:  <201701090939.v099dk7S094575@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



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