[56179] trunk/dports/security/ctool

[ryandesign at macports.org]

Revision: 56179
          http://trac.macports.org/changeset/56179
Author:   ryandesign at macports.org
Date:     2009-08-24 22:12:04 -0700 (Mon, 24 Aug 2009)
Log Message:
-----------
ctool: use MacPorts curl and openssl

Modified Paths:
--------------
    trunk/dports/security/ctool/Portfile
    trunk/dports/security/ctool/files/patch-Makefile

Added Paths:
-----------
    trunk/dports/security/ctool/files/patch-ctool.c

Modified: trunk/dports/security/ctool/Portfile
===================================================================
--- trunk/dports/security/ctool/Portfile	2009-08-25 04:53:21 UTC (rev 56178)
+++ trunk/dports/security/ctool/Portfile	2009-08-25 05:12:04 UTC (rev 56179)
@@ -4,6 +4,7 @@
 
 name			ctool
 version			1.2.3
+revision		1
 categories		security
 maintainers		nomaintainer
 description		ctool is a checksumming application.
@@ -13,9 +14,15 @@
 master_sites		http://web.archive.org/web/20050405212926/http://www.macsecurity.org/data/
 checksums	md5 	ae041e804743924e4fdc95e53645f64a
 platforms		darwin
-patchfiles		patch-Makefile
+depends_lib		port:openssl \
+			port:curl
+patchfiles		patch-Makefile \
+			patch-ctool.c
 configure		{}
-build.env		CC=${configure.cc}
+build.env		CC=${configure.cc} \
+			CFLAGS=${configure.cflags} \
+			CPPFLAGS=${configure.cppflags} \
+			LDFLAGS=${configure.ldflags}
 destroot.env		${build.env}
 post-configure		{ reinplace "s|/usr/local|${destroot}${prefix}|g" \
 				${worksrcpath}/Makefile }

Modified: trunk/dports/security/ctool/files/patch-Makefile
===================================================================
--- trunk/dports/security/ctool/files/patch-Makefile	2009-08-25 04:53:21 UTC (rev 56178)
+++ trunk/dports/security/ctool/files/patch-Makefile	2009-08-25 05:12:04 UTC (rev 56179)
@@ -1,10 +1,10 @@
 --- Makefile.orig	2003-04-28 08:13:54.000000000 -0500
-+++ Makefile	2009-08-24 22:59:49.000000000 -0500
++++ Makefile	2009-08-25 00:04:00.000000000 -0500
 @@ -1,16 +1,16 @@
  
  all: safe_string.o ctool.o 
 -	cc -o ctool safe_string.o ctool.o -lcurl -lssl -lcrypto
-+	$(CC) -o ctool safe_string.o ctool.o -lcurl -lssl -lcrypto
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ctool safe_string.o ctool.o -lcurl -lssl -lcrypto
  
  install: all
  	/bin/mkdir -p /usr/local/bin
@@ -12,11 +12,11 @@
  
  safe_string.o: safe_string.h safe_string.c
 -	cc -c safe_string.c
-+	$(CC) -c safe_string.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c safe_string.c
  
  ctool.o: ctool.h ctool.c
 -	cc -c ctool.c
-+	$(CC) -c ctool.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c ctool.c
  
  clean:
  	rm -rf *.o

Added: trunk/dports/security/ctool/files/patch-ctool.c
===================================================================
--- trunk/dports/security/ctool/files/patch-ctool.c	                        (rev 0)
+++ trunk/dports/security/ctool/files/patch-ctool.c	2009-08-25 05:12:04 UTC (rev 56179)
@@ -0,0 +1,11 @@
+--- ctool.c.orig	2004-04-02 08:39:45.000000000 -0600
++++ ctool.c	2009-08-25 00:10:15.000000000 -0500
+@@ -779,7 +779,7 @@
+         safe_strlcat( kg_get_url, file_hash, sizeof( kg_get_url ) );
+ 
+         curl_easy_setopt( curl, CURLOPT_URL, kg_get_url );
+-        curl_easy_setopt( curl, CURLOPT_NOPROGRESS );
++        curl_easy_setopt( curl, CURLOPT_NOPROGRESS, 1 );
+ 
+         response = curl_easy_perform( curl );
+         curl_easy_cleanup( curl );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090824/321f7f9d/attachment.html>