[88455] trunk/dports/graphics/swftools

[ryandesign at macports.org]

Revision: 88455
          http://trac.macports.org/changeset/88455
Author:   ryandesign at macports.org
Date:     2012-01-02 18:25:03 -0800 (Mon, 02 Jan 2012)
Log Message:
-----------
swftools: do not look for libraries explicitly in Fink or in the default MacPorts prefix; this causes havok if Fink is installed, or if you're installing into a secondary MacPorts prefix while also having the dependencies available in the primary MacPorts prefix

Modified Paths:
--------------
    trunk/dports/graphics/swftools/Portfile

Added Paths:
-----------
    trunk/dports/graphics/swftools/files/patch-configure.diff
    trunk/dports/graphics/swftools/files/patch-setup.py.diff

Modified: trunk/dports/graphics/swftools/Portfile
===================================================================
--- trunk/dports/graphics/swftools/Portfile	2012-01-03 02:07:12 UTC (rev 88454)
+++ trunk/dports/graphics/swftools/Portfile	2012-01-03 02:25:03 UTC (rev 88455)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 name                swftools
 version             0.9.1
-revision            1
+revision            2
 categories          graphics
 maintainers         nomaintainer
 description         SWF manipulation and generation tools
@@ -21,7 +21,9 @@
 depends_lib         port:jpeg port:openjpeg port:freetype port:lame \
                     path:include/gif_lib.h:giflib port:python26
 
-patchfiles          patch-Makefile.common.in.diff
+patchfiles          patch-Makefile.common.in.diff \
+                    patch-configure.diff \
+                    patch-setup.py.diff
 
 configure.python    ${prefix}/bin/python2.6
 

Added: trunk/dports/graphics/swftools/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/swftools/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/graphics/swftools/files/patch-configure.diff	2012-01-03 02:25:03 UTC (rev 88455)
@@ -0,0 +1,27 @@
+--- configure.orig	2012-01-02 20:19:33.000000000 -0600
++++ configure	2012-01-02 20:20:12.000000000 -0600
+@@ -2075,15 +2075,6 @@
+ 	CXXFLAGS="$CXXFLAGS -fno-rtti"
+ 	SHARED="-bundle"
+ 	SLEXT="bundle"
+-	if test -d /opt/local/include && test -d /opt/local/lib; then
+-	    CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
+-	    LDFLAGS="${LDFLAGS} -L/opt/local/lib"
+-	fi
+-	# Use fink packages if available.
+-	#if test -d /sw/include && test -d /sw/lib; then
+-	#    CPPFLAGS="${CPPFLAGS} -I/sw/include"
+-	#    LDFLAGS="${LDFLAGS} -L/sw/lib"
+-	#fi
+ 	;;
+ esac
+ 
+@@ -8230,7 +8221,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy=""$PATH:/usr/local/bin:/sw/bin:/opt/local/bin""
++as_dummy=""$PATH""
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS

Added: trunk/dports/graphics/swftools/files/patch-setup.py.diff
===================================================================
--- trunk/dports/graphics/swftools/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/graphics/swftools/files/patch-setup.py.diff	2012-01-03 02:25:03 UTC (rev 88455)
@@ -0,0 +1,20 @@
+--- setup.py.orig	2009-08-05 05:21:24.000000000 -0500
++++ setup.py	2012-01-02 20:10:18.000000000 -0600
+@@ -43,8 +43,6 @@
+ else:
+     update_dirs(cc.library_dirs, [os.path.join(sys.prefix, 'lib'), 
+                                   os.path.join(sys.prefix, 'local/lib')])
+-    if sys.platform == "darwin":
+-        update_list(cc.library_dirs, ["/sw/lib", "/opt/local/lib"])
+ 
+ if 'include_dirs' in os.environ:
+     update_dirs(cc.include_dirs, [path.strip() for path in os.environ.get('include_dirs').strip().split(":")])
+@@ -52,8 +50,6 @@
+     update_dirs(cc.include_dirs, [os.path.join(sys.prefix, 'include'), 
+                                   os.path.join(sys.prefix, 'include/freetype2'),
+                                   os.path.join(sys.prefix, 'include/fontconfig')])
+-    if sys.platform == "darwin":
+-        update_dirs(cc.include_dirs, ["/sw/include/freetype2", "/sw/lib/freetype2/include", "/sw/include", "/opt/local/include"])
+ 
+ 
+ class ConfigScript:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120102/67df6ecd/attachment.html>