Date: Mon, 29 Jun 2020 20:09:53 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540828 - in head/editors/mp: . files Message-ID: <202006292009.05TK9rgs078742@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Mon Jun 29 20:09:53 2020 New Revision: 540828 URL: https://svnweb.freebsd.org/changeset/ports/540828 Log: Update editors/mp to 5.41 Modified: head/editors/mp/Makefile head/editors/mp/distinfo head/editors/mp/files/patch-config.sh head/editors/mp/files/patch-mpdm_config.sh Modified: head/editors/mp/Makefile ============================================================================== --- head/editors/mp/Makefile Mon Jun 29 19:55:53 2020 (r540827) +++ head/editors/mp/Makefile Mon Jun 29 20:09:53 2020 (r540828) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mp -DISTVERSION= 5.36 +PORTVERSION= 5.41 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ Modified: head/editors/mp/distinfo ============================================================================== --- head/editors/mp/distinfo Mon Jun 29 19:55:53 2020 (r540827) +++ head/editors/mp/distinfo Mon Jun 29 20:09:53 2020 (r540828) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576212317 -SHA256 (mp-5.36.tar.gz) = 3850838d16d3c6be7902cdd1b7d77c5b4282caa36373ff4a2a88c77cc25ecc96 -SIZE (mp-5.36.tar.gz) = 537723 +TIMESTAMP = 1593452440 +SHA256 (mp-5.41.tar.gz) = 51dc71d414d35fb0437b66d3b86e3a03de3811e5c60d86105d4662e30040513c +SIZE (mp-5.41.tar.gz) = 550542 Modified: head/editors/mp/files/patch-config.sh ============================================================================== --- head/editors/mp/files/patch-config.sh Mon Jun 29 19:55:53 2020 (r540827) +++ head/editors/mp/files/patch-config.sh Mon Jun 29 20:09:53 2020 (r540828) @@ -1,6 +1,6 @@ ---- config.sh.orig 2019-07-02 05:57:45 UTC +--- config.sh.orig 2020-05-16 07:31:22 UTC +++ config.sh -@@ -40,6 +40,7 @@ while [ $# -gt 0 ] ; do +@@ -37,6 +37,7 @@ while [ $# -gt 0 ] ; do case $1 in --without-curses) WITHOUT_CURSES=1 ;; --without-gtk) WITHOUT_GTK=1 ;; @@ -8,7 +8,7 @@ --without-win32) WITHOUT_WIN32=1 ;; --with-kde4) WITHOUT_KDE4=0 ;; --without-qt) WITHOUT_QT5=1 && WITHOUT_QT4=1 ;; -@@ -75,6 +76,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then +@@ -71,6 +72,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then echo "--prefix=PREFIX Installation prefix ($PREFIX)." echo "--without-curses Disable curses (text) interface detection." echo "--without-gtk Disable GTK interface detection." @@ -16,7 +16,17 @@ echo "--without-win32 Disable win32 interface detection." echo "--with-kde4 Enable KDE4 interface detection." echo "--without-qt Disable Qt interface detection." -@@ -250,11 +252,11 @@ echo -n "Testing for ncursesw... " +@@ -203,9 +205,6 @@ echo + (cd $MPSL && ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS) + echo + +-# import MPSL build configuration +-[ -f "$MPSL.build.sh" ] && . $MPSL.build.sh +- + cat $MPDM/config.ldflags >> config.ldflags + cat $MPSL/config.ldflags >> config.ldflags + +@@ -244,11 +243,11 @@ echo -n "Testing for ncursesw... " if [ "$WITHOUT_CURSES" = "1" ] ; then echo "Disabled" else @@ -29,9 +39,9 @@ + TMP_CFLAGS="-I${NCURSESINC}" + TMP_LDFLAGS="${LDFLAGS} -L${NCURSESLIB} -lncursesw" - $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log + $CC $CFLAGS $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then -@@ -384,14 +386,14 @@ if [ "$WITHOUT_QT5" = "1" ] ; then +@@ -382,14 +381,14 @@ if [ "$WITHOUT_QT5" = "1" ] ; then else if which pkg-config > /dev/null 2>&1 then @@ -50,7 +60,7 @@ if [ $? = 0 ] ; then echo $TMP_CFLAGS >> config.cflags -@@ -475,15 +477,15 @@ else +@@ -475,15 +474,15 @@ else echo "int main(void) { gtk_main(); return 0; } " >> .tmp.c # Try first GTK 3.0 @@ -59,7 +69,7 @@ + TMP_CFLAGS=`sh -c "pkg-config --cflags gtk+-$GTKVER.0" 2>/dev/null` + TMP_LDFLAGS=`sh -c "pkg-config --libs gtk+-$GTKVER.0" 2>/dev/null` - $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log + $CC $CFLAGS $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then - echo "#define CONFOPT_GTK 3" >> config.h + echo "#define CONFOPT_GTK $GTKVER" >> config.h @@ -69,4 +79,4 @@ + echo "OK ($GTKVER.0)" DRIVERS="gtk $DRIVERS" DRV_OBJS="mpv_gtk.o $DRV_OBJS" - else + CFLAGS="$CFLAGS $TMP_CFLAGS" Modified: head/editors/mp/files/patch-mpdm_config.sh ============================================================================== --- head/editors/mp/files/patch-mpdm_config.sh Mon Jun 29 19:55:53 2020 (r540827) +++ head/editors/mp/files/patch-mpdm_config.sh Mon Jun 29 20:09:53 2020 (r540828) @@ -1,6 +1,6 @@ ---- mpdm/config.sh.orig 2019-02-11 11:53:55 UTC +--- mpdm/config.sh.orig 2020-05-10 08:05:32 UTC +++ mpdm/config.sh -@@ -194,8 +194,8 @@ echo -n "Testing for regular expressions... " +@@ -190,8 +190,8 @@ echo -n "Testing for regular expressions... " if [ "$WITH_PCRE" = 1 ] ; then # try first the pcre library @@ -11,7 +11,7 @@ echo "#include <pcreposix.h>" > .tmp.c echo "int main(void) { regex_t r; regmatch_t m; regcomp(&r,\".*\",REG_EXTENDED|REG_ICASE); return 0; }" >> .tmp.c -@@ -373,13 +373,15 @@ else +@@ -371,13 +371,15 @@ else echo "#define CONFOPT_GETTEXT 1" >> config.h else # try now with -lintl @@ -19,17 +19,17 @@ + TMP_CFLAGS="-I$LOCALBASE/include" + TMP_LDFLAGS="-L$LOCALBASE/lib -lintl" -- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log -+ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log +- $CC $CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $CFLAGS $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then echo "OK (libintl needed)" echo "#define CONFOPT_GETTEXT 1" >> config.h + echo "$TMP_CFLAGS" >> config.cflags echo "$TMP_LDFLAGS" >> config.ldflags + LDFLAGS="$LDFLAGS $TMP_LDFLAGS" else - echo "No" -@@ -406,13 +408,15 @@ else +@@ -405,13 +407,15 @@ else echo "#define CONFOPT_ICONV 1" >> config.h else # try now with -liconv @@ -37,13 +37,13 @@ + TMP_CFLAGS="-I$ICONV_PREFIX/include" + TMP_LDFLAGS="-L$ICONV_PREFIX/lib $ICONV_LIB" -- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log -+ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log +- $CC $CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $CFLAGS $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then echo "OK (libiconv needed)" echo "#define CONFOPT_ICONV 1" >> config.h + echo "$TMP_CFLAGS" >> config.cflags echo "$TMP_LDFLAGS" >> config.ldflags + LDFLAGS="$LDFLAGS $TMP_LDFLAGS" else - echo "No"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006292009.05TK9rgs078742>