From tkato@prontomail.com  Fri Jul  4 08:54:17 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BA46637B401
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  4 Jul 2003 08:54:17 -0700 (PDT)
Received: from hfep03.dion.ne.jp (hfep03.dion.ne.jp [203.181.105.69])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4DD0943FE5
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  4 Jul 2003 08:54:16 -0700 (PDT)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([61.198.241.183]) by hfep03.dion.ne.jp with SMTP
          id <20030704155358137.WOOM@hfep03.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Sat, 5 Jul 2003 00:53:58 +0900
Message-Id: <20030705005308.200ca6d6.tkato@prontomail.com>
Date: Sat, 5 Jul 2003 00:53:08 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: graphics/gd

>Number:         54100
>Category:       ports
>Synopsis:       Update port: graphics/gd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 04 09:00:32 PDT 2003
>Closed-Date:    Fri Jul 11 11:16:29 PDT 2003
>Last-Modified:  Fri Jul 11 11:16:29 PDT 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
- Change library name from libgd to libgd1
- Do not install everything except headers and libraries
  (to avoid conflicting with graphics/gd2)

New file:
files/Makefile.lib
files/patch-gd_gif_in.c
files/patch-gdcache.h

Remove file:
files/patch-ac


diff -urN /usr/ports/graphics/gd/Makefile graphics/gd/Makefile
--- /usr/ports/graphics/gd/Makefile	Wed Jul  2 09:12:16 2003
+++ graphics/gd/Makefile	Fri Jul  4 23:09:13 2003
@@ -7,32 +7,22 @@
 
 PORTNAME=	gd
 PORTVERSION=	1.8.4
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
-		http://virtual-estates.net/~mi/port-stuff/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	graphics/gd
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gd_gif_in.c.bz2
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	A graphics library for fast image creation
+COMMENT?=	A graphics library for fast creation of images
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2     # XXX
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2
-.if !exists(/usr/bin/bzip2)
-BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
-.endif
-
-FREETYPE_CONFIG?=       ${LOCALBASE}/bin/freetype-config
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_REINPLACE=	yes
-MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
+MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
 
 .if defined(WITH_X11)
@@ -48,16 +38,6 @@
 .endif
 
 post-extract:
