[97986] trunk/dports/science/irsim

[and.damore at macports.org]

Revision: 97986
          http://trac.macports.org//changeset/97986
Author:   and.damore at macports.org
Date:     2012-09-21 03:55:47 -0700 (Fri, 21 Sep 2012)
Log Message:
-----------
port irsim: removed macosx define in configure script, changed macro to __APPLE__ in source file, removed hardcoded /sw/ paths. Closed ticket 36250

Modified Paths:
--------------
    trunk/dports/science/irsim/Portfile

Added Paths:
-----------
    trunk/dports/science/irsim/files/
    trunk/dports/science/irsim/files/patch-macosx_define.diff
    trunk/dports/science/irsim/files/patch-remove_sw.diff

Modified: trunk/dports/science/irsim/Portfile
===================================================================
--- trunk/dports/science/irsim/Portfile	2012-09-21 10:48:20 UTC (rev 97985)
+++ trunk/dports/science/irsim/Portfile	2012-09-21 10:55:47 UTC (rev 97986)
@@ -29,6 +29,10 @@
                     port:tk \
                     port:xorg-libXt
 
+patch.pre_args      -p1
+patchfiles          patch-remove_sw.diff
+platform darwin 12  {patchfiles-append  patch-macosx_define.diff}
+
 build.env-append    LIBS="-L${prefix}/lib"
 configure.args      --mandir=${prefix}/share/man
 

Added: trunk/dports/science/irsim/files/patch-macosx_define.diff
===================================================================
--- trunk/dports/science/irsim/files/patch-macosx_define.diff	                        (rev 0)
+++ trunk/dports/science/irsim/files/patch-macosx_define.diff	2012-09-21 10:55:47 UTC (rev 97986)
@@ -0,0 +1,32 @@
+diff -ru irsim-9.7.74.orig/base/mem.c irsim-9.7.74/base/mem.c
+--- irsim-9.7.74.orig/base/mem.c	2012-09-21 12:45:34.000000000 +0200
++++ irsim-9.7.74/base/mem.c	2012-09-21 12:46:15.000000000 +0200
+@@ -113,7 +113,7 @@
+ 
+ private	Bucket  bucket[NBINS];		/* free list hash table */
+ 
+-#if !defined(CYGWIN) && !defined(macosx)
++#if !defined(CYGWIN) && !defined(__APPLE__)
+ 	/* External definitions */
+ extern	int	  etext;
+ extern	unsigned  sleep();
+@@ -126,7 +126,7 @@
+ #define	PAGE_MASK		( PAGE_SIZE - 1 )
+ 
+ #define	FPRINTF			(void) fprintf
+-#if defined(CYGWIN) || defined(macosx)
++#if defined(CYGWIN) || defined(__APPLE__)
+ private Pointer GetMoreCore( npages )
+   int  npages;
+   {
+diff -ru irsim-9.7.74.orig/scripts/configure irsim-9.7.74/scripts/configure
+--- irsim-9.7.74.orig/scripts/configure	2012-09-21 12:45:34.000000000 +0200
++++ irsim-9.7.74/scripts/configure	2012-09-21 12:46:31.000000000 +0200
+@@ -9958,7 +9958,6 @@
+     ;;
+   *darwin*)
+     cat >>confdefs.h <<\_ACEOF
+-#define macosx 1
+ _ACEOF
+ 
+     if test "$CPP" = "cc -E" ; then

Added: trunk/dports/science/irsim/files/patch-remove_sw.diff
===================================================================
--- trunk/dports/science/irsim/files/patch-remove_sw.diff	                        (rev 0)
+++ trunk/dports/science/irsim/files/patch-remove_sw.diff	2012-09-21 10:55:47 UTC (rev 97986)
@@ -0,0 +1,28 @@
+diff -ru irsim-9.7.74.orig/scripts/configure irsim-9.7.74/scripts/configure
+--- irsim-9.7.74.orig/scripts/configure	2012-09-21 11:56:18.000000000 +0200
++++ irsim-9.7.74/scripts/configure	2012-09-21 11:58:38.000000000 +0200
+@@ -7992,7 +7992,6 @@
+        /usr/local/lib \
+        /usr/local \
+        `ls -dr /usr/share/tcltk/tcl[7-9].[0-9]* 2>/dev/null` \
+-       /sw/lib \
+        /usr
+       do
+         if test -r "$dir/tclConfig.sh" ; then
+@@ -8076,7 +8075,6 @@
+        `ls -dr /usr/local/tcl/tcl[7-9].[0-9]* 2>/dev/null` \
+        /usr/local/tcl \
+        /usr/local/lib \
+-       /sw/lib \
+        /usr/local \
+        `ls -dr /usr/share/tcltk/tk[7-9].[0-9]* 2>/dev/null` \
+        ${x_libraries} \
+@@ -10100,7 +10098,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*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120921/96c9ed69/attachment.html>