- Fix graphs by: use bundled gdchart and use gd1 instead of gd2

- Get rid of interactive menu
- Rework build options
- Fix optional XML dumping support

PR:		ports/60184
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> (maintainer)

2 files changed, 106 insertions, 2 deletions

diff --git a/net/ntop/files/Makefile.gdchart b/net/ntop/files/Makefile.gdchart
new file mode 100644
index 000000000000..9ff45345fc70
--- /dev/null
+++ b/net/ntop/files/Makefile.gdchart
@@ -0,0 +1,36 @@
+GDC_INCL = .
+GD_INCL  = $(LOCALBASE)/include/gd
+GD_LIB   = $(LOCALBASE)/lib
+
+AR=ar
+RANLIB = ranlib
+
+all: libgdchart.a
+
+# --- compile the lib ---
+price_conv.o: price_conv.c
+	$(CC) $(CFLAGS) -c price_conv.c
+
+gdc.o: gdc.c gdc.h
+	$(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdc.c
+
+gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie.c
+	$(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdc_pie.c
+
+gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
+	$(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdchart.c
+
+libgdchart.a: gdc.o gdc_pie.o gdchart.o price_conv.o
+	$(AR) rc libgdchart.a gdc.o gdc_pie.o gdchart.o price_conv.o
+	@if [ -x $(RANLIB) ] ; then \
+	  $(RANLIB) libgdchart.a; \
+	fi;
+
+install:
+
+# --- clean ---
+clean:
+	rm -f *.o gdc_samp1 gdc_samp2 gdc_pie_samp libgdchart.a
+	cd $(GD_LIB) ; $(MAKE) -f Makefile clean
+
+distclean: clean
diff --git a/net/ntop/files/patch-configure b/net/ntop/files/patch-configure
index 7057d21339d6..359b44038f03 100644
--- a/net/ntop/files/patch-configure
+++ b/net/ntop/files/patch-configure
@@ -1,5 +1,29 @@
---- configure.orig	Sat Nov 22 13:54:32 2003
-+++ configure	Sat Nov 22 13:54:48 2003
+--- configure.orig	Mon Apr 14 18:41:50 2003
++++ configure	Fri Dec 12 19:11:08 2003
+@@ -8251,9 +8251,9 @@
+             esac
+         fi
+         if test ".gd" != "."; then
+-            rc=`(echo $LIBS | grep '\-lgd ' > /dev/null 2> /dev/null; echo $?)`
++            rc=`(echo $LIBS | grep '\-lgd1 ' > /dev/null 2> /dev/null; echo $?)`
+             if [ $rc -eq 1 ]; then
+-                LIBS="$LIBS -lgd"
++                LIBS="$LIBS -lgd1"
+             fi
+         fi
+     fi
+@@ -8512,9 +8512,9 @@
+             esac
+         fi
+         if test ".glib" != "."; then
+-            rc=`(echo $LIBS | grep '\-lglib ' > /dev/null 2> /dev/null; echo $?)`
++            rc=`(echo $LIBS | grep '\-lglib12 ' > /dev/null 2> /dev/null; echo $?)`
+             if [ $rc -eq 1 ]; then
+-                LIBS="$LIBS -lglib"
++                LIBS="$LIBS -lglib12"
+             fi
+         fi
+     fi
 @@ -14711,7 +14711,7 @@
  
  
@@ -9,3 +33,47 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -17879,7 +17879,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgd  $LIBS"
++LIBS="-lgd1  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -17932,7 +17932,7 @@
+ #define HAVE_LIBGD 1
+ _ACEOF
+ 
+-  LIBS="-lgd $LIBS"
++  LIBS="-lgd1 $LIBS"
+ 
+ fi
+ 
+@@ -18648,13 +18648,13 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for g_date_julian in -lglib" >&5
+-echo $ECHO_N "checking for g_date_julian in -lglib... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for g_date_julian in -lglib12" >&5
++echo $ECHO_N "checking for g_date_julian in -lglib12... $ECHO_C" >&6
+ if test "${ac_cv_lib_glib_g_date_julian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lglib  $LIBS"
++LIBS="-lglib12  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -18707,7 +18707,7 @@
+ #define HAVE_LIBGLIB 1
+ _ACEOF
+ 
+-  LIBS="-lglib $LIBS"
++  LIBS="-lglib12 $LIBS"
+ 
+ fi
+