View | Details | Raw Unified | Return to bug 53739 | Differences between
and this patch

Collapse All | Expand All

(-)meld/Makefile (-18 / +27 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	meld
8
PORTNAME=	meld
9
PORTVERSION=	0.7.1
9
PORTVERSION=	0.8.2
10
CATEGORIES=	textproc devel python
10
CATEGORIES=	textproc devel python
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	meld
12
MASTER_SITE_SUBDIR=	meld
Lines 18-45 Link Here
18
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
18
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
19
19
20
USE_PYTHON=	yes
20
USE_PYTHON=	yes
21
USE_X_PREFIX=	yes
21
NO_BUILD=	yes
22
NO_BUILD=	yes
22
USE_REINPLACE=	yes
23
USE_REINPLACE=	yes
23
24
24
post-patch:
25
post-patch:
25
	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PYTHON_SITELIBDIR}/meldapp"|' ${WRKSRC}/misc.py
26
	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${INSTALLDIR}"|' ${WRKSRC}/misc.py
26
	@${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${PREFIX}/share/doc/meld/index.html"|' ${WRKSRC}/meldapp.py
27
	@${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${DOCSDIR}/index.html"|' ${WRKSRC}/meldapp.py
27
	@${REINPLACE_CMD} \
28
	@${REINPLACE_CMD} -e 's|^Path=.*$$|Icon=${INSTALLDIR}/glade2/pixmaps/icon.png|' ${WRKSRC}/meld.desktop
28
		-e 's|/usr/share/pixmaps|${X11BASE}/share/gnome/pixmaps|' \
29
		${WRKSRC}/cvsview.py
30
29
30
INSTALLDIR=	${PREFIX}/share/meld
31
do-install:
31
do-install:
32
	${INSTALL_SCRIPT} ${WRKSRC}/meld ${PREFIX}/bin
32
	${MKDIR} ${INSTALLDIR}
33
	${ECHO} meldapp > ${PYTHON_SITELIBDIR}/meldapp.pth
33
	${INSTALL_SCRIPT} ${WRKSRC}/meld ${INSTALLDIR}/meld.py
34
	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp
34
	${LN} -sf ${INSTALLDIR}/meld.py ${PREFIX}/bin/meld
35
	${INSTALL_DATA} ${WRKSRC}/*.py ${PYTHON_SITELIBDIR}/meldapp
35
	${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
36
	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2
36
	${INSTALL_DATA} ${WRKSRC}/*.py ${INSTALLDIR}
37
	${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${PYTHON_SITELIBDIR}/meldapp/glade2
37
	${MKDIR} ${INSTALLDIR}/glade2
38
	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
38
	${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${INSTALLDIR}/glade2
39
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
39
	${MKDIR} ${INSTALLDIR}/glade2/pixmaps
40
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
40
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${INSTALLDIR}/glade2/pixmaps
41
	${MKDIR} ${PREFIX}/share/doc/meld
41
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${INSTALLDIR}/glade2/pixmaps
42
	${INSTALL_DATA} ${WRKSRC}/manual/*.html ${PREFIX}/share/doc/meld
42
.if !defined(NOPORTDOCS)
43
	${INSTALL_DATA} ${WRKSRC}/manual/*.css ${PREFIX}/share/doc/meld
43
	${MKDIR} ${DOCSDIR}
44
	${INSTALL_DATA} ${WRKSRC}/manual/*.html ${DOCSDIR}
45
	${INSTALL_DATA} ${WRKSRC}/manual/*.css ${DOCSDIR}
46
.endif
47
48
post-install:
49
	@${ECHO_CMD} 'Compiling files...'
50
	@(cd ${INSTALLDIR} && \
51
		${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)" && \
52
		${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 0)")
44
53
45
.include <bsd.port.mk>
54
.include <bsd.port.mk>
(-)meld/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (meld-0.7.1.tgz) = 09bb23c6afd868f209fdc5b0ea26e971
1
MD5 (meld-0.8.2.tgz) = e547340b3f8271a2135a0cea9c9b1c2f
(-)meld/pkg-plist (-40 / +73 lines)
Lines 1-41 Link Here
1
bin/meld
1
bin/meld
2
%%PYTHON_SITELIBDIR%%/meldapp.pth
2
share/gnome/applications/meld.desktop
3
%%PYTHON_SITELIBDIR%%/meldapp/cvsview.py
3
share/meld/cvsview.py
4
%%PYTHON_SITELIBDIR%%/meldapp/diffutil.py
4
share/meld/cvsview.pyc
5
%%PYTHON_SITELIBDIR%%/meldapp/dirdiff.py
5
share/meld/cvsview.pyo
6
%%PYTHON_SITELIBDIR%%/meldapp/filediff.py
6
share/meld/diffutil.py
7
%%PYTHON_SITELIBDIR%%/meldapp/gnomeglade.py
7
share/meld/diffutil.pyc
8
%%PYTHON_SITELIBDIR%%/meldapp/meldapp.py
8
share/meld/diffutil.pyo
9
%%PYTHON_SITELIBDIR%%/meldapp/misc.py
9
share/meld/dirdiff.py
10
%%PYTHON_SITELIBDIR%%/meldapp/prefs.py
10
share/meld/dirdiff.pyc
11
%%PYTHON_SITELIBDIR%%/meldapp/undo.py
11
share/meld/dirdiff.pyo
12
%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.glade
12
share/meld/filediff.py
13
%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.gladep
13
share/meld/filediff.pyc
14
%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.glade
14
share/meld/filediff.pyo
15
%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.gladep
15
share/meld/gnomeglade.py
16
%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.glade
16
share/meld/gnomeglade.pyc
17
%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.gladep
17
share/meld/gnomeglade.pyo
18
%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.glade
18
share/meld/meld.py
19
%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.gladep
19
share/meld/meld.pyc
20
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply0.xpm
20
share/meld/meld.pyo
21
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply1.xpm
21
share/meld/meldapp.py
22
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy0.xpm
22
share/meld/meldapp.pyc
23
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy1.xpm
23
share/meld/meldapp.pyo
24
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_delete.xpm
24
share/meld/melddoc.py
25
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/close.xpm
25
share/meld/melddoc.pyc
26
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-add-16.png
26
share/meld/melddoc.pyo
27
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-commit-16.png
27
share/meld/misc.py
28
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-remove-16.png
28
share/meld/misc.pyc
29
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-update-16.png
29
share/meld/misc.pyo
30
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/icon.png
30
share/meld/prefs.py
31
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-changed.png
31
share/meld/prefs.pyc
32
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-directory.png
32
share/meld/prefs.pyo
33
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-new.png
33
share/meld/task.py
34
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-regular.png
34
share/meld/task.pyc
35
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/logo.png
35
share/meld/task.pyo
36
share/doc/meld/index.html
36
share/meld/tree.py
37
share/doc/meld/stylesheet.css
37
share/meld/tree.pyc
38
@dirrm share/doc/meld
38
share/meld/tree.pyo
39
@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps
39
share/meld/undo.py
40
@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2
40
share/meld/undo.pyc
41
@dirrm %%PYTHON_SITELIBDIR%%/meldapp
41
share/meld/undo.pyo
42
share/meld/glade2/cvsview.glade
43
share/meld/glade2/cvsview.gladep
44
share/meld/glade2/dirdiff.glade
45
share/meld/glade2/dirdiff.gladep
46
share/meld/glade2/filediff.glade
47
share/meld/glade2/filediff.gladep
48
share/meld/glade2/meld-app.glade
49
share/meld/glade2/meld-app.gladep
50
share/meld/glade2/pixmaps/button_apply0.xpm
51
share/meld/glade2/pixmaps/button_apply1.xpm
52
share/meld/glade2/pixmaps/button_copy0.xpm
53
share/meld/glade2/pixmaps/button_copy1.xpm
54
share/meld/glade2/pixmaps/button_delete.xpm
55
share/meld/glade2/pixmaps/close.xpm
56
share/meld/glade2/pixmaps/cvs-add-16.png
57
share/meld/glade2/pixmaps/cvs-commit-16.png
58
share/meld/glade2/pixmaps/cvs-icon.png
59
share/meld/glade2/pixmaps/cvs-remove-16.png
60
share/meld/glade2/pixmaps/cvs-update-16.png
61
share/meld/glade2/pixmaps/icon.png
62
share/meld/glade2/pixmaps/logo.png
63
share/meld/glade2/pixmaps/tree-file-changed.png
64
share/meld/glade2/pixmaps/tree-file-new.png
65
share/meld/glade2/pixmaps/tree-file-normal.png
66
share/meld/glade2/pixmaps/tree-folder-changed.png
67
share/meld/glade2/pixmaps/tree-folder-new.png
68
share/meld/glade2/pixmaps/tree-folder-normal.png
69
%%PORTDOCS%%share/doc/meld/index.html
70
%%PORTDOCS%%share/doc/meld/stylesheet.css
71
%%PORTDOCS%%@dirrm share/doc/meld
72
@dirrm share/meld/glade2/pixmaps
73
@dirrm share/meld/glade2
74
@dirrm share/meld

Return to bug 53739