Index: head/editors/mp/Makefile =================================================================== --- head/editors/mp/Makefile (revision 463546) +++ head/editors/mp/Makefile (revision 463547) @@ -1,118 +1,111 @@ # Created by: Mark Pulford # $FreeBSD$ PORTNAME= mp DISTVERSION= 5.2.11 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ MAINTAINER= ports@FreeBSD.org COMMENT= Programming text editor LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= fails to compile: conflicting types for __wcwidth -BROKEN_armv6= fails to compile: conflicting types for __wcwidth -BROKEN_armv7= fails to compile: conflicting types for __wcwidth - -USES= iconv ncurses +USES= gmake iconv ncurses HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config.sh CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 --without-kde4 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=cairo,gdkpixbuf2,gtk20 GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GTK3_USE= gnome=cairo,gdkpixbuf2,gtk30 PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= pcre -QT4_USE= qt4=corelib,gui,moc_build -QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}" +QT4_USE= qt4=corelib,gui,moc_build \ + xorg=x11 +QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}" MOC="${MOC}" QT4_CONFIGURE_WITH= qt4 .include .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} CONFOPT_GTK= 2 .endif .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 post-patch: @${REINPLACE_CMD} -e \ - 's|||g' ${WRKSRC}/${i} .endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/mpsl/mpsl ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/mp_*.mpsl ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/lang/*.mpsl ${STAGEDIR}${DATADIR}/lang .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} ${INSTALL_DATA} ${WRKSRC}/mp.png ${STAGEDIR}${PREFIX}/share/pixmaps .endif do-install-NLS-on: .for lang in de es it nl ru sv - @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo .endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.* ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/editors/mp/files/patch-config.sh =================================================================== --- head/editors/mp/files/patch-config.sh (nonexistent) +++ head/editors/mp/files/patch-config.sh (revision 463547) @@ -0,0 +1,22 @@ +--- config.sh.orig 2018-03-04 01:48:31 UTC ++++ config.sh +@@ -101,7 +101,7 @@ if [ "$CPP" = "" ] ; then + which g++ > /dev/null 2>&1 && CPP=g++ + fi + +-MOC="moc" ++MOC?="moc" + which moc-qt4 > /dev/null 2>&1 && MOC=moc-qt4 + + echo "CC=$CC" >> makefile.opts +@@ -364,8 +364,8 @@ if [ "$WITHOUT_QT4" = "1" ] ; then + else + if which pkg-config > /dev/null 2>&1 + then +- TMP_CFLAGS=$(pkg-config --cflags QtGui) +- TMP_LDFLAGS="$(pkg-config --libs QtGui) -lX11" ++ TMP_CFLAGS="$(pkg-config --cflags QtGui) $(pkg-config --cflags x11)" ++ TMP_LDFLAGS="$(pkg-config --libs QtGui) $(pkg-config --libs x11)" + + echo "#include " > .tmp.cpp + echo "int main(int argc, char *argv[]) { new QApplication(argc, argv) ; return 0; } " >> .tmp.cpp Property changes on: head/editors/mp/files/patch-config.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/mp/files/patch-mpdm_mpdm__s.c =================================================================== --- head/editors/mp/files/patch-mpdm_mpdm__s.c (nonexistent) +++ head/editors/mp/files/patch-mpdm_mpdm__s.c (revision 463547) @@ -0,0 +1,26 @@ +Fix build with aarch64, armv6, and armv7 + +--- mpdm_s.o --- +mpdm_s.c:1070:5: error: conflicting types for '__wcwidth' +int wcwidth(wchar_t); + ^ +/usr/include/wchar.h:211:21: note: expanded from macro 'wcwidth' +#define wcwidth(_c) __wcwidth(_c) + ^ +/usr/include/_ctype.h:159:1: note: previous definition is here +__wcwidth(__ct_rune_t _c) +^ +1 error generated. +*** [mpdm_s.o] Error code 1 + +--- mpdm/mpdm_s.c.orig 2018-03-04 00:49:18 UTC ++++ mpdm/mpdm_s.c +@@ -1067,8 +1067,6 @@ int mpdm_gettext_domain(const mpdm_t dom, const mpdm_t + + #ifdef CONFOPT_WCWIDTH + +-int wcwidth(wchar_t); +- + int mpdm_wcwidth(wchar_t c) + { + return wcwidth(c); Property changes on: head/editors/mp/files/patch-mpdm_mpdm__s.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property