Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Aug 2015 15:57:20 +0000
From:      bugzilla-noreply@freebsd.org
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   [Bug 202404] [MAINTAINER] multimedia/mplayer2: updates to Makefile
Message-ID:  <bug-202404-13-wQvcgUj0BJ@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-202404-13@https.bugs.freebsd.org/bugzilla/>
References:  <bug-202404-13@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D202404

--- Comment #5 from Jan Beich <jbeich@FreeBSD.org> ---
Comment on attachment 159998
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D159998
v3

>-WITH_CDROM_DEVICE?=3D	/dev/cd0
>+.if defined(WITH_CDROM_DEVICE)
>+DEFAULT_CDROM_DEVICE=3D${WITH_CDROM_DEVICE}
>+.else
>+DEFAULT_CDROM_DEVICE=3D/dev/acd0
>+.endif

/dev/acd0 is provided by atapicd(4) and was phased out by ATA_CAM transitio=
n.
"device atapicd" was removed from GENERIC since 9.0-RELEASE while 8.x branc=
h is
officially EOL since 2015-08-01.

And some lines still reference WITH_CDROM_DEVICE which now can be empty.

> -.if ${PORT_OPTIONS:MLIBCACA}
> +.if ${PORT_OPTIONS:MCACA}
>  LIB_DEPENDS+=3D		libcaca.so:${PORTSDIR}/graphics/libcaca
>  .else
>  CONFIGURE_ARGS+=3D	--disable-caca

PORTREVISION bump is required for users who enabled CACA option but didn't
notice lack of its effect.

>++++ configure
>+@@ -1234,7 +1234,7 @@ if test "$(basename $_cc)" =3D "icc" || te
>+   esac
>+   echores "$cc_version"
>+ else
>+-  for _cc in "$_cc" gcc cc ; do
>++  for _cc in "$_cc" cc cc ; do

Before regenarating patches make sure there's no noise from changes caused =
by
REINPLACE_CMD.

>+PLIST_FILES=3D	bin/mplayer \
>+		etc/mplayer/codecs.conf.sample \
>+		etc/mplayer/input.conf.sample \
>+		etc/mplayer/mplayer.conf.sample \
>+		man/man1/mplayer.1.gz
>+
[...]
>--- /usr/ports/multimedia/mplayer2.old/pkg-plist	2015-02-01 21:24:27.00000=
0000 +0100
>+++ /usr/ports/multimedia/mplayer2/pkg-plist	1970-01-01 01:00:00.000000000=
 +0100
>@@ -1,5 +0,0 @@
>-bin/mplayer
>-etc/mplayer/codecs.conf.sample
>-etc/mplayer/input.conf.sample
>-etc/mplayer/mplayer.conf.sample
>-man/man1/mplayer.1.gz

On one hand it introduces more churn for |svn blame|, on the other one less
file to parse during build. Also, multimedia/mplayer still uses pkg-plist.

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-202404-13-wQvcgUj0BJ>