Date: Mon, 2 Oct 2006 22:50:17 GMT From: "Thomas E. Zander" <riggs@rrr.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/103892: multimedia/mplayer installs confs in wrong path Message-ID: <200610022250.k92MoHxa067835@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/103892; it has been noted by GNATS.
From: "Thomas E. Zander" <riggs@rrr.de>
To: bug-followup@FreeBSD.ORG
Cc:
Subject: Re: ports/103892: multimedia/mplayer installs confs in wrong path
Date: Tue, 3 Oct 2006 00:40:47 +0200
--rJwd6BRFiFCcLxzm
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
mplayer does not necessarily these config files to work properly.
They are needed however if one wants to set system-wide defaults
different from mplayer's built-in settings.
Therefore,
o these files have more example character and are now
installed in ${PREFIX}/share/mplayer/examples/etc
o this is mentioned in files/pkg-message.in
Also there are further cleanups:
o The port now recognizes the new skin dir accorting to
ports/103891. Please commit these two diffs together
in order to maintain dependency consistency
o pkg-message in the port root dir should be removed from
the tree as we are using files/pkg-message.in for quite
some time now
Attached patch addresses all these issues.
Riggs
--rJwd6BRFiFCcLxzm
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: attachment; filename="mplayer.diff"
diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile Mon Oct 2 10:17:53 2006
+++ mplayer/Makefile Tue Oct 3 00:21:31 2006
@@ -84,7 +84,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -262,7 +262,7 @@
.if !defined(WITHOUT_GUI)
PLIST_SUB+= GMPLAYER=""
.if !defined(WITHOUT_SKINS)
-RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins
+RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
.endif
.if ( ${OSVERSION} < 500000 )
@@ -594,8 +594,10 @@
@${CHMOD} 755 ${DATADIR}
@${MKDIR} ${DATADIR}/tools
@${CHMOD} 755 ${DATADIR}/tools
+ @${MKDIR} ${DATADIR}/examples/etc
+ @${CHMOD} 755 ${DATADIR}/examples/etc
.for conf in ${CONFFILES}
- ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc
.endfor
.for tool in ${TOOLFILES}
${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${DATADIR}/tools
diff -ruN /usr/ports/multimedia/mplayer/files/pkg-message.in mplayer/files/pkg-message.in
--- /usr/ports/multimedia/mplayer/files/pkg-message.in Wed Jul 12 03:53:07 2006
+++ mplayer/files/pkg-message.in Tue Oct 3 00:24:26 2006
@@ -1,11 +1,32 @@
+
+===================================================================
+MPlayer comes with useful documentation covering many topics like
+output devices, video encoding, repairing broken files etc.
+They are installed in
+
+%%DOCSDIR%%
+
+for references.
+===================================================================
+MPlayer's system-wide configuration dir is
+
+%%PREFIX%%/etc/mplayer
+
+If you want to install configuration files into this location
+in order to change mplayer's default settings for all users on
+your system, you find some examples in
+
+%%DATADIR%%/examples/etc
+===================================================================
This port provides a simple and easy to use
-tool to provide fonts in OSD.
+tool to provide bitmap fonts in OSD.
Just cd to the ports directory and type
make install-user
Note: This is only for the bitmap fonts! If you've compiled
-mplayer with truetype support, this won't work.
+mplayer with truetype support, i.e. it is linked to freetype,
+which is the preferred and supported default setting, this won't
+work as expected.
+===================================================================
-Please take a look at docs in
-%%DOCSDIR%%
diff -ruN /usr/ports/multimedia/mplayer/pkg-message mplayer/pkg-message
--- /usr/ports/multimedia/mplayer/pkg-message Fri Jun 11 20:08:50 2004
+++ mplayer/pkg-message Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-This port provides a simple and easy to use
-tool to provide fonts in OSD.
-Just cd to the ports directory and type
-
-make install-user
-
-Note: This is only for the bitmap fonts! If you've compiled
-mplayer with truetype support, this won't work.
-
-Please take a look at docs in
-/usr/local/share/doc/mplayer
-
-If you encounter strange problems, please have a look at
-http://www.rrr.de/~riggs/mplayer/faq_en.html
-before throwing stones at me :-)
diff -ruN /usr/ports/multimedia/mplayer/pkg-plist mplayer/pkg-plist
--- /usr/ports/multimedia/mplayer/pkg-plist Thu Jul 13 10:33:35 2006
+++ mplayer/pkg-plist Tue Oct 3 00:20:40 2006
@@ -118,11 +118,13 @@
%%DATADIR%%/tools/w32codec_dl.pl
%%DATADIR%%/tools/wma2ogg.pl
%%DATADIR%%/tools/x2mpsub.sh
-%%DATADIR%%/example.conf
-%%DATADIR%%/input.conf
-%%DATADIR%%/menu.conf
-%%DATADIR%%/dvb-menu.conf
+%%DATADIR%%/examples/etc/example.conf
+%%DATADIR%%/examples/etc/input.conf
+%%DATADIR%%/examples/etc/menu.conf
+%%DATADIR%%/examples/etc/dvb-menu.conf
@dirrm %%DATADIR%%/tools
+@dirrm %%DATADIR%%/examples/etc
+@dirrm %%DATADIR%%/examples
@dirrmtry %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%VIDIX%%@dirrm lib/mplayer/vidix
--rJwd6BRFiFCcLxzm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610022250.k92MoHxa067835>