From 4015364ffe80c59ddb88616a51201d2eaf092760 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 9 May 2014 18:29:01 +0000 Subject: [PATCH] - Support staging - Don't remove mtree directory - Consistently use DATADIR placeholder in plist Approved by: portmgr blanket --- net/tucan/Makefile | 35 +++++++------- net/tucan/pkg-plist | 110 ++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 74 deletions(-) diff --git a/net/tucan/Makefile b/net/tucan/Makefile index 98ad3c4fea7a..1448b46c3145 100644 --- a/net/tucan/Makefile +++ b/net/tucan/Makefile @@ -18,11 +18,8 @@ NO_BUILD= yes USE_GNOME= pygtk2 librsvg2 USE_PYTHON= yes -MANCOMPRESSED= yes -MAN1= tucan.1 USES= gettext -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -Ee 's|#! /usr/bin/env python|#! ${PYTHON_CMD}|' ${WRKSRC}/tucan.py @@ -31,21 +28,21 @@ pre-install: ${RM} ${WRKSRC}/core/*.orig do-install: - ${MKDIR} ${DATADIR} - ${MKDIR} ${DATADIR}/core - ${MKDIR} ${DATADIR}/default_plugins - ${MKDIR} ${DATADIR}/i18n - ${MKDIR} ${DATADIR}/media - ${MKDIR} ${DATADIR}/ui - ${INSTALL_SCRIPT} ${WRKSRC}/tucan.py ${PREFIX}/share/tucan/ - ${LN} -s ${PREFIX}/share/tucan/tucan.py ${PREFIX}/bin/tucan - (cd ${WRKSRC}/core/ && ${COPYTREE_SHARE} \* ${DATADIR}/core/) - (cd ${WRKSRC}/default_plugins/ && ${COPYTREE_SHARE} \* ${DATADIR}/default_plugins/) - (cd ${WRKSRC}/i18n/ && ${COPYTREE_SHARE} \* ${DATADIR}/i18n/) - (cd ${WRKSRC}/media/ && ${COPYTREE_SHARE} \* ${DATADIR}/media/) - (cd ${WRKSRC}/ui/ && ${COPYTREE_SHARE} \* ${DATADIR}/ui/) - ${INSTALL_DATA} ${WRKSRC}/media/tucan.png ${PREFIX}/share/pixmaps/ - ${INSTALL_MAN} ${WRKSRC}/tucan.1.gz ${PREFIX}/man/man1/ - ${INSTALL} ${WRKSRC}/tucan.desktop ${PREFIX}/share/applications/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/core + ${MKDIR} ${STAGEDIR}${DATADIR}/default_plugins + ${MKDIR} ${STAGEDIR}${DATADIR}/i18n + ${MKDIR} ${STAGEDIR}${DATADIR}/media + ${MKDIR} ${STAGEDIR}${DATADIR}/ui + ${INSTALL_SCRIPT} ${WRKSRC}/tucan.py ${STAGEDIR}${PREFIX}/share/tucan/ + ${LN} -s ${PREFIX}/share/tucan/tucan.py ${STAGEDIR}${PREFIX}/bin/tucan + (cd ${WRKSRC}/core/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/core/) + (cd ${WRKSRC}/default_plugins/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/default_plugins/) + (cd ${WRKSRC}/i18n/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/i18n/) + (cd ${WRKSRC}/media/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/media/) + (cd ${WRKSRC}/ui/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/ui/) + ${INSTALL_DATA} ${WRKSRC}/media/tucan.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/tucan.1.gz ${STAGEDIR}${PREFIX}/man/man1/ + ${INSTALL} ${WRKSRC}/tucan.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include diff --git a/net/tucan/pkg-plist b/net/tucan/pkg-plist index cb2775b129aa..32e3a0082d99 100644 --- a/net/tucan/pkg-plist +++ b/net/tucan/pkg-plist @@ -1,4 +1,5 @@ bin/tucan +man/man1/tucan.1.gz share/applications/tucan.desktop share/pixmaps/tucan.png %%DATADIR%%/core/__init__.py @@ -192,58 +193,57 @@ share/pixmaps/tucan.png %%DATADIR%%/ui/gtk/tray_icon.py %%DATADIR%%/ui/gtk/tree.py %%DATADIR%%/ui/gtk/update_manager.py -@dirrm share/tucan/ui/gtk -@dirrm share/tucan/ui/console -@dirrm share/tucan/ui -@dirrm share/tucan/media/scalable -@dirrm share/tucan/media -@dirrm share/tucan/i18n/tr/LC_MESSAGES -@dirrm share/tucan/i18n/tr -@dirrm share/tucan/i18n/sl/LC_MESSAGES -@dirrm share/tucan/i18n/sl -@dirrm share/tucan/i18n/sk/LC_MESSAGES -@dirrm share/tucan/i18n/sk -@dirrm share/tucan/i18n/se/LC_MESSAGES -@dirrm share/tucan/i18n/se -@dirrm share/tucan/i18n/ru/LC_MESSAGES -@dirrm share/tucan/i18n/ru -@dirrm share/tucan/i18n/pt/LC_MESSAGES -@dirrm share/tucan/i18n/pt -@dirrm share/tucan/i18n/pl/LC_MESSAGES -@dirrm share/tucan/i18n/pl -@dirrm share/tucan/i18n/nl/LC_MESSAGES -@dirrm share/tucan/i18n/nl -@dirrm share/tucan/i18n/it/LC_MESSAGES -@dirrm share/tucan/i18n/it -@dirrm share/tucan/i18n/gr/LC_MESSAGES -@dirrm share/tucan/i18n/gr -@dirrm share/tucan/i18n/fr/LC_MESSAGES -@dirrm share/tucan/i18n/fr -@dirrm share/tucan/i18n/es/LC_MESSAGES -@dirrm share/tucan/i18n/es -@dirrm share/tucan/i18n/en/LC_MESSAGES -@dirrm share/tucan/i18n/en -@dirrm share/tucan/i18n/de/LC_MESSAGES -@dirrm share/tucan/i18n/de -@dirrm share/tucan/i18n/da/LC_MESSAGES -@dirrm share/tucan/i18n/da -@dirrm share/tucan/i18n/cs/LC_MESSAGES -@dirrm share/tucan/i18n/cs -@dirrm share/tucan/i18n -@dirrm share/tucan/default_plugins/zshare -@dirrm share/tucan/default_plugins/uploading -@dirrm share/tucan/default_plugins/sendspace -@dirrm share/tucan/default_plugins/rapidshare -@dirrm share/tucan/default_plugins/megaupload -@dirrm share/tucan/default_plugins/mediafire -@dirrm share/tucan/default_plugins/hotfile -@dirrm share/tucan/default_plugins/fileserve -@dirrm share/tucan/default_plugins/filefactory -@dirrm share/tucan/default_plugins/easy-share -@dirrm share/tucan/default_plugins/depositfiles -@dirrm share/tucan/default_plugins/badongo -@dirrm share/tucan/default_plugins/4shared -@dirrm share/tucan/default_plugins -@dirrm share/tucan/core -@dirrm share/tucan -@dirrmtry share/pixmaps +@dirrm %%DATADIR%%/ui/gtk +@dirrm %%DATADIR%%/ui/console +@dirrm %%DATADIR%%/ui +@dirrm %%DATADIR%%/media/scalable +@dirrm %%DATADIR%%/media +@dirrm %%DATADIR%%/i18n/tr/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/tr +@dirrm %%DATADIR%%/i18n/sl/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/sl +@dirrm %%DATADIR%%/i18n/sk/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/sk +@dirrm %%DATADIR%%/i18n/se/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/se +@dirrm %%DATADIR%%/i18n/ru/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/ru +@dirrm %%DATADIR%%/i18n/pt/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/pt +@dirrm %%DATADIR%%/i18n/pl/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/pl +@dirrm %%DATADIR%%/i18n/nl/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/nl +@dirrm %%DATADIR%%/i18n/it/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/it +@dirrm %%DATADIR%%/i18n/gr/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/gr +@dirrm %%DATADIR%%/i18n/fr/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/fr +@dirrm %%DATADIR%%/i18n/es/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/es +@dirrm %%DATADIR%%/i18n/en/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/en +@dirrm %%DATADIR%%/i18n/de/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/de +@dirrm %%DATADIR%%/i18n/da/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/da +@dirrm %%DATADIR%%/i18n/cs/LC_MESSAGES +@dirrm %%DATADIR%%/i18n/cs +@dirrm %%DATADIR%%/i18n +@dirrm %%DATADIR%%/default_plugins/zshare +@dirrm %%DATADIR%%/default_plugins/uploading +@dirrm %%DATADIR%%/default_plugins/sendspace +@dirrm %%DATADIR%%/default_plugins/rapidshare +@dirrm %%DATADIR%%/default_plugins/megaupload +@dirrm %%DATADIR%%/default_plugins/mediafire +@dirrm %%DATADIR%%/default_plugins/hotfile +@dirrm %%DATADIR%%/default_plugins/fileserve +@dirrm %%DATADIR%%/default_plugins/filefactory +@dirrm %%DATADIR%%/default_plugins/easy-share +@dirrm %%DATADIR%%/default_plugins/depositfiles +@dirrm %%DATADIR%%/default_plugins/badongo +@dirrm %%DATADIR%%/default_plugins/4shared +@dirrm %%DATADIR%%/default_plugins +@dirrm %%DATADIR%%/core +@dirrm %%DATADIR%%