summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-08-27 06:29:06 +0000
committerjlam <jlam@pkgsrc.org>2004-08-27 06:29:06 +0000
commitca7093842870728d22dde1258798b1704c53ca18 (patch)
tree0ff3b0eccc04d1b065efd866b0590608098961d5 /graphics
parent49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff)
downloadpkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz
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} <path>", 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.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/png2html/Makefile4
-rw-r--r--graphics/py-gdchart/distinfo4
-rw-r--r--graphics/py-gdchart/patches/patch-aa4
-rw-r--r--graphics/vtk/Makefile.vtkdist6
4 files changed, 9 insertions, 9 deletions
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index da069c732b4..fd244d4df58 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/06/20 21:52:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/27 06:29:07 jlam Exp $
#
DISTNAME= png2html-1.1
@@ -12,7 +12,7 @@ COMMENT= Takes a PNG image and transforms it to a web page
USE_BUILDLINK3= YES
FIX_RPATH+= CFLAGS
-CFLAGS+= -L${BUILDLINK_PREFIX.gd}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.gd}/lib
+CFLAGS+= -L${BUILDLINK_PREFIX.gd}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gd}/lib
do-install:
${INSTALL_MAN_DIR} ${PREFIX}/share/doc/png2html
diff --git a/graphics/py-gdchart/distinfo b/graphics/py-gdchart/distinfo
index 2ca6a5d8123..decba5bbfbc 100644
--- a/graphics/py-gdchart/distinfo
+++ b/graphics/py-gdchart/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/07/02 20:07:29 jmc Exp $
+$NetBSD: distinfo,v 1.5 2004/08/27 06:29:07 jlam Exp $
SHA1 (gdchart-py-0.6.tar.gz) = 20547e8550bb8c925a3b9776739f9a5e93ce8692
Size (gdchart-py-0.6.tar.gz) = 321891 bytes
SHA1 (patch-Makefile) = 477519d0493bd69e2b33f5861b36d1d19275ed96
SHA1 (patch-gdc_py.c) = aeaca3dc2ca2a0ccb586b7da58e55d41b703abfc
-SHA1 (patch-aa) = 408ddf2be8ed5f72c6d148f25209de8b580a1dfe
+SHA1 (patch-aa) = d668c308d54aceedd09f4c5e39c5ad33f32c0e47
SHA1 (patch-ab) = b2179c1c7e1e6aee6d7d8051a7646344254ee96b
diff --git a/graphics/py-gdchart/patches/patch-aa b/graphics/py-gdchart/patches/patch-aa
index 47a1510db0d..50a4d4cf394 100644
--- a/graphics/py-gdchart/patches/patch-aa
+++ b/graphics/py-gdchart/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/07/02 20:07:30 jmc Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/27 06:29:08 jlam Exp $
--- Makefile.orig Fri Mar 16 19:08:18 2001
+++ Makefile Wed Jul 2 13:09:19 2003
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2003/07/02 20:07:30 jmc Exp $
-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 -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib -Wl,${RPATH_FLAG}${X11PREFIX}/lib
++LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib
+GCC = ${CC}
+CFLAGS ?= -Wall -fpic -O2
diff --git a/graphics/vtk/Makefile.vtkdist b/graphics/vtk/Makefile.vtkdist
index 11db9dfdfb0..0962cd7bc75 100644
--- a/graphics/vtk/Makefile.vtkdist
+++ b/graphics/vtk/Makefile.vtkdist
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vtkdist,v 1.1.1.1 2004/08/02 13:13:40 drochner Exp $
+# $NetBSD: Makefile.vtkdist,v 1.2 2004/08/27 06:29:08 jlam Exp $
.include "../../graphics/vtk/Makefile.common"
@@ -18,8 +18,8 @@ BUILD_DEPENDS+= cmake>=1.6.6:../../devel/cmake
VTK_LIBDIR= ${PREFIX}/lib/vtk
VTK_CMAKE_OPT+= -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} \
- -DCMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,${RPATH_FLAG}${VTK_LIBDIR} \
- -DCMAKE_MODULE_LINKER_FLAGS:STRING=-Wl,${RPATH_FLAG}${VTK_LIBDIR} \
+ -DCMAKE_SHARED_LINKER_FLAGS:STRING=${COMPILER_RPATH_FLAG}${VTK_LIBDIR} \
+ -DCMAKE_MODULE_LINKER_FLAGS:STRING=${COMPILER_RPATH_FLAG}${VTK_LIBDIR} \
-DVTK_USE_HYBRID:BOOL=ON
do-configure: