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

Collapse All | Expand All

(-)editors/mp/Makefile (-26 / +35 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/editors/mp/Makefile 382181 2015-03-24 21:40:47Z pawel $
2
# $FreeBSD: head/editors/mp/Makefile 382181 2015-03-24 21:40:47Z pawel $
3
3
4
PORTNAME=	mp
4
PORTNAME=	mp
5
PORTVERSION=	5.2.9
5
PORTVERSION=	5.2.10
6
CATEGORIES=	editors
6
CATEGORIES=	editors
7
MASTER_SITES=	http://triptico.com/download/mp/
7
MASTER_SITES=	http://triptico.com/download/mp/
8
8
Lines 10-21 Link Here
10
COMMENT=	Programming text editor
10
COMMENT=	Programming text editor
11
11
12
LICENSE=	GPLv2 # (or later)
12
LICENSE=	GPLv2 # (or later)
13
13
#LICENSE_FILE=	${WRKSRC}/COPYING
14
OPTIONS_DEFINE=	NLS PCRE DOCS
15
OPTIONS_RADIO=	GUI
16
OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
17
OPTIONS_DEFAULT=	PCRE
18
OPTIONS_SUB=	yes
19
14
20
USES=		iconv ncurses
15
USES=		iconv ncurses
21
HAS_CONFIGURE=	yes
16
HAS_CONFIGURE=	yes
Lines 24-72 Link Here
24
19
25
DATADIR=	${PREFIX}/share/mp-5
20
DATADIR=	${PREFIX}/share/mp-5
26
21
27
NLS_USES=	gettext
22
BROKEN_ia64=	Does not compile on ${ARCH}
28
NLS_CONFIGURE_WITH=	gettext
23
BROKEN_powerpc=	Does not compile on ${ARCH}
24
BROKEN_spacr64=	Does not compile on ${ARCH}
25
26
OPTIONS_DEFINE=		DOCS NLS PCRE
27
OPTIONS_RADIO=		GUI
28
OPTIONS_RADIO_GUI=	GTK2 GTK3 QT4
29
OPTIONS_DEFAULT=	PCRE
30
OPTIONS_SUB=		yes
29
31
32
NLS_USES=		gettext
33
NLS_CONFIGURE_WITH=	gettext
34
GTK2_USE=		gnome=gtk20
35
GTK3_USE=		gnome=gtk30
30
PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
36
PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
31
PCRE_CONFIGURE_WITH=	pcre
37
PCRE_CONFIGURE_WITH=	pcre
32
38
QT4_USE=		qt4=corelib,gui,moc_build
33
QT4_USE=		QT4=corelib,gui,moc_build
34
QT4_CONFIGURE_ENV=	CPP="${CXX}" CCLINK="${CXX}"
39
QT4_CONFIGURE_ENV=	CPP="${CXX}" CCLINK="${CXX}"
35
QT4_CONFIGURE_WITH=	qt4
40
QT4_CONFIGURE_WITH=	qt4
36
41
37
.include <bsd.port.options.mk>
42
.include <bsd.port.options.mk>
38
43
39
.if ${PORT_OPTIONS:MGTK3}
44
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
40
USE_GNOME+=	gtk30
45
USES+=		pkgconfig
41
CONFOPT_GTK=	3
46
PLIST_SUB+=	GUI=""
47
.else
48
PLIST_SUB+=	GUI="@comment "
49
.endif
50
51
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
52
DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Develpment;TextEditor;GTK;" ""
53
.else
54
CONFIGURE_ARGS+=	--without-gtk
55
CONFOPT_GTK=	0
42
.endif
56
.endif
43
57
44
.if ${PORT_OPTIONS:MGTK2}
58
.if ${PORT_OPTIONS:MGTK2}
45
USE_GNOME+=	gtk20
46
CONFOPT_GTK=	2
59
CONFOPT_GTK=	2
47
.endif
60
.endif
48
61
49
.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2)
62
.if ${PORT_OPTIONS:MGTK3}
50
CONFIGURE_ARGS+=	--without-gtk
63
CONFOPT_GTK=	3
51
CONFOPT_GTK=	0
52
.endif
64
.endif
53
65
54
.if ${PORT_OPTIONS:MQT4}
66
.if ${PORT_OPTIONS:MQT4}
67
DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" ""
55
QT_NONSTANDARD=	yes
68
QT_NONSTANDARD=	yes
56
.endif
69
.endif
57
70
58
.include <bsd.port.pre.mk>
59
60
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
61
BROKEN=		Does not compile on ia64, powerpc, or sparc64
62
.endif
63
64
post-patch:
71
post-patch:
65
	@${REINPLACE_CMD} -e \
72
	@${REINPLACE_CMD} -e \
