Page MenuHomeFreeBSD
Files F142171086

D9128.diff
No OneTemporary
Actions

D9128.diff
View Options

Index: head/www/obhttpd/Makefile
===================================================================
--- head/www/obhttpd/Makefile
+++ head/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 @@
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 @@
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>
Index: head/www/obhttpd/distinfo
===================================================================
--- head/www/obhttpd/distinfo
+++ head/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
Index: head/www/obhttpd/pkg-plist
===================================================================
--- head/www/obhttpd/pkg-plist
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 6:28 PM (15 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27697630
Default Alt Text
D9128.diff (2 KB)

Event Timeline