svn commit: r516764 - head/www/obhttpd
Koichiro Iwao
meta at FreeBSD.org
Tue Nov 5 01:13:56 UTC 2019
Author: meta
Date: Tue Nov 5 01:13:55 2019
New Revision: 516764
URL: https://svnweb.freebsd.org/changeset/ports/516764
Log:
www/obhttpd: Update to 6.6.20191023
Also, depend on standalone LibreSSL rather than security/libressl port.
Now this port can be installed even if LibreSSL is not selected in DEFAULT_VERSIONS.
PR: 241480
Submitted by: Nikola Kolev <koue at chaosophia.net>
Reported by: Leo Vandewoestijne
Modified:
head/www/obhttpd/Makefile
head/www/obhttpd/distinfo
Modified: head/www/obhttpd/Makefile
==============================================================================
--- head/www/obhttpd/Makefile Tue Nov 5 00:53:49 2019 (r516763)
+++ head/www/obhttpd/Makefile Tue Nov 5 01:13:55 2019 (r516764)
@@ -1,9 +1,10 @@
# $FreeBSD$
PORTNAME= obhttpd
-PORTVERSION= 6.3.20180803
-PORTREVISION= 3
+PORTVERSION= 6.6.20191023
CATEGORIES= www
+MASTER_SITES= OPENBSD/LibreSSL:libressl
+DISTFILES= libressl-${SSL_VERSION}.tar.gz:libressl
MAINTAINER= koue at chaosophia.net
COMMENT= OpenBSD http server
@@ -12,8 +13,9 @@ LICENSE= BSD3CLAUSE
WRKSRC_SUBDIR= src
-USES= ssl uidfix
+USES= uidfix
+SSL_VERSION= 3.0.2
USE_GITHUB= yes
GH_ACCOUNT= koue
GH_PROJECT= httpd
@@ -21,6 +23,7 @@ GH_PROJECT= httpd
USE_RC_SUBR= obhttpd
CFLAGS+= -Wall
+CFLAGS+= -I${WRKDIR}/libressl-${SSL_VERSION}/include
MAKE_ARGS+= MANDIR=${PREFIX}/man/man
@@ -39,28 +42,22 @@ post-patch:
${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \
${WRKSRC}/usr.sbin/httpd/httpd.h
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \
- ${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample
+pre-configure:
+ @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libressl-${SSL_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS})
+ @(cd ${WRKDIR}/libressl-${SSL_VERSION} && ${SETENV} ./configure && ${SETENV} ${MAKE_ENV} ${MAKE})
-.include <bsd.port.pre.mk>
-
-.if ! ${SSL_DEFAULT:Mlibressl*}
-. ifnmake describe
-STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
-. endif
-BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage
-CFLAGS+= -I${STAGEDIR_libressl}${LOCALBASE}/include
-
post-configure:
- ${REINPLACE_CMD} 's|-ltls|${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a|g' \
+ ${REINPLACE_CMD} 's|-ltls|${WRKDIR}/libressl-${SSL_VERSION}/tls/.libs/libtls.a|g' \
${WRKSRC}/usr.sbin/httpd/Makefile
- ${REINPLACE_CMD} 's|-lssl|${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a|g' \
+ ${REINPLACE_CMD} 's|-lssl|${WRKDIR}/libressl-${SSL_VERSION}/ssl/.libs/libssl.a|g' \
${WRKSRC}/usr.sbin/httpd/Makefile
- ${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+ ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \
${WRKSRC}/usr.sbin/httpd/Makefile
- ${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+ ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \
${WRKSRC}/usr.bin/htpasswd/Makefile
-.endif # SSL_DEFAULT
-.include <bsd.port.post.mk>
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \
+ ${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample
+
+.include <bsd.port.mk>
Modified: head/www/obhttpd/distinfo
==============================================================================
--- head/www/obhttpd/distinfo Tue Nov 5 00:53:49 2019 (r516763)
+++ head/www/obhttpd/distinfo Tue Nov 5 01:13:55 2019 (r516764)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1533301574
-SHA256 (koue-httpd-6.3.20180803_GH0.tar.gz) = 0133dc39e099aa04a570326457874329119a249f8b52aa4cb3e29600dae9e1ab
-SIZE (koue-httpd-6.3.20180803_GH0.tar.gz) = 217937
+TIMESTAMP = 1571950082
+SHA256 (libressl-3.0.2.tar.gz) = df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e
+SIZE (libressl-3.0.2.tar.gz) = 3669468
+SHA256 (koue-httpd-6.6.20191023_GH0.tar.gz) = 80d78d2badbda1ed5b119316df7fe5e81b0fcbe1321ec3cae0d34c2edb450ac2
+SIZE (koue-httpd-6.6.20191023_GH0.tar.gz) = 224662
More information about the svn-ports-all
mailing list