svn commit: r403117 - in head/www: . httpd obhttpd
Thomas Zander
riggs at FreeBSD.org
Sun Dec 6 15:41:39 UTC 2015
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
More information about the svn-ports-all
mailing list