Subject: patch to update www/sarg to 2.1
To: None <mishka@intostroy.com>
From: Ben Collver <collver@peak.org>
List: tech-pkg
Date: 04/23/2006 18:59:09
--OgqxwSJOaUobr8KG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Attached is a patch to update www/sarg to version 2.1. I've tested the
build on amd64, but have not configured the software yet.
Cheers,
Ben
--OgqxwSJOaUobr8KG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="sarg.diff"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 22 Apr 2006 09:22:17 -0000 1.8
+++ Makefile 24 Apr 2006 01:56:10 -0000
@@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.8 2006/04/22 09:22:17 rillig Exp $
-DISTNAME= sarg-1.4.1
+DISTNAME= sarg-2.1
CATEGORIES= www
-MASTER_SITES= http://web.onda.com.br/orso/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sarg/}
-PATCH_SITES= http://web.onda.com.br/orso/patches/
-PATCHFILES= sarg-1.4.1-index.sort.patch
+PATCH_SITES= http://sarg.sourceforge.net/
+PATCHFILES= datafile.patch lastlog.patch
MAINTAINER= mishka@terabyte.com.ua
-HOMEPAGE= http://web.onda.com.br/orso/
+HOMEPAGE= http://sarg.sourceforge.net/sarg.php
COMMENT= Squid-Cache proxy server Analysis Report Generator
GNU_CONFIGURE= yes
@@ -52,6 +52,7 @@
${EGLNG}/English ${CFLNG}/English \
${EGLNG}/French ${CFLNG}/French \
${EGLNG}/German ${CFLNG}/German \
+ ${EGLNG}/Greek ${CFLNG}/Greek \
${EGLNG}/Hungarian ${CFLNG}/Hungarian \
${EGLNG}/Indonesian ${CFLNG}/Indonesian \
${EGLNG}/Italian ${CFLNG}/Italian \
@@ -61,9 +62,11 @@
${EGLNG}/Portuguese ${CFLNG}/Portuguese \
${EGLNG}/Romanian ${CFLNG}/Romanian \
${EGLNG}/Russian_koi8 ${CFLNG}/Russian_koi8 \
+ ${EGLNG}/Russian_UTF8 ${CFLNG}/Russian_UTF8 \
${EGLNG}/Russian_windows1251 \
${CFLNG}/Russian_windows1251 \
${EGLNG}/Serbian ${CFLNG}/Serbian \
+ ${EGLNG}/Slovak ${CFLNG}/Slovak \
${EGLNG}/Spanish ${CFLNG}/Spanish \
${EGLNG}/Turkish ${CFLNG}/Turkish \
${EGLNG}/Ukrainian_windows1251 \
@@ -73,4 +76,5 @@
@${FIND} ${WRKSRC} -type d -exec ${CHMOD} +x {} \;
@${RM} ${WRKSRC}/languages/.new
+.include "../../graphics/gd/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ PLIST 24 Apr 2006 01:56:10 -0000
@@ -2,7 +2,15 @@
sbin/sarg
man/man1/sarg.1
share/examples/sarg/sarg.conf
+share/examples/sarg/css.tpl
share/examples/sarg/exclude_codes
+share/examples/sarg/fonts/FreeSans.ttf
+share/examples/sarg/fonts/README
+share/examples/sarg/fonts/license
+share/examples/sarg/images/datetime.png
+share/examples/sarg/images/graph.png
+share/examples/sarg/images/sarg-squidguard-block.png
+share/examples/sarg/images/sarg.png
share/examples/sarg/languages/Bulgarian_windows1251
share/examples/sarg/languages/Catalan
share/examples/sarg/languages/Czech
@@ -10,6 +18,7 @@
share/examples/sarg/languages/English
share/examples/sarg/languages/French
share/examples/sarg/languages/German
+share/examples/sarg/languages/Greek
share/examples/sarg/languages/Hungarian
share/examples/sarg/languages/Indonesian
share/examples/sarg/languages/Italian
@@ -20,9 +29,41 @@
share/examples/sarg/languages/Romanian
share/examples/sarg/languages/Russian_koi8
share/examples/sarg/languages/Russian_windows1251
+share/examples/sarg/languages/Russian_UTF-8
share/examples/sarg/languages/Serbian
+share/examples/sarg/languages/Slovak
share/examples/sarg/languages/Spanish
share/examples/sarg/languages/Turkish
share/examples/sarg/languages/Ukrainian_windows1251
+share/examples/sarg/sarg-php/COPYING
+share/examples/sarg/sarg-php/INSTALL
+share/examples/sarg/sarg-php/LANGUAGES
+share/examples/sarg/sarg-php/language.php
+share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo
+share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po
+share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.mo
+share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.po
+share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo
+share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po
+share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo
+share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po
+share/examples/sarg/sarg-php/sarg-block-it.php
+share/examples/sarg/sarg-php/sarg-realtime.php
+share/examples/sarg/sarg-php/sarg-squidguard-block.php
+share/examples/sarg/sarg-php/sarg-squidguard-block2.php
+share/examples/sarg/sarg-php/style.php
+share/examples/sarg/sarg-php/translate.this
+@dirrm share/examples/sarg/fonts
+@dirrm share/examples/sarg/images
@dirrm share/examples/sarg/languages
+@dirrm share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/en_EN
+@dirrm share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/fr
+@dirrm share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/pt_BR
+@dirrm share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/ru
+@dirrm share/examples/sarg/sarg-php/locale
+@dirrm share/examples/sarg/sarg-php
@dirrm share/examples/sarg
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 24 Feb 2005 14:08:38 -0000 1.2
+++ distinfo 24 Apr 2006 01:56:10 -0000
@@ -1,14 +1,20 @@
$NetBSD: distinfo,v 1.2 2005/02/24 14:08:38 wiz Exp $
-SHA1 (sarg-1.4.1/sarg-1.4.1.tar.gz) = 7b01ad67ca1e6795e33301ac03e455c01259b0f9
-RMD160 (sarg-1.4.1/sarg-1.4.1.tar.gz) = 8e5adc86ddd56152cc0392d44f1775bb1622fd92
-Size (sarg-1.4.1/sarg-1.4.1.tar.gz) = 125589 bytes
-SHA1 (sarg-1.4.1/sarg-1.4.1-index.sort.patch) = 4fb150014d027dd24891a292c1c4ad7fafe0e66f
-RMD160 (sarg-1.4.1/sarg-1.4.1-index.sort.patch) = a865614ee7a77014f48775f630abd4f5b0905cdc
-Size (sarg-1.4.1/sarg-1.4.1-index.sort.patch) = 2034 bytes
-SHA1 (patch-aa) = c625b392bb7bc6cec773c8c6c14dbe2fba86377e
-SHA1 (patch-ab) = fd2d38a511e1bc3b95a854a8e9fc8beb9631fe3e
-SHA1 (patch-ac) = 59ac8d12b3e8fbd6230fed23fd5da542aee18184
-SHA1 (patch-ad) = 393cc7a76e0a8d01b0387890f7c9f12c08787827
-SHA1 (patch-ae) = d3fac03932f2471fa298069336a890d0a884557f
-SHA1 (patch-af) = 13a7d437eb90ccdcb18851338ab2ebe5512dc84e
+SHA1 (sarg-2.1/sarg-2.1.tar.gz) = e35239d076f8b4bf9b9c41ea68f7711fa9a6d920
+RMD160 (sarg-2.1/sarg-2.1.tar.gz) = 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05
+Size (sarg-2.1/sarg-2.1.tar.gz) = 352935 bytes
+SHA1 (sarg-2.1/datafile.patch) = 15e5c4f6d7dd7bb0d978a67fd8163eda5cadc7d5
+RMD160 (sarg-2.1/datafile.patch) = a158013cbb19620f1942201cec0d7896d5a6ebfc
+Size (sarg-2.1/datafile.patch) = 1300 bytes
+SHA1 (sarg-2.1/lastlog.patch) = c4af4ff498baa5d2a124b52ca84b984169c9eea8
+RMD160 (sarg-2.1/lastlog.patch) = e72fec0af3ce48df9a3aa43656d8be5cf3c1044b
+Size (sarg-2.1/lastlog.patch) = 406 bytes
+SHA1 (patch-aa) = aadbd10cfa7bedd2c7ba629f5be40f48d3092776
+SHA1 (patch-ab) = a22082096256009cef93095184859815f48ec533
+SHA1 (patch-ac) = 7157d9ee56f1d31273e6d020a0d970bd55278ebd
+SHA1 (patch-ad) = 26f90ff3a3c1099f36c6d4a32f7309c4b70a3365
+SHA1 (patch-ae) = 46e01d4c2f106629e512523e3b4d58118ccfb0bf
+SHA1 (patch-af) = e3dc4c6edd26f7361974f573e38265f613e1da42
+SHA1 (patch-ag) = f895801bf2834fb7c65233f15c20cca7c50f6a44
+SHA1 (patch-ah) = 9f3486723378085a8c3d1fdf4b549543038e40e1
+SHA1 (patch-ai) = fb00daf29e53f56e2b2a1a0997f8f364d82e6acf
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ patches/patch-aa 24 Apr 2006 01:56:10 -0000
@@ -1,18 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+$NetBSD$
---- Makefile.in.orig 2003-04-25 20:20:55.000000000 +0300
+--- Makefile.in.orig 2005-11-29 08:39:45.000000000 -0800
+++ Makefile.in
-@@ -4,10 +4,10 @@ CC = @CC@
+@@ -4,12 +4,12 @@ CC = @CC@
BINDIR = @BINDIR@
IBINDIR = -DBINDIR=\"@BINDIR@\"
MANDIR = @MANDIR@
-SYSCONFDIR = @SYSCONFDIR@
+SYSCONFDIR = ${EGDIR}
+ HTMLDIR = @HTMLDIR@
ISYSCONFDIR = -DSYSCONFDIR=\"@SYSCONFDIR@\"
+ IHTMLDIR = -DHTMLDIR=\"@HTMLDIR@\"
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+CFLAGS += @CFLAGS@ ${PKG_FLAGS}
+LDFLAGS += @LDFLAGS@
DEFS = @DEFS@
+ LIBS = @LIBS@
SRCDIR = .
- VPATH = .
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ patches/patch-ab 24 Apr 2006 01:56:10 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+$NetBSD$
---- convlog.c.orig 2003-04-25 20:20:55.000000000 +0300
+--- convlog.c.orig 2005-11-29 08:39:45.000000000 -0800
+++ convlog.c
-@@ -19,7 +19,7 @@ void convlog(char *arq, char *df, int df
+@@ -39,7 +39,7 @@ void convlog(char *arq, char *df, int df
struct tm *t;
if(arq[0] == '\0')
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patches/patch-ac 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ patches/patch-ac 24 Apr 2006 01:56:10 -0000
@@ -1,19 +1,19 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+$NetBSD$
---- log.c.orig 2003-04-25 20:20:55.000000000 +0300
+--- log.c.orig 2005-11-29 08:39:45.000000000 -0800
+++ log.c
-@@ -133,7 +133,7 @@ int main(argc,argv)
- ReportType[0]='\0';
- UserTabFile[0]='\0';
+@@ -148,7 +148,7 @@ int main(argc,argv)
+ SquidGuardLogFormat[0]='\0';
+ SquidGuardLogAlternate[0]='\0';
- strcpy(AccessLog,"/usr/local/squid/var/logs/access.log");
+ strcpy(AccessLog,SQUID_ACCESSLOG);
sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR);
- strcpy(BgColor,"white");
- strcpy(TxColor,"black");
-@@ -146,7 +146,7 @@ int main(argc,argv)
- strcpy(HeaderBgColor,"blanchedalmond");
- strcpy(FontSize,"-1");
+ strcpy(GraphDaysBytesBarColor,"orange");
+ strcpy(BgColor,"#ffffff");
+@@ -163,7 +163,7 @@ int main(argc,argv)
+ strcpy(LogoTextColor,"#006699");
+ strcpy(FontSize,"9px");
strcpy(TempDir,"/tmp");
- strcpy(OutputDir,"/usr/local/etc/httpd/htdocs/squid-reports");
+ strcpy(OutputDir,SARG_REPORTSDIR);
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/patches/patch-ad,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ad
--- patches/patch-ad 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ patches/patch-ad 24 Apr 2006 01:56:10 -0000
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+$NetBSD$
---- sarg.1.orig 2003-04-25 20:20:55.000000000 +0300
+--- sarg.1.orig 2005-11-29 08:39:45.000000000 -0800
+++ sarg.1
-@@ -124,7 +124,7 @@ Convert the logfile's date/time field to
+@@ -131,9 +131,9 @@ Convert the logfile's date/time field to
.B \-split
Split the log file by date in \fB-d\fP parameter.
.SH FILES
--.BR /etc/squid/sarg.conf
+-.BR /usr/local/sarg/sarg.conf
+.BR @PKG_SYSCONFDIR@/sarg.conf
.br
- .SH AUTHOR
- This manual page was written by Luigi Gangitano <gangitano@lugroma3.org>,
+-.B /usr/local/squid/logs/access.log
++.B @SQUID_ACCESSLOG@
+ .br
+ .B /usr/local/squidGuard/logs/squidGuard.log
+ .SH SEE ALSO
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/patches/patch-ae,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ae
--- patches/patch-ae 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ patches/patch-ae 24 Apr 2006 01:56:10 -0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+$NetBSD$
---- sarg.conf.orig 2003-04-25 20:20:55.000000000 +0300
+--- sarg.conf.orig 2005-11-29 08:39:45.000000000 -0800
+++ sarg.conf
-@@ -29,7 +29,7 @@
+@@ -32,7 +32,7 @@
# Where is the access.log file
# sarg -l file
#
-#access_log /usr/local/squid/var/logs/access.log
+#access_log @SQUID_ACCESSLOG@
- # TAG: title
- # Especify the title for html page.
-@@ -120,7 +120,7 @@
+ # TAG: graphs yes|no
+ # Use graphics where is possible.
+@@ -139,7 +139,7 @@
# The reports will be saved in that directory
# sarg -o dir
#
@@ -20,7 +20,7 @@
# TAG: output_email
# Email address to send the reports. If you use this tag, no html reports will be generated.
-@@ -244,7 +244,7 @@
+@@ -269,7 +269,7 @@
# TAG: exclude_codes file
# Ignore records with these codes. Eg.: NONE/400
#
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/www/sarg/patches/patch-af,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-af
--- patches/patch-af 4 Dec 2003 16:06:32 -0000 1.1.1.1
+++ patches/patch-af 24 Apr 2006 01:56:10 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+$NetBSD$
---- splitlog.c.orig 2003-04-25 20:20:55.000000000 +0300
+--- splitlog.c.orig 2005-11-29 08:39:45.000000000 -0800
+++ splitlog.c
-@@ -19,7 +19,7 @@ void splitlog(char *arq, char *df, int d
+@@ -39,7 +39,7 @@ void splitlog(char *arq, char *df, int d
struct tm *t;
if(arq[0] == '\0')
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ag 24 Apr 2006 01:56:10 -0000
@@ -0,0 +1,49 @@
+$NetBSD$
+
+--- configure.in.orig 2005-11-29 08:39:45.000000000 -0800
++++ configure.in
+@@ -6,33 +6,8 @@ LDFLAGS="-g"
+
+ AC_CANONICAL_HOST
+
+-AC_ARG_WITH(gcc,
+-[ --without-gcc use CC to compile])
+-
+-test -n "$CC" && cc_specified=yes
+-case ${with_gcc} in
+- yes ) CC=gcc ;;
+-dnl yes ) CC=g++ ;;
+- no ) CC=cc ;;
+- * ) AC_PROG_CC;;
+-dnl * ) AC_PROG_CXX ;;
+-esac
+-
+-if test "${CC}" = "cc" ; then
+- CFLAGS="${CFLAGS} -w -g -O2 -Aa"
+-else
+- CFLAGS="${CFLAGS} -w"
+-fi
+-
+-case "$host" in
+- *-solaris*)
+- LDFLAGS="${LDFLAGS} -lsocket -lnsl"
+- CFLAGS="-DSOLARIS ${CFLAGS}"
+- ;;
+-esac
+-
+-#dnl Checks for programs.
+-#AC_PROG_CC
++dnl Checks for programs.
++AC_PROG_CC
+
+ dnl Check for headers
+ AC_HEADER_DIRENT
+@@ -40,7 +15,7 @@ AC_HEADER_STDC
+
+ AC_CHECK_HEADERS(stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \
+ dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \
+- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h)
++ ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h)
+
+ AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD="yes", HAVE_GD="")
+
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ah 24 Apr 2006 01:56:10 -0000
@@ -0,0 +1,99 @@
+$NetBSD$
+
+--- configure.orig 2005-11-29 08:39:45.000000000 -0800
++++ configure
+@@ -853,11 +853,6 @@ Optional Features:
+ --enable-htmldir=htmldir
+ Select htmldir
+
+-Optional Packages:
+- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --without-gcc use CC to compile
+-
+ Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+@@ -1388,18 +1383,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
+
+
+
+-
+-# Check whether --with-gcc or --without-gcc was given.
+-if test "${with_gcc+set}" = set; then
+- withval="$with_gcc"
+-
+-fi;
+-
+-test -n "$CC" && cc_specified=yes
+-case ${with_gcc} in
+- yes ) CC=gcc ;;
+- no ) CC=cc ;;
+- * ) ac_ext=c
++ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -2328,24 +2312,7 @@ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-;;
+-esac
+-
+-if test "${CC}" = "cc" ; then
+- CFLAGS="${CFLAGS} -w -g -O2 -Aa"
+-else
+- CFLAGS="${CFLAGS} -w"
+-fi
+-
+-case "$host" in
+- *-solaris*)
+- LDFLAGS="${LDFLAGS} -lsocket -lnsl"
+- CFLAGS="-DSOLARIS ${CFLAGS}"
+- ;;
+-esac
+
+-#dnl Checks for programs.
+-#AC_PROG_CC
+
+
+
+@@ -3166,10 +3133,35 @@ fi
+
+ done
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ for ac_header in stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \
+ dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \
+- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h errno.h \
+- sys/resource.h
++ ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
Index: patches/patch-ai
===================================================================
RCS file: patches/patch-ai
diff -N patches/patch-ai
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ai 24 Apr 2006 01:56:10 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- grepday.c.orig 2005-11-29 08:39:45.000000000 -0800
++++ grepday.c
+@@ -43,7 +43,7 @@ char s[15];
+ #include <iconv.h>
+ #define SARGgdImageStringFT I18NgdImageStringFT
+
+-BGD_DECLARE(char *) I18NgdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
++char *I18NgdImageStringFT(gdImage * im, int *brect, int fg, char *fontlist,
+ double ptsize, double angle, int x, int y,
+ char *string)
+ {
--OgqxwSJOaUobr8KG--