[63304] trunk/dports/devel/fbopenssl
ryandesign at macports.org
ryandesign at macports.org
Mon Feb 1 05:38:45 PST 2010
Revision: 63304
http://trac.macports.org/changeset/63304
Author: ryandesign at macports.org
Date: 2010-02-01 05:38:43 -0800 (Mon, 01 Feb 2010)
Log Message:
-----------
fbopenssl: ensure we're UsingTheRightCompiler; rework how things are patched and installed
Modified Paths:
--------------
trunk/dports/devel/fbopenssl/Portfile
Added Paths:
-----------
trunk/dports/devel/fbopenssl/files/patch-Makefile-Darwin.diff
trunk/dports/devel/fbopenssl/files/patch-Makefile.diff
Removed Paths:
-------------
trunk/dports/devel/fbopenssl/files/patch-Makefile
Modified: trunk/dports/devel/fbopenssl/Portfile
===================================================================
--- trunk/dports/devel/fbopenssl/Portfile 2010-02-01 13:25:03 UTC (rev 63303)
+++ trunk/dports/devel/fbopenssl/Portfile 2010-02-01 13:38:43 UTC (rev 63304)
@@ -18,23 +18,22 @@
worksrcdir ${name}
-patchfiles
+patchfiles patch-Makefile.diff
-post-patch {
- reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile
+set shared_ext .so
+platform darwin {
+ set shared_ext .dylib
+ patchfiles-append patch-Makefile-Darwin.diff
+ build.args-append PREFIX=${prefix}
}
use_configure no
-build.args CFG=release OPENSSLDIR=${prefix}
+build.args CC=${configure.cc} CFG=release OPENSSLDIR=${prefix}
destroot {
- xinstall ${worksrcpath}/[exec uname]-release/libfbopenssl.a \
- ${destroot}${prefix}/lib
- xinstall ${worksrcpath}/[exec uname]-release/libfbopenssl.dylib \
- ${destroot}${prefix}/lib
+ xinstall -m 644 -W ${worksrcpath}/[exec uname]-release \
+ libfbopenssl.a \
+ libfbopenssl${shared_ext} \
+ ${destroot}${prefix}/lib
}
-
-platform darwin {
- patchfiles-append patch-Makefile
-}
Deleted: trunk/dports/devel/fbopenssl/files/patch-Makefile
===================================================================
--- trunk/dports/devel/fbopenssl/files/patch-Makefile 2010-02-01 13:25:03 UTC (rev 63303)
+++ trunk/dports/devel/fbopenssl/files/patch-Makefile 2010-02-01 13:38:43 UTC (rev 63304)
@@ -1,26 +0,0 @@
---- Makefile.orig 2005-04-25 13:58:19.000000000 -0700
-+++ Makefile 2005-09-06 13:30:06.000000000 -0700
-@@ -28,12 +28,12 @@
- DIRMADE = $(ARCH)-made
-
- LIB = $(ARCH)/libfbopenssl.a
--SLIB = $(ARCH)/libfbopenssl.so
-+SLIB = $(ARCH)/libfbopenssl.dylib
-
- # If OpenSSL has been installed, append /lib to OPENSSLDIR in the following
- # statement (i.e., use $(OPENSSLDIR)/lib).
-
--SSLLIB = -Wl,-R$(OPENSSLDIR) -L$(OPENSSLDIR) -lcrypto
-+SSLLIB = -L$(OPENSSLDIR)/lib -lcrypto
-
- OBJS = $(ARCH)/asn1help.o \
- $(ARCH)/filehelp.o \
-@@ -48,7 +48,7 @@
- ar -r $(LIB) $(OBJS)
-
- $(SLIB): $(OBJS)
-- gcc -shared -o $(SLIB) $(OBJS) $(SSLLIB)
-+ gcc -dynamiclib -install_name __PREFIX__/lib/libfbopenssl.dylib -o $(SLIB) $(OBJS) $(SSLLIB)
-
- $(ARCH)/asn1help.o: src/asn1/asn1help.c
- gcc -c $(CFLAGS) src/asn1/asn1help.c -I$(OPENSSLDIR)/include -o $@
Copied: trunk/dports/devel/fbopenssl/files/patch-Makefile-Darwin.diff (from rev 61634, trunk/dports/devel/fbopenssl/files/patch-Makefile)
===================================================================
--- trunk/dports/devel/fbopenssl/files/patch-Makefile-Darwin.diff (rev 0)
+++ trunk/dports/devel/fbopenssl/files/patch-Makefile-Darwin.diff 2010-02-01 13:38:43 UTC (rev 63304)
@@ -0,0 +1,26 @@
+--- Makefile.orig 2005-04-25 13:58:19.000000000 -0700
++++ Makefile 2005-09-06 13:30:06.000000000 -0700
+@@ -28,12 +28,12 @@
+ DIRMADE = $(ARCH)-made
+
+ LIB = $(ARCH)/libfbopenssl.a
+-SLIB = $(ARCH)/libfbopenssl.so
++SLIB = $(ARCH)/libfbopenssl.dylib
+
+ # If OpenSSL has been installed, append /lib to OPENSSLDIR in the following
+ # statement (i.e., use $(OPENSSLDIR)/lib).
+
+-SSLLIB = -Wl,-R$(OPENSSLDIR)/lib -L$(OPENSSLDIR)/lib -lcrypto
++SSLLIB = -L$(OPENSSLDIR)/lib -lcrypto
+
+ OBJS = $(ARCH)/asn1help.o \
+ $(ARCH)/filehelp.o \
+@@ -48,7 +48,7 @@
+ ar -r $(LIB) $(OBJS)
+
+ $(SLIB): $(OBJS)
+- $(CC) -shared -o $(SLIB) $(OBJS) $(SSLLIB)
++ $(CC) -dynamiclib -install_name $(PREFIX)/lib/libfbopenssl.dylib -o $(SLIB) $(OBJS) $(SSLLIB)
+
+ $(ARCH)/asn1help.o: src/asn1/asn1help.c
+ $(CC) -c $(CFLAGS) src/asn1/asn1help.c -I$(OPENSSLDIR)/include -o $@
Added: trunk/dports/devel/fbopenssl/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/fbopenssl/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/devel/fbopenssl/files/patch-Makefile.diff 2010-02-01 13:38:43 UTC (rev 63304)
@@ -0,0 +1,44 @@
+--- Makefile.orig 2005-04-25 15:58:19.000000000 -0500
++++ Makefile 2009-12-17 07:22:30.000000000 -0600
+@@ -33,7 +33,7 @@
+ # If OpenSSL has been installed, append /lib to OPENSSLDIR in the following
+ # statement (i.e., use $(OPENSSLDIR)/lib).
+
+-SSLLIB = -Wl,-R$(OPENSSLDIR) -L$(OPENSSLDIR) -lcrypto
++SSLLIB = -Wl,-R$(OPENSSLDIR)/lib -L$(OPENSSLDIR)/lib -lcrypto
+
+ OBJS = $(ARCH)/asn1help.o \
+ $(ARCH)/filehelp.o \
+@@ -48,25 +48,25 @@
+ ar -r $(LIB) $(OBJS)
+
+ $(SLIB): $(OBJS)
+- gcc -shared -o $(SLIB) $(OBJS) $(SSLLIB)
++ $(CC) -shared -o $(SLIB) $(OBJS) $(SSLLIB)
+
+ $(ARCH)/asn1help.o: src/asn1/asn1help.c
+- gcc -c $(CFLAGS) src/asn1/asn1help.c -I$(OPENSSLDIR)/include -o $@
++ $(CC) -c $(CFLAGS) src/asn1/asn1help.c -I$(OPENSSLDIR)/include -o $@
+
+ $(ARCH)/filehelp.o: src/file/filehelp.c
+- gcc -c $(CFLAGS) src/file/filehelp.c -o $@
++ $(CC) -c $(CFLAGS) src/file/filehelp.c -o $@
+
+ $(ARCH)/gssapi.o: src/gssapi/gssapi.c
+- gcc -c $(CFLAGS) src/gssapi/gssapi.c -I$(OPENSSLDIR)/include -o $@
++ $(CC) -c $(CFLAGS) src/gssapi/gssapi.c -I$(OPENSSLDIR)/include -o $@
+
+ $(ARCH)/krb5help.o: src/krb5/krb5help.c
+- gcc -c $(CFLAGS) src/krb5/krb5help.c -I$(OPENSSLDIR)/include -o $@
++ $(CC) -c $(CFLAGS) src/krb5/krb5help.c -I$(OPENSSLDIR)/include -o $@
+
+ $(ARCH)/spnego.o: src/spnego/spnego.c
+- gcc -c $(CFLAGS) src/spnego/spnego.c -I$(OPENSSLDIR)/include -o $@
++ $(CC) -c $(CFLAGS) src/spnego/spnego.c -I$(OPENSSLDIR)/include -o $@
+
+ $(ARCH)/spnegohelp.o: src/spnego/spnegohelp.c
+- gcc -c $(CFLAGS) src/spnego/spnegohelp.c -I$(OPENSSLDIR)/include -o $@
++ $(CC) -c $(CFLAGS) src/spnego/spnegohelp.c -I$(OPENSSLDIR)/include -o $@
+
+ $(OBJS): $(DIRMADE)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100201/a8cfa9f0/attachment.html>
More information about the macports-changes
mailing list