diff options
| author | ler <ler@FreeBSD.org> | 2017-01-11 12:57:42 +0800 |
|---|---|---|
| committer | ler <ler@FreeBSD.org> | 2017-01-11 12:57:42 +0800 |
| commit | b44e860f856a0cdedd81945068ceddd388b4adf5 (patch) | |
| tree | 167da4c9c8eb7a3b1c71440154a76c099887c767 /www | |
| parent | db9a6dec9659ccf0cf36a2133fbe72d8387ac179 (diff) | |
| download | freebsd-ports-gnome-b44e860f856a0cdedd81945068ceddd388b4adf5.tar.gz freebsd-ports-gnome-b44e860f856a0cdedd81945068ceddd388b4adf5.tar.zst freebsd-ports-gnome-b44e860f856a0cdedd81945068ceddd388b4adf5.zip | |
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
Diffstat (limited to 'www')
| -rw-r--r-- | www/obhttpd/Makefile | 30 | ||||
| -rw-r--r-- | www/obhttpd/distinfo | 5 | ||||
| -rw-r--r-- | www/obhttpd/pkg-plist | 7 |
3 files changed, 22 insertions, 20 deletions
diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile index 176b62860b40..68a03e95fb06 100644 --- a/www/obhttpd/Makefile +++ b/www/obhttpd/Makefile @@ -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=${PREFIX}/man/man 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 <bsd.port.pre.mk> .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 <bsd.port.post.mk> diff --git a/www/obhttpd/distinfo b/www/obhttpd/distinfo index 7f02868d93e7..df05902b2636 100644 --- a/www/obhttpd/distinfo +++ b/www/obhttpd/distinfo @@ -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 diff --git a/www/obhttpd/pkg-plist b/www/obhttpd/pkg-plist new file mode 100644 index 000000000000..441d23db9e79 --- /dev/null +++ b/www/obhttpd/pkg-plist @@ -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 |