diff options
| author | jmc <jmc> | 2003-07-02 18:43:12 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-07-02 18:43:12 +0000 |
| commit | 38b50c6dee3151d0246f289f08200a9f6022237a (patch) | |
| tree | 3e9b3af5c31389f0d88d945bf4833b8ed895cedb /graphics/py-gdchart | |
| parent | a929f195f6fc9ed9331c509ba422eeacffa0a4b1 (diff) | |
| download | pkgsrc-38b50c6dee3151d0246f289f08200a9f6022237a.tar.gz | |
This depends on freetype and needs a define/library enabled to work.
Also replace -Wl,-R with RPATH_FLAG while I'm here.
Diffstat (limited to 'graphics/py-gdchart')
| -rw-r--r-- | graphics/py-gdchart/Makefile | 3 | ||||
| -rw-r--r-- | graphics/py-gdchart/distinfo | 4 | ||||
| -rw-r--r-- | graphics/py-gdchart/patches/patch-aa | 23 |
3 files changed, 19 insertions, 11 deletions
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile index cc5045c491e..438f4f1a07e 100644 --- a/graphics/py-gdchart/Makefile +++ b/graphics/py-gdchart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/06/02 01:19:16 jschauma Exp $ +# $NetBSD: Makefile,v 1.11 2003/07/02 18:43:12 jmc Exp $ # DISTNAME= gdchart-py-0.6 @@ -16,6 +16,7 @@ USE_GMAKE= yes MAKE_ENV= GD_INCLUDE=${LOCALBASE}/include \ GDCHART_INCLUDE=${LOCALBASE}/include \ PYTHON_INCLUDE=${LOCALBASE}/${PYINC} \ + HAVE_LIBFREETYPE=1 \ LOCALBASE=${LOCALBASE} PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} MODULE_FILES= chart.py gdchart.so diff --git a/graphics/py-gdchart/distinfo b/graphics/py-gdchart/distinfo index d13d9b295ce..ee5d62bce42 100644 --- a/graphics/py-gdchart/distinfo +++ b/graphics/py-gdchart/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/10/18 11:46:30 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/07/02 18:43:12 jmc 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-aa) = edb382f567b72e49554c0d07611a47d9bc3995de SHA1 (patch-ab) = b2179c1c7e1e6aee6d7d8051a7646344254ee96b diff --git a/graphics/py-gdchart/patches/patch-aa b/graphics/py-gdchart/patches/patch-aa index 9867dd1cb50..5a2cb562976 100644 --- a/graphics/py-gdchart/patches/patch-aa +++ b/graphics/py-gdchart/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1 2001/10/18 11:46:31 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/02 18:43:13 jmc Exp $ ---- Makefile.orig Fri Mar 16 20:08:18 2001 -+++ Makefile +--- Makefile.orig Fri Mar 16 19:08:18 2001 ++++ Makefile Wed Jul 2 13:09:19 2003 @@ -12,10 +12,10 @@ # SO Extension for shared libs. @@ -11,13 +11,13 @@ $NetBSD: patch-aa,v 1.1 2001/10/18 11:46:31 wiz Exp $ -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 ++LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${RPATH_FLAG}${X11PREFIX}/lib +GCC = ${CC} +CFLAGS ?= -Wall -fpic -O2 # Linux LD = $(GCC) -shared -@@ -31,20 +31,14 @@ +@@ -31,21 +31,19 @@ # Shouldn't need to touch anything below this point. @@ -30,17 +30,24 @@ $NetBSD: patch-aa,v 1.1 2001/10/18 11:46:31 wiz Exp $ DEFS = ifeq ($(HAVE_JPEG),1) DEFS += -DHAVE_JPEG - LIBJPEG = -ljpeg +- LIBJPEG = -ljpeg ++ LIBS = -ljpeg ++endif ++ifeq ($(HAVE_LIBFREETYPE),1) ++ DEFS += -DHAVE_LIBFREETYPE ++ LIBS += -lfreetype endif -CFLAGS += -I$(GDCHART) $(PY_INCLUDE) $(DEFS) -LDFLAGS = -L$(GDCHART) -L$(GD) $(LIB_DIRS) +-LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) +CFLAGS += ${INC_DIRS} $(DEFS) +LDFLAGS = $(LIB_DIRS) - LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) ++LDLIBS = -lgdchart -lgd -lpng -lz $(LIBS) TARGET = gdchart$(SO) -@@ -53,19 +47,11 @@ + PY_SRC = gdc_py.c +@@ -53,19 +51,11 @@ all: $(TARGET) |