summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam>2003-01-24 12:41:17 +0000
committerjlam <jlam>2003-01-24 12:41:17 +0000
commit82e9c08f368a939d1665560ad580743aca5a277f (patch)
tree17349f01409bcf8b1401255a48e8aa2d9862b117 /graphics
parent9ac7af039ca8bb07acca5eaeaa4ecbd8a26bda0c (diff)
downloadpkgsrc-82e9c08f368a939d1665560ad580743aca5a277f.tar.gz
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.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/gdchart/Makefile5
-rw-r--r--graphics/gdchart/buildlink2.mk6
-rw-r--r--graphics/gdchart/distinfo4
-rw-r--r--graphics/gdchart/patches/patch-ac4
4 files changed, 9 insertions, 10 deletions
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 99c2ad5bd15..dc6c11d71f3 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/01/17 13:49:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/24 12:41:17 jlam Exp $
#
DISTNAME= gdchart0.10.1dev
PKGNAME= gdchart-0.10.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.fred.net/brv/chart/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -41,5 +41,4 @@ do-install:
${PREFIX}/share/examples/gdchart
.include "../../graphics/gd/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdchart/buildlink2.mk b/graphics/gdchart/buildlink2.mk
index 0ebb3ac4622..4e89e732eb8 100644
--- a/graphics/gdchart/buildlink2.mk
+++ b/graphics/gdchart/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/24 11:40:04 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/01/24 12:41:18 jlam Exp $
#
.if !defined(GDCHART_BUILDLINK2_MK)
GDCHART_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gdchart
-BUILDLINK_DEPENDS.gdchart?= gdchart>=0.10.1nb2
+BUILDLINK_DEPENDS.gdchart?= gdchart>=0.10.1nb3
BUILDLINK_PKGSRCDIR.gdchart?= ../../graphics/gdchart
EVAL_PREFIX+= BUILDLINK_PREFIX.gdchart=gdchart
@@ -16,7 +16,7 @@ BUILDLINK_FILES.gdchart+= include/gdcpie.h
BUILDLINK_FILES.gdchart+= include/gifencode.h
BUILDLINK_FILES.gdchart+= lib/libgdchart.*
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/gd/buildlink2.mk"
BUILDLINK_TARGETS+= gdchart-buildlink
diff --git a/graphics/gdchart/distinfo b/graphics/gdchart/distinfo
index 3f29babcafc..8bff248bd0c 100644
--- a/graphics/gdchart/distinfo
+++ b/graphics/gdchart/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/01/17 13:49:07 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/01/24 12:41:18 jlam Exp $
SHA1 (gdchart0.10.1dev.tar.gz) = 52edc97cb45fc441afc4728c812cd33ddab9ef5c
Size (gdchart0.10.1dev.tar.gz) = 40708 bytes
SHA1 (patch-aa) = 6755bc77ee3e5bfb4dc92459d41f6ad4f8f76e75
SHA1 (patch-ab) = 100c284c8f9400785ef9eff42c81a9f13d73c1e5
-SHA1 (patch-ac) = 4d46784d569d904e4caa0155177e03c4edbd9260
+SHA1 (patch-ac) = ca0cd60f726854bcaa405a99aefeb523d2f38f28
diff --git a/graphics/gdchart/patches/patch-ac b/graphics/gdchart/patches/patch-ac
index 6d6c0af63d3..c1659e4301b 100644
--- a/graphics/gdchart/patches/patch-ac
+++ b/graphics/gdchart/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2003/01/17 13:49:08 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2003/01/24 12:41:19 jlam Exp $
--- makefile.orig Sat Nov 4 02:49:46 2000
+++ makefile
@@ -109,7 +109,7 @@ $NetBSD: patch-ac,v 1.2 2003/01/17 13:49:08 jmmv Exp $
+# @if [ -x $(RANLIB) ] ; then \
+# $(RANLIB) libgdchart.a; \
+# fi;
-+ $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) $(LDFLAGS) -ljpeg -version-info 0:10:0 -rpath $(PREFIX)
++ $(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) $(LDFLAGS) -lgd -version-info 0:10:0 -rpath $(PREFIX)
# --- clean ---
clean: