Revision: 140042 https://trac.macports.org/changeset/140042 Author: ryandesign@macports.org Date: 2015-09-07 17:47:09 -0700 (Mon, 07 Sep 2015) Log Message: ----------- magic-devel: update to 8.1.79 Modified Paths: -------------- trunk/dports/science/magic-devel/Portfile Added Paths: ----------- trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff Removed Paths: ------------- trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff Modified: trunk/dports/science/magic-devel/Portfile =================================================================== --- trunk/dports/science/magic-devel/Portfile 2015-09-08 00:10:22 UTC (rev 140041) +++ trunk/dports/science/magic-devel/Portfile 2015-09-08 00:47:09 UTC (rev 140042) @@ -9,7 +9,7 @@ name magic-devel conflicts magic -version 8.0.208 +version 8.1.79 set branch [join [lrange [split ${version} .] 0 1] .] categories science # mostly very permissively licensed, but includes a copy of GNU readline @@ -36,10 +36,11 @@ require_active_variants tk x11 -checksums rmd160 90a1a4202964543d198462528f533393c407e062 \ - sha256 b3ef7982028c902d2ea8646b3f0af22f06e66a6ef9b776406b7e7c330aa90e14 +checksums rmd160 846e83315fd47fb0b8d914cf349637fb74f0cd12 \ + sha256 c26270f813260df2fe168f24e087f87206459559295410937e7ae6c350ee0b7b -patchfiles patch-scripts-configure.in.diff +patchfiles patch-textio-txCommands.c.diff \ + patch-utils-magic.h.diff universal_variant no Deleted: trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff =================================================================== --- trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff 2015-09-08 00:10:22 UTC (rev 140041) +++ trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff 2015-09-08 00:47:09 UTC (rev 140042) @@ -1,37 +0,0 @@ ---- scripts/configure.in.orig 2012-11-14 08:16:52.000000000 -0600 -+++ scripts/configure.in 2012-11-15 15:11:14.000000000 -0600 -@@ -23,6 +23,7 @@ - dnl Checks for programs. - AC_PROG_CC - AC_PROG_CPP -+AC_PROG_CXX - AC_ISC_POSIX - AC_PROG_INSTALL - AC_PROG_RANLIB -@@ -251,7 +252,6 @@ - LD_RUN_PATH="" - WISH_EXE="" - TCLSH_EXE="" --CXX= - - modules="" - unused="" -@@ -1381,7 +1381,7 @@ - SHDLIB_EXT=".dylib" - LDDL_FLAGS="-dynamiclib -flat_namespace -undefined suppress -noprebind" - LDFLAGS="${LDFLAGS} ${LIB_SPECS}" -- CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -I/sw/include -fno-common" -+ CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -fno-common" - ;; - - *cygwin*) -@@ -1620,9 +1620,6 @@ - DEPEND_FLAG="-MM" - fi - --if test $usingOA ; then -- AC_PROG_CXX --fi - - dnl Substitute all variables - Added: trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff =================================================================== --- trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff (rev 0) +++ trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff 2015-09-08 00:47:09 UTC (rev 140042) @@ -0,0 +1,20 @@ +--- textio/txCommands.c.orig 2015-04-16 11:48:14.000000000 -0500 ++++ textio/txCommands.c 2015-09-07 19:42:06.000000000 -0500 +@@ -1141,7 +1141,7 @@ + if (argc > TX_MAXARGS) + { + TxError("Error: number of command arguments exceeds %d!\n", TX_MAXARGS); +- return; ++ return 0; + } + + SigIOReady = FALSE; +@@ -1158,7 +1158,7 @@ + { + TxError("Error: command length exceeds %d characters!\n", TX_MAX_CMDLEN); + TxFreeCommand(tclcmd); +- return; ++ return 0; + } + strcpy(&tclcmd->tx_argstring[asize], argv[n]); + tclcmd->tx_argv[n] = &tclcmd->tx_argstring[asize]; Added: trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff =================================================================== --- trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff (rev 0) +++ trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff 2015-09-08 00:47:09 UTC (rev 140042) @@ -0,0 +1,14 @@ +--- utils/magic.h.orig 2014-10-25 08:57:08.000000000 -0500 ++++ utils/magic.h 2015-09-07 19:30:15.000000000 -0500 +@@ -179,10 +179,8 @@ + + /* + * Select system call +- * +- * Note: Errors here may be caused by not including <sys/types.h> +- * before "magic.h" + */ ++#include <sys/select.h> + #ifndef FD_SET + #define fd_set int + #define FD_SET(n, p) ((*(p)) |= (1 << (n)))