From aec05479d1c4fc7c9c6dba633b61a5f56f7054a1 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 18 Oct 2001 11:46:30 +0000 Subject: Standardize patch names and some minor cleanup. --- graphics/py-gdchart/Makefile | 5 +-- graphics/py-gdchart/distinfo | 4 +- graphics/py-gdchart/patches/patch-Makefile | 63 ------------------------------ graphics/py-gdchart/patches/patch-aa | 63 ++++++++++++++++++++++++++++++ graphics/py-gdchart/patches/patch-ab | 13 ++++++ graphics/py-gdchart/patches/patch-gdc_py.c | 13 ------ graphics/py-gdchart/pkg/DESCR | 2 - 7 files changed, 81 insertions(+), 82 deletions(-) delete mode 100644 graphics/py-gdchart/patches/patch-Makefile create mode 100644 graphics/py-gdchart/patches/patch-aa create mode 100644 graphics/py-gdchart/patches/patch-ab delete mode 100644 graphics/py-gdchart/patches/patch-gdc_py.c diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile index 79d04fc6379..e1d40423490 100644 --- a/graphics/py-gdchart/Makefile +++ b/graphics/py-gdchart/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2001/10/18 11:14:39 darcy Exp $ -# FreeBSD Id: ports/graphics/py-gdchart/Makefile,v 1.2 2001/09/16 17:27:58 kevlo Exp +# $NetBSD: Makefile,v 1.2 2001/10/18 11:46:30 wiz Exp $ +# DISTNAME= gdchart-py-0.6 PKGNAME= py-gdchart-0.6 -WRKSRC= ${WRKDIR}/${DISTNAME} CATEGORIES= graphics python MASTER_SITES= http://athani.pair.com/msteed/software/gdchart/ diff --git a/graphics/py-gdchart/distinfo b/graphics/py-gdchart/distinfo index 1109569b7e7..d13d9b295ce 100644 --- a/graphics/py-gdchart/distinfo +++ b/graphics/py-gdchart/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1 2001/10/18 11:14:39 darcy Exp $ +$NetBSD: distinfo,v 1.2 2001/10/18 11:46:30 wiz Exp $ SHA1 (gdchart-py-0.6.tar.gz) = 20547e8550bb8c925a3b9776739f9a5e93ce8692 Size (gdchart-py-0.6.tar.gz) = 321891 bytes SHA1 (patch-Makefile) = 477519d0493bd69e2b33f5861b36d1d19275ed96 SHA1 (patch-gdc_py.c) = aeaca3dc2ca2a0ccb586b7da58e55d41b703abfc +SHA1 (patch-aa) = bf862183c2ec035a65e07e11b551758d66ca1f0f +SHA1 (patch-ab) = b2179c1c7e1e6aee6d7d8051a7646344254ee96b diff --git a/graphics/py-gdchart/patches/patch-Makefile b/graphics/py-gdchart/patches/patch-Makefile deleted file mode 100644 index 11b75d80f77..00000000000 --- a/graphics/py-gdchart/patches/patch-Makefile +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2001/10/18 11:14:39 darcy Exp $ - ---- Makefile.orig Sat Mar 17 04:08:18 2001 -+++ Makefile Mon Jun 18 16:57:12 2001 -@@ -12,10 +12,10 @@ - # SO Extension for shared libs. - - HAVE_JPEG = 1 --PY_INCLUDE = -I/usr/local/include/python2.0 --LIB_DIRS = -L/usr/local/lib -L/usr/lib --GCC = gcc --CFLAGS = -Wall -fpic -O2 -+INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE) -+LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib -Wl,-R${LOCALBASE}/lib -+GCC = ${CC} -+CFLAGS ?= -Wall -fpic -O2 - - # Linux - LD = $(GCC) -shared -@@ -31,20 +31,14 @@ - - # Shouldn't need to touch anything below this point. - --GD = gd-1.8.4 --LIBGD = $(GD)/libgd.a -- --GDCHART = gdchart0.10.1dev --LIBGDCHART = $(GDCHART)/libgdchart.a -- - DEFS = - ifeq ($(HAVE_JPEG),1) - DEFS += -DHAVE_JPEG - LIBJPEG = -ljpeg - endif - --CFLAGS += -I$(GDCHART) $(PY_INCLUDE) $(DEFS) --LDFLAGS = -L$(GDCHART) -L$(GD) $(LIB_DIRS) -+CFLAGS += ${INC_DIRS} $(DEFS) -+LDFLAGS = $(LIB_DIRS) - LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) - - TARGET = gdchart$(SO) -@@ -53,19 +47,11 @@ - - all: $(TARGET) - --$(TARGET): $(LIBGD) $(LIBGDCHART) $(PY_OBJ) -+$(TARGET): $(PY_OBJ) - $(LD) $(PY_OBJ) $(LDFLAGS) $(LDLIBS) -o $@ - - $(PY_OBJ): $(PY_SRC) - $(GCC) -c $(CFLAGS) $< - --$(LIBGD): -- make -C $(GD) libgd.a HAVE_JPEG=$(HAVE_JPEG) -- --$(LIBGDCHART): -- make -C $(GDCHART) libgdchart.a HAVE_JPEG=$(HAVE_JPEG) -- - clean: -- -make -C $(GD) clean -- -make -C $(GDCHART) clean - -rm -f $(TARGET) $(PY_OBJ) diff --git a/graphics/py-gdchart/patches/patch-aa b/graphics/py-gdchart/patches/patch-aa new file mode 100644 index 00000000000..9867dd1cb50 --- /dev/null +++ b/graphics/py-gdchart/patches/patch-aa @@ -0,0 +1,63 @@ +$NetBSD: patch-aa,v 1.1 2001/10/18 11:46:31 wiz Exp $ + +--- Makefile.orig Fri Mar 16 20:08:18 2001 ++++ Makefile +@@ -12,10 +12,10 @@ + # SO Extension for shared libs. + + HAVE_JPEG = 1 +-PY_INCLUDE = -I/usr/local/include/python2.0 +-LIB_DIRS = -L/usr/local/lib -L/usr/lib +-GCC = gcc +-CFLAGS = -Wall -fpic -O2 ++INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE) ++LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib -Wl,-R${LOCALBASE}/lib ++GCC = ${CC} ++CFLAGS ?= -Wall -fpic -O2 + + # Linux + LD = $(GCC) -shared +@@ -31,20 +31,14 @@ + + # Shouldn't need to touch anything below this point. + +-GD = gd-1.8.4 +-LIBGD = $(GD)/libgd.a +- +-GDCHART = gdchart0.10.1dev +-LIBGDCHART = $(GDCHART)/libgdchart.a +- + DEFS = + ifeq ($(HAVE_JPEG),1) + DEFS += -DHAVE_JPEG + LIBJPEG = -ljpeg + endif + +-CFLAGS += -I$(GDCHART) $(PY_INCLUDE) $(DEFS) +-LDFLAGS = -L$(GDCHART) -L$(GD) $(LIB_DIRS) ++CFLAGS += ${INC_DIRS} $(DEFS) ++LDFLAGS = $(LIB_DIRS) + LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) + + TARGET = gdchart$(SO) +@@ -53,19 +47,11 @@ + + all: $(TARGET) + +-$(TARGET): $(LIBGD) $(LIBGDCHART) $(PY_OBJ) ++$(TARGET): $(PY_OBJ) + $(LD) $(PY_OBJ) $(LDFLAGS) $(LDLIBS) -o $@ + + $(PY_OBJ): $(PY_SRC) + $(GCC) -c $(CFLAGS) $< + +-$(LIBGD): +- make -C $(GD) libgd.a HAVE_JPEG=$(HAVE_JPEG) +- +-$(LIBGDCHART): +- make -C $(GDCHART) libgdchart.a HAVE_JPEG=$(HAVE_JPEG) +- + clean: +- -make -C $(GD) clean +- -make -C $(GDCHART) clean + -rm -f $(TARGET) $(PY_OBJ) diff --git a/graphics/py-gdchart/patches/patch-ab b/graphics/py-gdchart/patches/patch-ab new file mode 100644 index 00000000000..c6a60b0794a --- /dev/null +++ b/graphics/py-gdchart/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/10/18 11:46:32 wiz Exp $ + +--- gdc_py.c.orig Fri Mar 16 20:06:08 2001 ++++ gdc_py.c +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#define MAXSHORT SHRT_MAX + + #include "Python.h" + #include "cStringIO.h" diff --git a/graphics/py-gdchart/patches/patch-gdc_py.c b/graphics/py-gdchart/patches/patch-gdc_py.c deleted file mode 100644 index 22ad1ec7de9..00000000000 --- a/graphics/py-gdchart/patches/patch-gdc_py.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-gdc_py.c,v 1.1 2001/10/18 11:14:39 darcy Exp $ - ---- gdc_py.c.orig Sat Mar 17 04:06:08 2001 -+++ gdc_py.c Mon Jun 18 17:03:24 2001 -@@ -33,6 +33,8 @@ - #include - #include - #include -+#include -+#define MAXSHORT SHRT_MAX - - #include "Python.h" - #include "cStringIO.h" diff --git a/graphics/py-gdchart/pkg/DESCR b/graphics/py-gdchart/pkg/DESCR index 3474e5d5452..976374a389d 100644 --- a/graphics/py-gdchart/pkg/DESCR +++ b/graphics/py-gdchart/pkg/DESCR @@ -1,5 +1,3 @@ This is a simple python interface to gdchart which is excellent for creating charts and graphs in PNG, JPEG, and GIF format. - -WWW: http://athani.pair.com/msteed/software/gdchart/ -- cgit v1.2.3