66
		's|<ncursesw/|<| ; \
73
		's|<ncursesw/|<| ; \
67
		 s|-I/usr/local/include|| ; \
74
		 s|-I/usr/local/include|| ; \
68
		 s|-L/usr/local/lib|| ; \
75
		 s|-L/usr/local/lib|| ; \
69
		 s|-lX11|| ; \
70
		 /gtk+/s|3.0|${CONFOPT_GTK}.0| ; \
76
		 /gtk+/s|3.0|${CONFOPT_GTK}.0| ; \
71
		 /OK/s|3.0|${CONFOPT_GTK}.0| ; \
77
		 /OK/s|3.0|${CONFOPT_GTK}.0| ; \
72
		 /CONFOPT_GTK/s|3|${CONFOPT_GTK}|' ${WRKSRC}/config.sh
78
		 /CONFOPT_GTK/s|3|${CONFOPT_GTK}|' ${WRKSRC}/config.sh
Lines 89-94 Link Here
89
	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})
95
	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})
90
	@${MKDIR} ${STAGEDIR}${DATADIR}/lang
96
	@${MKDIR} ${STAGEDIR}${DATADIR}/lang
91
	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)
97
	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)
98
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
99
	(cd ${WRKSRC} && ${INSTALL_DATA} mp.png ${STAGEDIR}${PREFIX}/share/pixmaps)
100
.endif
92
.if ${PORT_OPTIONS:MNLS}
101
.if ${PORT_OPTIONS:MNLS}
93
.for lang in de es it nl ru sv
102
.for lang in de es it nl ru sv
94
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
103
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
Lines 101-104 Link Here
101
	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
110
	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
102
.endfor
111
.endfor
103
112
104
.include <bsd.port.post.mk>
113
.include <bsd.port.mk>
(-)editors/mp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mp-5.2.9.tar.gz) = a30403f4b0c07905733168e914d488f48fb449bb95f67a5254d9ca9ecb6b795d
1
SHA256 (mp-5.2.10.tar.gz) = f3ce1831d2cfb42a8540d197a9fdad163ecd17883a57cd798a2f30bfe791ddc1
2
SIZE (mp-5.2.9.tar.gz) = 557502
2
SIZE (mp-5.2.10.tar.gz) = 504306
(-)editors/mp/files/patch-mpdn__config.sh (-4 / +4 lines)
Lines 1-6 Link Here
1
--- mpdm/config.sh.orig	2009-11-05 17:18:27.000000000 +0900
1
--- mpdm/config.sh.orig	2015-05-05 07:29:54 UTC
2
+++ mpdm/config.sh	2011-03-19 08:40:21.000000000 +0900
2
+++ mpdm/config.sh
3
@@ -309,13 +309,15 @@
3
@@ -370,13 +370,15 @@ else
4
 		echo "#define CONFOPT_GETTEXT 1" >> config.h
4
 		echo "#define CONFOPT_GETTEXT 1" >> config.h
5
 	else
5
 	else
6
 		# try now with -lintl
6
 		# try now with -lintl
Lines 18-24 Link Here
18
 			echo "$TMP_LDFLAGS" >> config.ldflags
18
 			echo "$TMP_LDFLAGS" >> config.ldflags
19
 		else
19
 		else
20
 			echo "No"
20
 			echo "No"
21
@@ -342,13 +344,15 @@
21
@@ -403,13 +405,15 @@ else
22
 		echo "#define CONFOPT_ICONV 1" >> config.h
22
 		echo "#define CONFOPT_ICONV 1" >> config.h
23
 	else
23
 	else
24
 		# try now with -liconv
24
 		# try now with -liconv
(-)editors/mp/pkg-plist (-2 / +1 lines)
Lines 6-13 Link Here
6
%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
6
%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
7
%%PORTDOCS%%%%DOCSDIR%%/mp_actions.html
7
%%PORTDOCS%%%%DOCSDIR%%/mp_actions.html
8
%%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt
8
%%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt
9
%%PORTDOCS%%%%DOCSDIR%%/mp_api.html
10
%%PORTDOCS%%%%DOCSDIR%%/mp_api.txt
11
%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.html
9
%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.html
12
%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.txt
10
%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.txt
13
%%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.html
11
%%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.html
Lines 62-64 Link Here
62
%%DATADIR%%/mp_tui.mpsl
60
%%DATADIR%%/mp_tui.mpsl
63
%%DATADIR%%/mp_vcs.mpsl
61
%%DATADIR%%/mp_vcs.mpsl
64
%%DATADIR%%/mp_writing.mpsl
62
%%DATADIR%%/mp_writing.mpsl
63
%%GUI%%share/pixmaps/mp.png

Return to bug 201840