Maintenance update to 0.88.

6 files changed, 55 insertions, 35 deletions

diff --git a/www/man2web/Makefile b/www/man2web/Makefile
index 3aec91942885..bff5b39da9c7 100644
--- a/www/man2web/Makefile
+++ b/www/man2web/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	man2web
-PORTVERSION=	0.87
+PORTVERSION=	0.88
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,14 +16,21 @@ COMMENT=	Convert man pages to HTML
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --bindir="${PREFIX}/${CGIDIR}" \
-		--sysconfdir="${PREFIX}/etc"
+CONFIGURE_ARGS=	--sysconfdir="${PREFIX}/etc" \
+		--with-distro=freebsd --enable-lynx
 
 PLIST_SUB=	CGIDIR="${CGIDIR}"
-
 CGIDIR=	www/cgi-bin
 
 MAN1=	man2web.1
 MAN5=	man2web.conf.5
 
+post-extract:
+	${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/src/section_h/
+
+# default Apache configuration disallows symlinks in cgi-bin
+post-install:
+	${LN} -f ${PREFIX}/bin/man2web ${PREFIX}/${CGIDIR}/man2web || \
+	    ${INSTALL_PROGRAM} ${WRKSRC}/src/man2web ${PREFIX}/${CGIDIR}/
+
 .include <bsd.port.mk>
diff --git a/www/man2web/distinfo b/www/man2web/distinfo
index dfd0e654f057..34342ba345e9 100644
--- a/www/man2web/distinfo
+++ b/www/man2web/distinfo
@@ -1 +1 @@
-MD5 (man2web-0.87.tar.gz) = d22afc6574dd840db25fc44788d0da4d
+MD5 (man2web-0.88.tar.gz) = 0c07ffaf49b975c8adeae6cf8c975ee1
diff --git a/www/man2web/files/freebsd.h b/www/man2web/files/freebsd.h
new file mode 100644
index 000000000000..37f8684bb06f
--- /dev/null
+++ b/www/man2web/files/freebsd.h
@@ -0,0 +1,16 @@
+/* $FreeBSD$ */
+
+/* default section entries that are used if configuration file is disabled*/
+#define SECTION_COUNT 9
+struct section_entry section_matrix[] = {
+	{ "1", "1",	"General Commands (Tools and Utilities)" },
+	{ "2", "2",     "System Calls and Error Numbers" },
+	{ "3", "3",     "C Libraries" },
+	{ "4", "4",     "Devices and Device Drivers" },
+	{ "5", "5",     "File Formats" },
+	{ "6", "6",     "Games" },
+	{ "7", "7",     "Miscellaneous Information Pages" },
+	{ "8", "8",     "System Maintenance and Operation Commands" },
+	{ "9", "9",     "Kernel Interfaces" }
+};
+
diff --git a/www/man2web/files/patch-configure b/www/man2web/files/patch-configure
new file mode 100644
index 000000000000..2a97781accd8
--- /dev/null
+++ b/www/man2web/files/patch-configure
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Apr 28 03:07:10 2003
++++ configure	Mon Apr 28 16:41:10 2003
+@@ -4593,6 +4593,20 @@
+ 		distro=debian-3
+ 		;;
+ 
++	freebsd)
++		if test x$section_switch = x
++		then
++			section_switch="-S"
++		fi
++		
++		if test x$manpath_switch = x
++		then
++			manpath_switch="-M"
++		fi
++
++		distro=freebsd
++		;;
++ 		
+ 	*)
+ 		distro=generic
+ 		;;
diff --git a/www/man2web/files/patch-src_cover__page.h b/www/man2web/files/patch-src_cover__page.h
deleted file mode 100644
index e3e41eb7bf61..000000000000
--- a/www/man2web/files/patch-src_cover__page.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD$
-
---- src/cover_page.h.orig	Sat Apr 19 13:56:03 2003
-+++ src/cover_page.h	Sat Apr 19 13:58:38 2003
-@@ -8,15 +8,16 @@
- char *find_section(struct section_entry **node, char *pseudo);
- 
- /* default section entries that are used if configuration file is disabled*/
--#define SECTION_COUNT 8
-+#define SECTION_COUNT 9
- struct section_entry section_matrix[] = {
--        { "1", "1",	"User Commands" },
--        { "2", "2",     "System Calls" },
--        { "3", "3",     "Library Functions" },
--        { "4", "4",     "Device Drivers & Files" },
-+        { "1", "1",	"General Commands (Tools and Utilities)" },
-+        { "2", "2",     "System Calls and Error Numbers" },
-+        { "3", "3",     "C Libraries" },
-+        { "4", "4",     "Devices and Device Drivers" },
-         { "5", "5",     "File Formats" },
--        { "6", "6",     "Games and Demos" },
--        { "7", "7",     "Conventions & Miscellany" },
--        { "8", "8",     "System Administration Commands" }
-+        { "6", "6",     "Games" },
-+        { "7", "7",     "Miscellaneous Information Pages" },
-+        { "8", "8",     "System Maintenance and Operation Commands" },
-+        { "9", "9",     "Kernel Interfaces" }
- };
- 
diff --git a/www/man2web/pkg-plist b/www/man2web/pkg-plist
index 6ba858a34d7a..4324dadb6151 100644
--- a/www/man2web/pkg-plist
+++ b/www/man2web/pkg-plist
@@ -1,3 +1,4 @@
 @comment $FreeBSD$
+bin/man2web
 %%CGIDIR%%/man2web
 etc/man2web.conf.default