(1) Fix HTML generation of tac.cgi.

(2) Fix to detect gd1 library. Submitted by: Bradley Dean <bjdean@unimelb.edu.au> (1), kuriyama (2) Approved by: maintainer
svn path=/head/; revision=86191
2024-12-27 05:10:36 +00:00 · 2003-08-02 15:02:05 +00:00 · 2003-08-02 15:02:05 +00:00 · 5124709f8c · 2021-03-31 03:12:20 +00:00
commit 5124709f8c
parent 85be72c26f
12 changed files with 184 additions and 24 deletions
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
--- a/net-mgmt/nagios/files/patch-ad
+++ b/net-mgmt/nagios/files/patch-ad
@ -1,5 +1,5 @@
--- configure.orig	Thu Mar  1 04:54:12 2001
-+++ configure	Thu Mar  1 21:58:09 2001
+--- configure.orig	Tue Jun  3 12:47:57 2003
+++ configure	Thu Jul 31 16:35:45 2003
@@ -11,7 +11,7 @@
 ac_help=
 ac_default_prefix=/usr/local
@ -9,7 +9,7 @@
 ac_help="$ac_help
 --with-nagios-user=<user> sets user name to run nagios"
 ac_help="$ac_help
-@@ -562,9 +562,9 @@
+@@ -576,9 +576,9 @@
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@ -21,7 +21,7 @@
   fi
 fi
 for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
+@@ -2608,6 +2608,9 @@
 	LDFLAGS="${LDFLAGS} -L${withval}"
 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
 	
@ -31,7 +31,7 @@
 fi
 
 # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
+@@ -2615,6 +2618,8 @@
   withval="$with_gd_inc"
   
 	CFLAGS="${CFLAGS} -I${withval}"
@ -40,3 +40,30 @@
 	
 fi
 
+@@ -2748,14 +2753,14 @@
+ 	fi
+ 
+ 		if test x$GDLIBFOUND = x; then
+-		echo $ac_n "checking for gdImagePng in -lgd (order 3)""... $ac_c" 1>&6
+-echo "configure:2753: checking for gdImagePng in -lgd (order 3)" >&5
+		echo $ac_n "checking for gdImagePng in -lgd1 (order 3)""... $ac_c" 1>&6
+echo "configure:2753: checking for gdImagePng in -lgd1 (order 3)" >&5
+ 					ac_lib_var=`echo gd'_'gdImagePng'_'3 | sed 'y%./+-%__p_%'`
+ 	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-	LIBS="-lgd -lpng -lz -lm $LIBS"
+	LIBS="-lgd1 -lz -lm -lpng -ljpeg $LIBS"
+ 	cat > conftest.$ac_ext <<EOF
+ #line 2761 "configure"
+ #include "confdefs.h"
+@@ -2785,7 +2790,7 @@
+ 	  echo "$ac_t""yes" 1>&6
+ 	  
+ 			GDLIBFOUND=yep
+-			GDLIBS="-lgd -lpng -lz -lm"
+			GDLIBS="-lgd1 -lz -lm -lpng"
+ 	        	
+ 	else
+ 	  echo "$ac_t""no" 1>&6
--- a/net-mgmt/nagios/files/patch-aj
+++ b/net-mgmt/nagios/files/patch-aj
@ -0,0 +1,13 @@
+--- cgi/tac.c.orig	Mon May 12 06:18:56 2003
+++ cgi/tac.c	Sat Aug  2 16:24:23 2003
+@@ -1220,10 +1220,8 @@
+ 	printf("</table>\n");
+ 	printf("</td>\n");
+ 
+-	/*
+ 	printf("</tr>\n");
+ 	printf("</table>\n");
+-	*/
+ 
+ 	printf("</td>\n");
+ 
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
--- a/net-mgmt/nagios12/files/patch-ad
+++ b/net-mgmt/nagios12/files/patch-ad
@ -1,5 +1,5 @@
--- configure.orig	Thu Mar  1 04:54:12 2001
-+++ configure	Thu Mar  1 21:58:09 2001
+--- configure.orig	Tue Jun  3 12:47:57 2003
+++ configure	Thu Jul 31 16:35:45 2003
@@ -11,7 +11,7 @@
 ac_help=
 ac_default_prefix=/usr/local
@ -9,7 +9,7 @@
 ac_help="$ac_help
 --with-nagios-user=<user> sets user name to run nagios"
 ac_help="$ac_help
