head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.86 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.84 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.82 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.80 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.78 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.76 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.74 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.72 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.70 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.68 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.66 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.64 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.62 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.60 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.58 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.56 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.54 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.52 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.50 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.48 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.46 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.44 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.42 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.38 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.18 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.40 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.36 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.34 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.32 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.30 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.28 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.26 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.24 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.22 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.20 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.16 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.14 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.12 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.10 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.8 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.6 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.4 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.2 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.5.0.58 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.56 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.54 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.52 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.50 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.48 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.46 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.44 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.42 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.40 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.38 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.36 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.34 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.32 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.30 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.28 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.26 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.24 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.22 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.20 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.18 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.16 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.14 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.12 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.10 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.8 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.6 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.4 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.34 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.32 pkgsrc-2008Q1:1.4.0.30 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.28 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.26 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.24 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.22 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.20 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.18 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.16 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.14 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.12 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.10 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.8 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.6 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.4 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.2 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.6 date 2015.07.04.16.18.36; author joerg; state Exp; branches; next 1.5; commitid EoZkjndZ4qhBbZry; 1.5 date 2008.08.17.06.14.21; author dholland; state Exp; branches; next 1.4; 1.4 date 2004.08.27.06.29.08; author jlam; state Exp; branches; next 1.3; 1.3 date 2003.07.02.20.07.30; author jmc; state Exp; branches; next 1.2; 1.2 date 2003.07.02.18.43.13; author jmc; state Exp; branches; next 1.1; 1.1 date 2001.10.18.11.46.31; author wiz; state Exp; branches; next ; desc @@ 1.6 log @Remove USE_X11BASE and X11PREFIX. @ text @$NetBSD: patch-aa,v 1.5 2008/08/17 06:14:21 dholland Exp $ --- Makefile.orig 2001-03-16 14:08:18.000000000 -0500 +++ Makefile 2008-08-17 02:14:47.000000000 -0400 @@@@ -12,10 +12,11 @@@@ # 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 ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib +GCC = ${CC} +CFLAGS ?= -Wall -fpic -O2 +CFLAGS+=-fPIC # Linux LD = $(GCC) -shared @@@@ -31,21 +32,19 @@@@ SO = .so # 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 + 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 $(LIBS) TARGET = gdchart$(SO) PY_SRC = gdc_py.c @@@@ -53,19 +52,11 @@@@ PY_OBJ = $(PY_SRC:.c=.o) 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) @ 1.5 log @Use -fPIC for the shared object. Fixes broken build on amd64 and probably others. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2004/08/27 06:29:08 jlam Exp $ d14 1 a14 1 +LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib @ 1.4 log @Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG, which are the full option names used to set rpath directives for the linker and the compiler, respectively. In places were we are invoking the linker, use "${LINKER_RPATH_FLAG} ", where the space is inserted in case the flag is a word, e.g. -rpath. The default values of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the compiler that you use. They may be overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG, respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2003/07/02 20:07:30 jmc Exp $ d3 3 a5 3 --- Makefile.orig Fri Mar 16 19:08:18 2001 +++ Makefile Wed Jul 2 13:09:19 2003 @@@@ -12,10 +12,10 @@@@ d17 1 d21 1 a21 1 @@@@ -31,21 +31,19 @@@@ d51 1 a51 1 @@@@ -53,19 +51,11 @@@@ @ 1.3 log @Actually do the RPATH_FLAG correctly this time.. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2003/07/02 18:43:13 jmc Exp $ d14 1 a14 1 +LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib -Wl,${RPATH_FLAG}${X11PREFIX}/lib @ 1.2 log @This depends on freetype and needs a define/library enabled to work. Also replace -Wl,-R with RPATH_FLAG while I'm here. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2001/10/18 11:46:31 wiz Exp $ d14 1 a14 1 +LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${RPATH_FLAG}${X11PREFIX}/lib @ 1.1 log @Standardize patch names and some minor cleanup. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.orig Fri Mar 16 20:08:18 2001 +++ Makefile d14 1 a14 1 +LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib -Wl,-R${LOCALBASE}/lib d20 1 a20 1 @@@@ -31,20 +31,14 @@@@ d33 6 a38 1 LIBJPEG = -ljpeg d43 1 d46 1 a46 1 LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) d49 2 a50 1 @@@@ -53,19 +47,11 @@@@ @