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

Collapse All | Expand All

(-)meld/Makefile (-18 / +29 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
24
PKGINSTALL=	${WRKSRC}/pkg-install
23
25
24
post-patch:
26
post-patch:
25
	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PYTHON_SITELIBDIR}/meldapp"|' ${WRKSRC}/misc.py
27
	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PINSTALLDIR}"|' ${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
28
	@${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${DOCSDIR}/index.html"|' ${WRKSRC}/meldapp.py
27
	@${REINPLACE_CMD} \
29
	@${REINPLACE_CMD} -e 's|^Path=.*$$|Icon=${PINSTALLDIR}/glade2/pixmaps/icon.png|' ${WRKSRC}/meld.desktop
28
		-e 's|/usr/share/pixmaps|${X11BASE}/share/gnome/pixmaps|' \
29
		${WRKSRC}/cvsview.py
30
30
31
INSTALLDIR=	share/meld
32
PINSTALLDIR=	${PREFIX}/${INSTALLDIR}
31
do-install:
33
do-install:
32
	${INSTALL_SCRIPT} ${WRKSRC}/meld ${PREFIX}/bin
34
	${MKDIR} ${PINSTALLDIR}
33
	${ECHO} meldapp > ${PYTHON_SITELIBDIR}/meldapp.pth
35
	${INSTALL_SCRIPT} ${WRKSRC}/meld ${PINSTALLDIR}/meld.py
34
	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp
36
	${LN} -sf ${PINSTALLDIR}/meld.py ${PREFIX}/bin/meld
35
	${INSTALL_DATA} ${WRKSRC}/*.py ${PYTHON_SITELIBDIR}/meldapp
37
	${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
36
	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2
38
	${INSTALL_DATA} ${WRKSRC}/*.py ${PINSTALLDIR}
37
	${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${PYTHON_SITELIBDIR}/meldapp/glade2
39
	${MKDIR} ${PINSTALLDIR}/glade2
38
	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
40
	${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${PINSTALLDIR}/glade2
39
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
41
	${MKDIR} ${PINSTALLDIR}/glade2/pixmaps
40
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
42
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${PINSTALLDIR}/glade2/pixmaps
41
	${MKDIR} ${PREFIX}/share/doc/meld
43
	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${PINSTALLDIR}/glade2/pixmaps
42
	${INSTALL_DATA} ${WRKSRC}/manual/*.html ${PREFIX}/share/doc/meld
44
.if !defined(NOPORTDOCS)
43
	${INSTALL_DATA} ${WRKSRC}/manual/*.css ${PREFIX}/share/doc/meld
45
	${MKDIR} ${DOCSDIR}
46
	${INSTALL_DATA} ${WRKSRC}/manual/*.html ${DOCSDIR}
47
	${INSTALL_DATA} ${WRKSRC}/manual/*.css ${DOCSDIR}
48
.endif
49
50
post-install:
51
	@${SED} -e 's,@PYTHON_CMD@,${PYTHON_CMD},g ; \
52
			s,@INSTALLDIR@,${INSTALLDIR},g' \
53
			< ${FILESDIR}/pkg-install.in > ${WRKSRC}/pkg-install
54
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${WRKSRC}/pkg-install ${PKGNAME} POST-INSTALL
44
55
45
.include <bsd.port.mk>
56
.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/files/pkg-install.in (+15 lines)
Line 0 Link Here
1
#!/bin/sh
2
# $FreeBSD$
3
 
4
if [ "$2" != "POST-INSTALL" ]; then
5
	exit 0
6
fi
7
8
PYTHON_CMD=@PYTHON_CMD@
9
INSTALLDIR=${PKG_PREFIX}/@INSTALLDIR@
10
11
echo 'Compiling files...'
12
(cd ${INSTALLDIR} && \
13
	${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)" && \
14
	${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 0)" \
15
	) || exit 1
(-)meld/pkg-plist (-40 / +48 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/diffutil.py
5
%%PYTHON_SITELIBDIR%%/meldapp/dirdiff.py
5
share/meld/dirdiff.py
6
%%PYTHON_SITELIBDIR%%/meldapp/filediff.py
6
share/meld/filediff.py
7
%%PYTHON_SITELIBDIR%%/meldapp/gnomeglade.py
7
share/meld/gnomeglade.py
8
%%PYTHON_SITELIBDIR%%/meldapp/meldapp.py
8
share/meld/meld.py
9
%%PYTHON_SITELIBDIR%%/meldapp/misc.py
9
share/meld/meldapp.py
10
%%PYTHON_SITELIBDIR%%/meldapp/prefs.py
10
share/meld/melddoc.py
11
%%PYTHON_SITELIBDIR%%/meldapp/undo.py
11
share/meld/misc.py
12
%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.glade
12
share/meld/prefs.py
13
%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.gladep
13
share/meld/task.py
14
%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.glade
14
share/meld/tree.py
15
%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.gladep
15
share/meld/undo.py
16
%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.glade
16
share/meld/glade2/cvsview.glade
17
%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.gladep
17
share/meld/glade2/cvsview.gladep
18
%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.glade
18
share/meld/glade2/dirdiff.glade
19
%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.gladep
19
share/meld/glade2/dirdiff.gladep
20
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply0.xpm
20
share/meld/glade2/filediff.glade
21
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply1.xpm
21
share/meld/glade2/filediff.gladep
22
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy0.xpm
22
share/meld/glade2/meld-app.glade
23
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy1.xpm
23
share/meld/glade2/meld-app.gladep
24
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_delete.xpm
24
share/meld/glade2/pixmaps/button_apply0.xpm
25
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/close.xpm
25
share/meld/glade2/pixmaps/button_apply1.xpm
26
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-add-16.png
26
share/meld/glade2/pixmaps/button_copy0.xpm
27
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-commit-16.png
27
share/meld/glade2/pixmaps/button_copy1.xpm
28
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-remove-16.png
28
share/meld/glade2/pixmaps/button_delete.xpm
29
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-update-16.png
29
share/meld/glade2/pixmaps/close.xpm
30
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/icon.png
30
share/meld/glade2/pixmaps/cvs-add-16.png
31
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-changed.png
31
share/meld/glade2/pixmaps/cvs-commit-16.png
32
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-directory.png
32
share/meld/glade2/pixmaps/cvs-icon.png
33
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-new.png
33
share/meld/glade2/pixmaps/cvs-remove-16.png
34
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-regular.png
34
share/meld/glade2/pixmaps/cvs-update-16.png
35
%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/logo.png
35
share/meld/glade2/pixmaps/icon.png
36
share/doc/meld/index.html
36
share/meld/glade2/pixmaps/logo.png
37
share/doc/meld/stylesheet.css
37
share/meld/glade2/pixmaps/tree-file-changed.png
38
@dirrm share/doc/meld
38
share/meld/glade2/pixmaps/tree-file-new.png
39
@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps
39
share/meld/glade2/pixmaps/tree-file-normal.png
40
@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2
40
share/meld/glade2/pixmaps/tree-folder-changed.png
41
@dirrm %%PYTHON_SITELIBDIR%%/meldapp
41
share/meld/glade2/pixmaps/tree-folder-new.png
42
share/meld/glade2/pixmaps/tree-folder-normal.png
43
%%PORTDOCS%%share/doc/meld/index.html
44
%%PORTDOCS%%share/doc/meld/stylesheet.css
45
%%PORTDOCS%%@dirrm share/doc/meld
46
@unexec rm -f %D/share/meld/*.py[co]
47
@dirrm share/meld/glade2/pixmaps
48
@dirrm share/meld/glade2
49
@dirrm share/meld

Return to bug 53739