svn commit: r474407 - in head/www/obhttpd: . files
Steve Wills
swills at FreeBSD.org
Tue Jul 10 20:22:12 UTC 2018
Author: swills
Date: Tue Jul 10 20:22:10 2018
New Revision: 474407
URL: https://svnweb.freebsd.org/changeset/ports/474407
Log:
www/obhttpd: Update to 6.3.20180529
PR: 229672
Submitted by: Nikola Kolev <koue at chaosophia.net> (maintainer)
Added:
head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile (contents, props changed)
head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile (contents, props changed)
Deleted:
head/www/obhttpd/files/patch-lib_libtls_tls__conninfo.c
head/www/obhttpd/files/patch-usr.sbin_httpd_server__file.c
Modified:
head/www/obhttpd/Makefile (contents, props changed)
head/www/obhttpd/distinfo (contents, props changed)
head/www/obhttpd/pkg-plist (contents, props changed)
Modified: head/www/obhttpd/Makefile
==============================================================================
--- head/www/obhttpd/Makefile Tue Jul 10 20:11:23 2018 (r474406)
+++ head/www/obhttpd/Makefile Tue Jul 10 20:22:10 2018 (r474407)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= obhttpd
-PORTVERSION= 6.0.20161006
-PORTREVISION= 2
+PORTVERSION= 6.3.20180529
CATEGORIES= www
MAINTAINER= koue at chaosophia.net
@@ -12,16 +11,17 @@ LICENSE= BSD3CLAUSE
WRKSRC_SUBDIR= src
+USES= ssl uidfix
+
USE_GITHUB= yes
GH_ACCOUNT= koue
GH_PROJECT= httpd
USE_RC_SUBR= obhttpd
-USES= ssl uidfix
CFLAGS+= -Wall
-MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
+MAKE_ARGS+= MANDIR=${PREFIX}/man/man
USERS= www
GROUPS= www
@@ -45,25 +45,21 @@ post-install:
.include <bsd.port.pre.mk>
.if ! ${SSL_DEFAULT:Mlibressl*}
-BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage
-
-do-configure:
- ${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
- ${WRKSRC}/usr.sbin/httpd/Makefile
- ${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
- ${WRKSRC}/usr.sbin/httpd/Makefile
- ${REINPLACE_CMD} -e 's|/usr/local|${WRKDIR}/libressl|g' \
- ${WRKSRC}/usr.bin/htpasswd/Makefile
- ${REINPLACE_CMD} -e 's|LOCALBASE|LIBRESSLBASE|g' \
- ${WRKSRC}/usr.bin/htpasswd/Makefile
-
. ifnmake describe
STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
. endif
+BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage
+CFLAGS+= -I${STAGEDIR_libressl}${LOCALBASE}/include
-pre-configure:
- @(cd ${STAGEDIR_libressl}${LOCALBASE} && ${COPYTREE_SHARE} \
- . ${WRKDIR}/libressl "! -name *.so*")
+post-configure:
+ ${REINPLACE_CMD} 's|-ltls|${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a|g' \
+ ${WRKSRC}/usr.sbin/httpd/Makefile
+ ${REINPLACE_CMD} 's|-lssl|${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a|g' \
+ ${WRKSRC}/usr.sbin/httpd/Makefile
+ ${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+ ${WRKSRC}/usr.sbin/httpd/Makefile
+ ${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+ ${WRKSRC}/usr.bin/htpasswd/Makefile
.endif # SSL_DEFAULT
.include <bsd.port.post.mk>
Modified: head/www/obhttpd/distinfo
==============================================================================
--- head/www/obhttpd/distinfo Tue Jul 10 20:11:23 2018 (r474406)
+++ head/www/obhttpd/distinfo Tue Jul 10 20:22:10 2018 (r474407)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476701489
-SHA256 (koue-httpd-6.0.20161006_GH0.tar.gz) = 5b26a697db0095ff06469c2005bd4c8e65b1a23c667e69b03a47b221128c7225
-SIZE (koue-httpd-6.0.20161006_GH0.tar.gz) = 162396
+TIMESTAMP = 1531153726
+SHA256 (koue-httpd-6.3.20180529_GH0.tar.gz) = 9b21fe1dc00164090aaf5c1511f7c6cd3516c24879373d5eeab21259725d1364
+SIZE (koue-httpd-6.3.20180529_GH0.tar.gz) = 171076
Added: head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile Tue Jul 10 20:22:10 2018 (r474407)
@@ -0,0 +1,9 @@
+--- usr.bin/htpasswd/Makefile.orig 2018-07-10 10:58:14 UTC
++++ usr.bin/htpasswd/Makefile
+@@ -1,5 +1,6 @@
+ # $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $
+ LOCALBASE?= /usr/local
++BINDIR?= ${LOCALBASE}/bin
+
+ PROG= htpasswd
+ SRCS= htpasswd.c
Added: head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/obhttpd/files/patch-usr.sbin_httpd_Makefile Tue Jul 10 20:22:10 2018 (r474407)
@@ -0,0 +1,10 @@
+--- usr.sbin/httpd/Makefile.orig 2018-07-10 10:58:32 UTC
++++ usr.sbin/httpd/Makefile
+@@ -1,6 +1,7 @@
+ # $OpenBSD: Makefile,v 1.30 2017/07/03 22:21:47 espie Exp $
+
+ LOCALBASE?= /usr/local
++BINDIR?= ${LOCALBASE}/sbin
+ PROG= httpd
+ SRCS= parse.y
+ SRCS+= config.c control.c httpd.c log.c logger.c proc.c getdtablecount.c
Modified: head/www/obhttpd/pkg-plist
==============================================================================
--- head/www/obhttpd/pkg-plist Tue Jul 10 20:11:23 2018 (r474406)
+++ head/www/obhttpd/pkg-plist Tue Jul 10 20:22:10 2018 (r474407)
@@ -1,7 +1,7 @@
@sample etc/obhttpd.conf.sample
+bin/obhtpasswd
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
More information about the svn-ports-all
mailing list