head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.80 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.78 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.76 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.74 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.72 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.70 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.68 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.66 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.64 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.62 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.60 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.58 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.56 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.54 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.52 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.50 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.48 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.46 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.44 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.42 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.40 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.38 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.36 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.32 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.12 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.34 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.30 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.28 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.26 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.24 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.22 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.20 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.18 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.16 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.14 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.10 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.8 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.6 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.4 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.2 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.8.0.94 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.92 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.90 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.88 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.86 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.84 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.82 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.80 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.78 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.76 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.74 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.72 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.70 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.68 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.66 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.64 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.62 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.60 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.58 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.56 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.54 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.52 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.50 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.48 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.46 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.42 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.40 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.38 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.36 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.34 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.32 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.30 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.28 pkgsrc-2008Q1:1.8.0.26 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.24 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.22 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.20 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.18 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.16 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.14 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.12 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.10 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.8 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.6 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.4 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.2 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 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.9 date 2016.05.07.09.58.49; author joerg; state Exp; branches; next 1.8; commitid dzASLAwW8d7Abx5z; 1.8 date 2005.03.11.08.51.58; author adam; state Exp; branches 1.8.94.1; next 1.7; 1.7 date 2005.01.19.09.05.44; author adam; state Exp; branches; next 1.6; 1.6 date 2003.06.24.08.04.24; author adam; state Exp; branches; next 1.5; 1.5 date 2003.06.23.15.56.12; author wiz; state Exp; branches; next 1.4; 1.4 date 2003.06.23.10.19.34; author adam; state Exp; branches; next 1.3; 1.3 date 2003.01.24.12.41.19; author jlam; state Exp; branches; next 1.2; 1.2 date 2003.01.17.13.49.08; author jmmv; state Exp; branches; next 1.1; 1.1 date 2001.10.18.11.39.24; author wiz; state Exp; branches; next ; 1.8.94.1 date 2016.05.11.16.19.22; author bsiegert; state Exp; branches; next ; commitid U548q7D5kitca56z; desc @@ 1.9 log @Fix rpath for X libraries. @ text @$NetBSD: patch-ac,v 1.8 2005/03/11 08:51:58 adam Exp $ --- Makefile.orig 2004-12-17 17:53:47.000000000 +0000 +++ Makefile @@@@ -1,4 +1,4 @@@@ -CC=gcc +LIB_OBJS=price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o # gcc 2.7.1 or better is required # CFLAGS= # CFLAGS=-g -ansi -pedantic @@@@ -6,11 +6,11 @@@@ CC=gcc # ----- build path ----- GDC_INCL=./ GDC_LD=./ -GDC_LIB=libgdc.a +GDC_LIB=libgdchart.a # ----- install locations ----- -PREFIX_INC = /usr/local/include -PREFIX_LIB = /usr/local/lib +PREFIX_INC = ${PREFIX}/include +PREFIX_LIB = ${PREFIX}/lib # INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include @@@@ -18,8 +18,8 @@@@ PREFIX_LIB = /usr/local/lib # GDChart requires the gd library - www.boutell.com/gd/ # gd 2.0.28 or better is required (GIF support has returned to libgd) # if it's not installed in a standard location edit these lines for your installation -GD_INCL=/usr/local/include/ -GD_LD=/usr/local/lib/ +GD_INCL=${PREFIX}/include/ +GD_LD=${PREFIX}/lib/ GD_LIB=libgd.so # a static libgd is also available # GD_LIB=libgd.a @@@@ -63,70 +63,70 @@@@ LIB_PATHS = -L$(GD_LD) -L$(GDC_LD) # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LD) -Xlinker -rpath -Xlinker $(ZLIB_LD) -all: libgdc.a gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp +all: libgdchart.a # --- compile the samples --- gdc_pie_samp.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie_samp.c - $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_pie_samp.c + ${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_pie_samp.c gdc_samp1.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdc_samp1.c - $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp1.c + ${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp1.c gdc_samp2.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdc_samp2.c - $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp2.c + ${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp2.c ft_samp.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h ft_samp.c - $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c + ${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c # --- link the samples --- -gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o gdc_samp1 \ +gdc_samp1: $(GDC_LD)libgdchart.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) + ${LIBTOOL} --mode=link $(CC) -o gdc_samp1 \ gdc_samp1.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm -gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o gdc_samp2 \ +gdc_samp2: $(GDC_LD)libgdchart.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) + ${LIBTOOL} --mode=link $(CC) -o gdc_samp2 \ gdc.o gdchart.o price_conv.o \ gdc_samp2.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm -gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o gdc_pie_samp \ +gdc_pie_samp: $(GDC_LD)libgdchart.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) + ${LIBTOOL} --mode=link $(CC) -o gdc_pie_samp \ gdc.o gdc_pie.o price_conv.o \ gdc_pie_samp.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm -ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) - $(CC) -o ft_samp \ +ft_samp: $(GDC_LD)libgdchart.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) + ${LIBTOOL} --mode=link $(CC) -o ft_samp \ gdc.o gdchart.o price_conv.o \ ft_samp.o \ $(LIB_PATHS) \ - -lgdc -lgd -lz -lpng $(LIBS) -lm + -lgdchart -lgd -lz -lpng $(LIBS) -lm # --- compile the lib --- gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)array_alloc.h price_conv.o: price_conv.c - $(CC) $(CFLAGS) -c price_conv.c + ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c price_conv.c gdc.o: gdc.c $(GDC_INCL)gdc.h - $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c + ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c gdc_pie.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie.c - $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c + ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c gdchart.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdchart.c - $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c + ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c array_alloc.o: array_alloc.c array_alloc.h - $(CC) $(CFLAGS) -c array_alloc.c + ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c array_alloc.c -libgdc.a: price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o - ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o array_alloc.o - ranlib libgdc.a +libgdchart.a: ${LIB_OBJS} + ${LIBTOOL} --mode=link ${CC} -o libgdchart.la ${LIB_OBJS:.o=.lo} \ + -L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib # --- supporting libraries --- # should be compile & installed separately @ 1.8 log @Fixed patch-ac @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2005/01/19 09:05:44 adam Exp $ d129 1 a129 1 + -L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib @ 1.8.94.1 log @Pullup ticket #4988 - requested by joerg graphics/gdchart: build fix Revisions pulled up: - graphics/gdchart/Makefile 1.39 - graphics/gdchart/distinfo 1.13 - graphics/gdchart/patches/patch-ac 1.9 --- Module Name: pkgsrc Committed By: joerg Date: Sat May 7 09:58:49 UTC 2016 Modified Files: pkgsrc/graphics/gdchart: Makefile distinfo pkgsrc/graphics/gdchart/patches: patch-ac Log Message: Fix rpath for X libraries. @ text @d1 1 a1 1 $NetBSD$ d129 1 a129 1 + -L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib @ 1.7 log @Changes 0.11.5: * Use compressed GIF support from libgd @ text @d1 1 a1 1 $NetBSD$ d32 2 a33 2 +GD_INCL=${BUILDLINK_PREFIX.gd}/include/ +GD_LD=${BUILDLINK_PREFIX.gd}/lib/ @ 1.6 log @Shared library now compiles correctly - no constants defined extern @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2003/06/23 15:56:12 wiz Exp $ d3 2 a4 2 --- makefile.orig Tue Mar 11 04:03:06 2003 +++ makefile d7 1 a7 1 +LIB_OBJS= gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o d26 1 a26 1 @@@@ -18,9 +18,9 @@@@ PREFIX_LIB = /usr/local/lib d28 1 a28 1 # libgd 1.8.4 or better is required. Don't use 2.0.0 d30 2 a31 3 -GD_INCL=../gd-1.8.4/ -GD_LD=../gd-1.8.4/ -GD_LIB=libgd.a d34 4 a37 5 +GD_LIB=libgd.so # if you're using gd2.x, use these lines # (it's typically built as a shared lib) # GD_INCL = ../gd-2.0.0/ @@@@ -66,73 +66,72 @@@@ LIB_PATHS = -L$(GD_LD) -L$(GDC_LD) d62 1 a62 1 gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) d64 2 a65 1 + ${LIBTOOL} $(CC) -o gdc_samp1 \ d71 1 a71 1 gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) d73 3 a75 2 + ${LIBTOOL} $(CC) -o gdc_samp2 \ gdc.o gdchart.o price_conv.o gifencode.o \ d81 1 a81 1 gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) d83 3 a85 2 + ${LIBTOOL} $(CC) -o gdc_pie_samp \ gdc.o gdc_pie.o price_conv.o gifencode.o \ d91 1 a91 1 ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB) d93 3 a95 2 + ${LIBTOOL} $(CC) -o ft_samp \ gdc.o gdchart.o price_conv.o gifencode.o \ d102 1 a102 5 gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)gifencode.h $(GDC_INCL)array_alloc.h gifencode.o: gifencode.c gifencode.h $(GDC_INCL)gdc.h - $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c d106 1 a106 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c price_conv.c d110 1 a110 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c d114 1 a114 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c d118 1 a118 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c d122 1 a122 1 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c array_alloc.c d124 2 a125 2 -libgdc.a: gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o - ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o gifencode.o array_alloc.o d127 3 a129 2 +libgdchart.a: $(LIB_OBJS) + $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) -L${GD_LD} -lgd -version-info 0:11 -rpath $(PREFIX)/lib a132 12 @@@@ -140,9 +139,9 @@@@ libgdc.a: gifencode.o price_conv.o gdc.o # cd $(GD_LD) ; make -f Makefile $(GD_LIB) # ----- install ----- -install: gdc.h gdchart.h gdcpie.h gifencode.h libgdc.a +install: gdc.h gdchart.h gdcpie.h gifencode.h libgdchart.a cp gdc.h gdchart.h gdcpie.h gifencode.h $(PREFIX_INC)/ - cp libgdc.a $(PREFIX_LIB)/ + $(LIBTOOL) --mode=install ${BSD_INSTALL_DATA} libgdchart.la ${PREFIX}/lib # --- clean --- clean: @ 1.5 log @Define TEST_TARGET; make the examples compilation use libtool, and correct the library name on the example link line (!). XXX: 'make test' fails. @ text @d1 1 a1 1 $NetBSD$ d33 2 a34 2 +GD_INCL=${BUILDLINK_PREFIX.gd}/include +GD_LD=${BUILDLINK_PREFIX.gd}/lib d130 1 a130 1 + $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) $(LDFLAGS) -lgd -version-info 0:11 -rpath $(PREFIX) @ 1.4 log @Update gdchart to 0.11.4. Bug fixes and performance improvements in PIE charts. @ text @d3 2 a4 2 --- makefile.orig 2003-03-11 04:03:06.000000000 +0100 +++ makefile 2003-06-20 15:22:12.000000000 +0200 d11 1 a11 1 @@@@ -6,11 +6,11 @@@@ d26 1 a26 1 @@@@ -18,9 +18,9 @@@@ d39 1 a39 1 @@@@ -66,7 +66,7 @@@@ d48 52 a99 1 @@@@ -113,26 +113,25 @@@@ d134 1 a134 1 @@@@ -140,9 +139,9 @@@@ @ 1.3 log @Now that we build a gdchart shared library, we should ensure that the correct libraries (-lgd) are added to the link command to produce the correct inter-library dependencies. Bump the PKGREVISION of graphics/gd to 3. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2003/01/17 13:49:08 jmmv Exp $ d3 39 a41 14 --- makefile.orig Sat Nov 4 02:49:46 2000 +++ makefile @@@@ -23,6 +23,8 @@@@ LIB_PATHS = -L$(GD_LIB) # 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 + # 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,67 @@@@ LIB_PATHS = -L$(GD_LIB) # LIB_PATHS = $(LIB_PATHS) -R$(PNG_LIB) -R$(ZLIB_LIB) # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LIB) -Xlinker -rpath -Xlinker $(ZLIB_LIB) d43 1 a43 3 -CC=gcc - -all: gdc_samp1 gdc_samp2 gdc_pie_samp d47 7 a53 61 -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 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c gifencode.c d56 1 a56 1 - $(CC) -c price_conv.c d59 21 a79 11 gdc.o: gdc.c $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h - $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc.c + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(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 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(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 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(JPEG_DEF) -c gdchart.c d83 9 a91 9 # $(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; + $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) $(LDFLAGS) -lgd -version-info 0:10:0 -rpath $(PREFIX) @ 1.2 log @Libtoolize this package so we get shared libraries (they are required by net/ntop2). While here, also enable jpeg support. Bump PKGREVISION to 2. Reviewed by wiz. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2001/10/18 11:39:24 wiz Exp $ d112 1 a112 1 + $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) $(LDFLAGS) -ljpeg -version-info 0:10:0 -rpath $(PREFIX) @ 1.1 log @Buildlinkify, don't use perl, sed is good enough, install examples into share/examples hierarchy, standardize patch names, remove FreeBSDisms from PLIST. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -23,6 +23,8 @@@@ d14 1 a14 1 @@@@ -30,62 +32,66 @@@@ d84 1 a84 1 + $(CC) $(CFLAGS) -c gifencode.c d88 1 a88 1 + $(CC) $(CFLAGS) -c price_conv.c d92 1 a92 1 + $(CC) $(CFLAGS) $(JPEG_DEF) -c gdc.c d96 1 a96 1 + $(CC) $(CFLAGS) $(JPEG_DEF) -c gdc_pie.c d100 1 a100 1 + $(CC) $(CFLAGS) $(JPEG_DEF) -c gdchart.c d108 5 a112 4 + $(AR) rc libgdchart.a $(LIB_OBJS) + @@if [ -x $(RANLIB) ] ; then \ + $(RANLIB) libgdchart.a; \ + fi; @