Attachment #160799 for bug #201840




# $FreeBSD: head/editors/mp/Makefile 396249 2015-09-07 07:00:08Z danfe $

PORTNAME=	mp
PORTVERSION=	5.2.10
CATEGORIES=	editors
MASTER_SITES=	http://triptico.com/download/mp/


COMMENT=	Programming text editor

LICENSE=	GPLv2 # (or later)
#LICENSE_FILE=	${WRKSRC}/COPYING

USES=		iconv ncurses
HAS_CONFIGURE=	yes


DATADIR=	${PREFIX}/share/mp-5

OPTIONS_DEFINE=		DOCS NLS PCRE
OPTIONS_RADIO=		GUI
OPTIONS_RADIO_GUI=	GTK2 GTK3 QT4
OPTIONS_DEFAULT=	PCRE
OPTIONS_SUB=		yes

NLS_USES=		gettext
NLS_CONFIGURE_WITH=	gettext
GTK2_USE=		gnome=gtk20
GTK3_USE=		gnome=gtk30
PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
PCRE_CONFIGURE_WITH=	pcre
QT4_USE=		qt4=corelib,gui,moc_build
QT4_USE=		QT4=corelib,gui,moc_build
QT4_CONFIGURE_ENV=	CPP="${CXX}" CCLINK="${CXX}"
QT4_CONFIGURE_WITH=	qt4

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
USES+=		pkgconfig
PLIST_SUB+=	GUI=""
.else
PLIST_SUB+=	GUI="@comment "
.endif

.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Develpment;TextEditor;GTK;" ""
.else
CONFIGURE_ARGS+=	--without-gtk
CONFOPT_GTK=	0
.endif

.if ${PORT_OPTIONS:MGTK2}
USE_GNOME+=	gtk20
CONFOPT_GTK=	2
.endif

.if ${PORT_OPTIONS:MGTK3}
CONFOPT_GTK=	3
CONFOPT_GTK=	0
.endif

.if ${PORT_OPTIONS:MQT4}
DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" ""
QT_NONSTANDARD=	yes
.endif


		's|<ncursesw/|<| ; \
		 s|-I/usr/local/include|| ; \
		 s|-L/usr/local/lib|| ; \
		 s|-lX11|| ; \
		 /gtk+/s|3.0|${CONFOPT_GTK}.0| ; \
		 /OK/s|3.0|${CONFOPT_GTK}.0| ; \
		 /CONFOPT_GTK/s|3|${CONFOPT_GTK}|' ${WRKSRC}/config.sh

	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})
	@${MKDIR} ${STAGEDIR}${DATADIR}/lang
	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
	(cd ${WRKSRC} && ${INSTALL_DATA} mp.png ${STAGEDIR}${PREFIX}/share/pixmaps)
.endif
.if ${PORT_OPTIONS:MNLS}
.for lang in de es it nl ru sv
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES

Lines 1-2 Link Here

(-)editors/mp/distinfo (-2 / +2 lines)
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

Lines 1-6 Link Here

(-)editors/mp/files/patch-mpdn__config.sh (-4 / +4 lines)
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

Lines 6-13 Link Here

(-)editors/mp/pkg-plist (-2 / +1 lines)
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

Lines 2-8 Link Here

(-)editors/mp/Makefile (-17 / +28 lines)
2	# $FreeBSD: head/editors/mp/Makefile 396249 2015-09-07 07:00:08Z danfe $	2	# $FreeBSD: head/editors/mp/Makefile 396249 2015-09-07 07:00:08Z danfe $
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-15 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	#LICENSE_FILE= ${WRKSRC}/COPYING
13		14
14	USES= iconv ncurses	15	USES= iconv ncurses
15	HAS_CONFIGURE= yes	16	HAS_CONFIGURE= yes
Lines 18-57 Link Here
18		19
19	DATADIR= ${PREFIX}/share/mp-5	20	DATADIR= ${PREFIX}/share/mp-5
20		21
21	OPTIONS_DEFINE= NLS PCRE DOCS	22	OPTIONS_DEFINE= DOCS NLS PCRE
22	OPTIONS_RADIO= GUI	23	OPTIONS_RADIO= GUI
23	OPTIONS_RADIO_GUI= GTK3 GTK2 QT4	24	OPTIONS_RADIO_GUI= GTK2 GTK3 QT4
24	OPTIONS_DEFAULT= PCRE	25	OPTIONS_DEFAULT= PCRE
25	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
26		27
27	NLS_USES= gettext	28	NLS_USES= gettext
28	NLS_CONFIGURE_WITH= gettext	29	NLS_CONFIGURE_WITH= gettext
29		30	GTK2_USE= gnome=gtk20
		31	GTK3_USE= gnome=gtk30
