Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Sep 2023 02:24:39 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6bdebd7b07df - main - www/fnord: Remove expired port
Message-ID:  <202309300224.38U2OdAp095830@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6bdebd7b07df9117a549dff059265b1cb6ec67b4

commit 6bdebd7b07df9117a549dff059265b1cb6ec67b4
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-09-30 01:23:24 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-09-30 02:22:59 +0000

    www/fnord: Remove expired port
    
    2023-09-30 www/fnord: Deprecated upstream, consider using www/apache24, www/lighttpd or www/nginx
---
 MOVED                          |  1 +
 www/Makefile                   |  1 -
 www/fnord/Makefile             | 91 ------------------------------------------
 www/fnord/distinfo             |  2 -
 www/fnord/files/fnord.inetd.in |  8 ----
 www/fnord/files/patch-httpd.c  | 18 ---------
 www/fnord/files/pkg-message.in | 30 --------------
 www/fnord/pkg-descr            |  3 --
 8 files changed, 1 insertion(+), 153 deletions(-)

diff --git a/MOVED b/MOVED
index 5c8f453d9980..196478019cc6 100644
--- a/MOVED
+++ b/MOVED
@@ -7916,3 +7916,4 @@ textproc/yamcha||2023-09-30|Has expired: Last upstream release was in 2005
 japanese/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats
 www/dhttpd||2023-09-30|Has expired: Abandonware, last release in 15+ years ago. Consider using www/darkhttpd, www/obhttpd or www/miniserve
 www/drupal8|www/drupal9|2023-09-30|Has expired: Upstream EOL reached on 2021-11-17
+www/fnord||2023-09-30|Has expired: Deprecated upstream, consider using www/apache24, www/lighttpd or www/nginx
diff --git a/www/Makefile b/www/Makefile
index ce3c899ed3e9..d2506fb0ace3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -182,7 +182,6 @@
     SUBDIR += flat-frog
     SUBDIR += flexget
     SUBDIR += flickcurl
-    SUBDIR += fnord
     SUBDIR += formication
     SUBDIR += foswiki
     SUBDIR += fpc-fastcgi