-@@ -562,9 +562,9 @@
+@@ -576,9 +576,9 @@
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@ -21,7 +21,7 @@
   fi
 fi
 for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
+@@ -2608,6 +2608,9 @@
 	LDFLAGS="${LDFLAGS} -L${withval}"
 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
 	
@ -31,7 +31,7 @@
 fi
 
 # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
+@@ -2615,6 +2618,8 @@
   withval="$with_gd_inc"
   
 	CFLAGS="${CFLAGS} -I${withval}"
@ -40,3 +40,30 @@
 	
 fi
 
+@@ -2748,14 +2753,14 @@
+ 	fi
+ 
+ 		if test x$GDLIBFOUND = x; then
+-		echo $ac_n "checking for gdImagePng in -lgd (order 3)""... $ac_c" 1>&6
+-echo "configure:2753: checking for gdImagePng in -lgd (order 3)" >&5
+		echo $ac_n "checking for gdImagePng in -lgd1 (order 3)""... $ac_c" 1>&6
+echo "configure:2753: checking for gdImagePng in -lgd1 (order 3)" >&5
+ 					ac_lib_var=`echo gd'_'gdImagePng'_'3 | sed 'y%./+-%__p_%'`
+ 	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-	LIBS="-lgd -lpng -lz -lm $LIBS"
+	LIBS="-lgd1 -lz -lm -lpng -ljpeg $LIBS"
+ 	cat > conftest.$ac_ext <<EOF
+ #line 2761 "configure"
+ #include "confdefs.h"
+@@ -2785,7 +2790,7 @@
+ 	  echo "$ac_t""yes" 1>&6
+ 	  
+ 			GDLIBFOUND=yep
+-			GDLIBS="-lgd -lpng -lz -lm"
+			GDLIBS="-lgd1 -lz -lm -lpng"
+ 	        	
+ 	else
+ 	  echo "$ac_t""no" 1>&6
--- a/net-mgmt/nagios12/files/patch-aj
+++ b/net-mgmt/nagios12/files/patch-aj
@ -0,0 +1,13 @@
+--- cgi/tac.c.orig	Mon May 12 06:18:56 2003
+++ cgi/tac.c	Sat Aug  2 16:24:23 2003
+@@ -1220,10 +1220,8 @@
+ 	printf("</table>\n");
+ 	printf("</td>\n");
+ 
+-	/*
+ 	printf("</tr>\n");
+ 	printf("</table>\n");
+-	*/
+ 
+ 	printf("</td>\n");
+ 
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
--- a/net-mgmt/nagios2/files/patch-ad
+++ b/net-mgmt/nagios2/files/patch-ad
@ -1,5 +1,5 @@
--- configure.orig	Thu Mar  1 04:54:12 2001
-+++ configure	Thu Mar  1 21:58:09 2001
+--- configure.orig	Tue Jun  3 12:47:57 2003
+++ configure	Thu Jul 31 16:35:45 2003
@@ -11,7 +11,7 @@
 ac_help=
 ac_default_prefix=/usr/local
@ -9,7 +9,7 @@
 ac_help="$ac_help
 --with-nagios-user=<user> sets user name to run nagios"
 ac_help="$ac_help
-@@ -562,9 +562,9 @@
+@@ -576,9 +576,9 @@
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@ -21,7 +21,7 @@
   fi
 fi
 for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
+@@ -2608,6 +2608,9 @@
 	LDFLAGS="${LDFLAGS} -L${withval}"
 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
 	
@ -31,7 +31,7 @@
 fi
 
 # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
+@@ -2615,6 +2618,8 @@
   withval="$with_gd_inc"
   
 	CFLAGS="${CFLAGS} -I${withval}"
@ -40,3 +40,30 @@
 	
 fi
 
