[98921] trunk/dports/science/exodriver

[ryandesign at macports.org]

Revision: 98921
          http://trac.macports.org//changeset/98921
Author:   ryandesign at macports.org
Date:     2012-10-20 17:40:49 -0700 (Sat, 20 Oct 2012)
Log Message:
-----------
exodriver: fix library install_name

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

Added Paths:
-----------
    trunk/dports/science/exodriver/files/
    trunk/dports/science/exodriver/files/patch-Makefile.diff

Modified: trunk/dports/science/exodriver/Portfile
===================================================================
--- trunk/dports/science/exodriver/Portfile	2012-10-21 00:32:27 UTC (rev 98920)
+++ trunk/dports/science/exodriver/Portfile	2012-10-21 00:40:49 UTC (rev 98921)
@@ -8,6 +8,7 @@
 github.setup        labjack exodriver ${git_tag}
 
 version             2.5.1
+revision            1
 license             MIT
 categories          science
 maintainers         macsforever2000 openmaintainer
@@ -24,6 +25,8 @@
 
 depends_lib         port:libusb
 
+patchfiles          patch-Makefile.diff
+
 use_configure       no
 use_parallel_build  no
 
@@ -31,11 +34,9 @@
 
 build.args-append   CC="${configure.cc} [get_canonical_archflags cc]" \
                     CXX="${configure.cxx} [get_canonical_archflags cxx]" \
-                    CPP=${configure.cpp}
+                    CPP=${configure.cpp} \
+                    PREFIX=${prefix}
 
-post-patch {
-    reinplace "s|/usr/local|${destroot}${prefix}|g" Makefile
-    reinplace "s|-lusb-1.0|-L${prefix}/lib -lusb-1.0|g" Makefile
-}
+destroot.args-append PREFIX=${prefix}
 
 livecheck.type      none

Added: trunk/dports/science/exodriver/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/exodriver/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/science/exodriver/files/patch-Makefile.diff	2012-10-21 00:40:49 UTC (rev 98921)
@@ -0,0 +1,28 @@
+--- Makefile.orig	2012-09-25 16:03:05.000000000 -0500
++++ Makefile	2012-10-20 19:36:27.000000000 -0500
+@@ -6,10 +6,13 @@
+ UNAME = $(shell uname -s)
+ 
+ VERSION = 2.5.1
+-DESTINATION = /usr/local/lib
++PREFIX = /usr/local
++LIBDIR = $(PREFIX)/lib
++DESTDIR = 
++DESTINATION = $(DESTDIR)$(LIBDIR)
+ HEADER = labjackusb.h
+-HEADER_DESTINATION = /usr/local/include
+-LIBFLAGS = -lusb-1.0 -lc
++HEADER_DESTINATION = $(DESTDIR)$(PREFIX)/include
++LIBFLAGS = -L$(LIBDIR) -lusb-1.0 -lc
+ 
+ ifeq ($(UNAME),Darwin)
+ 	#Mac OS X operating system macros
+@@ -20,7 +23,7 @@
+ 	#ARCHFLAGS = -arch i386 -arch x86_64
+ 	# Build for only the host architecture
+ 	ARCHFLAGS =
+-	COMPILE = libtool -dynamic -o $(TARGET) -install_name $(TARGET) -current_version $(VERSION) -compatibility_version $(VERSION) labjackusb.o $(LIBFLAGS)
++	COMPILE = libtool -dynamic -o $(TARGET) -install_name $(LIBDIR)$(TARGET) -current_version $(VERSION) -compatibility_version $(VERSION) labjackusb.o $(LIBFLAGS)
+ else
+ 	#Linux operating system macros
+ 	TARGET = liblabjackusb.so.$(VERSION)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121020/512d3464/attachment.html>