30	PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre	32	PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
31	PCRE_CONFIGURE_WITH= pcre	33	PCRE_CONFIGURE_WITH= pcre
32		34	QT4_USE= qt4=corelib,gui,moc_build
33	QT4_USE= QT4=corelib,gui,moc_build
34	QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}"	35	QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}"
35	QT4_CONFIGURE_WITH= qt4	36	QT4_CONFIGURE_WITH= qt4
36		37
37	.include <bsd.port.options.mk>	38	.include <bsd.port.options.mk>
38		39
39	.if ${PORT_OPTIONS:MGTK3}	40	.if ${PORT_OPTIONS:MGTK2} \|\| ${PORT_OPTIONS:MGTK3} \|\| ${PORT_OPTIONS:MQT4}
40	USE_GNOME+= gtk30	41	USES+= pkgconfig
41	CONFOPT_GTK= 3	42	PLIST_SUB+= GUI=""
		43	.else
		44	PLIST_SUB+= GUI="@comment "
		45	.endif
		46
		47	.if ${PORT_OPTIONS:MGTK2} \|\| ${PORT_OPTIONS:MGTK3}
		48	DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Develpment;TextEditor;GTK;" ""
		49	.else
		50	CONFIGURE_ARGS+= --without-gtk
		51	CONFOPT_GTK= 0
42	.endif	52	.endif
43		53
44	.if ${PORT_OPTIONS:MGTK2}	54	.if ${PORT_OPTIONS:MGTK2}
45	USE_GNOME+= gtk20
46	CONFOPT_GTK= 2	55	CONFOPT_GTK= 2
47	.endif	56	.endif
48		57
49	.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2)	58	.if ${PORT_OPTIONS:MGTK3}
50	CONFIGURE_ARGS+= --without-gtk	59	CONFOPT_GTK= 3
51	CONFOPT_GTK= 0
52	.endif	60	.endif
53		61
54	.if ${PORT_OPTIONS:MQT4}	62	.if ${PORT_OPTIONS:MQT4}
		63	DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" ""
55	QT_NONSTANDARD= yes	64	QT_NONSTANDARD= yes
56	.endif	65	.endif
57		66
Lines 60-66 Link Here
60	's\|<ncursesw/\|<\| ; \	69	's\|<ncursesw/\|<\| ; \
61	s\|-I/usr/local/include\|\| ; \	70	s\|-I/usr/local/include\|\| ; \
62	s\|-L/usr/local/lib\|\| ; \	71	s\|-L/usr/local/lib\|\| ; \
63	s\|-lX11\|\| ; \
64	/gtk+/s\|3.0\|${CONFOPT_GTK}.0\| ; \	72	/gtk+/s\|3.0\|${CONFOPT_GTK}.0\| ; \
65	/OK/s\|3.0\|${CONFOPT_GTK}.0\| ; \	73	/OK/s\|3.0\|${CONFOPT_GTK}.0\| ; \
66	/CONFOPT_GTK/s\|3\|${CONFOPT_GTK}\|' ${WRKSRC}/config.sh	74	/CONFOPT_GTK/s\|3\|${CONFOPT_GTK}\|' ${WRKSRC}/config.sh
Lines 83-88 Link Here
83	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})	91	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})
84	@${MKDIR} ${STAGEDIR}${DATADIR}/lang	92	@${MKDIR} ${STAGEDIR}${DATADIR}/lang
85	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)	93	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)
		94	.if ${PORT_OPTIONS:MGTK2} \|\| ${PORT_OPTIONS:MGTK3} \|\| ${PORT_OPTIONS:MQT4}
		95	(cd ${WRKSRC} && ${INSTALL_DATA} mp.png ${STAGEDIR}${PREFIX}/share/pixmaps)
		96	.endif
86	.if ${PORT_OPTIONS:MNLS}	97	.if ${PORT_OPTIONS:MNLS}
87	.for lang in de es it nl ru sv	98	.for lang in de es it nl ru sv
88	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES	99	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES