aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2006-10-07 03:48:00 +0800
committermiwi <miwi@FreeBSD.org>2006-10-07 03:48:00 +0800
commit5f139d0e452a7742f7d756f252d87a04795079af (patch)
tree74930204dcffcd6db6b6ec51e6df133eeba6644c /multimedia
parent858d5dcf24d14d9bb0cbd119c9420f9b24618e7f (diff)
downloadfreebsd-ports-gnome-5f139d0e452a7742f7d756f252d87a04795079af.tar.gz
freebsd-ports-gnome-5f139d0e452a7742f7d756f252d87a04795079af.tar.zst
freebsd-ports-gnome-5f139d0e452a7742f7d756f252d87a04795079af.zip
Log from Maintainer:
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 PR: ports/103892 Submitted by: Denis Eremenko <moonshade@pnhz.kz> Approved by: Thomas E. Zander <riggs@rrr.de> (maintainer)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer/Makefile8
-rw-r--r--multimedia/mplayer/files/pkg-message.in29
-rw-r--r--multimedia/mplayer/pkg-message15
-rw-r--r--multimedia/mplayer/pkg-plist10
4 files changed, 36 insertions, 26 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b3daa1f6787c..d79a75fd638a 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -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 @@ CATEGORIES+= ipv6
.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 @@ post-install:
@${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 --git a/multimedia/mplayer/files/pkg-message.in b/multimedia/mplayer/files/pkg-message.in
index 57c6c9c235b9..83103c0e2bca 100644
--- a/multimedia/mplayer/files/pkg-message.in
+++ b/multimedia/mplayer/files/pkg-message.in
@@ -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 --git a/multimedia/mplayer/pkg-message b/multimedia/mplayer/pkg-message
deleted file mode 100644
index 29ccbd1264ef..000000000000
--- a/multimedia/mplayer/pkg-message
+++ /dev/null
@@ -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 --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index e1fbb5b5e610..6f2e9d954344 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -118,11 +118,13 @@ bin/mplayer
%%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