-	@${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/gd_gif_in.c.bz2 \
-		> ${WRKSRC}/gd_gif_in.c
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
-.endif
+	@${CP} ${FILESDIR}/gd_gif_in.c ${WRKSRC}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/gd/files/Makefile.lib graphics/gd/files/Makefile.lib
--- /usr/ports/graphics/gd/files/Makefile.lib	Thu Jan  1 09:00:00 1970
+++ graphics/gd/files/Makefile.lib	Fri Jul  4 23:14:18 2003
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+PREFIX?=	/usr/local
+SHLIB_VER?=	2
+
+LIB=		gd1
+LIBDIR=		${PREFIX}/lib
+SHLIB_MAJOR=	${SHLIB_VER}
+SHLIB_MINOR=	0
+NOPROFILE=	yes
+NOOBJ=		yes
+
+INCS=		gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
+		gdfonts.h gdfontt.h
+INCSDIR=	${PREFIX}/include/gd
+INCDIR=		${INSCDIR}	# for pre-bsd.incs.mk API
+
+SRCS=		gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_ss.c \
+		gd_io_ss.c gd_png.c gd_jpeg.c gdxpm.c gdfontt.c gdfonts.c \
+		gdfontmb.c gdfontl.c gdfontg.c gdtables.c gdft.c gdttf.c \
+		gdcache.c gdkanji.c wbmp.c gd_wbmp.c gdhelpers.c gd_gif_in.c
+
+CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
+		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
+		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
+LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz
+
+.ifdef WITH_X11
+CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDADD+=		-L${X11BASE}/lib -lXpm -lX11
+.endif
+
+beforeinstall:
+	mkdir -p ${INCSDIR}
+
+.include <bsd.lib.mk>
diff -urN /usr/ports/graphics/gd/files/gd_gif_in.c graphics/gd/files/gd_gif_in.c
--- /usr/ports/graphics/gd/files/gd_gif_in.c	Thu Jan  1 09:00:00 1970
+++ graphics/gd/files/gd_gif_in.c	Fri Jul  4 14:46:25 2003
@@ -0,0 +1,561 @@
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include "gd.h"
+
+/* Used only when debugging GIF compression code */
+/* #define DEBUGGING_ENVARS */
+
+#ifdef DEBUGGING_ENVARS
+
+static int verbose_set = 0;
+static int verbose;
+#define VERBOSE (verbose_set?verbose:set_verbose())
+
+static int set_verbose(void)
+{
+ verbose = !!getenv("GIF_VERBOSE");
+ verbose_set = 1;
+ return(verbose);
+}
+
+#else
+
+#define VERBOSE 0
+
+#endif
+
+
+#define        MAXCOLORMAPSIZE         256
+
+#define        TRUE    1
+#define        FALSE   0
+
+#define CM_RED         0
+#define CM_GREEN       1
+#define CM_BLUE                2
+
+#define        MAX_LWZ_BITS            12
+
+#define INTERLACE              0x40
+#define LOCALCOLORMAP  0x80
+#define BitSet(byte, bit)      (((byte) & (bit)) == (bit))
+
+#define        ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) != 0)
+
+#define LM_to_uint(a,b)                        (((b)<<8)|(a))
+
+/* We may eventually want to use this information, but def it out for now */
+#if 0
+static struct {
+       unsigned int    Width;
+       unsigned int    Height;
+       unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
+       unsigned int    BitPixel;
+       unsigned int    ColorResolution;
+       unsigned int    Background;
+       unsigned int    AspectRatio;
+} GifScreen;
+#endif
+
+static struct {
+       int     transparent;
+       int     delayTime;
+       int     inputFlag;
+       int     disposal;
+} Gif89 = { -1, -1, -1, 0 };
+
+static int ReadColorMap (gdIOCtx *fd, int number, unsigned char (*buffer)[256]);
+static int DoExtension (gdIOCtx *fd, int label, int *Transparent);
+static int GetDataBlock (gdIOCtx *fd, unsigned char *buf);
+static int GetCode (gdIOCtx *fd, int code_size, int flag);
+static int LWZReadByte (gdIOCtx *fd, int flag, int input_code_size);
+
+static void ReadImage (gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace); /*1.4//, int ignore); */
+
+int ZeroDataBlock;
+
+gdImagePtr
+gdImageCreateFromGif(FILE *fdFile)
+{
+        gdIOCtx		*fd = gdNewFileCtx(fdFile);
+        gdImagePtr    	im = 0;
+
+        im = gdImageCreateFromGifCtx(fd);
+
+        fd->free(fd);
+
+        return im;
+}
+
+gdImagePtr
+gdImageCreateFromGifCtx(gdIOCtxPtr fd)
+{
+       int imageNumber;
+       int BitPixel;
+       int ColorResolution;
+       int Background;
+       int AspectRatio;
+       int Transparent = (-1);
+       unsigned char   buf[16];
+       unsigned char   c;
+       unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
+       unsigned char   localColorMap[3][MAXCOLORMAPSIZE];
+       int             imw, imh;
+       int             useGlobalColormap;
+       int             bitPixel;
+       int	       i;
+       /*1.4//int             imageCount = 0; */
+       char            version[4];
+
+       gdImagePtr im = 0;
+       ZeroDataBlock = FALSE;
+
+       /*1.4//imageNumber = 1; */
+       if (! ReadOK(fd,buf,6)) {
+		return 0;
+	}
+       if (strncmp((char *)buf,"GIF",3) != 0) {
+		return 0;
+	}
+       strncpy(version, (char *)buf + 3, 3);
+       version[3] = '\0';
+
+       if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {
+		return 0;
+	}
+       if (! ReadOK(fd,buf,7)) {
+		return 0;
+	}
+       BitPixel        = 2<<(buf[4]&0x07);
+       ColorResolution = (int) (((buf[4]&0x70)>>3)+1);
+       Background      = buf[5];
+       AspectRatio     = buf[6];
+
+       if (BitSet(buf[4], LOCALCOLORMAP)) {    /* Global Colormap */
+               if (ReadColorMap(fd, BitPixel, ColorMap)) {
+			return 0;
+		}
+       }
+       for (;;) {
+               if (! ReadOK(fd,&c,1)) {
+                       return 0;
+               }
+               if (c == ';') {         /* GIF terminator */
+			goto terminated;
+	       }
+
+               if (c == '!') {         /* Extension */
+                       if (! ReadOK(fd,&c,1)) {
+                               return 0;
+                       }
+                       DoExtension(fd, c, &Transparent);
+                       continue;
+               }
+
+               if (c != ',') {         /* Not a valid start character */
+                       continue;
+               }
+
+               /*1.4//++imageCount; */
+
+               if (! ReadOK(fd,buf,9)) {
+	               return 0;
+               }
+
+               useGlobalColormap = ! BitSet(buf[8], LOCALCOLORMAP);
+
+               bitPixel = 1<<((buf[8]&0x07)+1);
+
+               imw = LM_to_uint(buf[4],buf[5]);
+               imh = LM_to_uint(buf[6],buf[7]);
+	       if (!(im = gdImageCreate(imw, imh))) {
+			 return 0;
+	       }
+               im->interlace = BitSet(buf[8], INTERLACE);
+               if (! useGlobalColormap) {
+                       if (ReadColorMap(fd, bitPixel, localColorMap)) { 
+                                 return 0;
+                       }
+                       ReadImage(im, fd, imw, imh, localColorMap, 
+                                 BitSet(buf[8], INTERLACE)); 
+                                 /*1.4//imageCount != imageNumber); */
+               } else {
+                       ReadImage(im, fd, imw, imh,
+                                 ColorMap, 
+                                 BitSet(buf[8], INTERLACE));
+                                 /*1.4//imageCount != imageNumber); */
+               }
+               if (Transparent != (-1)) {
+                       gdImageColorTransparent(im, Transparent);
+               }	   
+	       goto terminated;
+       }
+
+terminated:
+       /* Terminator before any image was declared! */
+       if (!im) {
+		return 0;
+       }
+       /* Check for open colors at the end, so
+          we can reduce colorsTotal and ultimately
+          BitsPerPixel */
+       for (i=((im->colorsTotal-1)); (i>=0); i--) {
+		if (im->open[i]) {
+                	im->colorsTotal--;
+                } else {
+                	break;
+                }
+       } 
+       return im;
+}
+
+static int
+ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
+{
+       int             i;
+       unsigned char   rgb[3];
+
+
+       for (i = 0; i < number; ++i) {
+               if (! ReadOK(fd, rgb, sizeof(rgb))) {
+                       return TRUE;
+               }
+               buffer[CM_RED][i] = rgb[0] ;
+               buffer[CM_GREEN][i] = rgb[1] ;
+               buffer[CM_BLUE][i] = rgb[2] ;
+       }
+
+
+       return FALSE;
+}
+
+static int
+DoExtension(gdIOCtx *fd, int label, int *Transparent)
+{
+       static unsigned char     buf[256];
+
+       switch (label) {
+       case 0xf9:              /* Graphic Control Extension */
+               (void) GetDataBlock(fd, (unsigned char*) buf);
+               Gif89.disposal    = (buf[0] >> 2) & 0x7;
+               Gif89.inputFlag   = (buf[0] >> 1) & 0x1;
+               Gif89.delayTime   = LM_to_uint(buf[1],buf[2]);
+               if ((buf[0] & 0x1) != 0)
+                       *Transparent = buf[3];
+
+               while (GetDataBlock(fd, (unsigned char*) buf) != 0)
+                       ;
+               return FALSE;
+       default:
+               break;
+       }
+       while (GetDataBlock(fd, (unsigned char*) buf) != 0)
+               ;
+
+       return FALSE;
+}
+
+static int
+GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
+{
+       unsigned char   count;
+
+       if (! ReadOK(fd,&count,1)) {
+               return -1;
+       }
+
+       ZeroDataBlock = count == 0;
+
+       if ((count != 0) && (! ReadOK(fd, buf, count))) {
+               return -1;
+       }
+
+       return count;
+}
+
+static int
+GetDataBlock(gdIOCtx *fd, unsigned char *buf)
+{
+ int rv;
+ int i;
+
+ rv = GetDataBlock_(fd,buf);
+ if (VERBOSE)
+  { printf("[GetDataBlock returning %d",rv);
+    if (rv > 0)
+     { printf(":");
+       for (i=0;i<rv;i++) printf(" %02x",buf[i]);
+     }
+    printf("]\n");
+  }
+ return(rv);
+}
+
+static int
+GetCode_(gdIOCtx *fd, int code_size, int flag)
+{
+       static unsigned char    buf[280];
+       static int              curbit, lastbit, done, last_byte;
+       int                     i, j, ret;
+       unsigned char           count;
+
+       if (flag) {
+               curbit = 0;
+               lastbit = 0;
+               done = FALSE;
+               return 0;
+       }
+
+       if ( (curbit+code_size) >= lastbit) {
+               if (done) {
+                       if (curbit >= lastbit) {
+                                /* Oh well */
+                       }                        
+                       return -1;
+               }
+               buf[0] = buf[last_byte-2];
+               buf[1] = buf[last_byte-1];
+
+               if ((count = GetDataBlock(fd, &buf[2])) == 0)
+                       done = TRUE;
+
+               last_byte = 2 + count;
+               curbit = (curbit - lastbit) + 16;
+               lastbit = (2+count)*8 ;
+       }
+
+       ret = 0;
+       for (i = curbit, j = 0; j < code_size; ++i, ++j)
+               ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j;
+
+       curbit += code_size;
+       return ret;
+}
+
+static int
+GetCode(gdIOCtx *fd, int code_size, int flag)
+{
+ int rv;
+
+ rv = GetCode_(fd,code_size,flag);
+ if (VERBOSE) printf("[GetCode(,%d,%d) returning %d]\n",code_size,flag,rv);
+ return(rv);
+}
+
+#define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
+static int
+LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
+{
+       static int      fresh = FALSE;
+       int             code, incode;
+       static int      code_size, set_code_size;
+       static int      max_code, max_code_size;
+       static int      firstcode, oldcode;
+       static int      clear_code, end_code;
+       static int      table[2][(1<< MAX_LWZ_BITS)];
+       static int      stack[STACK_SIZE], *sp;
+       register int    i;
+
+       if (flag) {
+               set_code_size = input_code_size;
+               code_size = set_code_size+1;
+               clear_code = 1 << set_code_size ;
+               end_code = clear_code + 1;
+               max_code_size = 2*clear_code;
+               max_code = clear_code+2;
+
+               GetCode(fd, 0, TRUE);
+               
+               fresh = TRUE;
+
+               for (i = 0; i < clear_code; ++i) {
+                       table[0][i] = 0;
+                       table[1][i] = i;
+               }
+               for (; i < (1<<MAX_LWZ_BITS); ++i)
+                       table[0][i] = table[1][0] = 0;
+
+               sp = stack;
+
+               return 0;
+       } else if (fresh) {
+               fresh = FALSE;
+               do {
+                       firstcode = oldcode =
+                               GetCode(fd, code_size, FALSE);
+               } while (firstcode == clear_code);
+               return firstcode;
+       }
+
+       if (sp > stack)
+               return *--sp;
+
+       while ((code = GetCode(fd, code_size, FALSE)) >= 0) {
+               if (code == clear_code) {
+                       for (i = 0; i < clear_code; ++i) {
+                               table[0][i] = 0;
+                               table[1][i] = i;
+                       }
+                       for (; i < (1<<MAX_LWZ_BITS); ++i)
+                               table[0][i] = table[1][i] = 0;
+                       code_size = set_code_size+1;
+                       max_code_size = 2*clear_code;
+                       max_code = clear_code+2;
+                       sp = stack;
+                       firstcode = oldcode =
+                                       GetCode(fd, code_size, FALSE);
+                       return firstcode;
+               } else if (code == end_code) {
+                       int             count;
+                       unsigned char   buf[260];
+
+                       if (ZeroDataBlock)
+                               return -2;
+
+                       while ((count = GetDataBlock(fd, buf)) > 0)
+                               ;
+
+                       if (count != 0)
+                       return -2;
+               }
+
+               incode = code;
+
+	       if (sp == (stack + STACK_SIZE)) {
+		       /* Bad compressed data stream */
+		       return -1;
+	       }
+
+               if (code >= max_code) {
+                       *sp++ = firstcode;
+                       code = oldcode;
+               }
+
+               while (code >= clear_code) {
+		       if (sp == (stack + STACK_SIZE)) {
+			       /* Bad compressed data stream */
+			       return -1;
+		       }
+                       *sp++ = table[1][code];
+                       if (code == table[0][code]) {
+                               /* Oh well */
+                       }
+                       code = table[0][code];
+               }
+
+               *sp++ = firstcode = table[1][code];
+
+               if ((code = max_code) <(1<<MAX_LWZ_BITS)) {
+                       table[0][code] = oldcode;
+                       table[1][code] = firstcode;
+                       ++max_code;
+                       if ((max_code >= max_code_size) &&
+                               (max_code_size < (1<<MAX_LWZ_BITS))) {
+                               max_code_size *= 2;
+                               ++code_size;
+                       }
+               }
+
+               oldcode = incode;
+
+               if (sp > stack)
+                       return *--sp;
+       }
+       return code;
+}
+
+static int
+LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
+{
+ int rv;
+
+ rv = LWZReadByte_(fd,flag,input_code_size);
+ if (VERBOSE) printf("[LWZReadByte(,%d,%d) returning %d]\n",flag,input_code_size,rv);
+ return(rv);
+}
+
+static void
+ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
+{
+       unsigned char   c;      
+       int             v;
+       int             xpos = 0, ypos = 0, pass = 0;
+       int i;
+       /* Stash the color map into the image */
+       for (i=0; (i<gdMaxColors); i++) {
+               im->red[i] = cmap[CM_RED][i];	
+               im->green[i] = cmap[CM_GREEN][i];	
+               im->blue[i] = cmap[CM_BLUE][i];	
+               im->open[i] = 1;
+       }
+       /* Many (perhaps most) of these colors will remain marked open. */
+       im->colorsTotal = gdMaxColors;
+       /*
+       **  Initialize the Compression routines
+       */
+       if (! ReadOK(fd,&c,1)) {
+               return; 
+       }
+       if (LWZReadByte(fd, TRUE, c) < 0) {
+               return;
+       }
+
+       /*
+       **  If this is an "uninteresting picture" ignore it.
+       **  REMOVED For 1.4
+       */
+       /*if (ignore) { */
+       /*        while (LWZReadByte(fd, FALSE, c) >= 0) */
+       /*                ; */
+       /*        return; */
+       /*} */
+
+       while ((v = LWZReadByte(fd,FALSE,c)) >= 0 ) {
+               /* This how we recognize which colors are actually used. */
+               if (im->open[v]) {
+                       im->open[v] = 0;
+               }
+               gdImageSetPixel(im, xpos, ypos, v);
+               ++xpos;
+               if (xpos == len) {
+                       xpos = 0;
+                       if (interlace) {
+                               switch (pass) {
+                               case 0:
+                               case 1:
+                                       ypos += 8; break;
+                               case 2:
+                                       ypos += 4; break;
+                               case 3:
+                                       ypos += 2; break;
+                               }
+
+                               if (ypos >= height) {
+                                       ++pass;
+                                       switch (pass) {
+                                       case 1:
+                                               ypos = 4; break;
+                                       case 2:
+                                               ypos = 2; break;
+                                       case 3:
+                                               ypos = 1; break;
+                                       default:
+                                               goto fini;
+                                       }
+                               }
+                       } else {
+                               ++ypos;
+                       }
+               }
+               if (ypos >= height)
+                       break;
+       }
+
+fini:
+       if (LWZReadByte(fd,FALSE,c)>=0) {
+               /* Ignore extra */
+       }
+}
+
diff -urN /usr/ports/graphics/gd/files/patch-ac graphics/gd/files/patch-ac
--- /usr/ports/graphics/gd/files/patch-ac	Wed Jul  2 02:16:00 2003
+++ graphics/gd/files/patch-ac	Thu Jan  1 09:00:00 1970
@@ -1,188 +0,0 @@
---- Makefile.orig	Thu Feb 22 19:03:43 2001
-+++ Makefile	Sun Dec 16 05:57:07 2001
-@@ -3,22 +3,30 @@
- #If you do not have gcc, change the setting for COMPILER, but you must
- #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
- #compiler; get gcc if you are still using it). 
--COMPILER=gcc
-+COMPILER=${CC}
- 
- #If the ar command fails on your system, consult the ar manpage
- #for your system. 
--AR=ar
-+#AR=ar
- 
- #If you don't have FreeType, libjpeg and/or Xpm installed, including the
- #header files, uncomment this (default). You really must install
- #libpng and zlib to get anywhere if you wish to create PNG images.
--CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG
-+CFLAGS+=-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
- 
- #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
- #variation of this and comment out the line above. See also LIBS below.
- #CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
- #	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
- 
-+.if defined(WITH_X11)
-+CFLAGS+=-DHAVE_XPM 
-+.endif
-+
-+.if defined(JISX0208)
-+CFLAGS+=-DJISX0208
-+.endif
-+
- #To use the old FreeType 1.x library, add this additional #define
- #to the line above
- #-DHAVE_LIBTTF 
-@@ -30,7 +38,7 @@
- #Some systems are very picky about link order. They don't all agree
- #on the right order, either.
- 
--LIBS=-lgd -lpng -lz -lm
-+LIBS=-lgd -lpng -lz -ljpeg -lm `$(FREETYPE_CONFIG) --libs`
- 
- #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
- #variation of this and comment out the line above. Note that
-@@ -38,6 +46,10 @@
- 
- #LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
- 
-+.if defined(WITH_X11)
-+LIBS+=-lXpm -lX11
-+.endif
-+
- #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead.
- 
- #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header 
-@@ -45,7 +57,11 @@
- #ensure that the version of gd you are installing is used, and not an 
- #older release in your directory tree somewhere.
- 
--INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
-+INCLUDEDIRS=-I. `$(FREETYPE_CONFIG) --cflags` -I${LOCALBASE}/include
-+
-+.if defined(WITH_X11)
-+INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include
-+.endif
- 
- #Typical install locations for freetype, zlib, xpm and libpng libraries.
- #If yours are somewhere else, other than a standard location
-@@ -55,16 +71,20 @@
- #on your system can't cause conflicts while building a new one.
- #This line shouldn't hurt if you don't actually have some of the
- #optional libraries and directories.
--LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
-+LIBDIRS=-L. -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib
-+
-+.if defined(WITH_X11)
-+LIBDIRS+=-L${X11BASE}/lib -Wl,--rpath,${X11BASE}/lib
-+.endif
- 
- #Location where libgd.a should be installed by "make install".
--INSTALL_LIB=/usr/local/lib
-+INSTALL_LIB=${PREFIX}/lib
- 
- #Location where .h files should be installed by "make install".
--INSTALL_INCLUDE=/usr/local/include
-+INSTALL_INCLUDE=${PREFIX}/include/gd
- 
- #Location where useful non-test programs should be installed by "make install".
--INSTALL_BIN=/usr/local/bin
-+INSTALL_BIN=${PREFIX}/bin
- 
- #
- #
-@@ -74,34 +94,43 @@
- 
- VERSION=1.8.4
- 
--CC=$(COMPILER) $(INCLUDEDIRS)
--LINK=$(CC) $(LIBDIRS) $(LIBS)
-+CFLAGS+=$(INCLUDEDIRS)
- 
- PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
- 
- BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
- TEST_PROGRAMS=gdtest gddemo gd2time gdtestft gdtestttf
- 
--all: libgd.a $(PROGRAMS)
-+SOVER=2
-+
-+.SUFFIXES: .c .so .o
- 
--install: libgd.a $(BIN_PROGRAMS)
--	sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a
--	sh ./install-item 755 pngtogd $(INSTALL_BIN)/pngtogd
--	sh ./install-item 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
--	sh ./install-item 755 gdtopng $(INSTALL_BIN)/gdtopng
--	sh ./install-item 755 gd2topng $(INSTALL_BIN)/gd2topng
--	sh ./install-item 755 gd2copypal $(INSTALL_BIN)/gd2copypal
--	sh ./install-item 755 gdparttopng $(INSTALL_BIN)/gdparttopng
--	sh ./install-item 755 webpng $(INSTALL_BIN)/webpng
--	sh ./install-item 755 bdftogd $(INSTALL_BIN)/bdftogd
--	sh ./install-item 644 gd.h $(INSTALL_INCLUDE)/gd.h
--	sh ./install-item 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h
--	sh ./install-item 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h
--	sh ./install-item 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
--	sh ./install-item 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
--	sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
--	sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
--	sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
-+.c.so:
-+	$(CC) -fpic -DPIC $(CFLAGS) -o $@ -c $<
-+
-+all: libgd.a libgd.so.$(SOVER) $(PROGRAMS)
-+
-+install: libgd.a libgd.so.$(SOVER) $(BIN_PROGRAMS)
-+	-mkdir -p $(INSTALL_LIB) $(INSTALL_INCLUDE) $(INSTALL_BIN)
-+	${BSD_INSTALL_DATA} libgd.a $(INSTALL_LIB)/libgd.a
-+	${BSD_INSTALL_DATA} libgd.so.$(SOVER) $(INSTALL_LIB)/libgd.so.$(SOVER)
-+	-ln -sf libgd.so.$(SOVER) $(INSTALL_LIB)/libgd.so
-+	${BSD_INSTALL_PROGRAM} pngtogd $(INSTALL_BIN)/pngtogd
-+	${BSD_INSTALL_PROGRAM} pngtogd2 $(INSTALL_BIN)/pngtogd2
-+	${BSD_INSTALL_PROGRAM} gdtopng $(INSTALL_BIN)/gdtopng
-+	${BSD_INSTALL_PROGRAM} gd2topng $(INSTALL_BIN)/gd2topng
-+	${BSD_INSTALL_PROGRAM} gd2copypal $(INSTALL_BIN)/gd2copypal
-+	${BSD_INSTALL_PROGRAM} gdparttopng $(INSTALL_BIN)/gdparttopng
-+	${BSD_INSTALL_PROGRAM} webpng $(INSTALL_BIN)/webpng
-+	${BSD_INSTALL_SCRIPT} bdftogd $(INSTALL_BIN)/bdftogd
-+	${BSD_INSTALL_DATA} gd.h $(INSTALL_INCLUDE)/gd.h
-+	${BSD_INSTALL_DATA} gdcache.h $(INSTALL_INCLUDE)/gdcache.h
-+	${BSD_INSTALL_DATA} gd_io.h $(INSTALL_INCLUDE)/gd_io.h
-+	${BSD_INSTALL_DATA} gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
-+	${BSD_INSTALL_DATA} gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
-+	${BSD_INSTALL_DATA} gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
-+	${BSD_INSTALL_DATA} gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
-+	${BSD_INSTALL_DATA} gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
- 
- gddemo: gddemo.o libgd.a
- 	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
-@@ -138,18 +167,21 @@
- gdtestttf: gdtestttf.o libgd.a
- 	$(CC) --verbose gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
- 
--libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
-+OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
- 	gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
- 	gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
--	gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
-+	gd_wbmp.o gdhelpers.o gd_gif_in.o
-+INCS= gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
- 	gdfontg.h gdhelpers.h
-+
-+libgd.a:	$(INCS) $(OBJS)
- 	rm -f libgd.a
--	$(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
--		gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \
--		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
--		gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
--		gd_wbmp.o gdhelpers.o
-+	$(AR) rc libgd.a $(OBJS)
- 	-ranlib libgd.a
-+
-+libgd.so.$(SOVER):	$(INCS) $(OBJS:.o=.so)
-+	$(CC) -shared -Wl,-x,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS)
-+	ln -sf libgd.so.$(SOVER) libgd.so
- 
- clean:
- 	rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
diff -urN /usr/ports/graphics/gd/files/patch-gdcache.h graphics/gd/files/patch-gdcache.h
--- /usr/ports/graphics/gd/files/patch-gdcache.h	Thu Jan  1 09:00:00 1970
+++ graphics/gd/files/patch-gdcache.h	Fri Jul  4 21:58:44 2003
@@ -0,0 +1,10 @@
+--- gdcache.h.orig	Wed Feb  7 04:44:02 2001
++++ gdcache.h	Fri Jul  4 21:58:32 2003
+@@ -40,7 +40,6 @@
+ /* header                                                */
+ /*********************************************************/
+ 
+-#include <malloc.h>
+ #ifndef NULL
+ #define NULL (void *)0
+ #endif
diff -urN /usr/ports/graphics/gd/files/patch-gif graphics/gd/files/patch-gif
--- /usr/ports/graphics/gd/files/patch-gif	Wed Jul  2 02:16:00 2003
+++ graphics/gd/files/patch-gif	Fri Jul  4 14:46:40 2003
@@ -9,7 +9,3 @@
 +gdImagePtr gdImageCreateFromGif(FILE *fd);
 +gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
  gdImagePtr gdImageCreateFromPng(FILE *fd);
---- gd_gif_in.c	Fri Jul 27 16:13:45 2001
-+++ gd_gif_in.c	Fri Jul 27 16:14:46 2001
-@@ -6,1 +6,0 @@
--#include "io.h"
diff -urN /usr/ports/graphics/gd/pkg-plist graphics/gd/pkg-plist
--- /usr/ports/graphics/gd/pkg-plist	Wed Jul  2 09:12:19 2003
+++ graphics/gd/pkg-plist	Fri Jul  4 15:01:45 2003
@@ -1,11 +1,3 @@
-bin/bdftogd
-bin/gd2copypal
-bin/gd2topng
-bin/gdparttopng
-bin/gdtopng
-bin/pngtogd
-bin/pngtogd2
-bin/webpng
 include/gd/gd.h
 include/gd/gd_io.h
 include/gd/gdcache.h
@@ -14,9 +6,7 @@
 include/gd/gdfontmb.h
 include/gd/gdfonts.h
 include/gd/gdfontt.h
-lib/libgd.a
-lib/libgd.so
-lib/libgd.so.2
-%%PORTDOCS%%share/doc/gd/index.html
-%%PORTDOCS%%@dirrm share/doc/gd
+lib/libgd1.a
+lib/libgd1.so
+lib/libgd1.so.2
 @dirrm include/gd
>Release-Note:
>Audit-Trail:

From: dirk.meyer@dinoex.sub.org (Dirk Meyer)
To: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Cc:  
Subject: Re: ports/54100: Update port: graphics/gd
Date: Fri, 04 Jul 2003 18:24:34 +0200

 KATO Tsuguru schrieb:,
 
 > - Change library name from libgd to libgd1
 > - Do not install everything except headers and libraries
 >   (to avoid conflicting with graphics/gd2)
 
 Please suuplie a patch for the ports using this dependency (53).
 $ grep gd-1 /usr/ports/INDEX | cut -d "|" -f1-2
 
 rmap-1.2_1|/usr/ports/astro/rmap
 emboss-2.4.1|/usr/ports/biology/emboss
 genpak-0.26|/usr/ports/biology/genpak
 clip-0.99|/usr/ports/databases/clip
 grass-5.0.0,1|/usr/ports/databases/grass
 bugzilla-2.16.3_1|/usr/ports/devel/bugzilla
 cvsgraph-1.2.0|/usr/ports/devel/cvsgraph
 cvsmonitor-0.6.2|/usr/ports/devel/cvsmonitor
 veepee-1.0_1|/usr/ports/devel/veepee
 p5-GIFgraph-1.10_2|/usr/ports/graphics/GIFgraph
 ecg2png-0.30_2|/usr/ports/graphics/ecg2png
 g2-0.40_1|/usr/ports/graphics/g2
 imc-4.1|/usr/ports/graphics/imc
 p5-Chart-PNGgraph-1.21_2|/usr/ports/graphics/p5-Chart-PNGgraph
 p5-GD-1.41|/usr/ports/graphics/p5-GD
 p5-GD-Barcode-1.13|/usr/ports/graphics/p5-GD-Barcode
 p5-GD-Graph-1.35_1|/usr/ports/graphics/p5-GD-Graph
 p5-GD-Graph3d-0.63|/usr/ports/graphics/p5-GD-Graph3d
 p5-GD-TextUtil-0.83|/usr/ports/graphics/p5-GD-TextUtil
 p5-Chart-1.0.1|/usr/ports/graphics/p5-chart
 phplot-4.4.6|/usr/ports/graphics/phplot
 png2html-1.1_1|/usr/ports/graphics/png2html
 py22-gd-0.40|/usr/ports/graphics/py-gd
 ruby-GD-0.7.4_2|/usr/ports/graphics/ruby-gd
 scr2png-1.1|/usr/ports/graphics/scr2png
 springgraph-0.79|/usr/ports/graphics/springgraph
 zimg-4.19.1|/usr/ports/graphics/zimg
 ja-gd-1.8.4_6|/usr/ports/japanese/gd
 ploticus-2.11|/usr/ports/math/ploticus
 chord2html-1.3|/usr/ports/misc/chord2html
 dgd-1.2p3|/usr/ports/net/dgd
 dgd-lpmud-2.4.5|/usr/ports/net/dgd-lpmud
 mrtg-2.9.29_1,1|/usr/ports/net/mrtg
 nagios-1.1|/usr/ports/net/nagios
 netsaint-0.0.7_2,1|/usr/ports/net/netsaint
 wping-0.1a|/usr/ports/net/wping
 ru-gd-1.8.3|/usr/ports/russian/gd
 fwanalog-0.6.2|/usr/ports/security/fwanalog
 lire-1.1_1|/usr/ports/sysutils/lire
 docproj-1.11|/usr/ports/textproc/docproj
 docproj-jadetex-1.11|/usr/ports/textproc/docproj-jadetex
 docproj-nojadetex-1.11|/usr/ports/textproc/docproj-nojadetex
 modlogan-0.8.7|/usr/ports/textproc/modlogan
 analog-5.24,1|/usr/ports/www/analog
 http-analyze-2.01_1|/usr/ports/www/http-analyze
 ljdeps-1.0|/usr/ports/www/ljdeps
 mgstat-0.11|/usr/ports/www/mgstat
 reportmagic-2.21|/usr/ports/www/reportmagic
 
 kind regards Dirk
 
 - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany
 - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org]

