Attachment 176737 Details for Bug 213560 – fixed paths

[patch] fixed paths

obhttpd-6.0.20161006.txt (text/plain), 2.93 KB, created by Nikola Kolev on 2016-11-07 12:52:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2016-11-07 12:52:39 UTC

Size: 2.93 KB

patch

obsolete

>diff -rupN obhttpd.orig/Makefile obhttpd/Makefile
>--- obhttpd.orig/Makefile	2016-11-07 13:37:27.944197000 +0100
>+++ obhttpd/Makefile	2016-11-07 13:30:57.509405000 +0100
>@@ -1,7 +1,7 @@
>-# $FreeBSD: head/www/obhttpd/Makefile 417767 2016-06-29 14:22:47Z mat $
>+# $FreeBSD$
> 
> PORTNAME=	obhttpd
>-PORTVERSION=	5.9.20160601
>+PORTVERSION=	6.0.20161006
> CATEGORIES=	www
> 
> MAINTAINER=	koue@chaosophia.net
>@@ -9,7 +9,7 @@ COMMENT=	OpenBSD http server
> 
> LICENSE=	BSD3CLAUSE
> 
>-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT}
>+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	koue
>@@ -28,20 +28,17 @@ MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR
> 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 \
>@@ -50,7 +47,7 @@ post-install:
> .include <bsd.port.pre.mk>
> 
> .if empty(SSL_DEFAULT:Mlibressl*)
>-IGNORE=		Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything.
>+IGNORE=		need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything
> .endif
> 
> .include <bsd.port.post.mk>
>diff -rupN obhttpd.orig/distinfo obhttpd/distinfo
>--- obhttpd.orig/distinfo	2016-11-07 13:37:27.944301000 +0100
>+++ obhttpd/distinfo	2016-11-07 13:30:57.509499000 +0100
>@@ -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 -rupN obhttpd.orig/pkg-plist obhttpd/pkg-plist
>--- obhttpd.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ obhttpd/pkg-plist	2016-11-07 13:44:51.350694000 +0100
>@@ -0,0 +1,7 @@
>+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

Actions: View | Diff

Attachments on bug 213560: 175856 | 176737