Attachment 159178 Details for Bug 201840 – editors_mp.diff

[patch] editors_mp.diff

editors_mp.diff (text/plain), 5.13 KB, created by tkato432 on 2015-07-24 18:32:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-07-24 18:32:05 UTC

Size: 5.13 KB

patch

obsolete

>diff -urN /usr/ports/editors/mp/Makefile editors/mp/Makefile
>--- /usr/ports/editors/mp/Makefile	2015-03-26 01:12:11.762230000 +0900
>+++ editors/mp/Makefile	2015-07-25 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/editors/mp/Makefile 382181 2015-03-24 21:40:47Z pawel $
> 
> PORTNAME=	mp
>-PORTVERSION=	5.2.9
>+PORTVERSION=	5.2.10
> CATEGORIES=	editors
> MASTER_SITES=	http://triptico.com/download/mp/
> 
>@@ -10,12 +10,7 @@
> COMMENT=	Programming text editor
> 
> LICENSE=	GPLv2 # (or later)
>-
>-OPTIONS_DEFINE=	NLS PCRE DOCS
>-OPTIONS_RADIO=	GUI
>-OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
>-OPTIONS_DEFAULT=	PCRE
>-OPTIONS_SUB=	yes
>+#LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		iconv ncurses
> HAS_CONFIGURE=	yes
>@@ -24,49 +19,60 @@
> 
> DATADIR=	${PREFIX}/share/mp-5
> 
>-NLS_USES=	gettext
>-NLS_CONFIGURE_WITH=	gettext
>+BROKEN_ia64=	Does not compile on ${ARCH}
>+BROKEN_powerpc=	Does not compile on ${ARCH}
>+BROKEN_spacr64=	Does not compile on ${ARCH}
>+
>+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:MGTK3}
>-USE_GNOME+=	gtk30
>-CONFOPT_GTK=	3
>+.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 empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2)
>-CONFIGURE_ARGS+=	--without-gtk
>-CONFOPT_GTK=	0
>+.if ${PORT_OPTIONS:MGTK3}
>+CONFOPT_GTK=	3
> .endif
> 
> .if ${PORT_OPTIONS:MQT4}
>+DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" ""
> QT_NONSTANDARD=	yes
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
>-BROKEN=		Does not compile on ia64, powerpc, or sparc64
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		'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
>@@ -89,6 +95,9 @@
> 	(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
>@@ -101,4 +110,4 @@
> 	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
> .endfor
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/editors/mp/distinfo editors/mp/distinfo
>--- /usr/ports/editors/mp/distinfo	2015-03-26 01:12:11.763192000 +0900
>+++ editors/mp/distinfo	2015-07-25 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (mp-5.2.9.tar.gz) = a30403f4b0c07905733168e914d488f48fb449bb95f67a5254d9ca9ecb6b795d
>-SIZE (mp-5.2.9.tar.gz) = 557502
>+SHA256 (mp-5.2.10.tar.gz) = f3ce1831d2cfb42a8540d197a9fdad163ecd17883a57cd798a2f30bfe791ddc1
>+SIZE (mp-5.2.10.tar.gz) = 504306
>diff -urN /usr/ports/editors/mp/files/patch-mpdn__config.sh editors/mp/files/patch-mpdn__config.sh
>--- /usr/ports/editors/mp/files/patch-mpdn__config.sh	2014-06-21 17:47:54.000000000 +0900
>+++ editors/mp/files/patch-mpdn__config.sh	2015-07-25 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>---- mpdm/config.sh.orig	2009-11-05 17:18:27.000000000 +0900
>-+++ mpdm/config.sh	2011-03-19 08:40:21.000000000 +0900
>-@@ -309,13 +309,15 @@
>+--- mpdm/config.sh.orig	2015-05-05 07:29:54 UTC
>++++ mpdm/config.sh
>+@@ -370,13 +370,15 @@ else
>  		echo "#define CONFOPT_GETTEXT 1" >> config.h
>  	else
>  		# try now with -lintl
>@@ -18,7 +18,7 @@
>  			echo "$TMP_LDFLAGS" >> config.ldflags
>  		else
>  			echo "No"
>-@@ -342,13 +344,15 @@
>+@@ -403,13 +405,15 @@ else
>  		echo "#define CONFOPT_ICONV 1" >> config.h
>  	else
>  		# try now with -liconv
>diff -urN /usr/ports/editors/mp/pkg-plist editors/mp/pkg-plist
>--- /usr/ports/editors/mp/pkg-plist	2014-10-27 23:05:56.000000000 +0900
>+++ editors/mp/pkg-plist	2015-07-25 00:00:00.000000000 +0900
>@@ -6,8 +6,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
> %%PORTDOCS%%%%DOCSDIR%%/mp_actions.html
> %%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt
>-%%PORTDOCS%%%%DOCSDIR%%/mp_api.html
>-%%PORTDOCS%%%%DOCSDIR%%/mp_api.txt
> %%PORTDOCS%%%%DOCSDIR%%/mp_configuration.html
> %%PORTDOCS%%%%DOCSDIR%%/mp_configuration.txt
> %%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.html
>@@ -62,3 +60,4 @@
> %%DATADIR%%/mp_tui.mpsl
> %%DATADIR%%/mp_vcs.mpsl
> %%DATADIR%%/mp_writing.mpsl
>+%%GUI%%share/pixmaps/mp.png

Actions: View | Diff

Attachments on bug 201840: 159178 | 160799