[89330] trunk/dports/net/gpsd/files

[jmr at macports.org]

Revision: 89330
          http://trac.macports.org/changeset/89330
Author:   jmr at macports.org
Date:     2012-01-25 00:09:39 -0800 (Wed, 25 Jan 2012)
Log Message:
-----------
gpsd: check in files dir

Added Paths:
-----------
    trunk/dports/net/gpsd/files/SConstruct.patch

Removed Paths:
-------------
    trunk/dports/net/gpsd/files/patch-Makefile.in.diff

Added: trunk/dports/net/gpsd/files/SConstruct.patch
===================================================================
--- trunk/dports/net/gpsd/files/SConstruct.patch	                        (rev 0)
+++ trunk/dports/net/gpsd/files/SConstruct.patch	2012-01-25 08:09:39 UTC (rev 89330)
@@ -0,0 +1,29 @@
+--- SConstruct.orig	2012-01-13 03:41:41.000000000 +1100
++++ SConstruct	2012-01-25 18:50:00.000000000 +1100
+@@ -398,7 +399,7 @@
+     # use chrpath to edit this out of RPATH.
+     if env["shared"]:
+         env.Prepend(RPATH=[os.path.realpath(os.curdir)])
+-else:
++elif env.subst('$PLATFORM') != 'darwin':
+     print "chrpath is not available, forcing static linking."
+     env["shared"] = False
+ 
+@@ -1140,7 +1141,7 @@
+     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
+ 
+ # We don't use installdir here in order to avoid having DESTDIR affect the rpath
+-if env["shared"]:
++if env["shared"] and env.subst('$PLATFORM') != 'darwin':
+     env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
+                       % (installdir('libdir', False), ))
+ 
+@@ -1154,7 +1155,7 @@
+     python_module_dir = python_lib_dir + os.sep + 'gps'
+     python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
+                                                     python_built_extensions)
+-    if not env['debug'] or env['profiling']:
++    if not env['debug'] and not env['profiling'] and env['strip']:
+         python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
+ 
+     python_modules_install = python_env.Install( DESTDIR + python_module_dir,

Deleted: trunk/dports/net/gpsd/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-Makefile.in.diff	2012-01-25 07:55:28 UTC (rev 89329)
+++ trunk/dports/net/gpsd/files/patch-Makefile.in.diff	2012-01-25 08:09:39 UTC (rev 89330)
@@ -1,44 +0,0 @@
---- Makefile.in.orig	2010-11-23 11:08:37.000000000 -0500
-+++ Makefile.in	2010-11-23 11:09:00.000000000 -0500
-@@ -373,6 +373,11 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- QMAKE = @QMAKE@
-+# remove "-arch X" from QMAKE CFLAGS and LFLAGS ...
-+QMAKE_CFLAGS = `echo $(CFLAGS) | sed -e "s@[ ]*\-arch[ ]*[^ ]*@@g"`
-+QMAKE_LFLAGS = `echo $(LDFLAGS) | sed -e "s@[ ]*\-arch[ ]*[^ ]*@@g"`
-+# ... and put it into CONFIG instead
-+QMAKE_CONFIG = `echo $(CFLAGS) | sed -e "s@\(\-arch\)[ ]*\([^ ]*\)@\1\2 at g" | tr ' ' '\n' | grep "\-arch" | sed -e "s@\-arch\([^ ]*\)@\1 at g" | sed -e "s at i386@x86 at g" | tr '\n' ' '`
- QtNetwork_CFLAGS = @QtNetwork_CFLAGS@
- QtNetwork_LIBS = @QtNetwork_LIBS@
- RANLIB = @RANLIB@
-@@ -546,7 +551,7 @@
- libgps_VERSION__REVISION = 0
- libgps_VERSION_AGE = 0
- libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
--libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
-+libgps_la_LDFLAGS = $(LDFLAGS) -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
- lib_LTLIBRARIES = libgps.la libgpsd.la
- libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
- libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION)
-@@ -658,8 +663,9 @@
- @LIB_Q_GPSMM_ENABLE_TRUE@	     "MAKE=$(MAKE)" \
- @LIB_Q_GPSMM_ENABLE_TRUE@	     "QMAKE_CXX=$(CXX)" \
- @LIB_Q_GPSMM_ENABLE_TRUE@	     "QMAKE_CC=$(CC)" \
-- at LIB_Q_GPSMM_ENABLE_TRUE@	     "QMAKE_CFLAGS+=$(CFLAGS)" \
-- at LIB_Q_GPSMM_ENABLE_TRUE@	     "QMAKE_LFLAGS+=$(LDFLAGS)" \
-+ at LIB_Q_GPSMM_ENABLE_TRUE@	     CONFIG+="$(QMAKE_CONFIG)" \
-+ at LIB_Q_GPSMM_ENABLE_TRUE@	     QMAKE_CFLAGS+="$(QMAKE_CFLAGS)" \
-+ at LIB_Q_GPSMM_ENABLE_TRUE@	     QMAKE_LFLAGS+="$(QMAKE_LFLAGS)" \
- @LIB_Q_GPSMM_ENABLE_TRUE@	     "VERSION=$(libgps_VERSION)" \
- @LIB_Q_GPSMM_ENABLE_TRUE@	     "TARGET_LIBDIR=${libdir}" \
- @LIB_Q_GPSMM_ENABLE_TRUE@	     "TARGET_INCLUDEDIR=${includedir}"
-@@ -2049,6 +2055,8 @@
- @HAVE_PYTHON_TRUE@	(cd '$(srcdir)' && \
- @HAVE_PYTHON_TRUE@	env abs_builddir='$(abs_builddir)' \
- @HAVE_PYTHON_TRUE@	    MAKE='$(MAKE)' \
-+ at HAVE_PYTHON_TRUE@	    CFLAGS='$(CFLAGS)' \
-+ at HAVE_PYTHON_TRUE@	    LDFLAGS='$(LDFLAGS)' \
- @HAVE_PYTHON_TRUE@		$(PYTHON) setup.py build \
- @HAVE_PYTHON_TRUE@			--build-lib '$(srcdir)/$(PYTHON_DISTUTILS_LIBDIR)' \
- @HAVE_PYTHON_TRUE@			--build-scripts '$(srcdir)/$(PYTHON_DISTUTILS_SCRIPTDIR)' \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120125/60c2780b/attachment-0001.html>