+@@ -2748,14 +2753,14 @@
+ 	fi
+ 
+ 		if test x$GDLIBFOUND = x; then
+-		echo $ac_n "checking for gdImagePng in -lgd (order 3)""... $ac_c" 1>&6
+-echo "configure:2753: checking for gdImagePng in -lgd (order 3)" >&5
+		echo $ac_n "checking for gdImagePng in -lgd1 (order 3)""... $ac_c" 1>&6
+echo "configure:2753: checking for gdImagePng in -lgd1 (order 3)" >&5
+ 					ac_lib_var=`echo gd'_'gdImagePng'_'3 | sed 'y%./+-%__p_%'`
+ 	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-	LIBS="-lgd -lpng -lz -lm $LIBS"
+	LIBS="-lgd1 -lz -lm -lpng -ljpeg $LIBS"
+ 	cat > conftest.$ac_ext <<EOF
+ #line 2761 "configure"
+ #include "confdefs.h"
+@@ -2785,7 +2790,7 @@
+ 	  echo "$ac_t""yes" 1>&6
+ 	  
+ 			GDLIBFOUND=yep
+-			GDLIBS="-lgd -lpng -lz -lm"
+			GDLIBS="-lgd1 -lz -lm -lpng"
+ 	        	
+ 	else
+ 	  echo "$ac_t""no" 1>&6
--- a/net-mgmt/nagios2/files/patch-aj
+++ b/net-mgmt/nagios2/files/patch-aj
@ -0,0 +1,13 @@
+--- cgi/tac.c.orig	Mon May 12 06:18:56 2003
+++ cgi/tac.c	Sat Aug  2 16:24:23 2003
+@@ -1220,10 +1220,8 @@
+ 	printf("</table>\n");
+ 	printf("</td>\n");
+ 
+-	/*
+ 	printf("</tr>\n");
+ 	printf("</table>\n");
+-	*/
+ 
+ 	printf("</td>\n");
+ 
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
--- a/net/nagios/files/patch-ad
+++ b/net/nagios/files/patch-ad
@ -1,5 +1,5 @@
--- configure.orig	Thu Mar  1 04:54:12 2001
-+++ configure	Thu Mar  1 21:58:09 2001
+--- configure.orig	Tue Jun  3 12:47:57 2003
+++ configure	Thu Jul 31 16:35:45 2003
@@ -11,7 +11,7 @@
 ac_help=
 ac_default_prefix=/usr/local
@ -9,7 +9,7 @@
 ac_help="$ac_help
 --with-nagios-user=<user> sets user name to run nagios"
 ac_help="$ac_help
-@@ -562,9 +562,9 @@
+@@ -576,9 +576,9 @@
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@ -21,7 +21,7 @@
   fi
 fi
 for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
+@@ -2608,6 +2608,9 @@
 	LDFLAGS="${LDFLAGS} -L${withval}"
 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
 	
@ -31,7 +31,7 @@
 fi
 
 # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
+@@ -2615,6 +2618,8 @@
   withval="$with_gd_inc"
   
 	CFLAGS="${CFLAGS} -I${withval}"
@ -40,3 +40,30 @@
 	
 fi
 
+@@ -2748,14 +2753,14 @@
+ 	fi
+ 
+ 		if test x$GDLIBFOUND = x; then
+-		echo $ac_n "checking for gdImagePng in -lgd (order 3)""... $ac_c" 1>&6
+-echo "configure:2753: checking for gdImagePng in -lgd (order 3)" >&5
+		echo $ac_n "checking for gdImagePng in -lgd1 (order 3)""... $ac_c" 1>&6
+echo "configure:2753: checking for gdImagePng in -lgd1 (order 3)" >&5
+ 					ac_lib_var=`echo gd'_'gdImagePng'_'3 | sed 'y%./+-%__p_%'`
+ 	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-	LIBS="-lgd -lpng -lz -lm $LIBS"
+	LIBS="-lgd1 -lz -lm -lpng -ljpeg $LIBS"
+ 	cat > conftest.$ac_ext <<EOF
+ #line 2761 "configure"
+ #include "confdefs.h"
+@@ -2785,7 +2790,7 @@
+ 	  echo "$ac_t""yes" 1>&6
+ 	  
+ 			GDLIBFOUND=yep
+-			GDLIBS="-lgd -lpng -lz -lm"
+			GDLIBS="-lgd1 -lz -lm -lpng"
+ 	        	
+ 	else
+ 	  echo "$ac_t""no" 1>&6
--- a/net/nagios/files/patch-aj
+++ b/net/nagios/files/patch-aj
@ -0,0 +1,13 @@
+--- cgi/tac.c.orig	Mon May 12 06:18:56 2003
+++ cgi/tac.c	Sat Aug  2 16:24:23 2003
+@@ -1220,10 +1220,8 @@
+ 	printf("</table>\n");
+ 	printf("</td>\n");
+ 
+-	/*
+ 	printf("</tr>\n");
+ 	printf("</table>\n");
+-	*/
+ 
+ 	printf("</td>\n");
+