ports/145720: [PATCH] multimedia/vlc: plist incorrect WITHOUT_QT4
Joseph S. Atkinson
jsa.bsd at gmail.com
Mon Apr 19 23:00:17 UTC 2010
The following reply was made to PR ports/145720; it has been noted by GNATS.
From: "Joseph S. Atkinson" <jsa.bsd at gmail.com>
To: bug-followup at FreeBSD.org, amdmi3 at amdmi3.ru
Cc:
Subject: Re: ports/145720: [PATCH] multimedia/vlc: plist incorrect WITHOUT_QT4
Date: Mon, 19 Apr 2010 18:55:34 -0400
This is a multi-part message in MIME format.
--------------010501000003030005050005
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
This should do it. This kills the extra *vlc.desktop files and fixes the missing
icon in one true share/applications/vlc.desktop. Now desktop users wont have 3
vlc shortcuts, and the related plist error will just go away. Since this change
will affect the default package, bump PORTREVISION.
Also, while I am here, convert some funky syntax to use @dirrmtry instead of
@exec ${RMDIR} stuff in the plist. If this plist is correct, this should never
be problematic. If it isn't, tinderboxes and portools will let us know.
--------------010501000003030005050005
Content-Type: text/plain;
name="vlc_iconfix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="vlc_iconfix.diff"
diff -ruN /usr/ports/multimedia/vlc/Makefile vlc/Makefile
--- /usr/ports/multimedia/vlc/Makefile 2010-04-19 15:43:30.000000000 -0400
+++ vlc/Makefile 2010-04-19 18:40:29.000000000 -0400
@@ -10,7 +10,7 @@
PORTNAME= vlc
DISTVERSION= 1.0.5
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
diff -ruN /usr/ports/multimedia/vlc/Makefile.inc vlc/Makefile.inc
--- /usr/ports/multimedia/vlc/Makefile.inc 2010-03-29 04:19:07.000000000 -0400
+++ vlc/Makefile.inc 2010-04-19 18:06:40.000000000 -0400
@@ -228,18 +228,9 @@
${RM} -rf ${PLIST} ${FAKEDIR}
${MKDIR} ${FAKEDIR}
${TOUCH} -f ${PLIST}
+ ${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
-.if !defined(WITHOUT_QT4)
- ${ECHO_CMD} "share/pixmaps/qvlc.png" >> ${PLIST}
- ${ECHO_CMD} "share/applications/qvlc.desktop" >> ${PLIST}
-.endif
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
- ${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
- ${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
-.endif
-.if defined(WITH_SKINS) || !defined(WITHOUT_QT)
- ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-.endif
+ ${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST}
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
${RM} -f ${FAKEDIR}/share/locale/locale.alias
@@ -248,11 +239,11 @@
cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|include/|' >> ${PLIST} \
&& ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm include/|' >> ${PLIST}
+ ${SED} -e 's|^|@dirrmtry include/|' >> ${PLIST}
cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \
${SED} -e 's|^|lib/|' >> ${PLIST} \
&& ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
+ ${SED} -e 's|^|@dirrmtry lib/|' >> ${PLIST}
.if !defined(WITHOUT_X11)
cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \
${SED} -e 's|^|libdata/|' >> ${PLIST} \
@@ -263,17 +254,17 @@
cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
&& ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
+ ${SED} -e 's|^|@dirrmtry share/${dir}/|' >> ${PLIST}
.endfor
.if !defined(NOPORTDOCS)
cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/doc/|' >> ${PLIST} \
&& ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
+ ${SED} -e 's|^|@dirrmtry share/doc/|' >> ${PLIST}
.else
${RM} -rf ${FAKEDIR}/share/doc
.endif
- ${ECHO_MSG} "@dirrm share/vlc" >> ${PLIST}
+ ${ECHO_MSG} "@dirrmtry share/vlc" >> ${PLIST}
.if !defined(WITHOUT_NLS)
cd ${FAKEDIR}/share/locale && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/locale/|' >> ${PLIST}
@@ -284,8 +275,8 @@
${ECHO_CMD} "@dirrmtry %%WEBPLUGINS_DIR%%" >> ${PLIST}
.endif
.for locale in ckb co fur kk km my oc ps tet tl
- ${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
- ${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/locale/${locale}/LC_MESSAGES" >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/locale/${locale}" >> ${PLIST}
.endfor
do-install:
@@ -295,6 +286,7 @@
${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
cd ${FAKEDIR}/lib && ${FIND} . | \
${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
+ ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
.if !defined(WITHOUT_X11)
cd ${FAKEDIR}/libdata && ${FIND} . | \
${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata
@@ -314,12 +306,4 @@
if [ ! -d ${PREFIX}/share/pixmaps ]; then \
${MKDIR} ${PREFIX}/share/pixmaps ; \
fi
-.if !defined(WITHOUT_QT4)
- ${INSTALL_DATA} ${FILESDIR}/qvlc.desktop ${PREFIX}/share/applications
- ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/qvlc.png
-.endif
-.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
- ${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
- ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
-.endif
.endif
diff -ruN /usr/ports/multimedia/vlc/files/qvlc.desktop vlc/files/qvlc.desktop
--- /usr/ports/multimedia/vlc/files/qvlc.desktop 2009-01-19 20:50:29.000000000 -0500
+++ vlc/files/qvlc.desktop 1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=VideoLAN (QT4) Media Player
-Comment=Video and Audio player and server
-Icon=qvlc.png
-Exec=qvlc
-TryExec=qvlc
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
diff -ruN /usr/ports/multimedia/vlc/files/svlc.desktop vlc/files/svlc.desktop
--- /usr/ports/multimedia/vlc/files/svlc.desktop 2005-06-26 10:11:40.000000000 -0400
+++ vlc/files/svlc.desktop 1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=VideoLAN (skins) Media Player
-Comment=Video and Audio player and server
-Icon=gvlc.png
-Exec=vlc --intf skins2
-TryExec=svlc
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
--------------010501000003030005050005--
More information about the freebsd-ports-bugs
mailing list