diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index d35567a0bf6b..94c23a39ea75 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,69 +1,70 @@ PORTNAME= bozohttpd PORTVERSION= 20210227 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.eterna.com.au/bozohttpd/ \ NETBSD MAINTAINER= jmohacsi@bsd.hu COMMENT= Bozotic HTTP server from NetBSD WWW= http://www.eterna.com.au/bozohttpd/ LICENSE= BSD2CLAUSE USES= cpe uidfix tar:bzip2 CPE_VENDOR= eterna USE_RC_SUBR= bozohttpd MAKE_ARGS= LDADD="${LIBS}" PLIST_FILES= bin/bozohttpd \ - man/man8/bozohttpd.8.gz + share/man/man8/bozohttpd.8.gz OPTIONS_DEFINE= BLACKLIST CGI DAEMON DEBUG DIRINDEX\ DYNAMIC HTPASSWD LUA SSL USER OPTIONS_DEFAULT= BLACKLIST CGI DAEMON DEBUG DIRINDEX\ DYNAMIC HTPASSWD LUA SSL USER BLACKLIST_DESC= Report Unauthorized and Forbidden accesses to blacklistd CGI_DESC= Common Gateway Interface (CGI) support (-C, -c, -E, -e) DAEMON_DESC= Optional daemon mode (-b) DEBUG_DESC= Debug support (-d) DIRINDEX_DESC= Automatic directory index if index.html is missing (-X) DYNAMIC_DESC= Dynamic content based on file suffixes (-C, -M) HTPASSWD_DESC= Basic authentication with .htpasswd files LUA_DESC= Lua scripts for dynamic content (-L) SSL_DESC= SSL/TLS for HTTPS requests (-Z, -z) USER_DESC= Optional /~user transformation (-e, -p, -u) BLACKLIST_CFLAGS_OFF= -DNO_BLACKLIST_SUPPORT BLACKLIST_LIBS= -lblacklist CGI_CFLAGS_OFF= -DNO_CGIBIN_SUPPORT DAEMON_CFLAGS_OFF= -DNO_DAEMON_MODE DEBUG_CFLAGS_OFF= -DNO_DEBUG DIRINDEX_CFLAGS_OFF= -DNO_DIRINDEX_SUPPORT DYNAMIC_CFLAGS_OFF= -DNO_DYNAMIC_CONTENT HTPASSWD_CFLAGS= -DDO_HTPASSWD HTPASSWD_LIBS= -lcrypt LUA_USES= lua LUA_CFLAGS= -I${LUA_INCDIR} LUA_CFLAGS_OFF= -DNO_LUA_SUPPORT LUA_LDFLAGS= -L${LUA_LIBDIR} LUA_LIBS= -llua-${LUA_VER} SSL_USES= ssl SSL_CFLAGS= -I${OPENSSLINC} SSL_CFLAGS_OFF= -DNO_SSL_SUPPORT SSL_LDFLAGS= -L${OPENSSLLIB} SSL_LIBS= -lcrypto -lssl USER_CFLAGS_OFF= -DNO_USER_SUPPORT .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=unused-but-set-variable .endif .if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .endif .include diff --git a/www/bozohttpd/files/patch-Makefile b/www/bozohttpd/files/patch-Makefile index 17e5553801a6..0a96851e5973 100644 --- a/www/bozohttpd/files/patch-Makefile +++ b/www/bozohttpd/files/patch-Makefile @@ -1,45 +1,45 @@ ---- Makefile.orig 2020-10-15 04:35:06 UTC +--- Makefile.orig 2021-02-28 05:20:51 UTC +++ Makefile @@ -14,7 +14,7 @@ # NO_SSL_SUPPORT /* don't support ssl (https) */ # DO_HTPASSWD /* support .htpasswd files */ # NO_LUA_SUPPORT /* don't support Lua for dynamic content */ -# NO_BLOCKLIST_SUPPORT /* don't support blocklist */ +# NO_BLACKLIST_SUPPORT /* don't support blacklist */ # # other system specific defines: # HAVE_NBUTIL_H /* netbsd compat is in @@ -24,20 +24,17 @@ # for setting CFLAGS relevant to your make, eg # % make COPTS="-DDO_HTPASSWD" -COPTS+= -DDO_HTPASSWD PROG= bozohttpd -LINKS= ${BINDIR}/bozohttpd ${BINDIR}/httpd MAN= bozohttpd.8 -MLINKS+=bozohttpd.8 httpd.8 SRCS= bozohttpd.c ssl-bozo.c auth-bozo.c cgi-bozo.c daemon-bozo.c \ tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c SRCS+= main.c -LDADD= -lblocklist -lcrypt -llua -lm -DPADD= ${LIBBLOCKLIST} ${LIBCRYPT} ${LIBLUA} ${LIBM} - WARNS?= 4 +BINDIR=$(PREFIX)/bin -+MANDIR=$(PREFIX)/man/man ++MANDIR=$(PREFIX)/share/man/man + .if defined(.OS.MAKE) OPSYS= ${.OS.MAKE} .else -@@ -48,9 +45,6 @@ OPSYS:= ${:!uname -s!:S/-//g:S/\///g} +@@ -48,9 +45,6 @@ LDADD+= -lnbutil CPPFLAGS+= -DHAVE_NBUTIL_H LDADD+= -lnbutil .endif - -LDADD+= -lssl -lcrypto -DPADD+= ${LIBSSL} ${LIBCRYPTO} # # Build release things. diff --git a/www/http_get/Makefile b/www/http_get/Makefile index 28725cbd7c29..fab690fbb592 100644 --- a/www/http_get/Makefile +++ b/www/http_get/Makefile @@ -1,22 +1,23 @@ PORTNAME= http_get PORTVERSION= 1.0.20140814 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/http_get/ DISTNAME= ${PORTNAME}_14Aug2014 MAINTAINER= masaki@club.kyutech.ac.jp COMMENT= Dump http-contents to stdout WWW= https://www.acme.com/software/http_get/ WRKSRC= ${WRKDIR}/http_get USES= uidfix MAKEFILE= ${FILESDIR}/Makefile.bsd PLIST_FILES= bin/http_get \ - man/man1/http_get.1.gz + share/man/man1/http_get.1.gz .ifndef NO_OPENSSL USES+= ssl .endif .include diff --git a/www/http_get/files/Makefile.bsd b/www/http_get/files/Makefile.bsd index 4e29196e91b6..6494d7b538b9 100644 --- a/www/http_get/files/Makefile.bsd +++ b/www/http_get/files/Makefile.bsd @@ -1,12 +1,12 @@ PROG = http_get SRCS = http_get.c .ifndef NO_OPENSSL CFLAGS += -DUSE_SSL -I${OPENSSLBASE}/include ${OPENSSL_CFLAGS} LDFLAGS += -L${OPENSSLBASE}/lib -lssl -lcrypto .endif BINDIR = ${PREFIX}/bin -MANDIR = ${PREFIX}/man/man +MANDIR = ${PREFIX}/share/man/man .include diff --git a/www/http_load/Makefile b/www/http_load/Makefile index cbf5eb698e02..404729c2b244 100644 --- a/www/http_load/Makefile +++ b/www/http_load/Makefile @@ -1,23 +1,24 @@ PORTNAME= http_load PORTVERSION= 20160309 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/http_load/ DISTNAME= ${PORTNAME}-09Mar2016 MAINTAINER= marcel@herrbischoff.com COMMENT= Multiprocessing http performance test client WWW= https://www.acme.com/software/http_load/ LICENSE= BSD2CLAUSE USES= uidfix MAKEFILE= ${FILESDIR}/Makefile.bsd PLIST_FILES= bin/http_load \ - man/man1/http_load.1.gz + share/man/man1/http_load.1.gz .ifndef NO_OPENSSL USES+= ssl .endif .include diff --git a/www/http_load/files/Makefile.bsd b/www/http_load/files/Makefile.bsd index 625e0af62586..3cdea5b0ea15 100644 --- a/www/http_load/files/Makefile.bsd +++ b/www/http_load/files/Makefile.bsd @@ -1,12 +1,12 @@ PROG = http_load SRCS = http_load.c timers.c .ifndef NO_OPENSSL CFLAGS += -DUSE_SSL -I${OPENSSLBASE}/include ${OPENSSL_CFLAGS} LDADD += -L${OPENSSLBASE}/lib -lssl -lcrypto .endif BINDIR = ${PREFIX}/bin -MANDIR = ${PREFIX}/man/man +MANDIR = ${PREFIX}/share/man/man .include diff --git a/www/http_post/Makefile b/www/http_post/Makefile index 7e8f43413ed3..92987974b1de 100644 --- a/www/http_post/Makefile +++ b/www/http_post/Makefile @@ -1,22 +1,23 @@ PORTNAME= http_post PORTVERSION= 1.0.20140814 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/http_post/ DISTNAME= ${PORTNAME}_14Aug2014 MAINTAINER= masaki@club.kyutech.ac.jp COMMENT= Do a POST operation and dump http-contents to stdout WWW= https://www.acme.com/software/http_post/ WRKSRC= ${WRKDIR}/http_post USES= uidfix MAKEFILE= ${FILESDIR}/Makefile.bsd PLIST_FILES= bin/http_post \ - man/man1/http_post.1.gz + share/man/man1/http_post.1.gz .ifndef NO_OPENSSL USES+= ssl .endif .include diff --git a/www/http_post/files/Makefile.bsd b/www/http_post/files/Makefile.bsd index 7d72745bef47..c1fb7ae4fa7b 100644 --- a/www/http_post/files/Makefile.bsd +++ b/www/http_post/files/Makefile.bsd @@ -1,12 +1,12 @@ PROG = http_post SRCS = http_post.c .ifndef NO_OPENSSL CFLAGS += -DUSE_SSL -I${OPENSSLBASE}/include ${OPENSSL_CFLAGS} LDFLAGS += -L${OPENSSLBASE}/lib -lssl -lcrypto .endif BINDIR = ${PREFIX}/bin -MANDIR = ${PREFIX}/man/man +MANDIR = ${PREFIX}/share/man/man .include diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile index a587890949a6..bdf082a6616b 100644 --- a/www/mohawk/Makefile +++ b/www/mohawk/Makefile @@ -1,40 +1,43 @@ PORTNAME= mohawk DISTVERSION= 2.0.21 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://fossil.bsdsx.fr/mohawk/tarball/?r=${DISTVERSION}&name=/ MAINTAINER= dsx+mohawk@bsdsx.fr COMMENT= Simple and lightweight HTTP daemon WWW= http://fossil.etoilebsd.net/mohawk LICENSE= BSD2CLAUSE LIB_DEPENDS= libevent.so:devel/libevent USES= localbase uidfix USE_RC_SUBR= mohawk CFLAGS+= -I${LOCALBASE}/include/event2/compat +MAKE_ARGS= MANDIR="${PREFIX}/share/man/man" + PLIST_FILES= bin/mhtpasswd \ - man/man5/mohawk.conf.5.gz \ - man/man8/mhtpasswd.8.gz \ - man/man8/mohawk.8.gz \ sbin/mohawk \ + share/man/man5/mohawk.conf.5.gz \ + share/man/man8/mhtpasswd.8.gz \ + share/man/man8/mohawk.8.gz \ etc/mohawk.conf.sample PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES .include post-install: ${INSTALL_DATA} ${WRKSRC}/examples/minimal.conf ${STAGEDIR}${PREFIX}/etc/mohawk.conf.sample ${INSTALL_SCRIPT} ${WRKSRC}/mhtpasswd.sh ${STAGEDIR}${PREFIX}/bin/mhtpasswd .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.conf ${STAGEDIR}${EXAMPLESDIR} .endif .include diff --git a/www/mohawk/files/patch-man5__Makefile b/www/mohawk/files/patch-man5__Makefile deleted file mode 100644 index 3dac07424ee4..000000000000 --- a/www/mohawk/files/patch-man5__Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- man5/Makefile.orig 2021-09-25 06:45:21 UTC -+++ man5/Makefile -@@ -1,4 +1,5 @@ - MAN= mohawk.conf.5 -+SHAREDIR= ${PREFIX} - NO_OBJ= - - .include diff --git a/www/mohawk/files/patch-man8__Makefile b/www/mohawk/files/patch-man8__Makefile deleted file mode 100644 index 1170f1108b86..000000000000 --- a/www/mohawk/files/patch-man8__Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- man8/Makefile.orig 2021-09-25 06:45:21 UTC -+++ man8/Makefile -@@ -1,4 +1,5 @@ - MAN= mhtpasswd.8 mohawk.8 -+SHAREDIR= ${PREFIX} - NO_OBJ= - - .include diff --git a/www/slowcgi/Makefile b/www/slowcgi/Makefile index 5b5cd9e4d7fc..512d11386f3f 100644 --- a/www/slowcgi/Makefile +++ b/www/slowcgi/Makefile @@ -1,35 +1,36 @@ PORTNAME= slowcgi PORTVERSION= 7.1.20220916 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= koue@chaosophia.net COMMENT= FastCGI interface for old CGI programs WWW= https://github.com/koue/slowcgi LICENSE= BSD3CLAUSE LIB_DEPENDS= libevent.so:devel/libevent USES= uidfix USE_GITHUB= yes GH_ACCOUNT= koue GH_PROJECT= slowcgi USE_RC_SUBR= slowcgi -MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man +MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/share/man/man CFLAGS+= -Wall -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib WRKSRC_SUBDIR= src/usr.sbin/${GH_PROJECT} USERS= www GROUPS= www PLIST_FILES= sbin/slowcgi \ - man/man8/slowcgi.8.gz + share/man/man8/slowcgi.8.gz .include