From owner-svn-ports-all@freebsd.org Sun Dec 6 15:41:38 2015 Return-Path: Delivered-To: svn-ports-all@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 E6EBB99A74C; Sun, 6 Dec 2015 15:41:38 +0000 (UTC) (envelope-from riggs@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 9C5BA17DF; Sun, 6 Dec 2015 15:41:38 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB6FfbMa034053; Sun, 6 Dec 2015 15:41:37 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB6FfbJo034051; Sun, 6 Dec 2015 15:41:37 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201512061541.tB6FfbJo034051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 6 Dec 2015 15:41:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403117 - in head/www: . httpd 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2015 15:41:39 -0000 Author: riggs Date: Sun Dec 6 15:41:37 2015 New Revision: 403117 URL: https://svnweb.freebsd.org/changeset/ports/403117 Log: Move www/httpd to www/openhttpd to avoid consistency issues - Move to www/obhttpd - Avoid config file name conflict: httpd.conf -> obhttpd.conf PR: 198705 Added: head/www/obhttpd/ - copied from r403116, head/www/httpd/ Deleted: head/www/httpd/ Modified: head/www/Makefile head/www/obhttpd/Makefile Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sun Dec 6 14:52:27 2015 (r403116) +++ head/www/Makefile Sun Dec 6 15:41:37 2015 (r403117) @@ -334,7 +334,6 @@ SUBDIR += httpasyncclient SUBDIR += httpclient SUBDIR += httpcore - SUBDIR += httpd SUBDIR += httpie SUBDIR += httpsqs SUBDIR += httptunnel @@ -570,6 +569,7 @@ SUBDIR += npm SUBDIR += npm012 SUBDIR += nspluginwrapper + SUBDIR += obhttpd SUBDIR += ocaml-net SUBDIR += ocsigen SUBDIR += offline-npm Modified: head/www/obhttpd/Makefile ============================================================================== --- head/www/httpd/Makefile Sun Dec 6 14:52:27 2015 (r403116) +++ head/www/obhttpd/Makefile Sun Dec 6 15:41:37 2015 (r403117) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= httpd +PORTNAME= obhttpd PORTVERSION= 5.7.20150508 CATEGORIES= www @@ -9,10 +9,11 @@ COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/usr.sbin/${PORTNAME} +WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT} USE_GITHUB= yes GH_ACCOUNT= koue +GH_PROJECT= httpd USE_OPENSSL= yes USE_RC_SUBR= obhttpd @@ -28,12 +29,14 @@ USERS= www GROUPS= www PLIST_FILES= sbin/obhttpd \ - man/man5/httpd.conf.5.gz \ + man/man5/obhttpd.conf.5.gz \ man/man8/obhttpd.8.gz post-patch: - ${REINPLACE_CMD} -e "s|httpd$$|obhttpd|g" ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/Makefile + ${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 ${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \ ${WRKSRC}/httpd.h