Date: Sun, 5 May 2002 01:35:09 +0900 (KST) From: Hye-Shik Chang <perky@fallin.lv> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/37748: Update port: graphics/gdchart Message-ID: <200205041635.g44GZ9Yq041947@akaraka.yonsei.ac.kr>
next in thread | raw e-mail | index | archive | help
>Number: 37748 >Category: ports >Synopsis: Update port: graphics/gdchart >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat May 04 09:40:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Hye-Shik Chang >Release: FreeBSD 5.0-CURRENT i386 >Organization: Yonsei University >Environment: System: FreeBSD akaraka.yonsei.ac.kr 5.0-CURRENT FreeBSD 5.0-CURRENT #4: Fri May 3 15:10:14 KST 2002 root@akaraka.yonsei.ac.kr:/usr/src/sys/i386/compile/JOARRA i386 >Description: Update to 0.11.2 and take over maintainership. >How-To-Repeat: >Fix: diff -ruN gdchart.orig/Makefile gdchart/Makefile --- gdchart.orig/Makefile Sun Oct 7 11:03:41 2001 +++ gdchart/Makefile Sun May 5 03:21:16 2002 @@ -6,14 +6,13 @@ # PORTNAME= gdchart -PORTVERSION= 0.10.1 -PORTREVISION= 1 +PORTVERSION= 0.11.2 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ DISTNAME= ${PORTNAME}${PORTVERSION}dev -MAINTAINER= ports@FreeBSD.org +MAINTAINER= perky@fallin.lv LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd @@ -24,7 +23,7 @@ ${PERL} -i -pe 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' ${WRKSRC}/*.[ch] do-install: - ${INSTALL_DATA} ${WRKSRC}/libgdchart.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libgdc.a ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/gdchart.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gdc.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gdcpie.h ${PREFIX}/include @@ -33,15 +32,13 @@ .if !defined(NOPORTDOCS) post-install: @${INSTALL} -d -m 0755 ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/gdc_samp1.c ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/gdc_samp2.c ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/gdc_pie_samp.c ${PREFIX}/share/doc/gdchart + ${INSTALL_DATA} ${WRKSRC}/*samp*.c ${PREFIX}/share/doc/gdchart ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gdchart @${ECHO} "================================================================================" @${ECHO} "Have a look at the sample code and README in ${PREFIX}/share/doc/${PORTNAME}." @${ECHO} "To compile gdc_samp1, try something like:" @${ECHO} - @${ECHO} "gcc -I${PREFIX}/include -o gdc_samp1 gdc_samp1.c -L${PREFIX}/lib -lgdchart -lgd" + @${ECHO} "gcc -I${PREFIX}/include -o gdc_samp1 gdc_samp1.c -L${PREFIX}/lib -lgdc -lgd" @${ECHO} "================================================================================" .endif diff -ruN gdchart.orig/distinfo gdchart/distinfo --- gdchart.orig/distinfo Mon Jun 18 16:02:59 2001 +++ gdchart/distinfo Sun May 5 02:23:00 2002 @@ -1 +1 @@ -MD5 (gdchart0.10.1dev.tar.gz) = d40cba84e7532508ee1637133b6179ee +MD5 (gdchart0.11.2dev.tar.gz) = 340984a5b38821695b21b6f0f2379317 diff -ruN gdchart.orig/files/patch-gdc.h gdchart/files/patch-gdc.h --- gdchart.orig/files/patch-gdc.h Mon Jun 18 16:03:00 2001 +++ gdchart/files/patch-gdc.h Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- gdc.h.orig Mon Jun 18 00:51:01 2001 -+++ gdc.h Mon Jun 18 00:51:16 2001 -@@ -9,7 +9,7 @@ - #define _GDC_H - - #include <math.h> --#include <values.h> -+#include <limits.h> - #ifdef GDC_INCL - #include "gd.h" - #include "gdfonts.h" diff -ruN gdchart.orig/files/patch-gdchart.c gdchart/files/patch-gdchart.c --- gdchart.orig/files/patch-gdchart.c Mon Jun 18 16:03:00 2001 +++ gdchart/files/patch-gdchart.c Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- gdchart.c.orig Sat Nov 4 02:49:46 2000 -+++ gdchart.c Mon Jun 18 00:56:42 2001 -@@ -664,7 +664,7 @@ - - if( GDC_xaxis && xlbl ) - { -- int biggest = -MAXINT; -+ int biggest = -INT_MAX; - - for( i=0; i<num_points; ++i ) - { -@@ -1196,7 +1196,7 @@ - int num_xlbls = /* maximum x lables that'll fit */ - /* each xlbl + avg due to num_lf_xlbls */ - graphwidth / -- ( (GDC_xlabel_spacing==MAXSHORT?0:GDC_xlabel_spacing)+GDC_fontc[GDC_xaxisfont_size].h + -+ ( (GDC_xlabel_spacing==SHRT_MAX?0:GDC_xlabel_spacing)+GDC_fontc[GDC_xaxisfont_size].h + - (num_lf_xlbls*(GDC_fontc[GDC_xaxisfont_size].h-1))/num_points ); - int labelcolor = GDC_XLabelColor==GDC_DFLTCOLOR? - LineColor: clrallocate( im, GDC_XLabelColor ); -@@ -1226,7 +1226,7 @@ - /* labeled points */ - if( (!GDC_xlabel_ctl && ( (i%(1+num_points/num_xlbls) == 0) || // # x labels are regulated - num_xlbls >= num_points || -- GDC_xlabel_spacing == MAXSHORT )) -+ GDC_xlabel_spacing == SHRT_MAX )) - || - (GDC_xlabel_ctl && xi>=0 && *(GDC_xlabel_ctl+xi)) ) - { diff -ruN gdchart.orig/files/patch-makefile gdchart/files/patch-makefile --- gdchart.orig/files/patch-makefile Tue Jul 17 16:25:51 2001 +++ gdchart/files/patch-makefile Sun May 5 02:48:41 2002 @@ -1,123 +1,28 @@ ---- makefile.orig Sat Nov 4 02:49:46 2000 -+++ makefile Tue Jul 17 01:42:30 2001 -@@ -2,8 +2,8 @@ - GDC_LIB = . - +--- makefile.orig Fri Apr 5 09:59:36 2002 ++++ makefile Sun May 5 02:47:08 2002 +@@ -1,4 +1,4 @@ +-CC=gcc ++CC?=gcc + # gcc 2.7.1 or better is required + # CFLAGS= + # CFLAGS=-g -ansi -pedantic +@@ -18,8 +18,8 @@ # GDChart requires the gd library - www.boutell.com/gd/ --GD_INCL = ../gd-1.8.3 --GD_LIB = ../gd-1.8.3 -+GD_INCL = $(LOCALBASE)/include/gd -+GD_LIB = $(LOCALBASE)/lib - - # libgd requires libpng - # PNG_INCL = ../libpng-1.0.8 -@@ -23,6 +23,8 @@ + # libgd 1.8.4 or better is required. Don't use 2.0.0 + # 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_INCL=$(LOCALBASE)/include/gd ++GD_LD=$(LOCALBASE)/lib + GD_LIB=libgd.a + # if you're using gd2.x, use these lines + # (it's typically built as a shared lib) +@@ -57,6 +57,8 @@ + LIB_PATHS = -L$(GD_LD) -L$(GDC_LD) # if not installed in standard paths (/lib, /usr/lib), or LD_LIBRARY_PATH - # LIB_PATHS = -L$(GD_LIB) -L$(PNG_LIB) -L$(ZLIB_LIB) -L$(JPEG_LIB) - -+LIB_OBJS = gdc.o gdc_pie.o gdchart.o price_conv.o gifencode.o + # LIB_PATHS = -L$(GD_LD) -L$(PNG_LD) -L$(ZLIB_LD) -L$(JPEG_LD) + ++LIB_OBJS = gdc.o gdc_pie.o gdchart.o price_conv.o gifencode.o + # NOTE: # libpng, libz, etc. are usually linked in as dynamic libs - # either use a link line similar to one of these, or set environment LD_LIBRARY_PATH -@@ -30,62 +32,66 @@ - # LIB_PATHS = $(LIB_PATHS) -R$(PNG_LIB) -R$(ZLIB_LIB) - # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LIB) -Xlinker -rpath -Xlinker $(ZLIB_LIB) - --CC=gcc -- --all: gdc_samp1 gdc_samp2 gdc_pie_samp -+all: libgdchart.a - - # --- compile the samples --- --gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c -- $(CC) -I$(GDC_INCL) -c gdc_pie_samp.c -+#gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c -+# $(CC) $(CFLAGS) -I$(GDC_INCL) -c gdc_pie_samp.c - --gdc_samp1.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp1.c -- $(CC) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp1.c -+#gdc_samp1.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp1.c -+# $(CC) $(CFLAGS) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp1.c - --gdc_samp2.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp2.c -- $(CC) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp2.c -+#gdc_samp2.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp2.c -+# $(CC) $(CFLAGS) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp2.c - - # --- link the samples --- --gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o gifencode.o $(GD_LIB)/libgd.a -- $(CC) -o gdc_samp1 \ -- gdc.o gdchart.o price_conv.o gifencode.o \ -- gdc_samp1.o \ -- $(LIB_PATHS) \ -- -lgd -lz -lpng $(JPEG_LK) -lm -- --gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o gifencode.o $(GD_LIB)/libgd.a -- $(CC) -o gdc_samp2 \ -- gdc.o gdchart.o price_conv.o gifencode.o \ -- gdc_samp2.o \ -- $(LIB_PATHS) \ -- -lgd -lz -lpng $(JPEG_LK) -lm -- --gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o gifencode.o $(GD_LIB)/libgd.a -- $(CC) -o gdc_pie_samp \ -- gdc.o gdc_pie.o price_conv.o gifencode.o \ -- gdc_pie_samp.o \ -- $(LIB_PATHS) \ -- -lgd -lz -lpng $(JPEG_LK) -lm -+#gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o gifencode.o $(GD_LIB)/libgd.a -+# $(CC) $(CFLAGS) -o gdc_samp1 \ -+# gdc.o gdchart.o price_conv.o gifencode.o \ -+# gdc_samp1.o \ -+# $(LIB_PATHS) \ -+# -lgd -lz -lpng $(JPEG_LK) -lm -+ -+#gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o gifencode.o $(GD_LIB)/libgd.a -+# $(CC) $(CFLAGS) -o gdc_samp2 \ -+# gdc.o gdchart.o price_conv.o gifencode.o \ -+# gdc_samp2.o \ -+# $(LIB_PATHS) \ -+# -lgd -lz -lpng $(JPEG_LK) -lm -+ -+#gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o gifencode.o $(GD_LIB)/libgd.a -+# $(CC) $(CFLAGS) -o gdc_pie_samp \ -+# gdc.o gdc_pie.o price_conv.o gifencode.o \ -+# gdc_pie_samp.o \ -+# $(LIB_PATHS) \ -+# -lgd -lz -lpng $(JPEG_LK) -lm - - # --- compile the lib --- - gifencode.o: gifencode.c gifencode.h -- $(CC) -I$(GD_INCL) -c gifencode.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c - - price_conv.o: price_conv.c -- $(CC) -c price_conv.c -+ $(CC) $(CFLAGS) -c price_conv.c - - gdc.o: gdc.c $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h -- $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc.c - - gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h $(GDC_INCL)/gdcpie.h gdc_pie.c -- $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_pie.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_pie.c - - gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h $(GDC_INCL)/gdchart.h gdchart.c -- $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdchart.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdchart.c - - # --- supporting libraries --- - # should be compile & installed separately - # $(GD_LIB)/libgd.a: - # cd $(GD_LIB) ; make -f Makefile libgd.a -+ -+libgdchart.a: $(LIB_OBJS) -+ $(AR) rc libgdchart.a $(LIB_OBJS) -+ @if [ -x $(RANLIB) ] ; then \ -+ $(RANLIB) libgdchart.a; \ -+ fi; - - # --- clean --- - clean: diff -ruN gdchart.orig/pkg-plist gdchart/pkg-plist --- gdchart.orig/pkg-plist Mon Jun 18 16:02:59 2001 +++ gdchart/pkg-plist Sun May 5 03:15:58 2002 @@ -1,8 +1,9 @@ -lib/libgdchart.a +lib/libgdc.a include/gdchart.h include/gdc.h include/gdcpie.h include/gifencode.h +%%PORTDOCS%%share/doc/gdchart/ft_samp.c %%PORTDOCS%%share/doc/gdchart/gdc_samp1.c %%PORTDOCS%%share/doc/gdchart/gdc_samp2.c %%PORTDOCS%%share/doc/gdchart/gdc_pie_samp.c >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205041635.g44GZ9Yq041947>