[33364] trunk/dports/devel/libsockets

[mww at macports.org]

Revision: 33364
          http://trac.macosforge.org/projects/macports/changeset/33364
Author:   mww at macports.org
Date:     2008-01-25 03:16:37 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
version 2.2.8

Modified Paths:
--------------
    trunk/dports/devel/libsockets/Portfile
    trunk/dports/devel/libsockets/files/patch-Makefile

Added Paths:
-----------
    trunk/dports/devel/libsockets/files/configure
    trunk/dports/devel/libsockets/files/patch-Makefile.Defines.macosx

Modified: trunk/dports/devel/libsockets/Portfile
===================================================================
--- trunk/dports/devel/libsockets/Portfile	2008-01-25 08:42:52 UTC (rev 33363)
+++ trunk/dports/devel/libsockets/Portfile	2008-01-25 11:16:37 UTC (rev 33364)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			libsockets
-version			2.2.6
+version			2.2.8
 categories		devel net
 platforms		darwin
 maintainers		mww
@@ -16,8 +16,8 @@
 distfiles		uuid.h:header \
 				Sockets-${version}.tar.gz:tar
 checksums		uuid.h sha1 c466612c98aea27d92423589018e1a69d480c793 \
-				Sockets-${version}.tar.gz sha1 7f1c83003da0eb7be3dd2af42b78bce4d37aa3f7
-patchfiles		patch-Makefile
+				Sockets-${version}.tar.gz sha1 3afa7437a6ff07f604c6bcd5a7132e11fc4fbfa1
+patchfiles		patch-Makefile patch-Makefile.Defines.macosx
 
 depends_lib		port:openssl
 
@@ -26,28 +26,18 @@
 extract.only	Sockets-${version}.tar.gz
 post-extract {
 	file copy ${distpath}/uuid.h ${worksrcpath}
+	xinstall -m 755 ${filespath}/configure ${worksrcpath}
+	xinstall -m 755 ${filespath}/create-dylib.sh ${worksrcpath}
 }
 
-use_configure	no
+configure.env-append	PLATFORM="macosx" PREFIX="\$\(DESTROOT\)${prefix}"
+build.target-append	libSockets.dylib
 
-build.args		PLATFORM=macosx PREFIX=${prefix} INCLUDE="-I${prefix}/include"
-
-post-build {
-	system "cd ${worksrcpath} && \
-		CC=\"g++\" LDFLAGS=\"-L${prefix}/lib -lssl -lcrypto\" \
-		/bin/sh ${filespath}/create-dylib.sh libSockets.a 1.0.0 ${prefix}/lib"
-}
-
-destroot.destdir	PREFIX=${destroot}${prefix}
 post-destroot {
 	xinstall -m 755 -W ${worksrcpath} \
 		libSockets.1.0.0.dylib libSockets.dylib ${destroot}${prefix}/lib
 }
 
-platform darwin 8 {
-	build.args-append	CXX=/usr/bin/g++-4.0
-}
-
 livecheck.check	freshmeat
 livecheck.name	csockets
 

Added: trunk/dports/devel/libsockets/files/configure
===================================================================
--- trunk/dports/devel/libsockets/files/configure	                        (rev 0)
+++ trunk/dports/devel/libsockets/files/configure	2008-01-25 11:16:37 UTC (rev 33364)
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo "PREFIX=${PREFIX}" > Makefile.macports
+echo "CXX=${CXX}" >> Makefile.macports
+echo "INCLUDE=${CPPFLAGS}" >> Makefile.macports
+echo "PLATFORM=${PLATFORM}" >> Makefile.macports
+echo "CFLAGS=${CFLAGS}" >> Makefile.macports
+echo "LDFLAGS=${LDFLAGS}" >> Makefile.macports
+

Modified: trunk/dports/devel/libsockets/files/patch-Makefile
===================================================================
--- trunk/dports/devel/libsockets/files/patch-Makefile	2008-01-25 08:42:52 UTC (rev 33363)
+++ trunk/dports/devel/libsockets/files/patch-Makefile	2008-01-25 11:16:37 UTC (rev 33364)
@@ -1,8 +1,26 @@
---- Makefile	2006-02-24 10:09:20.000000000 +0100
-+++ Makefile	2006-03-02 21:42:33.000000000 +0100
-@@ -102,7 +102,7 @@
+--- Makefile	2007-11-05 00:31:02.000000000 +0100
++++ Makefile	2008-01-25 12:09:39.000000000 +0100
+@@ -13,6 +13,7 @@
+ # include paths
+ INCLUDE =	
+ 
++include		Makefile.macports
+ include		Makefile.version
+ 
+ # CXX, CFLAGS, LIBS
+@@ -39,6 +40,9 @@
+ Sockets-config:	Sockets-config.o
+ 		$(CXX) -o $@ $^
+ 
++libSockets.dylib: libSockets.a
++		CC="$(CXX)" LDFLAGS="$(LDFLAGS) $(LIBS)" ./create-dylib.sh libSockets.a 1.0.0 $(PREFIX)/lib
++
+ clean:
+ 		rm -f *.o *~ slask *.d $(PROGS) *.a */*~
+ 
+@@ -57,7 +61,7 @@
+ 		@mkdir -p $(PREFIX)/lib
  		cp libSockets.a $(PREFIX)/lib
- 		cp libSocketsEx.a $(PREFIX)/lib
  		@mkdir -p $(PREFIX)/include/Sockets
 -		cp -a *.h $(PREFIX)/include/Sockets
 +		cp *.h $(PREFIX)/include/Sockets

Added: trunk/dports/devel/libsockets/files/patch-Makefile.Defines.macosx
===================================================================
--- trunk/dports/devel/libsockets/files/patch-Makefile.Defines.macosx	                        (rev 0)
+++ trunk/dports/devel/libsockets/files/patch-Makefile.Defines.macosx	2008-01-25 11:16:37 UTC (rev 33364)
@@ -0,0 +1,13 @@
+--- Makefile.Defines.macosx	2007-09-29 05:54:39.000000000 +0200
++++ Makefile.Defines.macosx	2008-01-25 12:05:02.000000000 +0100
+@@ -1,10 +1,8 @@
+-CXX =		g++
+ 
+ CFLAGS +=	-Wall -g $(INCLUDE) -MD -D_VERSION='"$(VERSION)"'
+ 
+ # turn off optimization if compiling with gcc 2.9.x:
+ #CFLAGS +=	-O0
+-CFLAGS +=	-O2
+ 
+ 
+ # uncomment depending on your operating system

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080125/2bcf35ca/attachment.html