svn commit: r386861 - in head/www/thttpd: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed May 20 15:15:05 2015
New Revision: 386861
URL: https://svnweb.freebsd.org/changeset/ports/386861

Log:
  - Fix patch after rerolled distfile [1]
  - Mark MAKE_JOBS_UNSAFE, tries to use object file before it's built (cc: match.o: No such file or directory)
  
  Suggested by:	adamw [1]
  Approved by:	portmgr blanket

Modified:
  head/www/thttpd/Makefile
  head/www/thttpd/files/patch-mmc.c

Modified: head/www/thttpd/Makefile
==============================================================================
--- head/www/thttpd/Makefile	Wed May 20 14:29:41 2015	(r386860)
+++ head/www/thttpd/Makefile	Wed May 20 15:15:05 2015	(r386861)
@@ -20,6 +20,8 @@ SUB_FILES=	pkg-message thttpd.conf.sampl
 SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 CPE_VENDOR=	acme
 
+MAKE_JOBS_UNSAFE=	yes
+
 OPTIONS_DEFINE=	SENDFILE IPREAL INDEXES
 OPTIONS_DEFAULT=	SENDFILE IPREAL
 

Modified: head/www/thttpd/files/patch-mmc.c
==============================================================================
--- head/www/thttpd/files/patch-mmc.c	Wed May 20 14:29:41 2015	(r386860)
+++ head/www/thttpd/files/patch-mmc.c	Wed May 20 15:15:05 2015	(r386861)
@@ -1,6 +1,6 @@
---- mmc.c.orig	Tue Oct 22 09:42:01 2002
-+++ mmc.c	Fri Nov 14 12:26:39 2003
-@@ -83,6 +83,9 @@
+--- mmc.c.orig	2014-12-10 20:53:22 UTC
++++ mmc.c
+@@ -83,6 +83,9 @@ typedef struct MapStruct {
      time_t ct;
      int refcount;
      time_t reftime;
@@ -10,7 +10,7 @@
      void* addr;
      unsigned int hash;
      int hash_idx;
-@@ -149,7 +152,11 @@
+@@ -149,7 +152,11 @@ mmc_map( char* filename, struct stat* sb
  	/* Yep.  Just return the existing map */
  	++m->refcount;
  	m->reftime = now;
@@ -22,7 +22,7 @@
  	}
  
      /* Open the file. */
-@@ -195,7 +202,9 @@
+@@ -195,7 +202,9 @@ mmc_map( char* filename, struct stat* sb
      else
  	{
  	size_t size_size = (size_t) m->size;	/* loses on files >2GB */
@@ -33,7 +33,7 @@
  	/* Map the file into memory. */
  	m->addr = mmap( 0, size_size, PROT_READ, MAP_PRIVATE, fd, 0 );
  	if ( m->addr == (void*) -1 && errno == ENOMEM )
-@@ -243,8 +252,9 @@
+@@ -243,8 +252,9 @@ mmc_map( char* filename, struct stat* sb
  	    }
  #endif /* HAVE_MMAP */
  	}
@@ -44,7 +44,7 @@
      /* Put the Map into the hash table. */
      if ( add_hash( m ) < 0 )
  	{
-@@ -262,8 +272,12 @@
+@@ -262,8 +272,12 @@ mmc_map( char* filename, struct stat* sb
      /* Update the total byte count. */
      mapped_bytes += m->size;
  
@@ -57,7 +57,7 @@
      }
  
  
-@@ -276,14 +290,18 @@
+@@ -276,14 +290,18 @@ mmc_unmap( void* addr, struct stat* sbP,
      if ( sbP != (struct stat*) 0 )
  	{
  	m = find_hash( sbP->st_ino, sbP->st_dev, sbP->st_size, sbP->st_ctime );
@@ -76,7 +76,7 @@
      if ( m == (Map*) 0 )
  	syslog( LOG_ERR, "mmc_unmap failed to find entry!" );
      else if ( m->refcount <= 0 )
-@@ -372,7 +390,9 @@
+@@ -372,7 +390,9 @@ really_unmap( Map** mm )
      m = *mm;
      if ( m->size != 0 )
  	{
@@ -87,12 +87,12 @@
  	if ( munmap( m->addr, m->size ) < 0 )
  	    syslog( LOG_ERR, "munmap - %m" );
  #else /* HAVE_MMAP */
-@@ -523,7 +543,7 @@
+@@ -523,7 +543,7 @@ void
  mmc_logstats( long secs )
      {
      syslog(
--	LOG_INFO, "  map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %ld",
-+	LOG_INFO, "  map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %d",
+-	LOG_NOTICE, "  map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %ld",
++	LOG_NOTICE, "  map cache - %d allocated, %d active (%lld bytes), %d free; hash size: %d; expire age: %d",
  	alloc_count, map_count, (long long) mapped_bytes, free_count, hash_size,
  	expire_age );
      if ( map_count + free_count != alloc_count )