summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-01 02:15:02 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-01 02:15:02 +0800
commit36c390d9fc8ec1787fbe1f83600621f933636be4 (patch)
tree4aec1878260bbb81aa42fd2662c67d4adc23a40f /multimedia
parent1816c30edb22d4b38eefd13087fe52f046cbadca (diff)
downloadmarcuscom-ports-36c390d9fc8ec1787fbe1f83600621f933636be4.tar.gz
marcuscom-ports-36c390d9fc8ec1787fbe1f83600621f933636be4.tar.zst
marcuscom-ports-36c390d9fc8ec1787fbe1f83600621f933636be4.zip
- Don't install share/locale/locale.alias or remove it
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7429 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc-devel/Makefile.inc4
-rw-r--r--multimedia/vlc/Makefile.inc4
2 files changed, 6 insertions, 2 deletions
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index b8f09ed33..0804b7403 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -5,7 +5,7 @@
# and will be autodetected to enable
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.4 2006/06/21 22:50:36 ahze Exp $
+# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.5 2006/09/04 15:10:51 ahze Exp $
#
# If you define for example WITH_FAAD and WITHOUT_FAAD
# the WITHOUT_ will always over ride the WITH_.
@@ -303,6 +303,7 @@ pre-install:
.endif
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+ ${RM} -f ${FAKEDIR}/share/locale/locale.alias
cd ${FAKEDIR}/bin && ${FIND} -s * | \
${SED} -e 's|^|bin/|' >> ${PLIST}
cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -319,6 +320,7 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
.endfor
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(NOPORTDOCS)
cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 227e6fa11..4dafa80cc 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -5,7 +5,7 @@
# and will be autodetected to enable
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/multimedia/vlc/Makefile.inc,v 1.2 2006/08/20 05:49:24 mezz Exp $
#
# If you define for example WITH_FAAD and WITHOUT_FAAD
# the WITHOUT_ will always over ride the WITH_.
@@ -294,6 +294,7 @@ pre-install:
.endif
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+ ${RM} -f ${FAKEDIR}/share/locale/locale.alias
cd ${FAKEDIR}/bin && ${FIND} -s * | \
${SED} -e 's|^|bin/|' >> ${PLIST}
cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -310,6 +311,7 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
.endfor
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(NOPORTDOCS)
cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/doc/|' >> ${PLIST} \