<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128950] trunk/dports/www/apache</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128950">128950</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2014-11-30 18:41:58 -0800 (Sun, 30 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>apache: fix builds on non-ancients platforms. frankensoftware lives.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwapachePortfile">trunk/dports/www/apache/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwapachefilespatchsrc_Configureremoveflat_namespacediff">trunk/dports/www/apache/files/patch-src_Configure-remove-flat_namespace.diff</a></li>
<li><a href="#trunkdportswwwapachefilespatchsrc_support_htdigest_htpasswd_logresolvecremoverenamestaticgetlinefunctionsdiff">trunk/dports/www/apache/files/patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwapachePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/apache/Portfile (128949 => 128950)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,6 +32,10 @@
</span><span class="cx"> if { ![variant_isset apache_layout] } {
</span><span class="cx"> configure.args-append --with-layout=FreeBSD --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run
</span><span class="cx"> }
</span><ins>+
+ 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
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant apache_layout {
</span></span></pre></div>
<a id="trunkdportswwwapachefilespatchsrc_Configureremoveflat_namespacediff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/apache/files/patch-src_Configure-remove-flat_namespace.diff (0 => 128950)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportswwwapachefilespatchsrc_support_htdigest_htpasswd_logresolvecremoverenamestaticgetlinefunctionsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/apache/files/patch-src_support_htdigest_htpasswd_logresolve.c-remove-rename-static-getline-functions.diff (0 => 128950)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+--- 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++;
</ins></span></pre>
</div>
</div>
</body>
</html>