[128950] trunk/dports/www/apache

[ionic at macports.org]

Revision: 128950
          https://trac.macports.org/changeset/128950
Author:   ionic at macports.org
Date:     2014-11-30 18:41:58 -0800 (Sun, 30 Nov 2014)
Log Message:
-----------
apache: fix builds on non-ancients platforms. frankensoftware lives.

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

Added Paths:
-----------
    trunk/dports/www/apache/files/patch-src_Configure-remove-flat_namespace.diff
    trunk/dports/www/apache/files/patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff

Modified: trunk/dports/www/apache/Portfile
===================================================================
--- trunk/dports/www/apache/Portfile	2014-12-01 02:07:13 UTC (rev 128949)
+++ trunk/dports/www/apache/Portfile	2014-12-01 02:41:58 UTC (rev 128950)
@@ -32,6 +32,10 @@
 	if { ![variant_isset apache_layout] } {
 		configure.args-append	--with-layout=FreeBSD  --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run
 	}
+
+    patchfiles              patch-src_Configure-remove-flat_namespace.diff \
+                            patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff
+    configure.cflags-append -std=c89
 }
 
 variant apache_layout {

Added: trunk/dports/www/apache/files/patch-src_Configure-remove-flat_namespace.diff
===================================================================
--- trunk/dports/www/apache/files/patch-src_Configure-remove-flat_namespace.diff	                        (rev 0)
+++ trunk/dports/www/apache/files/patch-src_Configure-remove-flat_namespace.diff	2014-12-01 02:41:58 UTC (rev 128950)
@@ -0,0 +1,15 @@
+--- src/Configure.old
++++ src/Configure
+@@ -1146,11 +1146,8 @@
+ 	    LD_SHLIB="cc"
+ 	    CFLAGS_SHLIB=""
+ 	    case "$PLAT" in
+-		*-apple-rhapsody* | *-apple-darwin1.[0-3]* )
+-		    LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress'
+-		    ;;
+ 		* )
+-		    LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress -flat_namespace'
++		    LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined dynamic_lookup'
+ 		    ;;
+ 	    esac
+ 	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB

Added: trunk/dports/www/apache/files/patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff
===================================================================
--- trunk/dports/www/apache/files/patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff	                        (rev 0)
+++ trunk/dports/www/apache/files/patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff	2014-12-01 02:41:58 UTC (rev 128950)
@@ -0,0 +1,78 @@
+--- src/support/htdigest.c.old
++++ src/support/htdigest.c
+@@ -71,7 +71,7 @@
+     while ((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f)
++static int htdigest_getline(char *s, int n, FILE *f)
+ {
+     register int i = 0;
+ 
+@@ -158,7 +158,7 @@
+ {
+     static char line[MAX_STRING_LEN];
+ 
+-    while (!(getline(line, MAX_STRING_LEN, source))) {  
++    while (!(htdigest_getline(line, MAX_STRING_LEN, source))) {  
+ 	putline(target, line);
+     }
+ }
+@@ -216,7 +216,7 @@
+     ap_cpystrn(realm, argv[2], sizeof(realm));
+ 
+     found = 0;
+-    while (!(getline(line, MAX_STRING_LEN, f))) {
++    while (!(htdigest_getline(line, MAX_STRING_LEN, f))) {
+ 	if (found || (line[0] == '#') || (!line[0])) {
+ 	    putline(tfp, line);
+ 	    continue;
+--- src/support/htpasswd.c.old
++++ src/support/htpasswd.c
+@@ -98,7 +98,7 @@
+  * Get a line of input from the user, not including any terminating
+  * newline.
+  */
+-static int getline(char *s, int n, FILE *f)
++static int htpasswd_getline(char *s, int n, FILE *f)
+ {
+     register int i = 0;
+ 
+@@ -547,7 +547,7 @@
+ 	char scratch[MAX_STRING_LEN];
+ 
+ 	fpw = fopen(pwfilename, "r");
+-	while (! (getline(line, sizeof(line), fpw))) {
++	while (! (htpasswd_getline(line, sizeof(line), fpw))) {
+ 	    char *colon;
+ 
+ 	    if ((line[0] == '#') || (line[0] == '\0')) {
+--- src/support/logresolve.c.old
++++ src/support/logresolve.c
+@@ -71,7 +71,7 @@
+ #endif /* !MPE && !WIN32*/
+ 
+ static void cgethost(struct in_addr ipnum, char *string, int check);
+-static int getline(char *s, int n);
++static int logresolve_getline(char *s, int n);
+ static void stats(FILE *output);
+ 
+ 
+@@ -278,7 +278,7 @@
+  * gets a line from stdin
+  */
+ 
+-static int getline (char *s, int n)
++static int logresolve_getline (char *s, int n)
+ {
+     char *cp;
+ 
+@@ -326,7 +326,7 @@
+     for (i = 0; i < MAX_ERR + 2; i++)
+ 	errors[i] = 0;
+ 
+-    while (getline(line, MAXLINE)) {
++    while (logresolve_getline(line, MAXLINE)) {
+ 	if (line[0] == '\0')
+ 	    continue;
+ 	entries++;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141130/43e0c21e/attachment.html>