From owner-svn-ports-head@FreeBSD.ORG Fri Aug 15 11:23:15 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61F1E8AF; Fri, 15 Aug 2014 11:23:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DC8E201C; Fri, 15 Aug 2014 11:23:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7FBNFER004427; Fri, 15 Aug 2014 11:23:15 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7FBNEjs004424; Fri, 15 Aug 2014 11:23:14 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201408151123.s7FBNEjs004424@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 15 Aug 2014 11:23:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364962 - in head/www/mini_httpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2014 11:23:15 -0000 Author: riggs Date: Fri Aug 15 11:23:14 2014 New Revision: 364962 URL: http://svnweb.freebsd.org/changeset/ports/364962 QAT: https://qat.redports.org/buildarchive/r364962/ Log: - Update to upstream release 1.20 - Add LICENSE Approved by: mentors (implicit) Deleted: head/www/mini_httpd/files/patch-mini_httpd.c Modified: head/www/mini_httpd/Makefile head/www/mini_httpd/distinfo head/www/mini_httpd/files/patch-Makefile Modified: head/www/mini_httpd/Makefile ============================================================================== --- head/www/mini_httpd/Makefile Fri Aug 15 11:04:27 2014 (r364961) +++ head/www/mini_httpd/Makefile Fri Aug 15 11:23:14 2014 (r364962) @@ -2,14 +2,15 @@ # $FreeBSD$ PORTNAME= mini_httpd -PORTVERSION= 1.19 -PORTREVISION= 2 +PORTVERSION= 1.20 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/mini_httpd/ MAINTAINER= ports@FreeBSD.org COMMENT= Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6 +LICENSE= BSD2CLAUSE + OPTIONS_DEFINE= SSL SSL_MAKE_ARGS= -DUSE_OPENSSL Modified: head/www/mini_httpd/distinfo ============================================================================== --- head/www/mini_httpd/distinfo Fri Aug 15 11:04:27 2014 (r364961) +++ head/www/mini_httpd/distinfo Fri Aug 15 11:23:14 2014 (r364962) @@ -1,2 +1,2 @@ -SHA256 (mini_httpd-1.19.tar.gz) = f7f36533b1338ea16d916ea525ea7006ab38fdd3544ac7df93a4688a8e270241 -SIZE (mini_httpd-1.19.tar.gz) = 42063 +SHA256 (mini_httpd-1.20.tar.gz) = 60dfb045c07c993f811eb1024e040b0a2cb392e882c8092905bf719003912730 +SIZE (mini_httpd-1.20.tar.gz) = 43109 Modified: head/www/mini_httpd/files/patch-Makefile ============================================================================== --- head/www/mini_httpd/files/patch-Makefile Fri Aug 15 11:04:27 2014 (r364961) +++ head/www/mini_httpd/files/patch-Makefile Fri Aug 15 11:23:14 2014 (r364962) @@ -1,26 +1,22 @@ ---- Makefile.orig 2002-11-01 23:02:57.000000000 +0000 -+++ Makefile 2010-12-23 14:02:54.000000000 +0000 -@@ -14,17 +14,20 @@ - # http://www.openssl.org/ Make sure the SSL_TREE definition points to the +--- Makefile.orig 2014-08-11 21:13:49.000000000 +0200 ++++ Makefile 2014-08-15 13:12:30.099236617 +0200 +@@ -15,16 +15,16 @@ # tree with your OpenSSL installation - depending on how you installed it, # it may be in /usr/local instead of /usr/local/ssl. -+.ifdef USE_OPENSSL #SSL_TREE = /usr/local/ssl -#SSL_DEFS = -DUSE_SSL +SSL_DEFS = -DUSE_SSL - #SSL_INC = -I${SSL_TREE}/include - #SSL_LIBS = -L${SSL_TREE}/lib -lssl -lcrypto + #SSL_INC = -I$(SSL_TREE)/include +-#SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto +SSL_LIBS = -lssl -lcrypto -+.endif BINDIR = /usr/local/sbin MANDIR = /usr/local/man --CC = gcc -+#CC = gcc - CDEFS = ${SSL_DEFS} ${SSL_INC} --CFLAGS = -O ${CDEFS} -+CFLAGS += ${CDEFS} - #CFLAGS = -g ${CDEFS} + CC = cc + CDEFS = $(SSL_DEFS) $(SSL_INC) +-CFLAGS = -O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long ++CFLAGS += $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long LDFLAGS = -s - #LDFLAGS = -g + LDLIBS = $(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS) +