diff --git a/www/fnord/Makefile b/www/fnord/Makefile
deleted file mode 100644
index 9eca73ef35b4..000000000000
--- a/www/fnord/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-PORTNAME=	fnord
-PORTVERSION=	1.11
-CATEGORIES=	www
-MASTER_SITES=	http://www.fefe.de/fnord/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Small and fast web server with CGI-capability
-WWW=		https://www.fefe.de/fnord/
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Deprecated upstream, consider using www/apache24, www/lighttpd or www/nginx
-EXPIRATION_DATE=2023-09-30
-
-USES=		gmake tar:bzip2
-
-MAKE_ARGS+=	DIET="" CC="${CC}" CXX="${CXX}"
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
-
-SUB_FILES=	pkg-message fnord.inetd
-
-PLIST_FILES=	bin/fnord \
-		bin/fnord-conf \
-		bin/fnord.inetd
-
-OPTIONS_DEFINE=	DAEMONTOOLS TCPSERVER CGI DIR_LIST SYSTEM_SYMLINK_DEREF OLD_STYLE_REDIRECT
-OPTIONS_DEFAULT=	CGI DIR_LIST
-
-CGI_DESC=		Enable CGI support
-DAEMONTOOLS_DESC=	Use DJB's daemontools
-DIR_LIST_DESC=		Enable directory listing
-OLD_STYLE_REDIRECT_DESC=	Enable old style redirection
-SYSTEM_SYMLINK_DEREF_DESC=	Enable system symlink (needs DIR_LIST)
-TCPSERVER_DESC=		Use DJB's tcpserver
-
-DAEMONTOOLS_RUN_DEPENDS=	setuidgid:sysutils/daemontools
-TCPSERVER_RUN_DEPENDS=		tcpserver:sysutils/ucspi-tcp
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCGI}
-SED_SCRIPT+=	-e "s|^// \(\#define CGI\).*|\1|"
-.endif
-
-# HOPE YOU KNOW WHAT YOU'RE LINKING !
-#
-# e.g.: if a file foo is a symlink to /etc/passwd and you don't have a
-# chroot enviroment then the system-wide /etc/passwd is provided !!!
-#
-# If the symlink is dangling OR this option is not active the symlink is
-# provided as a new http-uri.
-#
-# e.g.: is foo a symlink to /etc/passwd than the client gets a href to
-# http://<vhost>/etc/passwd */
-
-.if ${PORT_OPTIONS:MSYSTEM_SYMLINK_DEREF}
-.if empty(PORT_OPTIONS:MDIR_LIST)
-IGNORE=	SYSTEM_SYMLINK_DEREF requires the DIR_LIST option
-.endif
-SED_SCRIPT+=	-e "s|^/\* \(\#define SYSTEM_SYMLINK_DEREF\).*|\1|"
-.endif
-
-.if ${PORT_OPTIONS:MDIR_LIST}
-SED_SCRIPT+=	-e "s|^/\* \(\#define DIR_LIST\).*|\1|"
-.endif
-
-# If a file is not found locally, and $REDIRECT_HOST is set, fnord will
-# issue a redirect to strcat($REDIRECT_HOST,uri).  Otherwise, if
-# $REDIRECT_URI is set, fnord will issue a redirect to $REDIRECT_URI.
-# Only if those fail will a 404 error be returned. */
-
-.if ${PORT_OPTIONS:MOLD_STYLE_REDIRECT}
-SED_SCRIPT+=	-e "s|^/\* \(\#define OLD_STYLE_REDIRECT\).*|\1|"
-.endif
-
-post-patch:
-	@[ -z '${SED_SCRIPT}' ] || \
-		 ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/httpd.c
-	@${REINPLACE_CMD} -e "/strip/d" ${WRKSRC}/Makefile
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
-	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=-Wno-error=incompatible-function-pointer-types |g' \
-		${WRKSRC}/Makefile
-.endif
-
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fnord ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/fnord-conf ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/fnord.inetd ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/www/fnord/distinfo b/www/fnord/distinfo
deleted file mode 100644
index df4ec8730973..000000000000
--- a/www/fnord/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fnord-1.11.tar.bz2) = 896f734b589b52a145dbb1d268f41ae94eff90529db36658a66eda3aada21d35
-SIZE (fnord-1.11.tar.bz2) = 28845
diff --git a/www/fnord/files/fnord.inetd.in b/www/fnord/files/fnord.inetd.in
deleted file mode 100644
index fdd1a68446bc..000000000000
--- a/www/fnord/files/fnord.inetd.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-if [ ! -d "$1" ]; then
-	echo "usage: $0 <www_root_directory>"
-else
-	cd $1
-	exec %%PREFIX%%/bin/fnord 2>/dev/null
-fi
diff --git a/www/fnord/files/patch-httpd.c b/www/fnord/files/patch-httpd.c
deleted file mode 100644
index b933587a2a18..000000000000
--- a/www/fnord/files/patch-httpd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- httpd.orig	Fri Oct 14 14:44:45 2005
-+++ httpd.c	Fri Oct 14 14:47:03 2005
-@@ -963,13 +963,12 @@
- }
- static void handledirlist(const char*origurl) {
-   DIR*dir;
--  unsigned int nl=str_len(origurl);
-+  unsigned int nl;
-   const char*nurl=origurl;
-   url=(char*)origurl;
-   while (nurl[0]=='/') ++nurl;
--  if (nurl<=origurl) return;
-+  if (nurl==origurl) return;
-   nl=str_len(nurl);
--  if (nurl[nl-1]!='/') return;
-   if (!stat(nl?nurl:".",&st) && (S_ISDIR(st.st_mode)) && ((st.st_mode&S_IRWXO)==5)) {
-     if (nl) chdir(nurl);
-     if (dir=opendir(".")) {
diff --git a/www/fnord/files/pkg-message.in b/www/fnord/files/pkg-message.in
deleted file mode 100644
index 5046d7936aea..000000000000
--- a/www/fnord/files/pkg-message.in
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Now that fnord is installed, do the following :
-
-1) If you chose to use daemontools and/or tcpserver, I assume you
-know how to do it, go to 4). If you chose to use inetd go to 2).
-
-2) Create a webroot somewhere :
-
-   # mkdir /usr/local/www
-
-3) Add an entry in inetd.conf like this :
-
-  "http stream tcp nowait root %%PREFIX%%/bin/fnord.inetd \
-	fnord.inetd /usr/local/www"
-
-4) Finally add some virtual hosts to your webserver :
-
-   # cd /usr/local/www
-   # mkdir host.tld:80
-   # ln -s host.tld:80 host.tld
-   # echo "test" > host.tld:80/index.html
-
-5- Test with your favorite web browser.
-
-   # links http://host.tld/index.html
-EOM
-}
-]
diff --git a/www/fnord/pkg-descr b/www/fnord/pkg-descr
deleted file mode 100644
index c1a01cfbdc76..000000000000
--- a/www/fnord/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-fnord is a small and fast web server with CGI-capability. fnord has
-been written by Felix von Leitner. fnord supports virtual hosting
-und runs under tcpserver.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309300224.38U2OdAp095830>