Attachment #116849 for bug #158872

View | Details | Raw Unified | Return to bug 158872
Collapse All | Expand All




#

PORTNAME=	diffuse
PORTVERSION=	0.4.5
CATEGORIES=	devel python
MASTER_SITES=	SF

MAINTAINER=	marco.broeder@gmx.eu
COMMENT=	A graphical N-way diff and merge tool written in python

LICENSE=	GPLv2 GPLv3
LICENSE_COMB=	dual

NO_BUILD=	yes

USE_PYTHON=	yes
USE_GNOME=	pygtk2
USE_BZIP2=	yes

MANLANG=	"" ru
MAN1=		diffuse.1

OPTIONS=	MENU	"Install a desktop menu entry"	on \
		NLS	"Install translations (work in progress)"	on
		NLS	"Install some translations (work in progress)"	on

.include <bsd.port.options.mk>


PLIST_SUB+=	MENU="@comment "
.endif

.ifdef (WITH_OMF)
PLIST_SUB+=	OMF=""
RUN_DEPENDS+=	scrollkeeper-update:${PORTSDIR}/textproc/scrollkeeper
INSTALLS_OMF=	yes
.else
PLIST_SUB+=	OMF="@comment "
.endif

.ifndef (WITHOUT_NLS)
PLIST_SUB+=	NLS=""
USE_GETTEXT=	yes
TRANSLATIONS=	de es it ja ko ru zh_CN
MANLANG=	"" it ru
.else
PLIST_SUB+=	NLS="@comment "
.endif


	${REINPLACE_CMD} -e 's|../../etc|${PREFIX}/etc|g' \
		${WRKSRC}/src/usr/bin/${PORTNAME}
	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
		${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
		${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/*/*.xml

do-install:
	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \

	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
		${MANPREFIX}/man/man1/
	${MKDIR} ${MANPREFIX}/man/ru/man1
	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/ru/man1/*.1 \
		${MANPREFIX}/man/ru/man1/

post-install:
.ifndef (NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}/; \
	done
.endif

.ifndef (NOPORTDATA)
	${MKDIR} ${DATADIR}/syntax
	(cd ${WRKSRC}/src/usr/share/${PORTNAME} && \
		${COPYTREE_SHARE} \* ${DATADIR})
.endif

.ifndef (WITHOUT_NLS)
	for x in ${TRANSLATIONS}; do \
		${MKDIR} ${PREFIX}/share/locale/$${x}/LC_MESSAGES; \
		${MKDIR} ${WRKSRC}/translations/$${x}; \
		${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/$${x}.po \
			-o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \
		${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \
			${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \
	done
	for y in ${MANLANG}; do \
		${MKDIR} ${MANPREFIX}/man/$${y}/man1; \
		${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/$${y}/man1/*.1 \
			${MANPREFIX}/man/$${y}/man1/; \
	done
		${PREFIX}/share/gnome/help/${PORTNAME}/C/
	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/ru
	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/ru/*.xml \
		${PREFIX}/share/gnome/help/${PORTNAME}/ru/
	${MKDIR} ${PREFIX}/share/omf/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
		${PREFIX}/share/omf/${PORTNAME}/
	${LOCALBASE}/bin/scrollkeeper-update -q
.endif

.ifdef (WITH_MENU)
	${MKDIR} ${PREFIX}/share/pixmaps
	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
		${PREFIX}/share/pixmaps/
	${MKDIR} ${DESKTOPDIR}
	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
		${DESKTOPDIR}
	${LOCALBASE}/bin/update-desktop-database -q
.endif


Lines 1-2 Link Here

(-)b/devel/diffuse/distinfo (-2 / +2 lines)
1	SHA256 (diffuse-0.4.4.tar.bz2) = 9dae1aad1aff538fbd571c6ce40e07bbe81530c5d4ebe959b25995be68c462f5	1	SHA256 (diffuse-0.4.5.tar.bz2) = 0290a055027aea8b14203d1ea05f2dcdb1b9e701f485a604057044a467b95791
2	SIZE (diffuse-0.4.4.tar.bz2) = 146351	2	SIZE (diffuse-0.4.5.tar.bz2) = 167958

Lines 2-8 Diffuse is a graphical tool for merging and comparing text files. Diffuse is Link Here

(-)b/devel/diffuse/pkg-descr (-2 / +2 lines)
2	able to compare an arbitrary number of files side-by-side and gives users the	2	able to compare an arbitrary number of files side-by-side and gives users the
3	ability to manually adjust line matching and directly edit files. Diffuse can	3	ability to manually adjust line matching and directly edit files. Diffuse can
4	also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,	4	also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
5	Monotone, Subversion, and SVK repositories for comparison and merging.	5	Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
6		6
7	Some key features of Diffuse:	7	Some key features of Diffuse:
8		8
Lines 11-17 Some key features of Diffuse: Link Here
11	- line matching can be manually corrected by the user	11	- line matching can be manually corrected by the user
12	- ability to directly edit files	12	- ability to directly edit files
13	- syntax highlighting	13	- syntax highlighting
14	- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support	14	- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, SVK support
15	- support for UTF-8 encoded unicode	15	- support for UTF-8 encoded unicode
16	- unlimited undo	16	- unlimited undo
17	- easy keyboard navigation	17	- easy keyboard navigation




%%MENU%%share/pixmaps/diffuse.png
%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo
%%NLS%%share/locale/es/LC_MESSAGES/diffuse.mo
%%NLS%%share/locale/it/LC_MESSAGES/diffuse.mo
%%NLS%%share/locale/ja/LC_MESSAGES/diffuse.mo
%%NLS%%share/locale/ko/LC_MESSAGES/diffuse.mo
%%NLS%%share/locale/ru/LC_MESSAGES/diffuse.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo
%%OMF%%share/gnome/help/diffuse/C/diffuse.xml
%%OMF%%share/gnome/help/diffuse/ru/diffuse.xml
%%OMF%%@dirrm share/gnome/help/diffuse/ru
%%OMF%%@dirrm share/gnome/help/diffuse/C
%%OMF%%@dirrm share/gnome/help/diffuse
%%OMF%%share/omf/diffuse/diffuse-C.omf
%%OMF%%share/omf/diffuse/diffuse-ru.omf
%%OMF%%@dirrm share/omf/diffuse

Return to bug 158872

Lines 6-30 Link Here

(-)b/devel/diffuse/Makefile (-42 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= diffuse	8	PORTNAME= diffuse
9	PORTVERSION= 0.4.4	9	PORTVERSION= 0.4.5
10	CATEGORIES= devel python	10	CATEGORIES= devel python
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
13	MAINTAINER= marco.broeder@gmx.eu	13	MAINTAINER= marco.broeder@gmx.eu
14	COMMENT= A graphical N-way diff and merge tool written in python	14	COMMENT= A graphical N-way diff and merge tool written in python
15		15
		16	LICENSE= GPLv2 GPLv3
		17	LICENSE_COMB= dual
		18
16	NO_BUILD= yes	19	NO_BUILD= yes
17		20
18	USE_PYTHON= yes	21	USE_PYTHON= yes
19	USE_GNOME= pygtk2	22	USE_GNOME= pygtk2
20	USE_BZIP2= yes	23	USE_BZIP2= yes
21		24
22	MANLANG= "" ru
23	MAN1= diffuse.1	25	MAN1= diffuse.1
24		26
25	OPTIONS= MENU "Add desktop menu (needs desktop-file-utils)" on \	27	OPTIONS= MENU "Install a desktop menu entry" on \
26	OMF "Install OMF manual (needs scrollkeeper)" on \	28	NLS "Install translations (work in progress)" on
27	NLS "Install some translations (work in progress)" on
28		29
29	.include <bsd.port.options.mk>	30	.include <bsd.port.options.mk>
30		31
Lines 43-60 USE_GNOME+= desktopfileutils Link Here
43	PLIST_SUB+= MENU="@comment "	44	PLIST_SUB+= MENU="@comment "
44	.endif	45	.endif
45		46
46	.ifdef (WITH_OMF)
47	PLIST_SUB+= OMF=""
48	RUN_DEPENDS+= scrollkeeper-update:${PORTSDIR}/textproc/scrollkeeper
49	INSTALLS_OMF= yes
50	.else
51	PLIST_SUB+= OMF="@comment "
52	.endif
53
54	.ifndef (WITHOUT_NLS)	47	.ifndef (WITHOUT_NLS)
55	PLIST_SUB+= NLS=""	48	PLIST_SUB+= NLS=""
56	USE_GETTEXT= yes	49	USE_GETTEXT= yes
57	TRANSLATIONS= de es ja ko ru zh_CN	50	TRANSLATIONS= de es it ja ko ru zh_CN
		51	MANLANG= "" it ru
58	.else	52	.else
59	PLIST_SUB+= NLS="@comment "	53	PLIST_SUB+= NLS="@comment "
60	.endif	54	.endif
Lines 71-79 post-patch: Link Here
71		65
72	${REINPLACE_CMD} -e 's\|../../etc\|${PREFIX}/etc\|g' \	66	${REINPLACE_CMD} -e 's\|../../etc\|${PREFIX}/etc\|g' \
73	${WRKSRC}/src/usr/bin/${PORTNAME}	67	${WRKSRC}/src/usr/bin/${PORTNAME}
74	${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|g' \
75	${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
76	${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}//.xml
77		68
78	do-install:	69	do-install:
79	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \	70	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
Lines 81-135 do-install: Link Here
81	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/	72	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
82	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \	73	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
83	${MANPREFIX}/man/man1/	74	${MANPREFIX}/man/man1/
84	${MKDIR} ${MANPREFIX}/man/ru/man1
85	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/ru/man1/*.1 \
86	${MANPREFIX}/man/ru/man1/
87		75
88	post-install:	76	post-install:
89	.ifndef (NOPORTDOCS)	77	.ifndef (NOPORTDOCS)
90	${MKDIR} ${DOCSDIR}	78	${MKDIR} ${DOCSDIR}
91	for n in ${PORTDOCS}; do \	79	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
92	${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}/; \
93	done
94	.endif	80	.endif
95		81
96	.ifndef (NOPORTDATA)	82	.ifndef (NOPORTDATA)
97	${MKDIR} ${DATADIR}/syntax	83	${MKDIR} ${DATADIR}/syntax
98	(cd ${WRKSRC}/src/usr/share/${PORTNAME}/ && \	84	(cd ${WRKSRC}/src/usr/share/${PORTNAME} && \
99	${COPYTREE_SHARE} \* ${DATADIR}/)	85	${COPYTREE_SHARE} \* ${DATADIR})
100	.endif	86	.endif
101		87
102	.ifndef (WITHOUT_NLS)	88	.ifndef (WITHOUT_NLS)
103	for x in ${TRANSLATIONS}; do \	89	for x in ${TRANSLATIONS}; do \
104	${MKDIR} ${PREFIX}/share/locale/$${x}/LC_MESSAGES; \
105	${MKDIR} ${WRKSRC}/translations/$${x}; \	90	${MKDIR} ${WRKSRC}/translations/$${x}; \
106	${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/$${x}.po \	91	${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/$${x}.po \
107	-o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \	92	-o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \
108	${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \	93	${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \
109	${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \	94	${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \
110	done	95	done
111	.endif	96	for y in ${MANLANG}; do \
112		97	${MKDIR} ${MANPREFIX}/man/$${y}/man1; \
113	.ifdef (WITH_OMF)	98	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/$${y}/man1/*.1 \
114	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/C	99	${MANPREFIX}/man/$${y}/man1/; \
115	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/C/*.xml \	100	done
116	${PREFIX}/share/gnome/help/${PORTNAME}/C/
117	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/ru
118	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/ru/*.xml \
119	${PREFIX}/share/gnome/help/${PORTNAME}/ru/
120	${MKDIR} ${PREFIX}/share/omf/${PORTNAME}
121	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
122	${PREFIX}/share/omf/${PORTNAME}/
123	${LOCALBASE}/bin/scrollkeeper-update -q
124	.endif	101	.endif
125		102
126	.ifdef (WITH_MENU)	103	.ifdef (WITH_MENU)
127	${MKDIR} ${PREFIX}/share/pixmaps
128	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \	104	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
129	${PREFIX}/share/pixmaps/	105	${PREFIX}/share/pixmaps/
130	${MKDIR} ${DESKTOPDIR}
131	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \	106	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
132	${DESKTOPDIR}/	107	${DESKTOPDIR}
133	${LOCALBASE}/bin/update-desktop-database -q	108	${LOCALBASE}/bin/update-desktop-database -q
134	.endif	109	.endif
135		110

Lines 4-18 etc/diffuserc Link Here

(-)b/devel/diffuse/pkg-plist (-8 / +1 lines)
4	%%MENU%%share/pixmaps/diffuse.png	4	%%MENU%%share/pixmaps/diffuse.png
5	%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo	5	%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo
6	%%NLS%%share/locale/es/LC_MESSAGES/diffuse.mo	6	%%NLS%%share/locale/es/LC_MESSAGES/diffuse.mo
		7	%%NLS%%share/locale/it/LC_MESSAGES/diffuse.mo
7	%%NLS%%share/locale/ja/LC_MESSAGES/diffuse.mo	8	%%NLS%%share/locale/ja/LC_MESSAGES/diffuse.mo
8	%%NLS%%share/locale/ko/LC_MESSAGES/diffuse.mo	9	%%NLS%%share/locale/ko/LC_MESSAGES/diffuse.mo
9	%%NLS%%share/locale/ru/LC_MESSAGES/diffuse.mo	10	%%NLS%%share/locale/ru/LC_MESSAGES/diffuse.mo
10	%%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo	11	%%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo
11	%%OMF%%share/gnome/help/diffuse/C/diffuse.xml
12	%%OMF%%share/gnome/help/diffuse/ru/diffuse.xml
13	%%OMF%%@dirrm share/gnome/help/diffuse/ru
14	%%OMF%%@dirrm share/gnome/help/diffuse/C
15	%%OMF%%@dirrm share/gnome/help/diffuse
16	%%OMF%%share/omf/diffuse/diffuse-C.omf
17	%%OMF%%share/omf/diffuse/diffuse-ru.omf
18	%%OMF%%@dirrm share/omf/diffuse