[46773] trunk/dports/archivers/bzip2
mcalhoun at macports.org
mcalhoun at macports.org
Thu Feb 12 11:20:28 PST 2009
Revision: 46773
http://trac.macports.org/changeset/46773
Author: mcalhoun at macports.org
Date: 2009-02-12 11:20:25 -0800 (Thu, 12 Feb 2009)
Log Message:
-----------
bzip2: Ensure that library name and current_version value have the correct version number.
Previously, using cp in Makefile, dynamic libraries which were intended to be soft links were not.
Modified Paths:
--------------
trunk/dports/archivers/bzip2/Portfile
trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff
Modified: trunk/dports/archivers/bzip2/Portfile
===================================================================
--- trunk/dports/archivers/bzip2/Portfile 2009-02-12 18:54:46 UTC (rev 46772)
+++ trunk/dports/archivers/bzip2/Portfile 2009-02-12 19:20:25 UTC (rev 46773)
@@ -4,7 +4,7 @@
name bzip2
version 1.0.5
-revision 1
+revision 2
platforms darwin freebsd linux sunos
categories archivers sysutils
maintainers ryandesign openmaintainer
@@ -31,6 +31,19 @@
platform darwin {
patchfiles-append patch-Makefile-dylib.diff
+
+ post-patch {
+ reinplace "s|__MacPorts_Version__|${version}|g" \
+ ${worksrcpath}/Makefile
+ reinplace "s|__MacPorts_Compatibility_Version__|[join [lrange [split ${version} .] 0 1] .]|g" \
+ ${worksrcpath}/Makefile
+ }
+
+ post-destroot {
+ ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.[join [lrange [split ${version} .] 0 1] .].dylib
+ ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.[join [lrange [split ${version} .] 0 0] .].dylib
+ ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.dylib
+ }
}
platform freebsd {
Modified: trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff
===================================================================
--- trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff 2009-02-12 18:54:46 UTC (rev 46772)
+++ trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff 2009-02-12 19:20:25 UTC (rev 46773)
@@ -9,18 +9,15 @@
bzip2: libbz2.a bzip2.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-@@ -52,15 +52,24 @@
+@@ -52,15 +52,21 @@
$(RANLIB) libbz2.a ; \
fi
+libbz2.dylib: $(OBJS)
+ rm -f libbz2.dylib
-+ $(CC) -dynamiclib $(OBJS) -o libbz2.1.0.4.dylib \
-+ -install_name $(PREFIX)/lib/libbz2.1.0.dylib \
-+ -compatibility_version 1.0 -current_version 1.0.4
-+ ln -s libbz2.1.0.4.dylib libbz2.1.0.dylib
-+ ln -s libbz2.1.0.dylib libbz2.1.dylib
-+ ln -s libbz2.1.dylib libbz2.dylib
++ $(CC) -dynamiclib $(OBJS) -o libbz2.__MacPorts_Version__.dylib \
++ -install_name $(PREFIX)/lib/libbz2.__MacPorts_Compatibility_Version__.dylib \
++ -compatibility_version __MacPorts_Compatibility_Version__ -current_version __MacPorts_Version__
+
check: test
test: bzip2
@@ -40,15 +37,11 @@
cmp sample1.bz2 sample1.rb2
cmp sample2.bz2 sample2.rb2
cmp sample3.bz2 sample3.rb2
-@@ -89,6 +98,11 @@
+@@ -89,6 +98,7 @@
chmod a+r $(PREFIX)/include/bzlib.h
cp -f libbz2.a $(PREFIX)/lib
chmod a+r $(PREFIX)/lib/libbz2.a
-+ cp -f libbz2.1.0.4.dylib $(PREFIX)/lib
-+ chmod a+r $(PREFIX)/lib/libbz2.a
-+ cp -f libbz2.1.0.dylib $(PREFIX)/lib
-+ cp -f libbz2.1.dylib $(PREFIX)/lib
-+ cp -f libbz2.dylib $(PREFIX)/lib
++ cp -f libbz2.__MacPorts_Version__.dylib $(PREFIX)/lib
cp -f bzgrep $(PREFIX)/bin/bzgrep
ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090212/77b7eea4/attachment.html>
More information about the macports-changes
mailing list