Attachment 116522 Details for Bug 158475 – file.diff

[patch] file.diff

file.diff (text/plain), 6.97 KB, created by tkato432 on 2011-06-29 19:30:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-06-29 19:30:13 UTC

Size: 6.97 KB

patch

obsolete

>diff -urN /usr/ports/math/convertall/Makefile math/convertall/Makefile
>--- /usr/ports/math/convertall/Makefile	2010-05-09 23:10:12.000000000 +0900
>+++ math/convertall/Makefile	2011-06-29 23:01:11.000000000 +0900
>@@ -6,15 +6,20 @@
> #
> 
> PORTNAME=	convertall
>-PORTVERSION=	0.5.0
>+PORTVERSION=	0.5.1b
> CATEGORIES=	math
> MASTER_SITES=	BERLIOS
>+DISTFILES=	${PORTNAME}-${PORTVERSION:S/b//}${EXTRACT_SUFX} \
>+		${PORTNAME}-i18n-${PORTVERSION}${EXTRACT_SUFX}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Another unit converter
> 
> RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
> 
>+LICENSE=	GPLv2 GPLv3
>+LICENSE_COMB=	dual
>+
> WRKSRC=		${WRKDIR}/ConvertAll
> 
> USE_PYTHON=	2.4+
>@@ -22,26 +27,32 @@
> post-patch:
> 	@cd ${WRKSRC}/source && ${REINPLACE_CMD} -e \
> 		"/^dataFilePath/s|None|\'${DATADIR}\'|g ; \
>-		 /^helpFilePath/s|None|\'${DOCSDIR}\'|g" convertall.py
>+		 /^helpFilePath/s|None|\'${DOCSDIR}\'|g ; \
>+		 /^iconPath/s|None|\'${DATADIR}/icons\'|g ; \
>+		 /^translationPath/s|'translations'|'${DATADIR}/translations'|" convertall.py
> 
> do-build:
> 	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/convertall.sh
> 	@${ECHO_CMD} 'exec ${PYTHON_CMD} ${PYTHON_SITELIBDIR}/convertall/convertall.py $$*' >> ${WRKDIR}/convertall.sh
>+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/source
>+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/source
> 
> do-install:
> 	${INSTALL_SCRIPT} ${WRKDIR}/convertall.sh ${PREFIX}/bin/convertall
> 	@${MKDIR} ${PYTHON_SITELIBDIR}/convertall
> 	${INSTALL_DATA} ${WRKSRC}/source/*.py ${PYTHON_SITELIBDIR}/convertall
>-	@${CHMOD} ${BINMODE} ${PYTHON_SITELIBDIR}/convertall/convertall.py
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/convertall
>-	@${MKDIR} ${PREFIX}/share/icons
>-	${INSTALL_DATA} ${WRKSRC}/icons/convertall.svg ${PREFIX}/share/icons
>-	${INSTALL_DATA} ${WRKSRC}/icons/convertall_*.png ${PREFIX}/share/icons
>+	${INSTALL_DATA} ${WRKSRC}/source/*.pyc ${PYTHON_SITELIBDIR}/convertall
>+	${INSTALL_DATA} ${WRKSRC}/source/*.pyo ${PYTHON_SITELIBDIR}/convertall
> 	@${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/data/*.dat ${DATADIR}
>+	@${MKDIR} ${DATADIR}/icons
>+	${INSTALL_DATA} ${WRKSRC}/icons/*.png ${DATADIR}/icons
>+	${INSTALL_DATA} ${WRKSRC}/icons/*.svg ${DATADIR}/icons
>+	@${MKDIR} ${DATADIR}/translations
>+	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${DATADIR}/translations
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/convertall/distinfo math/convertall/distinfo
>--- /usr/ports/math/convertall/distinfo	2011-03-21 02:47:33.000000000 +0900
>+++ math/convertall/distinfo	2011-06-29 16:08:01.000000000 +0900
>@@ -1,2 +1,4 @@
>-SHA256 (convertall-0.5.0.tar.gz) = f2d77a1f2372c352ab60bc4e9c815f3c290d3666d68fa4225818aa530ca1596f
>-SIZE (convertall-0.5.0.tar.gz) = 59849
>+SHA256 (convertall-0.5.1.tar.gz) = 3e474257dfa0fb451ffff5dd70d5f4274984937d6ff090d09326ab5c404f4a2e
>+SIZE (convertall-0.5.1.tar.gz) = 60067
>+SHA256 (convertall-i18n-0.5.1b.tar.gz) = 16ba35fc35c8acfd1187c85f65330b8e8cee0841cd98ec911c0dd9444dfcf640
>+SIZE (convertall-i18n-0.5.1b.tar.gz) = 140977
>diff -urN /usr/ports/math/convertall/pkg-plist math/convertall/pkg-plist
>--- /usr/ports/math/convertall/pkg-plist	2010-05-09 23:10:12.000000000 +0900
>+++ math/convertall/pkg-plist	2011-06-29 23:03:13.000000000 +0900
>@@ -1,49 +1,81 @@
> bin/convertall
> %%PYTHON_SITELIBDIR%%/convertall/cmdline.py
> %%PYTHON_SITELIBDIR%%/convertall/cmdline.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/cmdline.pyo
> %%PYTHON_SITELIBDIR%%/convertall/convertall.py
> %%PYTHON_SITELIBDIR%%/convertall/convertall.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/convertall.pyo
> %%PYTHON_SITELIBDIR%%/convertall/convertdlg.py
> %%PYTHON_SITELIBDIR%%/convertall/convertdlg.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/convertdlg.pyo
> %%PYTHON_SITELIBDIR%%/convertall/finddlg.py
> %%PYTHON_SITELIBDIR%%/convertall/finddlg.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/finddlg.pyo
> %%PYTHON_SITELIBDIR%%/convertall/helpview.py
> %%PYTHON_SITELIBDIR%%/convertall/helpview.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/helpview.pyo
> %%PYTHON_SITELIBDIR%%/convertall/icondict.py
> %%PYTHON_SITELIBDIR%%/convertall/icondict.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/icondict.pyo
> %%PYTHON_SITELIBDIR%%/convertall/modbutton.py
> %%PYTHON_SITELIBDIR%%/convertall/modbutton.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/modbutton.pyo
> %%PYTHON_SITELIBDIR%%/convertall/numedit.py
> %%PYTHON_SITELIBDIR%%/convertall/numedit.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/numedit.pyo
> %%PYTHON_SITELIBDIR%%/convertall/option.py
> %%PYTHON_SITELIBDIR%%/convertall/option.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/option.pyo
> %%PYTHON_SITELIBDIR%%/convertall/optiondefaults.py
> %%PYTHON_SITELIBDIR%%/convertall/optiondefaults.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/optiondefaults.pyo
> %%PYTHON_SITELIBDIR%%/convertall/optiondlg.py
> %%PYTHON_SITELIBDIR%%/convertall/optiondlg.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/optiondlg.pyo
> %%PYTHON_SITELIBDIR%%/convertall/recentunits.py
> %%PYTHON_SITELIBDIR%%/convertall/recentunits.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/recentunits.pyo
> %%PYTHON_SITELIBDIR%%/convertall/setup.py
> %%PYTHON_SITELIBDIR%%/convertall/setup.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/setup.pyo
> %%PYTHON_SITELIBDIR%%/convertall/unitatom.py
> %%PYTHON_SITELIBDIR%%/convertall/unitatom.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/unitatom.pyo
> %%PYTHON_SITELIBDIR%%/convertall/unitdata.py
> %%PYTHON_SITELIBDIR%%/convertall/unitdata.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/unitdata.pyo
> %%PYTHON_SITELIBDIR%%/convertall/unitedit.py
> %%PYTHON_SITELIBDIR%%/convertall/unitedit.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/unitedit.pyo
> %%PYTHON_SITELIBDIR%%/convertall/unitgroup.py
> %%PYTHON_SITELIBDIR%%/convertall/unitgroup.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/unitgroup.pyo
> %%PYTHON_SITELIBDIR%%/convertall/unitlistview.py
> %%PYTHON_SITELIBDIR%%/convertall/unitlistview.pyc
>+%%PYTHON_SITELIBDIR%%/convertall/unitlistview.pyo
>+%%DATADIR%%/icons/convertall.svg
>+%%DATADIR%%/icons/convertall_lg.png
>+%%DATADIR%%/icons/convertall_med.png
>+%%DATADIR%%/icons/convertall_sm.png
>+%%DATADIR%%/icons/helpback.png
>+%%DATADIR%%/icons/helpforward.png
>+%%DATADIR%%/icons/helphome.png
>+%%DATADIR%%/translations/convertall_de.qm
>+%%DATADIR%%/translations/convertall_es.qm
>+%%DATADIR%%/translations/convertall_fr.qm
>+%%DATADIR%%/translations/qt_de.qm
>+%%DATADIR%%/translations/qt_es.qm
>+%%DATADIR%%/translations/qt_fr.qm
> %%DATADIR%%/units.dat
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%DATADIR%%/units_de.dat
>+%%DATADIR%%/units_es.dat
>+%%DATADIR%%/units_fr.dat
> %%PORTDOCS%%%%DOCSDIR%%/README.html
>-share/icons/convertall.svg
>-share/icons/convertall_lg.png
>-share/icons/convertall_med.png
>-share/icons/convertall_sm.png
>-@dirrm %%DATADIR%%
>+%%PORTDOCS%%%%DOCSDIR%%/README_de.html
>+%%PORTDOCS%%%%DOCSDIR%%/README_es.html
>+%%PORTDOCS%%%%DOCSDIR%%/README_fr.html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrm %%DATADIR%%/translations
>+@dirrm %%DATADIR%%/icons
>+@dirrm %%DATADIR%%
> @dirrm %%PYTHON_SITELIBDIR%%/convertall
>-@dirrmtry share/icons

Actions: View | Diff

Attachments on bug 158475: 116522