From owner-svn-ports-head@freebsd.org Wed Jan 11 04:57:43 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEE18CAAF7F; Wed, 11 Jan 2017 04:57:43 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 BA35A1F12; Wed, 11 Jan 2017 04:57:43 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0B4vgGp075075; Wed, 11 Jan 2017 04:57:42 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B4vg4g075072; Wed, 11 Jan 2017 04:57:42 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201701110457.v0B4vg4g075072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Wed, 11 Jan 2017 04:57:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431157 - head/www/obhttpd 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.23 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: Wed, 11 Jan 2017 04:57:44 -0000 Author: ler Date: Wed Jan 11 04:57:42 2017 New Revision: 431157 URL: https://svnweb.freebsd.org/changeset/ports/431157 Log: upgrade www/obhttpd to 6.0.20161006 modernized the Uses / USE_OPENSSL usage PR: 213560 Submitted by: koue@chaosophia.net (Maintainer) Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D9128 Added: head/www/obhttpd/pkg-plist (contents, props changed) Modified: head/www/obhttpd/Makefile head/www/obhttpd/distinfo Modified: head/www/obhttpd/Makefile ============================================================================== --- head/www/obhttpd/Makefile Wed Jan 11 03:04:41 2017 (r431156) +++ head/www/obhttpd/Makefile Wed Jan 11 04:57:42 2017 (r431157) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= obhttpd -PORTVERSION= 5.9.20160601 +PORTVERSION= 6.0.20161006 CATEGORIES= www MAINTAINER= koue@chaosophia.net @@ -9,17 +9,14 @@ COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE -WRKSRC_SUBDIR= src/usr.sbin/${GH_PROJECT} +WRKSRC_SUBDIR= src USE_GITHUB= yes GH_ACCOUNT= koue GH_PROJECT= httpd -USE_OPENSSL= yes USE_RC_SUBR= obhttpd -USES= uidfix - -WITH_OPENSSL_PORT=yes +USES= ssl uidfix CFLAGS+= -Wall @@ -28,29 +25,26 @@ MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR USERS= www GROUPS= www -PLIST_FILES= sbin/obhttpd \ - man/man5/obhttpd.conf.5.gz \ - man/man7/patterns.7.gz \ - man/man8/obhttpd.8.gz \ - etc/obhttpd.conf.sample - post-patch: ${REINPLACE_CMD} -e 's|httpd$$|obhttpd|g' \ -e 's|httpd.conf.5|obhttpd.conf.5|g' \ - -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/Makefile - ${MV} ${WRKSRC}/httpd.conf.5 ${WRKSRC}/obhttpd.conf.5 - ${MV} ${WRKSRC}/httpd.8 ${WRKSRC}/obhttpd.8 + -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} -e 's|htpasswd$$|obhtpasswd|g' \ + -e 's|htpasswd.1|obhtpasswd.1|g' ${WRKSRC}/usr.bin/htpasswd/Makefile + ${MV} ${WRKSRC}/usr.bin/htpasswd/htpasswd.1 ${WRKSRC}/usr.bin/htpasswd/obhtpasswd.1 + ${MV} ${WRKSRC}/usr.sbin/httpd/httpd.conf.5 ${WRKSRC}/usr.sbin/httpd/obhttpd.conf.5 + ${MV} ${WRKSRC}/usr.sbin/httpd/httpd.8 ${WRKSRC}/usr.sbin/httpd/obhttpd.8 ${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \ - ${WRKSRC}/httpd.h + ${WRKSRC}/usr.sbin/httpd/httpd.h post-install: - ${INSTALL_DATA} ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/etc/examples/httpd.conf \ + ${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \ ${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample .include .if empty(SSL_DEFAULT:Mlibressl*) -IGNORE= Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything. +IGNORE= needs LibreSSL to build. Set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything .endif .include Modified: head/www/obhttpd/distinfo ============================================================================== --- head/www/obhttpd/distinfo Wed Jan 11 03:04:41 2017 (r431156) +++ head/www/obhttpd/distinfo Wed Jan 11 04:57:42 2017 (r431157) @@ -1,2 +1,3 @@ -SHA256 (koue-httpd-5.9.20160601_GH0.tar.gz) = 8eaac48547dcffb656ffe707d6788b526ef34388a2691e0046ca41b96ec92a6c -SIZE (koue-httpd-5.9.20160601_GH0.tar.gz) = 147571 +TIMESTAMP = 1476701489 +SHA256 (koue-httpd-6.0.20161006_GH0.tar.gz) = 5b26a697db0095ff06469c2005bd4c8e65b1a23c667e69b03a47b221128c7225 +SIZE (koue-httpd-6.0.20161006_GH0.tar.gz) = 162396 Added: head/www/obhttpd/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/obhttpd/pkg-plist Wed Jan 11 04:57:42 2017 (r431157) @@ -0,0 +1,7 @@ +@sample etc/obhttpd.conf.sample +man/man1/obhtpasswd.1.gz +man/man5/obhttpd.conf.5.gz +man/man7/patterns.7.gz +man/man8/obhttpd.8.gz +sbin/obhtpasswd +sbin/obhttpd