diff options
| author | riggs <riggs@FreeBSD.org> | 2015-12-06 23:41:37 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2015-12-06 23:41:37 +0800 |
| commit | 0bbc3a4f07cabb3c49caf1cab5f619fe90140175 (patch) | |
| tree | cf966abe79db20bd84649c143d7e0b9895c48fd7 | |
| parent | b0e678f2f6370443af91f186e6cafba076dddad1 (diff) | |
| download | freebsd-ports-gnome-0bbc3a4f07cabb3c49caf1cab5f619fe90140175.tar.gz freebsd-ports-gnome-0bbc3a4f07cabb3c49caf1cab5f619fe90140175.tar.zst freebsd-ports-gnome-0bbc3a4f07cabb3c49caf1cab5f619fe90140175.zip | |
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
| -rw-r--r-- | www/Makefile | 2 | ||||
| -rw-r--r-- | www/obhttpd/Makefile (renamed from www/httpd/Makefile) | 13 | ||||
| -rw-r--r-- | www/obhttpd/distinfo (renamed from www/httpd/distinfo) | 0 | ||||
| -rw-r--r-- | www/obhttpd/files/obhttpd.in (renamed from www/httpd/files/obhttpd.in) | 0 | ||||
| -rw-r--r-- | www/obhttpd/pkg-descr (renamed from www/httpd/pkg-descr) | 0 |
5 files changed, 9 insertions, 6 deletions
diff --git a/www/Makefile b/www/Makefile index b00c829b7ed2..5efa9c8c125f 100644 --- a/www/Makefile +++ b/www/Makefile @@ -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 diff --git a/www/httpd/Makefile b/www/obhttpd/Makefile index 27e42e5ff907..4a93b36226b0 100644 --- a/www/httpd/Makefile +++ b/www/obhttpd/Makefile @@ -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 diff --git a/www/httpd/distinfo b/www/obhttpd/distinfo index 79e99b151a39..79e99b151a39 100644 --- a/www/httpd/distinfo +++ b/www/obhttpd/distinfo diff --git a/www/httpd/files/obhttpd.in b/www/obhttpd/files/obhttpd.in index 9cff29f15ed9..9cff29f15ed9 100644 --- a/www/httpd/files/obhttpd.in +++ b/www/obhttpd/files/obhttpd.in diff --git a/www/httpd/pkg-descr b/www/obhttpd/pkg-descr index ea3c00d2710a..ea3c00d2710a 100644 --- a/www/httpd/pkg-descr +++ b/www/obhttpd/pkg-descr |