1 files changed, 42 insertions, 20 deletions
diff --git a/databases/rrdtool/patches/patch-aq b/databases/rrdtool/patches/patch-aq
index 0feae5e72c9..44401b29cd1 100644
--- a/databases/rrdtool/patches/patch-aq
+++ b/databases/rrdtool/patches/patch-aq
@@ -1,24 +1,46 @@
-$NetBSD: patch-aq,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-aq,v 1.4 2003/02/16 23:08:59 seb Exp $
 
---- src/rrd_tool.h.orig	Thu Sep 14 15:34:00 2000
-+++ src/rrd_tool.h	Tue Dec  5 20:46:24 2000
-@@ -14,6 +14,11 @@
- #ifndef _RRD_TOOL_H
- #define _RRD_TOOL_H
+--- src/Makefile.am.orig	Tue May  7 21:51:19 2002
++++ src/Makefile.am
+@@ -5,19 +5,6 @@
+ #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
+ #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
  
-+/*
-+ * gd.h needs to be called before math.h to avoid -Wshadow warnings
-+ */
-+#include <gd.h>
-+
- #ifdef WIN32
- # include "ntconfig.h"
- #else
-@@ -125,7 +130,6 @@
- int PngSize(FILE *, long *, long *);
- int PngSize(FILE *, long *, long *);
+-CGI_INC_DIR       = $(top_srcdir)/@CGI_LIB_DIR@
+-GD_INC_DIR        = $(top_srcdir)/@GD_LIB_DIR@
+-PNG_INC_DIR       = $(top_srcdir)/@PNG_LIB_DIR@
+-ZLIB_INC_DIR      = $(top_srcdir)/@ZLIB_LIB_DIR@
+-
+-CGI_LIB_DIR       = $(top_builddir)/@CGI_LIB_DIR@
+-GD_LIB_DIR        = $(top_builddir)/@GD_LIB_DIR@
+-PNG_LIB_DIR       = $(top_builddir)/@PNG_LIB_DIR@
+-ZLIB_LIB_DIR      = $(top_builddir)/@ZLIB_LIB_DIR@
+-
+-
+-INCLUDES          = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) -I$(PNG_INC_DIR) -I$(ZLIB_INC_DIR)
+-
+ #COMPILE   = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+ #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+ #LINK      = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
+@@ -54,11 +41,7 @@ RRD_C_FILES =		\
+ # creates a ./.lib/*.al file that contains the PIC compiled object
+ # files.
  
--#include <gd.h>
- void gdImagePng(gdImagePtr im, FILE *out);
+-RRD_LIBS =				\
+-	$(CGI_LIB_DIR)/librrd_cgi.la	\
+-	$(GD_LIB_DIR)/librrd_gd.la	\
+-	$(PNG_LIB_DIR)/librrd_png.la	\
+-	$(ZLIB_LIB_DIR)/librrd_z.la
++RRD_LIBS=	-lz -ljpeg -lgd -lcgi -lpng -lttf
+ 
+ lib_LTLIBRARIES           = librrd.la
+ noinst_LTLIBRARIES        = librrd_private.la
+@@ -72,7 +55,7 @@ librrd_la_LDFLAGS         = -version-inf
+ include_HEADERS	= rrd.h
+ 
+ librrd_private_la_LIBADD  = $(RRD_LIBS)
+-librrd_private_la_LDFLAGS = -static
++librrd_private_la_LDFLAGS = -prefer-pic
+ 
+ bin_PROGRAMS	= rrdcgi rrdtool rrdupdate
  
- int rrd_create_fn(char *file_name, rrd_t *rrd);