aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2009-04-22 08:46:42 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2009-04-22 08:46:42 +0800
commit59b46444b7228a6d2c3e6d8c2e6ca195447b376f (patch)
tree7de60b763d8bc191ce63c82d2b59acc4daa427ab /multimedia
parent4669f4cd2bbc6462a1c80a76f73bf43d31ab1d70 (diff)
downloadfreebsd-ports-gnome-59b46444b7228a6d2c3e6d8c2e6ca195447b376f.tar.gz
freebsd-ports-gnome-59b46444b7228a6d2c3e6d8c2e6ca195447b376f.tar.zst
freebsd-ports-gnome-59b46444b7228a6d2c3e6d8c2e6ca195447b376f.zip
- pkg-install and plist fixes
- while here, further fix plist and remove superfluous pre/post.mk usage PR: 133813 Submitted by: "J.R. Oldroyd" <fbsd at opal dot com> (maintainer)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/freevo/Makefile4
-rw-r--r--multimedia/freevo/files/pkg-install.in2
-rw-r--r--multimedia/freevo/pkg-plist23
3 files changed, 3 insertions, 26 deletions
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index f9e7d31b4f75..6ef12b760108 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -51,8 +51,6 @@ RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
CONFDIR= ${PREFIX}/etc/${PORTNAME}
-.include <bsd.port.pre.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/freevo_config.py
@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/local_conf.py.example
@@ -64,4 +62,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/local_conf.py.example ${CONFDIR}
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/freevo/files/pkg-install.in b/multimedia/freevo/files/pkg-install.in
index 6449b1e4ab10..f3e854518aa2 100644
--- a/multimedia/freevo/files/pkg-install.in
+++ b/multimedia/freevo/files/pkg-install.in
@@ -9,7 +9,7 @@ home=%%FREEVO_HOME%%
export PATH=/bin:/usr/bin:/sbin:/usr/sbin
-if [ "$1" = "PRE-INSTALL" ]; then
+if [ "$2" = "POST-INSTALL" ]; then
if pw groupshow "$group" 2>/dev/null; then
echo "You already have a group \"$group\", so I will use it."
else
diff --git a/multimedia/freevo/pkg-plist b/multimedia/freevo/pkg-plist
index 3754de7a7103..5280642e166e 100644
--- a/multimedia/freevo/pkg-plist
+++ b/multimedia/freevo/pkg-plist
@@ -2306,7 +2306,6 @@ share/locale/zh_CN/LC_MESSAGES/freevo.po
@dirrm %%PYTHON_SITELIBDIR%%/freevo/video
@dirrm %%PYTHON_SITELIBDIR%%/freevo/www
@dirrm %%PYTHON_SITELIBDIR%%/freevo
-@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrm %%DOCSDIR%%/installation
@dirrm %%DOCSDIR%%/plugin_writing
@dirrm %%DOCSDIR%%
@@ -2402,24 +2401,4 @@ share/locale/zh_CN/LC_MESSAGES/freevo.po
@dirrm %%DATADIR%%/skins/plugins/osd
@dirrm %%DATADIR%%/skins/plugins
@dirrm %%DATADIR%%/skins
-@dirrm share/freevo
-@dirrmtry share/locale/af/LC_MESSAGES
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/da/LC_MESSAGES
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/en_GB/LC_MESSAGES
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/hu/LC_MESSAGES
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/nl/LC_MESSAGES
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt_BR/LC_MESSAGES
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrm %%DATADIR%%