[98089] trunk/dports/science/magic
ryandesign at macports.org
ryandesign at macports.org
Mon Sep 24 11:24:45 PDT 2012
Revision: 98089
http://trac.macports.org//changeset/98089
Author: ryandesign at macports.org
Date: 2012-09-24 11:24:45 -0700 (Mon, 24 Sep 2012)
Log Message:
-----------
magic: update to 7.5.224; remove __APPLE__ patch integrated upstream
Modified Paths:
--------------
trunk/dports/science/magic/Portfile
trunk/dports/science/magic/files/patch-scripts-configure.in.diff
Removed Paths:
-------------
trunk/dports/science/magic/files/patch-__APPLE__.diff
Modified: trunk/dports/science/magic/Portfile
===================================================================
--- trunk/dports/science/magic/Portfile 2012-09-24 17:52:47 UTC (rev 98088)
+++ trunk/dports/science/magic/Portfile 2012-09-24 18:24:45 UTC (rev 98089)
@@ -5,7 +5,7 @@
PortGroup conflicts_build 1.0
name magic
-version 7.5.223
+version 7.5.224
set major [lindex [split ${version} .] 0]
categories science
# mostly very permissively licensed, but includes a copy of GNU readline
@@ -29,11 +29,10 @@
depends_lib port:tcl port:tk port:blt port:mesa
-checksums rmd160 1e11d5bdef69f866c57c8f739c4ca5420f3779da \
- sha256 72e5609c61620161fcc3574a8a76684dde5fed1cbebe4cc54261429f05f5bce3
+checksums rmd160 68cc5fd71905dac2ed4abbe6eac5256e359fcdac \
+ sha256 47f1b3283cf35c97de30c35c844f4abdbc331f375062fc4462d36a9a447c6495
-patchfiles patch-scripts-configure.in.diff \
- patch-__APPLE__.diff
+patchfiles patch-scripts-configure.in.diff
universal_variant no
Deleted: trunk/dports/science/magic/files/patch-__APPLE__.diff
===================================================================
--- trunk/dports/science/magic/files/patch-__APPLE__.diff 2012-09-24 17:52:47 UTC (rev 98088)
+++ trunk/dports/science/magic/files/patch-__APPLE__.diff 2012-09-24 18:24:45 UTC (rev 98089)
@@ -1,215 +0,0 @@
---- graphics/X11Helper.c.orig 2008-09-08 14:56:47.000000000 -0500
-+++ graphics/X11Helper.c 2012-09-17 19:34:00.000000000 -0500
-@@ -142,7 +142,7 @@
-
- keymod = (LockMask | ControlMask | ShiftMask)
- & KeyPressedEvent->state;
--#ifdef macosx
-+#ifdef __APPLE__
- if (KeyPressedEvent->state & (Mod1Mask | Mod2Mask | Mod3Mask
- | Mod4Mask | Mod5Mask))
- keymod |= Mod1Mask;
---- graphics/grTOGL1.c.orig 2008-09-08 14:56:47.000000000 -0500
-+++ graphics/grTOGL1.c 2012-09-17 19:34:02.000000000 -0500
-@@ -517,7 +517,7 @@
- keymod = (LockMask | ControlMask | ShiftMask)
- & KeyPressedEvent->state;
-
--#ifdef macosx
-+#ifdef __APPLE__
- /* Change by Philippe---Allows magic to deal with Mac OS-X
- * mapping Meta to Mod2 instead of Mod1
- */
---- graphics/grTk1.c.orig 2008-09-08 14:56:47.000000000 -0500
-+++ graphics/grTk1.c 2012-09-17 19:34:03.000000000 -0500
-@@ -75,7 +75,7 @@
- extern bool GrTkInstalledCMap;
-
- /* machine-dependent constants - see below */
--#ifdef macosx
-+#ifdef __APPLE__
- #define X_COLORMAP_BASE 128
- #define X_COLORMAP_RESERVED 4
- #else
-@@ -806,7 +806,7 @@
-
- keymod = (LockMask | ControlMask | ShiftMask)
- & KeyPressedEvent->state;
--#ifdef macosx
-+#ifdef __APPLE__
- if (KeyPressedEvent->state & (Mod1Mask | Mod2Mask |
- Mod3Mask | Mod4Mask | Mod5Mask))
- keymod |= Mod1Mask;
---- graphics/grX11su1.c.orig 2006-04-10 17:03:14.000000000 -0500
-+++ graphics/grX11su1.c 2012-09-17 19:34:01.000000000 -0500
-@@ -65,7 +65,7 @@
-
- /* machine-dependent constants - see below */
-
--#ifdef macosx
-+#ifdef __APPLE__
- #define X_COLORMAP_BASE 128
- #define X_COLORMAP_RESERVED 4
- #else
---- graphics/grX11thread.c.orig 2008-09-08 14:56:47.000000000 -0500
-+++ graphics/grX11thread.c 2012-09-17 19:34:00.000000000 -0500
-@@ -78,7 +78,7 @@
-
- keymod = (LockMask | ControlMask | ShiftMask)
- & KeyPressedEvent->state;
--#ifdef macosx
-+#ifdef __APPLE__
- if (KeyPressedEvent->state & (Mod1Mask | Mod2Mask | Mod3Mask
- | Mod4Mask | Mod5Mask))
- keymod |= Mod1Mask;
---- plot/plotInt.h.orig 2010-03-08 07:33:07.000000000 -0600
-+++ plot/plotInt.h 2012-09-17 19:33:59.000000000 -0500
-@@ -28,7 +28,7 @@
- #define VERSATEC /* Add this for HP plotter support */
-
- /* system V machines lack vfont.h, so include the defs below. */
--#if !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(macosx) && !defined(__DragonFly__)
-+#if !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(__APPLE__) && !defined(__DragonFly__)
- #include <vfont.h>
- #else
- struct header {
---- plow/PlowMain.c.orig 2006-04-10 17:03:13.000000000 -0500
-+++ plow/PlowMain.c 2012-09-17 19:33:58.000000000 -0500
-@@ -46,7 +46,7 @@
- #include "utils/main.h"
- #include "select/select.h"
-
--#if defined(SYSV) || defined(macosx)
-+#if defined(SYSV) || defined(__APPLE__)
- # define NO_RUSAGE
- #endif
-
---- resis/ResRex.c.orig 2010-03-08 07:33:07.000000000 -0600
-+++ resis/ResRex.c 2012-09-17 19:33:45.000000000 -0500
-@@ -12,7 +12,7 @@
- /* It is hard to get the value of MAXFLOAT in a portable manner. */
- #if defined(ibm032)
- #define MAXFLOAT ((float)3.40282346638528860e+38)
--#elif !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(CYGWIN) && !defined(macosx) && !defined(__DragonFly__)
-+#elif !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(CYGWIN) && !defined(__APPLE__) && !defined(__DragonFly__)
- #include <values.h>
- #endif
-
---- scripts/configure.in.orig 2012-04-20 09:12:44.000000000 -0500
-+++ scripts/configure.in 2012-09-17 19:52:29.000000000 -0500
-@@ -1148,7 +1148,6 @@
- AC_DEFINE(WIN32)
- ;;
- *darwin*)
-- AC_DEFINE(macosx)
- if test "$CPP" = "cc -E" ; then
- CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
- fi
---- sim/SimRsim.c.orig 2006-04-10 17:03:13.000000000 -0500
-+++ sim/SimRsim.c 2012-09-17 19:33:23.000000000 -0500
-@@ -626,7 +626,7 @@
- int charsRead = 0;
- char *temp;
- int n, nfd;
--#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(macosx)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(__APPLE__)
- fd_set readfds, writefds, exceptfds;
- #else
- int nr, nex;
-@@ -642,7 +642,7 @@
-
- /* read reply from Rsim */
-
--#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(macosx)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(__APPLE__)
- FD_ZERO(&readfds);
- FD_ZERO(&exceptfds);
- #endif /* SYSV */
-@@ -651,7 +651,7 @@
-
- try_again:
-
--#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(macosx)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(__APPLE__)
- FD_SET(pipeIn, &readfds);
- FD_ZERO(&writefds);
- FD_SET(pipeIn, &exceptfds);
---- utils/getrect.c.orig 2010-03-08 07:33:08.000000000 -0600
-+++ utils/getrect.c 2012-09-17 19:33:22.000000000 -0500
-@@ -65,7 +65,7 @@
- #define FILE_PTR(fin) ((char *) fin->_IO_read_ptr)
- #define FILE_DEC_CNT(fin, n)
- #define FILE_SET_PTR(fin, cp) ((fin)->_IO_read_ptr = (cp))
--#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(CYGWIN) || defined(macosx)
-+#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(CYGWIN) || defined(__APPLE__)
- #define FILE_CNT(fin) ((fin)->_r)
- #define FILE_PTR(fin) ((char *)(fin)->_p)
- #define FILE_DEC_CNT(fin, n) ((fin)->_r -= (n))
---- utils/magic.h.orig 2010-03-08 07:33:08.000000000 -0600
-+++ utils/magic.h 2012-09-17 19:33:21.000000000 -0500
-@@ -280,10 +280,10 @@
- #ifdef CYGWIN
- #include <errno.h>
- #define sys_errlist _sys_errlist
--#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(macosx)
-+#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
- extern int errno;
- /* extern char *sys_errlist[]; */
--#elif defined(macosx)
-+#elif defined(__APPLE__)
- extern int errno;
- #endif
-
-@@ -293,7 +293,7 @@
-
- #ifndef __STDC__
- #ifndef SYSV
--#if !defined(ALPHA) && !defined(macosx)
-+#if !defined(ALPHA) && !defined(__APPLE__)
- extern char* sprintf();
- #endif
- #endif
---- utils/netlist.c.orig 2006-07-27 11:29:53.000000000 -0500
-+++ utils/netlist.c 2012-09-17 19:33:21.000000000 -0500
-@@ -365,7 +365,7 @@
- static char tempId[100];
- #if defined(linux) || defined(CYGWIN)
- extern int etext asm("etext");
--#elif defined(macosx)
-+#elif defined(__APPLE__)
- int etext;
- #else
- extern int etext;
---- utils/runstats.c.orig 2006-04-14 20:05:01.000000000 -0500
-+++ utils/runstats.c 2012-09-17 19:33:20.000000000 -0500
-@@ -32,7 +32,7 @@
-
- /* Library imports: */
-
--#ifndef macosx
-+#ifndef __APPLE__
- extern char *sbrk();
- extern end;
- #else
---- utils/signals.c.orig 2010-03-08 07:33:08.000000000 -0600
-+++ utils/signals.c 2012-09-17 19:33:20.000000000 -0500
-@@ -76,7 +76,7 @@
- extern bool DBWriteBackup();
-
- /* macs support BSD4.2 signals, so turn off the SYSV flag for this module */
--#ifdef macosx
-+#ifdef __APPLE__
- #undef SYSV
- #endif
-
---- utils/utils.h.orig 2006-07-28 18:12:49.000000000 -0500
-+++ utils/utils.h 2012-09-17 19:33:19.000000000 -0500
-@@ -77,7 +77,7 @@
- #define FORK_f(pid) do { pid = fork(); if (pid > 0) ForkChildAdd (pid); } while (0)
- #define FORK_vf(pid) do { pid = vfork(); if (pid > 0) ForkChildAdd (pid); } while (0)
-
--#if defined(SYSV) || defined(CYGWIN) || defined(macosx)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__APPLE__)
-
- #define FORK(pid) FORK_f(pid)
-
Modified: trunk/dports/science/magic/files/patch-scripts-configure.in.diff
===================================================================
--- trunk/dports/science/magic/files/patch-scripts-configure.in.diff 2012-09-24 17:52:47 UTC (rev 98088)
+++ trunk/dports/science/magic/files/patch-scripts-configure.in.diff 2012-09-24 18:24:45 UTC (rev 98089)
@@ -1,5 +1,5 @@
---- scripts/configure.in.orig 2012-04-20 09:12:44.000000000 -0500
-+++ scripts/configure.in 2012-09-17 20:51:22.000000000 -0500
+--- scripts/configure.in.orig 2012-09-22 08:52:38.000000000 -0500
++++ scripts/configure.in 2012-09-24 12:55:31.000000000 -0500
@@ -23,6 +23,7 @@
dnl Checks for programs.
AC_PROG_CC
@@ -16,7 +16,7 @@
modules=""
unused=""
-@@ -1290,7 +1290,7 @@
+@@ -1361,7 +1361,7 @@
SHDLIB_EXT=".dylib"
LDDL_FLAGS="-dynamiclib -flat_namespace -undefined suppress -noprebind"
LDFLAGS="${LDFLAGS} ${LIB_SPECS}"
@@ -25,7 +25,7 @@
;;
*cygwin*)
-@@ -1529,9 +1529,6 @@
+@@ -1600,9 +1600,6 @@
DEPEND_FLAG="-MM"
fi
@@ -35,7 +35,7 @@
dnl Substitute all variables
-@@ -1583,7 +1580,7 @@
+@@ -1654,7 +1651,7 @@
echo "Configuration Summary (principle requirements):"
echo
@@ -44,7 +44,7 @@
if test $usingX11 ; then
echo "yes"
else
-@@ -1597,7 +1594,7 @@
+@@ -1668,7 +1665,7 @@
echo
fi
@@ -53,7 +53,7 @@
if test $usingOGL ; then
echo "yes"
else
-@@ -1614,9 +1611,9 @@
+@@ -1685,9 +1682,9 @@
fi
if test $usingTcl ; then
@@ -65,7 +65,7 @@
if test "x${TCLSH_EXE}" = "x" ; then
echo "Cannot find 'tclsh' executable to check existance of the BLT package"
else
-@@ -1639,10 +1636,10 @@
+@@ -1710,10 +1707,10 @@
fi
else
if test $usingScheme ; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120924/28b58a20/attachment-0001.html>
More information about the macports-changes
mailing list