[110997] trunk/dports/www/mathopd

[jmr at macports.org]

Revision: 110997
          https://trac.macports.org/changeset/110997
Author:   jmr at macports.org
Date:     2013-09-12 17:25:26 -0700 (Thu, 12 Sep 2013)
Log Message:
-----------
mathopd: set license, fix getline conflict, pass CC and flags to makefile

Modified Paths:
--------------
    trunk/dports/www/mathopd/Portfile

Added Paths:
-----------
    trunk/dports/www/mathopd/files/
    trunk/dports/www/mathopd/files/getline.diff

Modified: trunk/dports/www/mathopd/Portfile
===================================================================
--- trunk/dports/www/mathopd/Portfile	2013-09-13 00:05:33 UTC (rev 110996)
+++ trunk/dports/www/mathopd/Portfile	2013-09-13 00:25:26 UTC (rev 110997)
@@ -1,9 +1,11 @@
 # $Id$
 
 PortSystem 1.0
+
 name             mathopd
 version          1.5p4
 categories       www
+license          BSD
 maintainers      nomaintainer
 description      small, yet very fast HTTP server
 long_description \
@@ -17,12 +19,17 @@
 checksums        md5 38b7bfd66b4bd18d4cb41b4ce4703e58
 worksrcdir       ${distname}/src
 
-patch {
+patchfiles       getline.diff
+post-patch {
     reinplace "s|LIBS = -lcrypt||" ${worksrcpath}/Makefile
 }
 
 use_configure    no
 
+build.args       CC="${configure.cc}" \
+                 CFLAGS="${configure.cflags} ${configure.cc_archflags} -Wall -Wextra" \
+                 LDFLAGS="${configure.ld_archflags}"
+
 destroot.destdir PREFIX=${destroot}${prefix}
 post-destroot {
     file mkdir ${destroot}${prefix}/share/doc

Added: trunk/dports/www/mathopd/files/getline.diff
===================================================================
--- trunk/dports/www/mathopd/files/getline.diff	                        (rev 0)
+++ trunk/dports/www/mathopd/files/getline.diff	2013-09-13 00:25:26 UTC (rev 110997)
@@ -0,0 +1,29 @@
+--- request.c.orig	2004-11-28 01:26:46.000000000 +1100
++++ request.c	2013-09-13 10:22:02.000000000 +1000
+@@ -209,7 +209,7 @@ char *rfctime(time_t t, char *buf)
+ 	return buf;
+ }
+ 
+-static char *getline(struct pool *p, int fold)
++static char *private_getline(struct pool *p, int fold)
+ {
+ 	char *s, *olds, *sp, *end;
+ 	int f;
+@@ -1090,7 +1090,7 @@ static int process_headers(struct reques
+ 	unsigned long cl;
+ 
+ 	do {
+-		l = getline(&r->cn->header_input, 0);
++		l = private_getline(&r->cn->header_input, 0);
+ 		if (l == 0)
+ 			return -1;
+ 	} while (*l == 0);
+@@ -1119,7 +1119,7 @@ static int process_headers(struct reques
+ 	if (r->protocol_major && r->protocol_minor)
+ 		r->cn->keepalive = 1;
+ 	n = 0;
+-	while ((l = getline(&r->cn->header_input, 1)) != 0) {
++	while ((l = private_getline(&r->cn->header_input, 1)) != 0) {
+ 		s = strchr(l, ':');
+ 		if (s == 0)
+ 			continue;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130912/8b57a98d/attachment.html>