From: KATO Tsuguru <tkato@prontomail.com>
To: Dirk Meyer <dirk.meyer@dinoex.sub.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/54100: Update port: graphics/gd
Date: Sun, 6 Jul 2003 01:59:46 +0900

 On Fri, 4 Jul 2003 09:30:12 -0700 (PDT)
 dirk.meyer@dinoex.sub.org (Dirk Meyer) wrote:
 
 >  Please suuplie a patch for the ports using this dependency (53).
 
 How about these?
 
 (databases/clip is excluded since valid source archive is
 currently unavailable and there is an ongoing PR for upgrading)
 
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	astro_rmap.diff
 #	biology_emboss.diff
 #	biology_genpak.diff
 #	comms_hamlib.diff
 #	databases_grass.diff
 #	devel_cvsgraph.diff
 #	devel_veepee.diff
 #	graphics_ecg2png.diff
 #	graphics_g2.diff
 #	graphics_p5-GD.diff
 #	graphics_phplot.diff
 #	graphics_png2html.diff
 #	graphics_py-gd.diff
 #	graphics_ruby-gd.diff
 #	graphics_scr2png.diff
 #	graphics_zimg.diff
 #	net_mrtg.diff
 #	net_nagios.diff
 #	textproc_modlogan.diff
 #	www_analog.diff
 #	www_http-analyze.diff
 #	www_mgstat.diff
 #
 echo x - astro_rmap.diff
 sed 's/^X//' >astro_rmap.diff << 'END-of-astro_rmap.diff'
 Xdiff -urN /usr/ports/astro/rmap/Makefile astro/rmap/Makefile
 X--- /usr/ports/astro/rmap/Makefile	Sat Apr 12 22:35:09 2003
 X+++ astro/rmap/Makefile	Sat Jul  5 22:41:16 2003
 X@@ -7,21 +7,21 @@
 X 
 X PORTNAME=	rmap
 X PORTVERSION=	1.2
 X-PORTREVISION=	1
 X+PORTREVISION=	3
 X CATEGORIES=	astro
 X MASTER_SITES=	http://www.reza.net/rmap/
 X 
 X MAINTAINER=	trevor@FreeBSD.org
 X COMMENT=	Generates images of the Earth centered at a particular location
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
 X 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 X 
 X MAN1=		rmap.1
 X GNU_CONFIGURE=	yes
 X USE_GMAKE=	yes
 X 
 X-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I ${LOCALBASE}/include/gd/" \
 X+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 X 		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
 X 
 X .include <bsd.port.mk>
 END-of-astro_rmap.diff
 echo x - biology_emboss.diff
 sed 's/^X//' >biology_emboss.diff << 'END-of-biology_emboss.diff'
 Xdiff -urN /usr/ports/biology/emboss/Makefile biology/emboss/Makefile
 X--- /usr/ports/biology/emboss/Makefile	Sat Apr 12 22:36:50 2003
 X+++ biology/emboss/Makefile	Sat Jul  5 22:41:43 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	emboss
 X PORTVERSION=	2.4.1
 X+PORTREVISION=	1
 X CATEGORIES=	biology
 X MASTER_SITES=	ftp://ftp.uk.embnet.org/pub/EMBOSS/old/ \
 X 		ftp://ftp.es.embnet.org/pub/software/emboss/EMBOSS/ \
 X@@ -18,7 +19,7 @@
 X MAINTAINER=	wjv@FreeBSD.org
 X COMMENT=	A collection of open source tools for genetic sequence analysis
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X USE_SUBMAKE=	yes
 X USE_GMAKE=	yes
 END-of-biology_emboss.diff
 echo x - biology_genpak.diff
 sed 's/^X//' >biology_genpak.diff << 'END-of-biology_genpak.diff'
 Xdiff -urN /usr/ports/biology/genpak/Makefile biology/genpak/Makefile
 X--- /usr/ports/biology/genpak/Makefile	Sat Apr 12 22:36:50 2003
 X+++ biology/genpak/Makefile	Sat Jul  5 22:43:41 2003
 X@@ -8,6 +8,7 @@
 X 
 X PORTNAME=	genpak
 X PORTVERSION=	0.26
 X+PORTREVISION=	1
 X CATEGORIES=	biology
 X MASTER_SITES=	http://www.bioinformatics.org/genpak/download/
 X DISTNAME=	gp-${PORTVERSION}
 X@@ -16,8 +17,7 @@
 X MAINTAINER=	ports@FreeBSD.org
 X COMMENT=	GP is a set of small utilities to manipulate DNA sequences
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
 X-		png.5:${PORTSDIR}/graphics/png
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X USE_GMAKE=	yes
 X MAKE_ENV=	GMAKE="${GMAKE}" MANPREFIX="${MANPREFIX}"
 END-of-biology_genpak.diff
 echo x - comms_hamlib.diff
 sed 's/^X//' >comms_hamlib.diff << 'END-of-comms_hamlib.diff'
 Xdiff -urN /usr/ports/comms/hamlib/Makefile comms/hamlib/Makefile
 X--- /usr/ports/comms/hamlib/Makefile	Fri May 16 21:19:28 2003
 X+++ comms/hamlib/Makefile	Sun Jul  6 00:42:23 2003
 X@@ -34,7 +34,7 @@
 X .endif
 X 
 X .if defined(WITH_RIGMATRIX)
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X CONFIGURE_ARGS+=	--with-rigmatrix
 X PLIST_SUB+=	RIGMATRIX=""
 X .else
 END-of-comms_hamlib.diff
 echo x - databases_grass.diff
 sed 's/^X//' >databases_grass.diff << 'END-of-databases_grass.diff'
 Xdiff -urN /usr/ports/databases/grass/Makefile databases/grass/Makefile
 X--- /usr/ports/databases/grass/Makefile	Sat Apr 12 22:38:21 2003
 X+++ databases/grass/Makefile	Sat Jul  5 22:45:26 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	grass
 X PORTVERSION=	5.0.0
 X+PORTREVISION=	1
 X PORTEPOCH=	1
 X CATEGORIES=	databases
 X MASTER_SITES=	http://grass.itc.it/grass5/source/ \
 X@@ -20,7 +21,7 @@
 X LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 X 		png.5:${PORTSDIR}/graphics/png \
 X 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 X-		gd.2:${PORTSDIR}/graphics/gd \
 X+		gd.4:${PORTSDIR}/graphics/gd2 \
 X 		fftw.2:${PORTSDIR}/math/fftw \
 X 		iconv.3:${PORTSDIR}/converters/libiconv \
 X 		freetype.9:${PORTSDIR}/print/freetype2 \
 END-of-databases_grass.diff
 echo x - devel_cvsgraph.diff
 sed 's/^X//' >devel_cvsgraph.diff << 'END-of-devel_cvsgraph.diff'
 Xdiff -urN /usr/ports/devel/cvsgraph/Makefile devel/cvsgraph/Makefile
 X--- /usr/ports/devel/cvsgraph/Makefile	Sat Apr 12 22:40:18 2003
 X+++ devel/cvsgraph/Makefile	Sat Jul  5 23:07:17 2003
 X@@ -7,13 +7,14 @@
 X 
 X PORTNAME=	cvsgraph
 X PORTVERSION=	1.2.0
 X+PORTREVISION=	1
 X CATEGORIES=	devel graphics
 X MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 X 
 X MAINTAINER=	trevor@FreeBSD.org
 X COMMENT=	Graph the life story of a file under CVS or RCS
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
 X 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 X 		png.5:${PORTSDIR}/graphics/png
 X 
 END-of-devel_cvsgraph.diff
 echo x - devel_veepee.diff
 sed 's/^X//' >devel_veepee.diff << 'END-of-devel_veepee.diff'
 Xdiff -urN /usr/ports/devel/veepee/Makefile devel/veepee/Makefile
 X--- /usr/ports/devel/veepee/Makefile	Mon Apr 21 12:21:22 2003
 X+++ devel/veepee/Makefile	Sat Jul  5 23:07:34 2003
 X@@ -7,7 +7,7 @@
 X 
 X PORTNAME=	veepee
 X PORTVERSION=	1.0
 X-PORTREVISION=	1
 X+PORTREVISION=	2
 X CATEGORIES=	devel python gnome
 X MASTER_SITES=	http://www.river-bank.demon.co.uk/software/
 X DISTNAME=	VeePee-${PORTVERSION}
 X@@ -15,7 +15,7 @@
 X MAINTAINER=	sobomax@FreeBSD.org
 X COMMENT=	A user orientated scripting environment for embedding in applications
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X USE_GNOME=	gnomelibs
 X USE_XLIB=	yes
 END-of-devel_veepee.diff
 echo x - graphics_ecg2png.diff
 sed 's/^X//' >graphics_ecg2png.diff << 'END-of-graphics_ecg2png.diff'
 Xdiff -urN /usr/ports/graphics/ecg2png/Makefile graphics/ecg2png/Makefile
 X--- /usr/ports/graphics/ecg2png/Makefile	Sat Apr 12 22:48:20 2003
 X+++ graphics/ecg2png/Makefile	Sat Jul  5 23:08:16 2003
 X@@ -7,14 +7,14 @@
 X 
 X PORTNAME=	ecg2png
 X PORTVERSION=	0.30
 X-PORTREVISION=	2
 X+PORTREVISION=	3
 X CATEGORIES=	graphics
 X MASTER_SITES=	http://www.cardiothink.com/downloads/ecg2png/
 X 
 X MAINTAINER=	ports@freebsd.org
 X COMMENT=	"Converts scanned 12-lead electrocardiograms into PNGs"
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X WRKSRC=		${WRKDIR}/${PORTNAME}
 X 
 END-of-graphics_ecg2png.diff
 echo x - graphics_g2.diff
 sed 's/^X//' >graphics_g2.diff << 'END-of-graphics_g2.diff'
 Xdiff -urN /usr/ports/graphics/g2/Makefile graphics/g2/Makefile
 X--- /usr/ports/graphics/g2/Makefile	Sat Apr 12 22:48:28 2003
 X+++ graphics/g2/Makefile	Sat Jul  5 23:08:58 2003
 X@@ -7,7 +7,7 @@
 X 
 X PORTNAME=	g2
 X PORTVERSION=	0.40
 X-PORTREVISION=	1
 X+PORTREVISION=	2
 X CATEGORIES=	graphics
 X MASTER_SITES=	${MASTER_SITE_SUNSITE}
 X MASTER_SITE_SUBDIR=	libs/graphics
 X@@ -15,11 +15,11 @@
 X MAINTAINER=	billf@FreeBSD.org
 X COMMENT=	An easy to use, portable and powerful 2D graphics library
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X USE_XLIB=	yes
 X GNU_CONFIGURE=	yes
 X-CONFIGURE_ENV=  CFLAGS="${CFLAGS} -I${PREFIX}/include/gd"
 X+CONFIGURE_ENV=  CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 X 
 X do-build:
 X 	cd ${WRKSRC} ; make depend ; make
 END-of-graphics_g2.diff
 echo x - graphics_p5-GD.diff
 sed 's/^X//' >graphics_p5-GD.diff << 'END-of-graphics_p5-GD.diff'
 Xdiff -urN /usr/ports/graphics/p5-GD/Makefile graphics/p5-GD/Makefile
 X--- /usr/ports/graphics/p5-GD/Makefile	Tue May 20 00:18:57 2003
 X+++ graphics/p5-GD/Makefile	Sat Jul  5 23:47:46 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	GD
 X PORTVERSION=	1.41
 X+PORTREVISION=	1
 X CATEGORIES=	graphics perl5
 X MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 X MASTER_SITE_SUBDIR=	GD
 X@@ -15,7 +16,7 @@
 X MAINTAINER=	ports@FreeBSD.org
 X COMMENT=	A perl5 interface to Gd Graphics Library
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
 X 
 X PERL_CONFIGURE=	yes
 X USE_REINPLACE=	yes
 X@@ -26,7 +27,7 @@
 X post-patch:
 X 	${REINPLACE_CMD} \
 X 		-e 's,@@LOCALBASE@@,${LOCALBASE},g' \
 X-		-e 's,@@LOCALBASE@@,${LOCALBASE},g' \
 X+		-e 's,@@X11BASE@@,${X11BASE},g' \
 X 		${WRKSRC}/Makefile.PL
 X 
 X .include <bsd.port.mk>
 Xdiff -urN /usr/ports/graphics/p5-GD/files/patch-aa graphics/p5-GD/files/patch-aa
 X--- /usr/ports/graphics/p5-GD/files/patch-aa	Tue May 20 00:18:57 2003
 X+++ graphics/p5-GD/files/patch-aa	Sat Jul  5 23:47:37 2003
 X@@ -15,9 +15,9 @@
 X -my $TTF     = lc prompt('Build FreeType support?','y') eq 'y';
 X -my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
 X -my $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') eq 'y';
 X-+my @INC     = qw(-I@@LOCALBASE@@/include -I@@LOCALBASE@@/include/gd -I@@LOCALBASE@@/include/freetype -I@@X11BASE@@/include -I@@X11BASE@@/include/X11); 
 X++my @INC     = qw(-I@@LOCALBASE@@/include/gd -I@@LOCALBASE@@/include/freetype -I@@LOCALBASE@@/include -I@@X11BASE@@/include/X11 -I@@X11BASE@@/include); 
 X +my @LIBPATH = qw(-L@@LOCALBASE@@/lib -L@@X11BASE@@/lib);
 X-+my @LIBS    = qw(-lfreetype -ljpeg -lgd -lpng -lz);
 X++my @LIBS    = qw(-lfreetype -ljpeg -lgd1 -lpng -lz);
 X  
 X  my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
 X  
 END-of-graphics_p5-GD.diff
 echo x - graphics_phplot.diff
 sed 's/^X//' >graphics_phplot.diff << 'END-of-graphics_phplot.diff'
 Xdiff -urN /usr/ports/graphics/phplot/Makefile graphics/phplot/Makefile
 X--- /usr/ports/graphics/phplot/Makefile	Sat Apr 12 22:49:19 2003
 X+++ graphics/phplot/Makefile	Sat Jul  5 23:19:58 2003
 X@@ -6,6 +6,7 @@
 X 
 X PORTNAME=	phplot
 X PORTVERSION=	4.4.6
 X+PORTREVISION=	1
 X CATEGORIES=	graphics www
 X MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 X MASTER_SITE_SUBDIR=	phplot
 X@@ -15,7 +16,7 @@
 X COMMENT=	A PHP class for creating scientific and business charts
 X 
 X RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X NO_BUILD=	YES
 X 
 END-of-graphics_phplot.diff
 echo x - graphics_png2html.diff
 sed 's/^X//' >graphics_png2html.diff << 'END-of-graphics_png2html.diff'
 Xdiff -urN /usr/ports/graphics/png2html/Makefile graphics/png2html/Makefile
 X--- /usr/ports/graphics/png2html/Makefile	Sat Apr 12 22:49:21 2003
 X+++ graphics/png2html/Makefile	Sat Jul  5 23:20:13 2003
 X@@ -7,7 +7,7 @@
 X 
 X PORTNAME=	png2html
 X PORTVERSION=	1.1
 X-PORTREVISION=	1
 X+PORTREVISION=	2
 X CATEGORIES=	graphics
 X MASTER_SITES=	http://www.engr.mun.ca/~holden/
 X 
 X@@ -15,7 +15,7 @@
 X COMMENT=	Takes a PNG image and transforms it into HTML
 X 
 X LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 X-		gd.2:${PORTSDIR}/graphics/gd
 X+		gd.4:${PORTSDIR}/graphics/gd2
 X 
 X do-configure:
 X 		@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
 Xdiff -urN /usr/ports/graphics/png2html/files/patch-aa graphics/png2html/files/patch-aa
 X--- /usr/ports/graphics/png2html/files/patch-aa	Sat Feb 19 19:42:53 2000
 X+++ graphics/png2html/files/patch-aa	Sat Jul  5 23:29:18 2003
 X@@ -6,7 +6,7 @@
 X -CC      = gcc
 X -CFLAGS  = -O2 -Wall -lpng -lgd
 X +CC      ?= gcc
 X-+INCLUDES= -ICHANGE_ME/include/gd
 X++INCLUDES= -ICHANGE_ME/include
 X +LDFLAGS = -LCHANGE_ME/lib
 X +LIBS    = -lpng -lgd
 X  
 END-of-graphics_png2html.diff
 echo x - graphics_py-gd.diff
 sed 's/^X//' >graphics_py-gd.diff << 'END-of-graphics_py-gd.diff'
 Xdiff -urN /usr/ports/graphics/py-gd/Makefile graphics/py-gd/Makefile
 X--- /usr/ports/graphics/py-gd/Makefile	Sat Apr 12 22:49:23 2003
 X+++ graphics/py-gd/Makefile	Sat Jul  5 23:42:54 2003
 X@@ -6,6 +6,7 @@
 X 
 X PORTNAME=	gd
 X PORTVERSION=	0.40
 X+PORTREVISION=	1
 X CATEGORIES=	graphics python
 X MASTER_SITES=	http://newcenturycomputers.net/projects/download.cgi/
 X PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 X@@ -14,7 +15,7 @@
 X MAINTAINER=	perky@FreeBSD.org
 X COMMENT=	Python interface to the GD library
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X USE_XPM=	yes
 X USE_REINPLACE=  yes
 X@@ -27,7 +28,7 @@
 X post-patch:
 X 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 X 		-e 's,/usr/X11R6,${X11BASE},g' \
 X-		-e 's,/usr/include/X11,${LOCALBASE}/include/gd,g' \
 X+		-e 's,/usr/include/X11,${LOCALBASE}/include,g' \
 X 		${WRKSRC}/${PYSETUP}
 X 
 X post-install:
 END-of-graphics_py-gd.diff
 echo x - graphics_ruby-gd.diff
 sed 's/^X//' >graphics_ruby-gd.diff << 'END-of-graphics_ruby-gd.diff'
 Xdiff -urN /usr/ports/graphics/ruby-gd/Makefile graphics/ruby-gd/Makefile
 X--- /usr/ports/graphics/ruby-gd/Makefile	Sat Apr 12 22:49:30 2003
 X+++ graphics/ruby-gd/Makefile	Sun Jul  6 00:15:16 2003
 X@@ -7,7 +7,7 @@
 X 
 X PORTNAME=	GD
 X PORTVERSION=	0.7.4
 X-PORTREVISION=	2
 X+PORTREVISION=	3
 X CATEGORIES=	graphics ruby
 X MASTER_SITES=	http://www.acc.ne.jp/~tam/GD/
 X PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 X@@ -36,7 +36,7 @@
 X LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 X .else
 X CONFIGURE_ARGS+=	--with-gd-include="${LOCALBASE}/include/gd"
 X-LIB_DEPENDS+=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS+=	gd1.2:${PORTSDIR}/graphics/gd
 X .endif
 X 
 X .include <bsd.port.pre.mk>
 X@@ -70,6 +70,11 @@
 X 
 X post-patch:
 X 	${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${X11BASE}/lib/X11/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb
 X+.if defined(WITH_GD2)
 X+	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb
 X+.else
 X+	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd1"' ${WRKSRC}/extconf.rb
 X+.endif
 X 
 X post-install:
 X .if !defined(NOPORTDOCS)
 Xdiff -urN /usr/ports/graphics/ruby-gd/files/patch-extconf.rb graphics/ruby-gd/files/patch-extconf.rb
 X--- /usr/ports/graphics/ruby-gd/files/patch-extconf.rb	Thu Jan  1 09:00:00 1970
 X+++ graphics/ruby-gd/files/patch-extconf.rb	Sun Jul  6 00:14:32 2003
 X@@ -0,0 +1,11 @@
 X+--- extconf.rb.orig	Wed May 30 23:14:17 2001
 X++++ extconf.rb	Sun Jul  6 00:14:20 2003
 X+@@ -48,7 +48,7 @@
 X+ end
 X+ 
 X+ if have_library('z') and have_library('png') and 
 X+-    have_library('gd', 'gdImagePng') and have_library('m')
 X++    have_library('%%GD%%', 'gdImagePng') and have_library('m')
 X+ 
 X+   if with_config('ttf') and not have_func('gdImageStringTTF')
 X+     delete_link('ttf')
 END-of-graphics_ruby-gd.diff
 echo x - graphics_scr2png.diff
 sed 's/^X//' >graphics_scr2png.diff << 'END-of-graphics_scr2png.diff'
 Xdiff -urN /usr/ports/graphics/scr2png/Makefile graphics/scr2png/Makefile
 X--- /usr/ports/graphics/scr2png/Makefile	Sat Apr 12 22:49:35 2003
 X+++ graphics/scr2png/Makefile	Sat Jul  5 23:23:34 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	scr2png
 X PORTVERSION=	1.1
 X+PORTREVISION=	1
 X CATEGORIES=	graphics
 X 
 X MASTER_SITES=	${MASTER_SITE_LOCAL}
 X@@ -16,7 +17,7 @@
 X MAINTAINER=	nik@freebsd.org
 X COMMENT=	Converts the output of "vidcontrol -p" to PNG
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X USE_REINPLACE=	yes
 X 
 END-of-graphics_scr2png.diff
 echo x - graphics_zimg.diff
 sed 's/^X//' >graphics_zimg.diff << 'END-of-graphics_zimg.diff'
 Xdiff -urN /usr/ports/graphics/zimg/Makefile graphics/zimg/Makefile
 X--- /usr/ports/graphics/zimg/Makefile	Sat Apr 12 22:49:57 2003
 X+++ graphics/zimg/Makefile	Sat Jul  5 23:28:42 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	zimg
 X PORTVERSION=	4.19.1
 X+PORTREVISION=	1
 X CATEGORIES=	graphics
 X MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 X MASTER_SITE_SUBDIR=	${PORTNAME}
 X@@ -14,14 +15,13 @@
 X MAINTAINER=	ports@FreeBSD.org
 X COMMENT=	Image-generator that uses ASCII input files to create PNGs/EDFs
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X GNU_CONFIGURE=	yes
 X CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 X 		LDFLAGS="-L${LOCALBASE}/lib"
 X CONFIGURE_ARGS=	--with-dynaload-cc="${CC}" \
 X-		--with-dynaload-cflags="${CFLAGS} -shared" \
 X-		--with-gd-includes=${LOCALBASE}/include/gd
 X+		--with-dynaload-cflags="${CFLAGS} -shared"
 X 
 X MAN1=		zimg.1
 X 
 END-of-graphics_zimg.diff
 echo x - net_mrtg.diff
 sed 's/^X//' >net_mrtg.diff << 'END-of-net_mrtg.diff'
 Xdiff -urN /usr/ports/net/mrtg/Makefile net/mrtg/Makefile
 X--- /usr/ports/net/mrtg/Makefile	Mon Jun  9 01:37:35 2003
 X+++ net/mrtg/Makefile	Sat Jul  5 23:57:25 2003
 X@@ -7,7 +7,7 @@
 X 
 X PORTNAME=	mrtg
 X PORTVERSION=	2.9.29
 X-PORTREVISION=	1
 X+PORTREVISION=	2
 X PORTEPOCH=	1
 X CATEGORIES=	net
 X MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 X@@ -25,7 +25,7 @@
 X CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 X 		--with-gd-inc=${LOCALBASE}/include
 X .else
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
 X CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 X 		--with-gd-inc=${LOCALBASE}/include/gd
 X .endif
 X@@ -43,6 +43,11 @@
 X 
 X post-patch:
 X 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
 X+.if defined(WITH_GD2)
 X+	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
 X+.else
 X+	${PERL} -pi -e 's:%%GD%%:-lgd1:g' ${WRKSRC}/configure
 X+.endif
 X 
 X do-install:
 X 		${MKDIR} -m 755 ${PREFIX}/etc/mrtg
 Xdiff -urN /usr/ports/net/mrtg/files/patch-configure net/mrtg/files/patch-configure
 X--- /usr/ports/net/mrtg/files/patch-configure	Thu Jan  1 09:00:00 1970
 X+++ net/mrtg/files/patch-configure	Sat Jul  5 23:55:40 2003
 X@@ -0,0 +1,120 @@
 X+--- configure.orig	Sun Mar  9 02:17:40 2003
 X++++ configure	Sat Jul  5 23:55:07 2003
 X+@@ -3159,13 +3159,13 @@
 X+ LDFLAGS="${LDFLAGS} ${MATHLIBS}"
 X+ 
 X+ GDEXTRALIB=""
 X+-echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
 X+-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6
 X++echo "$as_me:$LINENO: checking for gdImageGif in %%GD%%" >&5
 X++echo $ECHO_N "checking for gdImageGif in %%GD%%... $ECHO_C" >&6
 X+ if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
 X+   echo $ECHO_N "(cached) $ECHO_C" >&6
 X+ else
 X+   ac_check_lib_save_LIBS=$LIBS
 X+-LIBS="-lgd -lgd ${MATHLIBS} $LIBS"
 X++LIBS="%%GD%% %%GD%% ${MATHLIBS} $LIBS"
 X+ cat >conftest.$ac_ext <<_ACEOF
 X+ #line $LINENO "configure"
 X+ #include "confdefs.h"
 X+@@ -3211,20 +3211,20 @@
 X+ if test $ac_cv_lib_gd_gdImageGif = yes; then
 X+ 
 X+   GDFORM_EXT=gif
 X+-  GLIBS="-lgd"
 X++  GLIBS="%%GD%%"
 X+ 
 X+ else
 X+   :
 X+ fi
 X+ 
 X+ 
 X+-echo "$as_me:$LINENO: checking for gdImagePng in -lgd" >&5
 X+-echo $ECHO_N "checking for gdImagePng in -lgd... $ECHO_C" >&6
 X++echo "$as_me:$LINENO: checking for gdImagePng in %%GD%%" >&5
 X++echo $ECHO_N "checking for gdImagePng in %%GD%%... $ECHO_C" >&6
 X+ if test "${ac_cv_lib_gd_gdImagePng+set}" = set; then
 X+   echo $ECHO_N "(cached) $ECHO_C" >&6
 X+ else
 X+   ac_check_lib_save_LIBS=$LIBS
 X+-LIBS="-lgd -lgd -lpng -lz ${MATHLIBS} $LIBS"
 X++LIBS="%%GD%% %%GD%% -lpng -lz ${MATHLIBS} $LIBS"
 X+ cat >conftest.$ac_ext <<_ACEOF
 X+ #line $LINENO "configure"
 X+ #include "confdefs.h"
 X+@@ -3270,20 +3270,20 @@
 X+ if test $ac_cv_lib_gd_gdImagePng = yes; then
 X+ 
 X+    GDFORM_EXT=png
 X+-   GLIBS="-lgd -lpng -lz"
 X++   GLIBS="%%GD%% -lpng -lz"
 X+ 
 X+ else
 X+   :
 X+ fi
 X+ 
 X+ 
 X+-echo "$as_me:$LINENO: checking for gdImagePng_jpg in -lgd" >&5
 X+-echo $ECHO_N "checking for gdImagePng_jpg in -lgd... $ECHO_C" >&6
 X++echo "$as_me:$LINENO: checking for gdImagePng_jpg in %%GD%%" >&5
 X++echo $ECHO_N "checking for gdImagePng_jpg in %%GD%%... $ECHO_C" >&6
 X+ if test "${ac_cv_lib_gd_gdImagePng_jpg+set}" = set; then
 X+   echo $ECHO_N "(cached) $ECHO_C" >&6
 X+ else
 X+   ac_check_lib_save_LIBS=$LIBS
 X+-LIBS="-lgd -lgd -lpng -lz -ljpeg ${MATHLIBS} $LIBS"
 X++LIBS="%%GD%% %%GD%% -lpng -lz -ljpeg ${MATHLIBS} $LIBS"
 X+ cat >conftest.$ac_ext <<_ACEOF
 X+ #line $LINENO "configure"
 X+ #include "confdefs.h"
 X+@@ -3329,20 +3329,20 @@
 X+ if test $ac_cv_lib_gd_gdImagePng_jpg = yes; then
 X+ 
 X+    GDFORM_EXT=png
 X+-   GLIBS="-lgd -lpng -lz -ljpeg"
 X++   GLIBS="%%GD%% -lpng -lz -ljpeg"
 X+ 
 X+ else
 X+   :
 X+ fi
 X+ 
 X+ 
 X+-echo "$as_me:$LINENO: checking for gdImagePng_jpg_ft in -lgd" >&5
 X+-echo $ECHO_N "checking for gdImagePng_jpg_ft in -lgd... $ECHO_C" >&6
 X++echo "$as_me:$LINENO: checking for gdImagePng_jpg_ft in %%GD%%" >&5
 X++echo $ECHO_N "checking for gdImagePng_jpg_ft in %%GD%%... $ECHO_C" >&6
 X+ if test "${ac_cv_lib_gd_gdImagePng_jpg_ft+set}" = set; then
 X+   echo $ECHO_N "(cached) $ECHO_C" >&6
 X+ else
 X+   ac_check_lib_save_LIBS=$LIBS
 X+-LIBS="-lgd -lgd -lpng -lz -ljpeg -lfreetype ${MATHLIBS} $LIBS"
 X++LIBS="%%GD%% %%GD%% -lpng -lz -ljpeg -lfreetype ${MATHLIBS} $LIBS"
 X+ cat >conftest.$ac_ext <<_ACEOF
 X+ #line $LINENO "configure"
 X+ #include "confdefs.h"
 X+@@ -3388,7 +3388,7 @@
 X+ if test $ac_cv_lib_gd_gdImagePng_jpg_ft = yes; then
 X+ 
 X+    GDFORM_EXT=png
 X+-   GLIBS="-lgd -lpng -lz -ljpeg -lfreetype"
 X++   GLIBS="%%GD%% -lpng -lz -ljpeg -lfreetype"
 X+ 
 X+ else
 X+   :
 X+@@ -3399,13 +3399,13 @@
 X+   CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImageGif"
 X+ fi
 X+ 
 X+-echo "$as_me:$LINENO: checking for gdImageGd in -lgd" >&5
 X+-echo $ECHO_N "checking for gdImageGd in -lgd... $ECHO_C" >&6
 X++echo "$as_me:$LINENO: checking for gdImageGd in %%GD%%" >&5
 X++echo $ECHO_N "checking for gdImageGd in %%GD%%... $ECHO_C" >&6
 X+ if test "${ac_cv_lib_gd_gdImageGd+set}" = set; then
 X+   echo $ECHO_N "(cached) $ECHO_C" >&6
 X+ else
 X+   ac_check_lib_save_LIBS=$LIBS
 X+-LIBS="-lgd -Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic $LIBS"
 X++LIBS="%%GD%% -Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic $LIBS"
 X+ cat >conftest.$ac_ext <<_ACEOF
 X+ #line $LINENO "configure"
 X+ #include "confdefs.h"
 END-of-net_mrtg.diff
 echo x - net_nagios.diff
 sed 's/^X//' >net_nagios.diff << 'END-of-net_nagios.diff'
 Xdiff -urN /usr/ports/net/nagios/Makefile net/nagios/Makefile
 X--- /usr/ports/net/nagios/Makefile	Mon Jun  9 01:37:36 2003
 X+++ net/nagios/Makefile	Sun Jul  6 00:07:07 2003
 X@@ -17,15 +17,15 @@
 X .if defined(WITH_GD2)
 X LIB_DEPENDS=    gd.4:${PORTSDIR}/graphics/gd2
 X .else
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
 X .endif
 X LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 X RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 X 
 X GNU_CONFIGURE=	yes
 X-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 X-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 X-		LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
 X+CONFIGURE_ENV=	CPPFLAGS="${INCGD} -I${LOCALBASE}/include" \
 X+		CFLAGS="${CFLAGS} ${INCGD} -I${LOCALBASE}/include" \
 X+		LIBS="-L${LOCALBASE}/lib ${LIBGD} -lgnugetopt"
 X CONFIGURE_ARGS=	--with-command-user=nagios \
 X 		--with-command-grp=www \
 X 		--with-nagios-user=nagios \
 X@@ -39,6 +39,14 @@
 X 		--sysconfdir=${PREFIX}/etc/nagios \
 X 		--localstatedir=/var/spool/nagios \
 X 		--prefix=${PREFIX}
 X+
 X+.if defined(WITH_GD2)
 X+INCGD=		-I${LOCALBASE}/include
 X+LIBGD=		-lgd
 X+.else
 X+INCGD=		-I${LOCALBASE}/include/gd
 X+LIBGD=		-lgd1
 X+.endif
 X 
 X .if defined(WITH_MYSQL)
 X LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 END-of-net_nagios.diff
 echo x - textproc_modlogan.diff
 sed 's/^X//' >textproc_modlogan.diff << 'END-of-textproc_modlogan.diff'
 Xdiff -urN /usr/ports/textproc/modlogan/Makefile textproc/modlogan/Makefile
 X--- /usr/ports/textproc/modlogan/Makefile	Sun May  4 01:55:21 2003
 X+++ textproc/modlogan/Makefile	Sat Jul  5 22:53:03 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	modlogan
 X PORTVERSION=	0.8.7
 X+PORTREVISION=	1
 X CATEGORIES=	textproc www
 X MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 X 		${MASTER_SITE_SOURCEFORGE}
 X@@ -15,7 +16,7 @@
 X COMMENT=	A modular log file analysis program
 X 
 X LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns \
 X-		gd.2:${PORTSDIR}/graphics/gd \
 X+		gd.4:${PORTSDIR}/graphics/gd2 \
 X 		intl.4:${PORTSDIR}/devel/gettext \
 X 		pcre.0:${PORTSDIR}/devel/pcre \
 X 		expat.4:${PORTSDIR}/textproc/expat2
 END-of-textproc_modlogan.diff
 echo x - www_analog.diff
 sed 's/^X//' >www_analog.diff << 'END-of-www_analog.diff'
 Xdiff -urN /usr/ports/www/analog/Makefile www/analog/Makefile
 X--- /usr/ports/www/analog/Makefile	Sat Apr 12 23:29:53 2003
 X+++ www/analog/Makefile	Sat Jul  5 22:49:03 2003
 X@@ -7,6 +7,7 @@
 X 
 X PORTNAME=	analog
 X PORTVERSION=	5.24
 X+PORTREVISION=	1
 X PORTEPOCH=	1
 X CATEGORIES=	www
 X MASTER_SITES=	http://www.analog.cx/ \
 X@@ -22,7 +23,7 @@
 X MAINTAINER=	mharo@FreeBSD.org
 X COMMENT=	An extremely fast program for analysing WWW logfiles
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
 X 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 X 		png.5:${PORTSDIR}/graphics/png
 X 
 END-of-www_analog.diff
 echo x - www_http-analyze.diff
 sed 's/^X//' >www_http-analyze.diff << 'END-of-www_http-analyze.diff'
 Xdiff -urN /usr/ports/www/http-analyze/Makefile www/http-analyze/Makefile
 X--- /usr/ports/www/http-analyze/Makefile	Sat Apr 12 23:30:26 2003
 X+++ www/http-analyze/Makefile	Sat Jul  5 22:49:27 2003
 X@@ -6,7 +6,7 @@
 X 
 X PORTNAME=	http-analyze
 X PORTVERSION=	2.01
 X-PORTREVISION=	1
 X+PORTREVISION=	2
 X CATEGORIES=	www
 X MASTER_SITES=	ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
 X DISTNAME=	${PORTNAME}${PORTVERSION}
 X@@ -16,7 +16,7 @@
 X COMMENT=	A fast Log-Analyzer for web servers
 X 
 X BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X MAN1=		http-analyze.1
 X 
 END-of-www_http-analyze.diff
 echo x - www_mgstat.diff
 sed 's/^X//' >www_mgstat.diff << 'END-of-www_mgstat.diff'
 Xdiff -urN /usr/ports/www/mgstat/Makefile www/mgstat/Makefile
 X--- /usr/ports/www/mgstat/Makefile	Tue May 13 14:31:54 2003
 X+++ www/mgstat/Makefile	Sat Jul  5 22:50:10 2003
 X@@ -7,13 +7,14 @@
 X 
 X PORTNAME=	mgstat
 X PORTVERSION=	0.11
 X+PORTREVISION=	1
 X CATEGORIES=	www
 X MASTER_SITES=	http://wizard.ae.krakow.pl/~mike/download/
 X 
 X MAINTAINER=	ports@FreeBSD.org
 X COMMENT=	Produce graphs from mod_gzip log files
 X 
 X-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 X+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 X 
 X GNU_CONFIGURE=	yes
 X 
 END-of-www_mgstat.diff
 exit
 
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Fri Jul 11 11:16:18 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54100 
>Unformatted:
