diff options
author | adam <adam> | 2005-01-19 09:05:44 +0000 |
---|---|---|
committer | adam <adam> | 2005-01-19 09:05:44 +0000 |
commit | 523798908427ef998cd9fd9359f7ecdd567b63fc (patch) | |
tree | cdbb37ce4b17abe8a7b519f6e291d6de41ec4ca2 /graphics/gdchart/patches | |
parent | ce652ba4a0b90f6e59bf25e4dbb8ab9288040f58 (diff) | |
download | pkgsrc-523798908427ef998cd9fd9359f7ecdd567b63fc.tar.gz |
Changes 0.11.5:
* Use compressed GIF support from libgd
Diffstat (limited to 'graphics/gdchart/patches')
-rw-r--r-- | graphics/gdchart/patches/patch-aa | 8 | ||||
-rw-r--r-- | graphics/gdchart/patches/patch-ac | 89 |
2 files changed, 42 insertions, 55 deletions
diff --git a/graphics/gdchart/patches/patch-aa b/graphics/gdchart/patches/patch-aa index ffd8f5edf59..a118a7be3c4 100644 --- a/graphics/gdchart/patches/patch-aa +++ b/graphics/gdchart/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2003/06/24 08:04:24 adam Exp $ +$NetBSD: patch-aa,v 1.4 2005/01/19 09:05:44 adam Exp $ ---- gdc.h.orig 2003-06-23 20:44:44.000000000 +0200 -+++ gdc.h 2003-06-23 20:44:53.000000000 +0200 -@@ -127,7 +127,7 @@ +--- gdc.h.orig 2004-12-17 18:12:06.000000000 +0000 ++++ gdc.h +@@ -126,7 +126,7 @@ short cnt_nl( char*, int* ); #endif #ifdef GDC_LIB diff --git a/graphics/gdchart/patches/patch-ac b/graphics/gdchart/patches/patch-ac index 8161ff54413..3a7694aabda 100644 --- a/graphics/gdchart/patches/patch-ac +++ b/graphics/gdchart/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $ +$NetBSD: patch-ac,v 1.7 2005/01/19 09:05:44 adam Exp $ ---- makefile.orig Tue Mar 11 04:03:06 2003 -+++ makefile +--- Makefile.orig 2004-12-17 17:53:47.000000000 +0000 ++++ Makefile @@ -1,4 +1,4 @@ -CC=gcc -+LIB_OBJS= gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o ++LIB_OBJS=price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o # gcc 2.7.1 or better is required # CFLAGS= # CFLAGS=-g -ansi -pedantic @@ -23,20 +23,18 @@ $NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $ # INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include -@@ -18,9 +18,9 @@ PREFIX_LIB = /usr/local/lib +@@ -18,8 +18,8 @@ PREFIX_LIB = /usr/local/lib # GDChart requires the gd library - www.boutell.com/gd/ - # libgd 1.8.4 or better is required. Don't use 2.0.0 + # gd 2.0.28 or better is required (GIF support has returned to libgd) # if it's not installed in a standard location edit these lines for your installation --GD_INCL=../gd-1.8.4/ --GD_LD=../gd-1.8.4/ --GD_LIB=libgd.a +-GD_INCL=/usr/local/include/ +-GD_LD=/usr/local/lib/ +GD_INCL=${BUILDLINK_PREFIX.gd}/include/ +GD_LD=${BUILDLINK_PREFIX.gd}/lib/ -+GD_LIB=libgd.so - # if you're using gd2.x, use these lines - # (it's typically built as a shared lib) - # GD_INCL = ../gd-2.0.0/ -@@ -66,73 +66,72 @@ LIB_PATHS = -L$(GD_LD) -L$(GDC_LD) + GD_LIB=libgd.so + # a static libgd is also available + # GD_LIB=libgd.a +@@ -63,70 +63,70 @@ LIB_PATHS = -L$(GD_LD) -L$(GDC_LD) # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LD) -Xlinker -rpath -Xlinker $(ZLIB_LD) @@ -61,85 +59,74 @@ $NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $ + ${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c # --- link the samples --- - gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) +-gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o gdc_samp1 \ -+ ${LIBTOOL} $(CC) -o gdc_samp1 \ ++gdc_samp1: $(GDC_LD)libgdchart.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) ++ ${LIBTOOL} --mode=link $(CC) -o gdc_samp1 \ gdc_samp1.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm - gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) +-gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o gdc_samp2 \ -+ ${LIBTOOL} $(CC) -o gdc_samp2 \ - gdc.o gdchart.o price_conv.o gifencode.o \ ++gdc_samp2: $(GDC_LD)libgdchart.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) ++ ${LIBTOOL} --mode=link $(CC) -o gdc_samp2 \ + gdc.o gdchart.o price_conv.o \ gdc_samp2.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm - gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) +-gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o gdc_pie_samp \ -+ ${LIBTOOL} $(CC) -o gdc_pie_samp \ - gdc.o gdc_pie.o price_conv.o gifencode.o \ ++gdc_pie_samp: $(GDC_LD)libgdchart.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) ++ ${LIBTOOL} --mode=link $(CC) -o gdc_pie_samp \ + gdc.o gdc_pie.o price_conv.o \ gdc_pie_samp.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm - ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) +-ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o ft_samp \ -+ ${LIBTOOL} $(CC) -o ft_samp \ - gdc.o gdchart.o price_conv.o gifencode.o \ ++ft_samp: $(GDC_LD)libgdchart.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) ++ ${LIBTOOL} --mode=link $(CC) -o ft_samp \ + gdc.o gdchart.o price_conv.o \ ft_samp.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm # --- compile the lib --- - gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)gifencode.h $(GDC_INCL)array_alloc.h - - gifencode.o: gifencode.c gifencode.h $(GDC_INCL)gdc.h -- $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c + gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)array_alloc.h price_conv.o: price_conv.c - $(CC) $(CFLAGS) -c price_conv.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c price_conv.c ++ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c price_conv.c gdc.o: gdc.c $(GDC_INCL)gdc.h - $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c ++ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c gdc_pie.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie.c - $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c ++ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c gdchart.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdchart.c - $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c ++ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c array_alloc.o: array_alloc.c array_alloc.h - $(CC) $(CFLAGS) -c array_alloc.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c array_alloc.c ++ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c array_alloc.c --libgdc.a: gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o -- ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o gifencode.o array_alloc.o +-libgdc.a: price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o +- ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o array_alloc.o - ranlib libgdc.a -+libgdchart.a: $(LIB_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) -L${GD_LD} -lgd -version-info 0:11 -rpath $(PREFIX)/lib ++libgdchart.a: ${LIB_OBJS} ++ ${LIBTOOL} --mode=link ${CC} -o libgdchart.la ${LIB_OBJS:.o=.lo} \ ++ -L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib # --- supporting libraries --- # should be compile & installed separately -@@ -140,9 +139,9 @@ libgdc.a: gifencode.o price_conv.o gdc.o - # cd $(GD_LD) ; make -f Makefile $(GD_LIB) - - # ----- install ----- --install: gdc.h gdchart.h gdcpie.h gifencode.h libgdc.a -+install: gdc.h gdchart.h gdcpie.h gifencode.h libgdchart.a - cp gdc.h gdchart.h gdcpie.h gifencode.h $(PREFIX_INC)/ -- cp libgdc.a $(PREFIX_LIB)/ -+ $(LIBTOOL) --mode=install ${BSD_INSTALL_DATA} libgdchart.la ${PREFIX}/lib - - # --- clean --- - clean: |