Sat May 7 09:58:49 2016 UTC ()
Fix rpath for X libraries.


(joerg)
diff -r1.38 -r1.39 pkgsrc/graphics/gdchart/Makefile
diff -r1.12 -r1.13 pkgsrc/graphics/gdchart/distinfo
diff -r1.8 -r1.9 pkgsrc/graphics/gdchart/patches/patch-ac
cvs diff -r1.38 -r1.39 pkgsrc/graphics/gdchart/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gdchart/Makefile 2015/11/18 14:19:46 1.38
+++ pkgsrc/graphics/gdchart/Makefile 2016/05/07 09:58:49 1.39
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.38 2015/11/18 14:19:46 ryoon Exp $ 1# $NetBSD: Makefile,v 1.39 2016/05/07 09:58:49 joerg Exp $
2 2
3DISTNAME= gdchart0.11.5dev 3DISTNAME= gdchart0.11.5dev
4PKGNAME= gdchart-0.11.5 4PKGNAME= gdchart-0.11.5
5PKGREVISION= 15 5PKGREVISION= 16
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://www.fred.net/brv/chart/ 7MASTER_SITES= http://www.fred.net/brv/chart/
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://www.fred.net/brv/chart/ 10HOMEPAGE= http://www.fred.net/brv/chart/
11COMMENT= Easy to use, fast C API for creating charts and graphs 11COMMENT= Easy to use, fast C API for creating charts and graphs
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14INSTALLATION_DIRS= include lib 14INSTALLATION_DIRS= include lib
15 15
16#TEST_TARGET= gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp 16#TEST_TARGET= gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
17 17
18post-patch: 18post-patch:
cvs diff -r1.12 -r1.13 pkgsrc/graphics/gdchart/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gdchart/distinfo 2015/11/03 21:33:58 1.12
+++ pkgsrc/graphics/gdchart/distinfo 2016/05/07 09:58:49 1.13
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.12 2015/11/03 21:33:58 agc Exp $ 1$NetBSD: distinfo,v 1.13 2016/05/07 09:58:49 joerg Exp $
2 2
3SHA1 (gdchart0.11.5dev.tar.gz) = c23e1cd233c38ac007b57420c20a5fa7fa206841 3SHA1 (gdchart0.11.5dev.tar.gz) = c23e1cd233c38ac007b57420c20a5fa7fa206841
4RMD160 (gdchart0.11.5dev.tar.gz) = be9b11eb446738d9e30d78e8ce73b8a418b1f520 4RMD160 (gdchart0.11.5dev.tar.gz) = be9b11eb446738d9e30d78e8ce73b8a418b1f520
5SHA512 (gdchart0.11.5dev.tar.gz) = dc08d02c0273fd41d0de193126b5fd8524473e76e17ea972ed1891354ca67dd406c1073f07fe5f11a2623b575499bb7e5633825d43033fdfd2b492d19db957a3 5SHA512 (gdchart0.11.5dev.tar.gz) = dc08d02c0273fd41d0de193126b5fd8524473e76e17ea972ed1891354ca67dd406c1073f07fe5f11a2623b575499bb7e5633825d43033fdfd2b492d19db957a3
6Size (gdchart0.11.5dev.tar.gz) = 38783 bytes 6Size (gdchart0.11.5dev.tar.gz) = 38783 bytes
7SHA1 (patch-ac) = eb4bc3be51bb1a9e8b3db9cd8c6038381fbf734a 7SHA1 (patch-ac) = 191ad026f5203cd115deb9c5e7d55f981858d401
cvs diff -r1.8 -r1.9 pkgsrc/graphics/gdchart/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/gdchart/patches/patch-ac 2005/03/11 08:51:58 1.8
+++ pkgsrc/graphics/gdchart/patches/patch-ac 2016/05/07 09:58:49 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.8 2005/03/11 08:51:58 adam Exp $ 1$NetBSD: patch-ac,v 1.9 2016/05/07 09:58:49 joerg Exp $
2 2
3--- Makefile.orig 2004-12-17 17:53:47.000000000 +0000 3--- Makefile.orig 2004-12-17 17:53:47.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -1,4 +1,4 @@ 5@@ -1,4 +1,4 @@
6-CC=gcc 6-CC=gcc
7+LIB_OBJS=price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o 7+LIB_OBJS=price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
8 # gcc 2.7.1 or better is required 8 # gcc 2.7.1 or better is required
9 # CFLAGS= 9 # CFLAGS=
10 # CFLAGS=-g -ansi -pedantic 10 # CFLAGS=-g -ansi -pedantic
11@@ -6,11 +6,11 @@ CC=gcc 11@@ -6,11 +6,11 @@ CC=gcc
12 # ----- build path ----- 12 # ----- build path -----
13 GDC_INCL=./ 13 GDC_INCL=./
14 GDC_LD=./ 14 GDC_LD=./
@@ -116,17 +116,17 @@ $NetBSD: patch-ac,v 1.8 2005/03/11 08:51 @@ -116,17 +116,17 @@ $NetBSD: patch-ac,v 1.8 2005/03/11 08:51
116 gdchart.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdchart.c 116 gdchart.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdchart.c
117- $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c 117- $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
118+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c 118+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
119  119
120 array_alloc.o: array_alloc.c array_alloc.h 120 array_alloc.o: array_alloc.c array_alloc.h
121- $(CC) $(CFLAGS) -c array_alloc.c 121- $(CC) $(CFLAGS) -c array_alloc.c
122+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c array_alloc.c 122+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c array_alloc.c
123  123
124-libgdc.a: price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o 124-libgdc.a: price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
125- ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o array_alloc.o 125- ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o array_alloc.o
126- ranlib libgdc.a 126- ranlib libgdc.a
127+libgdchart.a: ${LIB_OBJS} 127+libgdchart.a: ${LIB_OBJS}
128+ ${LIBTOOL} --mode=link ${CC} -o libgdchart.la ${LIB_OBJS:.o=.lo} \ 128+ ${LIBTOOL} --mode=link ${CC} -o libgdchart.la ${LIB_OBJS:.o=.lo} \
129+ -L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib 129+ -L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
130  130
131 # --- supporting libraries --- 131 # --- supporting libraries ---
132 # should be compile & installed separately 132 # should be compile & installed separately