[71111] trunk/dports/devel/libusb-legacy

[michaelld at macports.org]

Revision: 71111
          http://trac.macports.org/changeset/71111
Author:   michaelld at macports.org
Date:     2010-09-01 09:19:30 -0700 (Wed, 01 Sep 2010)
Log Message:
-----------
Tweak to install files and libraries as 'libusb-legacy' instead of
just 'libusb'; avoids name conflict with 'libusb-compat' port.

Modified Paths:
--------------
    trunk/dports/devel/libusb-legacy/Portfile

Removed Paths:
-------------
    trunk/dports/devel/libusb-legacy/files/patch-configure

Modified: trunk/dports/devel/libusb-legacy/Portfile
===================================================================
--- trunk/dports/devel/libusb-legacy/Portfile	2010-09-01 16:04:49 UTC (rev 71110)
+++ trunk/dports/devel/libusb-legacy/Portfile	2010-09-01 16:19:30 UTC (rev 71111)
@@ -5,10 +5,10 @@
 
 name                libusb-legacy
 version             0.1.12
-revision            1
+revision            2
 categories          devel
 #license             LGPLv2.1
-maintainers         snc openmaintainer
+maintainers         snc michaelld openmaintainer
 description         Library providing access to USB devices
 long_description    A library originally developed under Linux to give \
                     userland programs an API to access to USB hardware.
@@ -22,22 +22,58 @@
                     sha1    599a5168590f66bc6f1f9a299579fd8500614807 \
                     rmd160  63848df717e00fff67ab30ba86a85466370d4e8e
 
-patchfiles          patch-Makefile.in.diff patch-darwin.c.diff patch-configure
+patchfiles          patch-Makefile.in.diff patch-darwin.c.diff
 
+post-patch {
+    # tweak pkg-config install directory & file name
+    reinplace "/pkgconfigdir/s@\\$\{libdir\}@\\$\{prefix\}/lib at g" \
+        ${worksrcpath}/configure
+    reinplace "/Name/s at libusb@libusb-legacy at g" \
+        ${worksrcpath}/libusb.pc.in
+    reinplace "s at -lusb@-lusb-legacy at g" \
+        ${worksrcpath}/libusb.pc.in
+    file rename ${worksrcpath}/libusb.pc.in \
+        ${worksrcpath}/libusb-legacy.pc.in
+    reinplace "s at libusb\.pc at libusb-legacy\.pc at g" \
+        ${worksrcpath}/Makefile.in
+    reinplace "s at libusb\.pc at libusb-legacy\.pc at g" \
+        ${worksrcpath}/configure
+
+    # tweak library build and install name
+    reinplace "s@\\(libusb\[^ \]*\\)_la@\\1-legacy_la at g" \
+        ${worksrcpath}/Makefile.in
+    reinplace "s@\\(libusb\[^ \]*\\)\.la@\\1-legacy\.la at g" \
+        ${worksrcpath}/Makefile.in
+    reinplace "s at -lusb@-lusb-legacy at g" \
+        ${worksrcpath}/Makefile.in
+    reinplace "s@\\(libusb\[^ \]*\\)_la@\\1-legacy_la at g" \
+        ${worksrcpath}/tests/Makefile.in
+    reinplace "s@\\(libusb\[^ \]*\\)\.la@\\1-legacy\.la at g" \
+        ${worksrcpath}/tests/Makefile.in
+
+    # tweak libusb-config binary name
+    reinplace "s at -lusb@-lusb-legacy at g" \
+        ${worksrcpath}/libusb-config.in
+    reinplace "s at libusb-config@libusb-legacy-config at g" \
+        ${worksrcpath}/libusb-config.in
+    file rename ${worksrcpath}/libusb-config.in \
+        ${worksrcpath}/libusb-legacy-config.in
+    reinplace "s at libusb-config@libusb-legacy-config at g" \
+        ${worksrcpath}/Makefile.in
+    reinplace "s at libusb-config@libusb-legacy-config at g" \
+        ${worksrcpath}/configure
+}
+
 configure.args      --disable-build-docs \
                     --libdir=${prefix}/lib/libusb-legacy \
                     --includedir=${prefix}/include/libusb-legacy
+
 post-configure {
     if {[variant_isset universal]} {
         reinplace "s|CC -dynamiclib|CC -dynamiclib ${configure.universal_ldflags}|g" ${worksrcpath}/libtool
     }
 }
 
-post-destroot {
-    file rename ${destroot}${prefix}/bin/libusb-config ${destroot}${prefix}/bin/libusb-legacy-config
-    file rename ${destroot}${prefix}/lib/pkgconfig/libusb.pc ${destroot}${prefix}/lib/pkgconfig/libusb-legacy.pc
-}
-
 livecheck.type      regex
 livecheck.url       http://sourceforge.net/projects/libusb/files/libusb-0.1%20(LEGACY)/
 livecheck.regex     "libusb-(\\d+\\.\\d+\\.\\d+.?)${extract.suffix}"

Deleted: trunk/dports/devel/libusb-legacy/files/patch-configure
===================================================================
--- trunk/dports/devel/libusb-legacy/files/patch-configure	2010-09-01 16:04:49 UTC (rev 71110)
+++ trunk/dports/devel/libusb-legacy/files/patch-configure	2010-09-01 16:19:30 UTC (rev 71111)
@@ -1,11 +0,0 @@
---- configure.orig	2009-08-06 10:27:02.000000000 -0700
-+++ configure	2009-08-06 10:27:16.000000000 -0700
-@@ -21744,7 +21744,7 @@
-   fi
- fi
- # guessing directory to install *.pc into
--pkgconfigdir="${libdir}/pkgconfig"
-+pkgconfigdir="${prefix}/lib/pkgconfig"
- 
- 
- # Check if the user wants to enable documentation
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100901/48d8876e/attachment-0001.html>