Date: Mon, 18 Jun 2001 01:20:04 -0700 (PDT) From: Hye-Shik Chang <perky@python.or.kr> To: freebsd-ports@FreeBSD.org Subject: Re: ports/28242: New port: graphics/py-gdchart Message-ID: <200106180820.f5I8K4M91823@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/28242; it has been noted by GNATS.
From: Hye-Shik Chang <perky@python.or.kr>
To: anders@fix.no
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/28242: New port: graphics/py-gdchart
Date: Mon, 18 Jun 2001 17:12:18 +0900 (KST)
OK. :)
depends on new gdchart port. :)
diff -ruN py-gdchart.orig/Makefile py-gdchart/Makefile
--- py-gdchart.orig/Makefile Mon Jun 18 16:53:33 2001
+++ py-gdchart/Makefile Mon Jun 18 17:07:22 2001
@@ -13,15 +13,15 @@
MAINTAINER= perky@python.or.kr
-LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \
- png.4:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg
+BUILD_DEPENDS= ${LOCALBASE}/lib/libgdchart.a:${PORTSDIR}/graphics/gdchart
USE_PYTHON= yes
USE_GMAKE= yes
MAKE_ENV= GD_INCLUDE=${LOCALBASE}/include/gd \
- GD_LIBRARY=${LOCALBASE}/lib \
- PYTHON_INCLUDE=${PYTHON_INCLUDEDIR}
+ GDCHART_INCLUDE=${LOCALBASE}/include \
+ PYTHON_INCLUDE=${PYTHON_INCLUDEDIR} \
+ LOCALBASE=${LOCALBASE}
+
PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} \
EXAMPLE_DIR=${EXAMPLE_DIR:S/^${LOCALBASE}\///g}
MODULE_FILES= chart.py gdchart.so
diff -ruN py-gdchart.orig/files/patch-Makefile py-gdchart/files/patch-Makefile
--- py-gdchart.orig/files/patch-Makefile Mon Jun 18 16:53:33 2001
+++ py-gdchart/files/patch-Makefile Mon Jun 18 16:57:33 2001
@@ -1,5 +1,5 @@
--- Makefile.orig Sat Mar 17 04:08:18 2001
-+++ Makefile Mon Jun 18 05:23:37 2001
++++ Makefile Mon Jun 18 16:57:12 2001
@@ -12,10 +12,10 @@
# SO Extension for shared libs.
@@ -8,40 +8,42 @@
-LIB_DIRS = -L/usr/local/lib -L/usr/lib
-GCC = gcc
-CFLAGS = -Wall -fpic -O2
-+PY_INCLUDE = -I${PYTHON_INCLUDE}
++INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE)
+LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib
+GCC = ${CC}
+CFLAGS ?= -Wall -fpic -O2
# Linux
LD = $(GCC) -shared
-@@ -31,9 +31,6 @@
+@@ -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
-
-@@ -43,8 +40,8 @@
+-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 += -I$(GDCHART) -I$(GD_INCLUDE) $(PY_INCLUDE) $(DEFS)
-+LDFLAGS = -L$(GDCHART) $(LIB_DIRS)
++CFLAGS += ${INC_DIRS} $(DEFS)
++LDFLAGS = $(LIB_DIRS)
LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG)
TARGET = gdchart$(SO)
-@@ -53,19 +50,16 @@
+@@ -53,19 +47,11 @@
all: $(TARGET)
-$(TARGET): $(LIBGD) $(LIBGDCHART) $(PY_OBJ)
-+$(TARGET): $(LIBGDCHART) $(PY_OBJ)
++$(TARGET): $(PY_OBJ)
$(LD) $(PY_OBJ) $(LDFLAGS) $(LDLIBS) -o $@
$(PY_OBJ): $(PY_SRC)
@@ -50,13 +52,10 @@
-$(LIBGD):
- make -C $(GD) libgd.a HAVE_JPEG=$(HAVE_JPEG)
-
- $(LIBGDCHART):
+-$(LIBGDCHART):
- make -C $(GDCHART) libgdchart.a HAVE_JPEG=$(HAVE_JPEG)
-+ ${MAKE} -C $(GDCHART) libgdchart.a HAVE_JPEG=$(HAVE_JPEG) \
-+ GD_INCL=${GD_INCLUDE} GD_LIB=${GD_LIBRARY}
-
+-
clean:
- -make -C $(GD) clean
- -make -C $(GDCHART) clean
-+ -${MAKE} -C $(GDCHART) clean
-rm -f $(TARGET) $(PY_OBJ)
diff -ruN py-gdchart.orig/files/patch-gdc_py.c py-gdchart/files/patch-gdc_py.c
--- py-gdchart.orig/files/patch-gdc_py.c Thu Jan 1 09:00:00 1970
+++ py-gdchart/files/patch-gdc_py.c Mon Jun 18 17:04:13 2001
@@ -0,0 +1,11 @@
+--- 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 <stdio.h>
+ #include <string.h>
+ #include <assert.h>
++#include <limits.h>
++#define MAXSHORT SHRT_MAX
+
+ #include "Python.h"
+ #include "cStringIO.h"
diff -ruN py-gdchart.orig/files/patch-gdchart::makefile py-gdchart/files/patch-gdchart::makefile
--- py-gdchart.orig/files/patch-gdchart::makefile Mon Jun 18 16:53:33 2001
+++ py-gdchart/files/patch-gdchart::makefile Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
---- gdchart0.10.1dev/makefile.old Mon Jun 18 05:16:15 2001
-+++ gdchart0.10.1dev/makefile Mon Jun 18 05:15:28 2001
-@@ -2,8 +2,8 @@
- GDC_LIB = .
-
- # GDChart requires the gd library - www.boutell.com/gd/
--GD_INCL = ../gd-1.8.4
--GD_LIB = ../gd-1.8.4
-+GD_INCL = ${GD_INCL}
-+GD_LIB = ${GD_LIB}
-
- # libgd requires libpng
- PNG_INCL = ../libpng-1.0.9
--------------------------------
Hye-Shik Chang, a.k.a. "Perky"
Mechatronics, Yonsei University, Korea
Public Key: http://openlook.org/pgp.txt
PGP Fingerprint : 115C CF2F D90D 8AFE F45B 0356 21DA 398B 6474 11EA
-------------------------------------------------
DreamWiz Free Mail @ http://www.dreamwiz.com/
DreamSearch Click the world!!! http://search.dreamwiz.com/
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?200106180820.f5I8K4M91823>