summaryrefslogtreecommitdiff
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
commit2347df5518184e316028bf90a0d032ee71028b63 (patch)
tree0ff3b0eccc04d1b065efd866b0590608098961d5
parente5a1b353192b781a2b5c36eca0f963c97d681caa (diff)
downloadpkgsrc-2347df5518184e316028bf90a0d032ee71028b63.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.
-rw-r--r--audio/portaudio/distinfo4
-rw-r--r--audio/portaudio/patches/patch-ac4
-rw-r--r--cad/fasthenry/Makefile4
-rw-r--r--chat/eggdrop/distinfo4
-rw-r--r--chat/eggdrop/patches/patch-ag6
-rw-r--r--chat/fugu/Makefile4
-rw-r--r--chat/ser/distinfo4
-rw-r--r--chat/ser/patches/patch-aa4
-rw-r--r--comms/kermit/Makefile4
-rw-r--r--cross/bfd-mdsetimage/Makefile4
-rw-r--r--databases/db/buildlink3.mk4
-rw-r--r--databases/db3/buildlink3.mk4
-rw-r--r--databases/db4/buildlink3.mk4
-rw-r--r--databases/mysql-client/Makefile.common4
-rw-r--r--databases/mysql4-client/Makefile6
-rw-r--r--databases/mysql4-client/Makefile.common4
-rw-r--r--databases/p5-DBD-Sybase/Makefile4
-rw-r--r--databases/p5-DB_File/Makefile4
-rw-r--r--databases/p5-sybperl/Makefile4
-rw-r--r--databases/php4-mysql/Makefile4
-rw-r--r--databases/sqsh/Makefile.common4
-rw-r--r--devel/gnustep-make/gnustep.mk6
-rw-r--r--devel/jgrasp/Makefile4
-rw-r--r--devel/sdcc/Makefile3
-rw-r--r--emulators/mips64emul/Makefile5
-rw-r--r--games/hugo/distinfo4
-rw-r--r--games/hugo/patches/patch-aa4
-rw-r--r--games/xbomber/distinfo4
-rw-r--r--games/xbomber/patches/patch-aa4
-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
-rw-r--r--lang/cim/Makefile4
-rw-r--r--lang/gcc3/distinfo4
-rw-r--r--lang/gcc3/patches/patch-ab4
-rw-r--r--lang/guile14/distinfo4
-rw-r--r--lang/guile14/patches/patch-ab4
-rw-r--r--lang/perl5/Makefile6
-rw-r--r--lang/perl58/Makefile6
-rw-r--r--lang/python20/Makefile6
-rw-r--r--mail/exim/Makefile.common10
-rw-r--r--mail/exim3/Makefile6
-rw-r--r--mail/postfix-current/options.mk20
-rw-r--r--mail/postfix/options.mk20
-rw-r--r--mail/qmail/options.mk4
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/scilab/Makefile4
-rw-r--r--meta-pkgs/XFree86/Makefile.common6
-rw-r--r--meta-pkgs/xorg/Makefile.common9
-rw-r--r--misc/gkrellm-leds/distinfo4
-rw-r--r--misc/gkrellm-leds/patches/patch-aa4
-rw-r--r--mk/bsd.pkg.mk14
-rw-r--r--mk/bsd.prefs.mk21
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk26
-rw-r--r--mk/buildlink3/gen-transform.sh7
-rw-r--r--mk/compiler/gcc.mk13
-rw-r--r--mk/compiler/mipspro.mk9
-rw-r--r--mk/compiler/sunpro.mk8
-rw-r--r--mk/defs.AIX.mk3
-rw-r--r--mk/defs.BSDOS.mk3
-rw-r--r--mk/defs.Darwin.mk5
-rw-r--r--mk/defs.FreeBSD.mk3
-rw-r--r--mk/defs.IRIX.mk3
-rw-r--r--mk/defs.Interix.mk3
-rw-r--r--mk/defs.Linux.mk3
-rw-r--r--mk/defs.NetBSD.mk3
-rw-r--r--mk/defs.OpenBSD.mk3
-rw-r--r--mk/defs.SunOS.mk3
-rw-r--r--mk/defs.UnixWare.mk4
-rw-r--r--mk/motif.buildlink3.mk6
-rw-r--r--net/bind9-current/Makefile4
-rw-r--r--net/bind9/Makefile4
-rw-r--r--net/scli/Makefile4
-rw-r--r--net/waste/Makefile4
-rw-r--r--parallel/pvm3/distinfo8
-rw-r--r--parallel/pvm3/patches/patch-am4
-rw-r--r--parallel/pvm3/patches/patch-bu6
-rw-r--r--parallel/pvm3/patches/patch-bv6
-rw-r--r--pkgtools/xpkgwedge/Makefile5
-rw-r--r--print/ghostscript-gnu/Makefile.common4
-rw-r--r--print/ghostscript-nox11/Makefile.common6
-rw-r--r--security/pgp2/Makefile4
-rw-r--r--shells/zsh/Makefile.common4
-rw-r--r--sysutils/mtools/distinfo4
-rw-r--r--sysutils/mtools/patches/patch-ab6
-rw-r--r--textproc/lua-expat/distinfo4
-rw-r--r--textproc/lua-expat/patches/patch-aa4
-rw-r--r--textproc/py-xml/Makefile4
-rw-r--r--time/bbdate/distinfo4
-rw-r--r--time/bbdate/patches/patch-aa4
-rw-r--r--wm/amiwm/Makefile4
-rw-r--r--www/ap-auth-mysql/Makefile4
-rw-r--r--www/ap-ssl/Makefile4
-rw-r--r--www/ap2-auth-mysql/Makefile4
-rw-r--r--www/ap2-auth-pgsql/Makefile4
-rw-r--r--www/apache6/Makefile4
-rw-r--r--www/galeon12/Makefile4
-rw-r--r--www/mozilla/Makefile.common4
-rw-r--r--www/p5-libapreq/Makefile4
-rw-r--r--x11/gnome-python/Makefile6
-rw-r--r--x11/qt3-libs/buildlink3.mk4
-rw-r--r--x11/xcursorgen/Makefile4
-rw-r--r--x11/xorg-server/files/host.def4
104 files changed, 279 insertions, 277 deletions
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index 1d463e8af7b..65abbbe1f35 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
+$NetBSD: distinfo,v 1.2 2004/08/27 06:29:06 jlam Exp $
SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
Size (portaudio_v18_1.zip) = 550130 bytes
SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
-SHA1 (patch-ac) = de0d99b71e09f9bbcd5d838188e5dc8d68d09a46
+SHA1 (patch-ac) = e1c912bb7b0eb24f31481996af92d42312dcd182
SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a
SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59
SHA1 (patch-af) = da42578e66137f95edbbb86bde724af32e398d57
diff --git a/audio/portaudio/patches/patch-ac b/audio/portaudio/patches/patch-ac
index b23e93cb226..cae85f273fc 100644
--- a/audio/portaudio/patches/patch-ac
+++ b/audio/portaudio/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
+$NetBSD: patch-ac,v 1.2 2004/08/27 06:29:06 jlam Exp $
--- Makefile.in.orig Tue Feb 11 23:24:56 2003
+++ Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
CC = @CC@
CFLAGS = @CFLAGS@ -Ipa_common
-LIBS = @LIBS@
-+LIBS = ${LIBOSSAUDIO} -L@prefix@/lib -Wl,${RPATH_FLAG} @prefix@/lib @LIBS@
++LIBS = ${LIBOSSAUDIO} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@
AR = @AR@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 5d8c6dbc8ed..8e0f22db20f 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/04/11 05:02:25 snj Exp $
+# $NetBSD: Makefile,v 1.22 2004/08/27 06:29:06 jlam Exp $
#
DISTNAME= fasthenry-3.0-12Nov96
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= default
#>
. include "../../math/libffm/buildlink3.mk"
DEPENDS+= libffm-[0-9]*:../../math/libffm
-LIBS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -lffm -lm
+LIBS= -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lffm -lm
MAKE_ENV+= LIBS="${LIBS}"
.else
LIBS= -lm
diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo
index f66cb273fa8..17253b63289 100644
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/03/11 06:37:50 minskim Exp $
+$NetBSD: distinfo,v 1.7 2004/08/27 06:29:06 jlam Exp $
SHA1 (eggdrop1.6.15.tar.bz2) = 8740800b066b35c745c7e753e7f58daac9929f3a
Size (eggdrop1.6.15.tar.bz2) = 760615 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = a1c5648e2748f5efbcb890b5ed8a3e8faac5f0a5
SHA1 (patch-ad) = 8b9f740e82d44df7daeede770fce7f5add751407
SHA1 (patch-ae) = 370fe00ada6b9432483ab3e0ef9c349f7c7dd00f
SHA1 (patch-af) = 1915d3f9ac55e49d829613c6f003b2800f62a734
-SHA1 (patch-ag) = ab193737668ff9c0bdfbfa1b21678356a505bb41
+SHA1 (patch-ag) = 9cb1acc1be5ad4186dc7c9fac9f20955a9f51292
SHA1 (patch-ah) = b9f6e10f0a1a8f73f014ceae5015dc157f8fe124
SHA1 (patch-ai) = 0bbf9e3be1368897e2a9399c9ea58f28c8f84e0c
SHA1 (patch-aj) = 7701eefed77228fe46360bea717403314386de03
diff --git a/chat/eggdrop/patches/patch-ag b/chat/eggdrop/patches/patch-ag
index 7368af9184b..1297714f426 100644
--- a/chat/eggdrop/patches/patch-ag
+++ b/chat/eggdrop/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $
+$NetBSD: patch-ag,v 1.5 2004/08/27 06:29:06 jlam Exp $
--- Makefile.in.orig Tue Feb 27 20:06:27 2001
+++ Makefile.in Fri Nov 2 11:40:10 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $
# make modules
SHLIB_CC = @SHLIB_CC@
-SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ $(RPATH_FLAG)@TCLLIB@
++SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@
SHLIB_STRIP = @SHLIB_STRIP@
MOD_EXT = @MOD_EXT@
@@ -15,7 +15,7 @@ $NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $
# stuff for Tcl
XREQS = @TCL_REQS@
XLIBS = @TCL_LIBS@ @LIBS@
-+XLDFLAGS = -Wl,$(RPATH_FLAG)@TCLLIB@
++XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@
TCLLIB = @TCLLIB@
TCLLIBFN = @TCLLIBFN@
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index 5b2b344339c..dd60a066ee8 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/05/30 02:19:16 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/08/27 06:29:06 jlam Exp $
#
DISTNAME= fugu-1.0
@@ -16,7 +16,7 @@ USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN}
LDFLAGS+= -L${BUILDLINK_PREFIX.py-Pmw}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
CPPFLAGS+= -I${BUILDLINK_PREFIX.py-Pmw}/include \
-I${BUILDLINK_PREFIX.rsaref}/include/rsaref \
-I${BUILDLINK_PREFIX.rsaref}/include
diff --git a/chat/ser/distinfo b/chat/ser/distinfo
index 4634f7ba0ec..2e3eaa02bb6 100644
--- a/chat/ser/distinfo
+++ b/chat/ser/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/05/09 23:58:19 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/08/27 06:29:07 jlam Exp $
SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d
Size (ser-0.8.10_src.tar.gz) = 931150 bytes
-SHA1 (patch-aa) = ebee20df3766908a6dc6b031f703f3ce60b45071
+SHA1 (patch-aa) = 40c28c6855a99468b5081eb21007d6b0e6744527
SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec
SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d
diff --git a/chat/ser/patches/patch-aa b/chat/ser/patches/patch-aa
index e7c522f949f..e7ce8ecec5a 100644
--- a/chat/ser/patches/patch-aa
+++ b/chat/ser/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
--- Makefile.defs.orig 2002-11-12 17:21:28.000000000 +0000
+++ Makefile.defs 2003-09-16 15:42:29.000000000 +0100
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $
endif
endif #mode=release
-+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
++LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
#*FLAGS used for compiling the modules
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 7739b05756a..9eca4afcf4f 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/06/04 05:34:13 ben Exp $
+# $NetBSD: Makefile,v 1.55 2004/08/27 06:29:07 jlam Exp $
DISTNAME= cku211
PKGNAME= kermit-8.0.211
@@ -26,7 +26,7 @@ PLIST_SRC= ${WRKDIR}/PLIST
# Set to empty
SSLINC= -I${WRKDIR}/.buildlink/include
-SSLLIB= -L${WRKDIR}/.buildlink/lib -Wl,${RPATH_FLAG}${WRKDIR}/.buildlink/lib
+SSLLIB= -L${WRKDIR}/.buildlink/lib ${COMPILER_RPATH_FLAG}${WRKDIR}/.buildlink/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index 9a1e9dd1481..8ca87e38cc3 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:55 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/27 06:29:07 jlam Exp $
DISTNAME= bfd-mdsetimage-1.15.1
CATEGORIES= cross
@@ -22,7 +22,7 @@ MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \
LIBS="${BFD_LIBS}"
FIX_RPATH+= BFD_LIBS
-BFD_LIBS= -L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty
+BFD_LIBS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty
do-extract:
@${MKDIR} ${WRKSRC}
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index a3120c167de..388d9e045ad 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/07/10 03:01:38 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/08/27 06:29:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_LIBDIRS.db2?= lib
BUILDLINK_TRANSFORM+= l:db:db2
BUILDLINK_CPPFLAGS.db2= -I${BUILDLINK_PREFIX.db2}/${BUILDLINK_INCDIRS.db2}
. endif
-BUILDLINK_LDFLAGS.db2= -L${BUILDLINK_PREFIX.db2}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib
+BUILDLINK_LDFLAGS.db2= -L${BUILDLINK_PREFIX.db2}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib
BUILDLINK_LIBS.db2= -ldb2
.endif # DB_BUILDLINK3_MK
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index dec45804de9..64813893d76 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/07/10 03:01:38 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/08/27 06:29:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ USE_DB185?= yes
BUILDLINK_TRANSFORM+= l:db:db3
BUILDLINK_CPPFLAGS.db3= -I${BUILDLINK_PREFIX.db3}/${BUILDLINK_INCDIRS.db3}
. endif
-BUILDLINK_LDFLAGS.db3= -L${BUILDLINK_PREFIX.db3}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db3}/lib
+BUILDLINK_LDFLAGS.db3= -L${BUILDLINK_PREFIX.db3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db3}/lib
BUILDLINK_LIBS.db3= -ldb3
.endif # DB3_BUILDLINK3_MK
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index e8796b5cd5c..9be739bcde9 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/07/10 03:01:38 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/08/27 06:29:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
@@ -27,7 +27,7 @@ BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1
BUILDLINK_TRANSFORM+= l:db:db4
BUILDLINK_CPPFLAGS.db4= -I${BUILDLINK_PREFIX.db4}/${BUILDLINK_INCDIRS.db4}
. endif
-BUILDLINK_LDFLAGS.db4= -L${BUILDLINK_PREFIX.db4}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib
+BUILDLINK_LDFLAGS.db4= -L${BUILDLINK_PREFIX.db4}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib
BUILDLINK_LIBS.db4= -ldb4
.endif # DB4_BUILDLINK3_MK
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 4e344f375f7..e5bb0fa931c 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2004/07/20 04:53:09 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.25 2004/08/27 06:29:07 jlam Exp $
DISTNAME= mysql-3.23.58
CATEGORIES= databases
@@ -60,7 +60,7 @@ CXXFLAGS+= -DHAVE_CURSES_H
USE_PERL5= # defined
USE_LIBTOOL= # defined
-LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
post-extract:
cd ${WRKSRC}; \
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 674799c7cff..65d1dd18f28 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/18 22:57:17 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/27 06:29:07 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
SVR4_PKGNAME= mysqc
@@ -9,8 +9,8 @@ CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
.include "Makefile.common"
CONFIGURE_ARGS+= --without-server
-USE_BUILDLINK3= YES
-UNBUILDLINK_FILES= scripts/mysql_config
+USE_BUILDLINK3= yes
+UNWRAP_FILES= scripts/mysql_config
INFO_FILES= mysql.info
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 40511bd586e..fe92236f5ee 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/07/20 04:53:09 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/08/27 06:29:07 jlam Exp $
DISTNAME= mysql-4.0.20
CATEGORIES= databases
@@ -69,7 +69,7 @@ USE_LANGUAGES= c c++
USE_GNU_TOOLS+= make
USE_PERL5= # defined
USE_LIBTOOL= # defined
-LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
post-extract:
cd ${WRKSRC}; \
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 98a693ba5ab..2a40fffce93 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/07/19 21:07:39 heinz Exp $
+# $NetBSD: Makefile,v 1.17 2004/08/27 06:29:07 jlam Exp $
#
DISTNAME= DBD-Sybase-0.94
@@ -29,7 +29,7 @@ PKG_FAIL_REASON+= "You must define SYBASE to the base directory of your Open Cli
_SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
.endif
-PERL5_LDFLAGS+= -Wl,${RPATH_FLAG}${_SYBASE}/lib
+PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib
MAKE_ENV+= SYBASE=${_SYBASE}
.if !defined(USE_SYBASE_OPENCLIENT)
diff --git a/databases/p5-DB_File/Makefile b/databases/p5-DB_File/Makefile
index 53adfd979c8..c54bf83f353 100644
--- a/databases/p5-DB_File/Makefile
+++ b/databases/p5-DB_File/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/05/14 18:38:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/27 06:29:07 jlam Exp $
DISTNAME= DB_File-1.806
PKGNAME= p5-${DISTNAME}
@@ -19,7 +19,7 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/DB_File/.packlist
# XXX This is a bit ugly...
DB_NAME= ${BUILDLINK_TRANSFORM:Ml\:db\:*:S/l:db:/-l/}
MAKE_ENV+= DB_NAME=${DB_NAME}
-PERL5_LDFLAGS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db}/lib
+PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db}/lib
PERL5_LDFLAGS+= -L${BUILDLINK_PREFIX.db}/lib
MAKE_ENV+= DB_CPPFLAGS=${BUILDLINK_CPPFLAGS.db}
.if ${BDB_TYPE} == "db2"
diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile
index 61e3ea448f3..3b8a3490ece 100644
--- a/databases/p5-sybperl/Makefile
+++ b/databases/p5-sybperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/05/08 05:25:12 snj Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/27 06:29:07 jlam Exp $
#
DISTNAME= sybperl-2.16
@@ -27,7 +27,7 @@ PKG_FAIL_REASON+= "You must define SYBASE to the base directory of your Open Cli
_SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
.endif
-PERL5_LDFLAGS+= -Wl,${RPATH_FLAG}${_SYBASE}/lib
+PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib
MAKE_ENV+= SYBASE=${_SYBASE}
.if !defined(USE_SYBASE_OPENCLIENT)
diff --git a/databases/php4-mysql/Makefile b/databases/php4-mysql/Makefile
index d9b09e29d5d..b39fe378983 100644
--- a/databases/php4-mysql/Makefile
+++ b/databases/php4-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/05/13 13:08:28 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/27 06:29:07 jlam Exp $
MODNAME= mysql
CATEGORIES+= databases
@@ -15,7 +15,7 @@ USE_BUILDLINK3= yes
EVAL_PREFIX+= MYSQLDIR=mysql-client
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${MYSQLDIR}
-LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql
.include "../../databases/mysql-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
index 02748ccc8bf..a4ab5166eda 100644
--- a/databases/sqsh/Makefile.common
+++ b/databases/sqsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/07/18 09:38:26 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/08/27 06:29:07 jlam Exp $
DISTNAME= sqsh-2.1-src
CATEGORIES= databases
@@ -34,7 +34,7 @@ CONFIGURE_ENV+= SYBASE_LIBS=-lct
MAKE_FLAGS+= SYBASE_LIBS=-lct
.endif
-LDFLAGS+= -Wl,${RPATH_FLAG}${_SYBASE}/lib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib
CONFIGURE_ENV+= SYBASE="${_SYBASE}"
CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include"
CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 201bbf6c41d..470075b910d 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.1 2004/04/10 23:31:39 rh Exp $
+# $NetBSD: gnustep.mk,v 1.2 2004/08/27 06:29:07 jlam Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -30,8 +30,8 @@ GNUSTEP_LDIRS= ${GNUSTEP_LFLAGS:S/-L//g}
GNUSTEP_IDIRS= ${GNUSTEP_IFLAGS:S/-I//g}
GNUSTEP_BLDIRS= ${GNUSTEP_LDIRS:S/${PREFIX}\///g}
GNUSTEP_BIDIRS= ${GNUSTEP_IDIRS:S/${PREFIX}\///g}
-.if empty(_USE_RPATH:M[nN][oO])
-GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/-Wl,${_OPSYS_RPATH_NAME}/g}
+.if !empty(_USE_RPATH:M[yY][eE][sS])
+GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/${COMPILER_RPATH_FLAG}/g}
.else
GNUSTEP_RFLAGS?=
.endif
diff --git a/devel/jgrasp/Makefile b/devel/jgrasp/Makefile
index 2b6a75b95d6..ea1772539f1 100644
--- a/devel/jgrasp/Makefile
+++ b/devel/jgrasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/06/05 22:51:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/27 06:29:07 jlam Exp $
#
DISTNAME= jgrasp170
@@ -21,7 +21,7 @@ do-build:
${CC} ${CFLAGS} -lutil -o ${WRKSRC}/jbin/${LOWER_OPSYS}_run \
${WRKSRC}/src/linux_run.c
${CC} ${CFLAGS} -I${X11BASE}/include \
- -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -lX11 \
+ -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lX11 \
-o ${WRKSRC}/bin/${LOWER_OPSYS}/jgrasp \
${WRKSRC}/src/linux_exec.c
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 8001bc576e1..cd4bb947ed8 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/07/18 10:49:49 recht Exp $
+# $NetBSD: Makefile,v 1.25 2004/08/27 06:29:07 jlam Exp $
# FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
DISTNAME= sdcc-2.4.0
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/sdcc
CPPFLAGS+= -fdollars-in-identifiers
CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
CONFIGURE_ENV+= sdcc_cv_CCggdb="no"
-MAKE_ENV+= _OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
.include "../../mk/bsd.prefs.mk"
diff --git a/emulators/mips64emul/Makefile b/emulators/mips64emul/Makefile
index a05b061019f..89376b35b57 100644
--- a/emulators/mips64emul/Makefile
+++ b/emulators/mips64emul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/04 06:22:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/27 06:29:07 jlam Exp $
#
DISTNAME= mips64emul-0.2
@@ -17,8 +17,7 @@ HAS_CONFIGURE= yes
INSTALLATION_DIRS= bin share/doc/${PKGBASE}
-GLOBAL_LDFLAGS= -L${X11BASE}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mips64emul ${PREFIX}/bin
diff --git a/games/hugo/distinfo b/games/hugo/distinfo
index 7c7df7be8c4..c6f472dce95 100644
--- a/games/hugo/distinfo
+++ b/games/hugo/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2004/06/15 13:21:21 grant Exp $
+$NetBSD: distinfo,v 1.4 2004/08/27 06:29:07 jlam Exp $
SHA1 (hugo-3.0.07/hugov30_unix_source.tar.gz) = 4b3afc3b4f03ff23643460321d76127980184ec0
Size (hugo-3.0.07/hugov30_unix_source.tar.gz) = 213002 bytes
SHA1 (hugo-3.0.07/hugolib.zip) = 76b5580461a6c6f15780f554d2e23574ef78e24d
Size (hugo-3.0.07/hugolib.zip) = 67669 bytes
-SHA1 (patch-aa) = c291ff5787189bf6f0261e10ef1b5b46243719a3
+SHA1 (patch-aa) = cc0d06b3abec10feb882f6a87af8bd5def10a8b7
SHA1 (patch-ab) = 4d2753b45b1e16c7213e1ee99860519bf889e11d
SHA1 (patch-ac) = 43df8bc8b35cb5525f582a6d11eba89d063fbe76
SHA1 (patch-ad) = 454c364a4fe45d1fc94b768db85443fcc8ef8204
diff --git a/games/hugo/patches/patch-aa b/games/hugo/patches/patch-aa
index e70bfcc22f7..a22c8d6c074 100644
--- a/games/hugo/patches/patch-aa
+++ b/games/hugo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/06/15 13:21:21 grant Exp $
+$NetBSD: patch-aa,v 1.3 2004/08/27 06:29:07 jlam Exp $
--- Makefile.orig 2001-11-26 19:54:04.000000000 +1100
+++ Makefile
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/15 13:21:21 grant Exp $
#HE_LIBS=-lcurses -ltermlib
#HE_LIBS=-lcurses
-HE_LIBS=-lncurses
-+HE_LIBS=-L$(PREFIX)/lib -Wl,${RPATH_FLAG}$(PREFIX)/lib -lncurses
++HE_LIBS=-L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}$(PREFIX)/lib -lncurses
# Shouldn't need to change anything below here.
HC_H=source/hcheader.h source/htokens.h
diff --git a/games/xbomber/distinfo b/games/xbomber/distinfo
index 0734ba6971d..7a2a2cfef26 100644
--- a/games/xbomber/distinfo
+++ b/games/xbomber/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/11/18 14:43:08 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/08/27 06:29:07 jlam Exp $
SHA1 (xbomber.0.8.tar.gz) = 1146d1cc9d10f1115f650ad20bf4fd9e77cf2b8b
Size (xbomber.0.8.tar.gz) = 241168 bytes
-SHA1 (patch-aa) = d4fccbda2d59db7a776b8505ea2ddc633b9d5a9c
+SHA1 (patch-aa) = 908ec814f6810b55f5a1b52d4fb0bfe87743d7de
SHA1 (patch-ab) = 934cd3bba0f7f257c7e5dd9490c4114413f4a094
diff --git a/games/xbomber/patches/patch-aa b/games/xbomber/patches/patch-aa
index e3c405dbb6c..63996f54e34 100644
--- a/games/xbomber/patches/patch-aa
+++ b/games/xbomber/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2003/11/18 14:43:08 xtraeme Exp $
+$NetBSD: patch-aa,v 1.8 2004/08/27 06:29:07 jlam Exp $
--- makefile.orig 1998-06-19 04:28:34.000000000 +0100
+++ makefile 2003-11-05 12:36:20.000000000 +0000
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.7 2003/11/18 14:43:08 xtraeme Exp $
# adjust according to target
-XLIB=-L/usr/X11/lib -lX11
-+XLIB=-Wl,${RPATH_FLAG}${PREFIX}/lib -L$(PREFIX)/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
++XLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib -L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
# uncomment for sunos/solaris
#XLIB=-L/usr/openwin/lib -lX11
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:
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index af3df13d770..d026a87fb23 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/05/11 03:33:57 snj Exp $
+# $NetBSD: Makefile,v 1.18 2004/08/27 06:29:08 jlam Exp $
DISTNAME= cim-3.30
CATEGORIES= lang
@@ -20,7 +20,7 @@ SUBST_STAGE.x= post-patch
SUBST_FILES.x= src/cimcomp.c
SUBST_SED.x= -e "s|SCC|\"${CC}\"|"
SUBST_SED.x+= -e "s|SCFLAGS|\"${CFLAGS} -I${PREFIX}/include\"|"
-SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib\"|"
+SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib\"|"
SUBST_SED.x+= -e "s|= LIBDIR|= \"${PREFIX}/lib\"|"
SUBST_SED.x+= -e "s|= INCLUDEDIR|= \"${PREFIX}/include\"|"
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index e9590301f98..292939a3670 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2004/07/02 15:40:01 drochner Exp $
+$NetBSD: distinfo,v 1.20 2004/08/27 06:29:08 jlam Exp $
SHA1 (gcc-3.3.4.tar.bz2) = f1690df8d2f0c60ada0c8d0c9c350063aa00f705
Size (gcc-3.3.4.tar.bz2) = 23331664 bytes
SHA1 (patch-aa) = 2b8d1fcbe1f8028a6a011e85bb3ef9c1a9373b36
-SHA1 (patch-ab) = f0795e3792cd5200140bc19e291a2616b7d31468
+SHA1 (patch-ab) = 304d640028f56cc17e9c79faf3f3a67ee50335d0
SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab
index e6b7c3f8deb..2e5792f6503 100644
--- a/lang/gcc3/patches/patch-ab
+++ b/lang/gcc3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $
+$NetBSD: patch-ab,v 1.6 2004/08/27 06:29:08 jlam Exp $
--- gcc/Makefile.in.orig Tue Jan 28 16:54:07 2003
+++ gcc/Makefile.in Sat May 24 13:01:38 2003
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $
# Language-independent files.
DRIVER_DEFINES = \
-+ -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(prefix)/lib\"" \
++ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/lib\"" \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
-DDEFAULT_TARGET_VERSION=\"$(version)\" \
diff --git a/lang/guile14/distinfo b/lang/guile14/distinfo
index f5ead04a43f..f72aff2fc98 100644
--- a/lang/guile14/distinfo
+++ b/lang/guile14/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2004/05/02 03:19:50 snj Exp $
+$NetBSD: distinfo,v 1.4 2004/08/27 06:29:08 jlam Exp $
SHA1 (guile-1.4.1.tar.gz) = 81a91ea7480ca06d1aeda94b90a89b27e9bdea7a
Size (guile-1.4.1.tar.gz) = 1502840 bytes
SHA1 (patch-aa) = 22a9181066193cadc3663ae43d42e9f81d55c8e1
-SHA1 (patch-ab) = 5ecfcacba60cc509682ff5482906b115a6e90ddc
+SHA1 (patch-ab) = e970c1467184d2012cbaa6975bef4e24249113a9
SHA1 (patch-ad) = c692027caed122ef840a9ef3bf78eb125b26441e
SHA1 (patch-ae) = 98174a540753d1eb5ac9071fb3ebd073158d8e93
diff --git a/lang/guile14/patches/patch-ab b/lang/guile14/patches/patch-ab
index 93a75cbc244..b00dbdff132 100644
--- a/lang/guile14/patches/patch-ab
+++ b/lang/guile14/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2004/05/02 03:19:50 snj Exp $
+$NetBSD: patch-ab,v 1.2 2004/08/27 06:29:08 jlam Exp $
--- libguile/Makefile.in.orig 2004-04-28 20:56:11.000000000 -0700
+++ libguile/Makefile.in 2004-04-28 20:59:32.000000000 -0700
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2004/05/02 03:19:50 snj Exp $
guile_SOURCES = guile.c
-guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
-+guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} -Wl,${RPATH_FLAG}${PREFIX}/lib
++guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} ${COMPILER_RPATH_FLAG}${PREFIX}/lib
guile_LDFLAGS = @DLPREOPEN@
libguile_la_SOURCES = \
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index d606f492122..6bc0cc8c481 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2004/07/03 14:13:06 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2004/08/27 06:29:08 jlam Exp $
.include "../../lang/perl5/Makefile.common"
@@ -98,9 +98,9 @@ LOCINCPATH= ${LOCALBASE}/include
# flags to the link command in the right way.
#
.if ${OBJECT_FMT} == "a.out"
-LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${RPATH_FLAG}/g}
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g}
.else
-LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,${RPATH_FLAG}/g}
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g}
.endif
FIX_RPATH+= LOCLIBRPATHFLAGS
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 4fe5b87c20a..747fa1af01f 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/06/25 17:41:47 abs Exp $
+# $NetBSD: Makefile,v 1.48 2004/08/27 06:29:08 jlam Exp $
# The following two variables should have empty values unless we're
# building a perl snapshot or release candidate.
@@ -168,9 +168,9 @@ LOCINCPATH= ${LOCALBASE}/include
# flags to the link command in the right way.
#
.if ${OBJECT_FMT} == "a.out"
-LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${RPATH_FLAG}/g}
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g}
.elif ${OBJECT_FMT} == "ELF"
-LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,${RPATH_FLAG}/g}
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g}
.else
LOCLIBRPATHFLAGS= # empty
.endif
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 19c3508e339..6bbc132c474 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/07/22 09:16:03 recht Exp $
+# $NetBSD: Makefile,v 1.19 2004/08/27 06:29:08 jlam Exp $
#
DISTNAME= Python-2.0.1
@@ -33,7 +33,7 @@ SCRIPTS_ENV+= 'OPT=${CFLAGS}'
SSLFLAGS= -DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \
-L${BUILDLINK_PREFIX.openssl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto
FIX_RPATH+= SSLFLAGS
# Handle the module setup file:
@@ -43,7 +43,7 @@ FIX_RPATH+= SSLFLAGS
.if ${OPSYS} == "SunOS"
ZOULARIS?= ${PREFIX}/bsd
-MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib ${RPATH_FLAG}${ZOULARIS}/lib
+MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib ${COMPILER_RPATH_FLAG}${ZOULARIS}/lib
FIX_RPATH+= MODADD
.endif
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 51e41c76c88..5141e8ae3bb 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/07/07 08:46:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/08/27 06:29:08 jlam Exp $
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -41,19 +41,19 @@ CFLAGS+= ${_STRIPFLAG_CC}
.if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
. include "../../databases/gdbm/buildlink3.mk"
EXIM_USE_DB_CONFIG= USE_GDBM=yes
-EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
+EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
EXIM_INCLUDE= -I${PREFIX}/include
.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
. include "../../mk/bdb.buildlink3.mk"
EXIM_USE_DB_CONFIG= USE_DB=yes # the default
. if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4
+EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4
EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db4}
. elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3
+EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3
EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db3}
. elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2
+EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2
EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db2}
. else # using native
EXIM_DBMLIB= # empty so use defaults
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 97f848f12b0..cc60d6dd58d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/27 06:29:08 jlam Exp $
DISTNAME= exim-3.36
PKGREVISION= 2
@@ -53,7 +53,7 @@ BDB_ACCEPTED= native db3 db2
.if defined(EXIM_DB.mysql) && ${EXIM_DB.mysql} == "YES"
LOOKUP_INCLUDE+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
LOOKUP_LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
-LOOKUP_LIBS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+LOOKUP_LIBS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
LOOKUP_LIBS+= -lmysqlclient
MAKE_ENV+= LOOKUP_MYSQL=YES
. include "../../databases/mysql-client/buildlink3.mk"
@@ -61,7 +61,7 @@ MAKE_ENV+= LOOKUP_MYSQL=YES
.if defined(EXIM_DB.pgsql) && ${EXIM_DB.pgsql} == "YES"
LOOKUP_INCLUDE+= -I${PGSQL_PREFIX}/include/postgresql
LOOKUP_LIBS+= -L${PGSQL_PREFIX}/lib
-LOOKUP_LIBS+= -Wl,${RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq
+LOOKUP_LIBS+= ${COMPILER_RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq
MAKE_ENV+= LOOKUP_PGSQL=YES
. include "../../mk/pgsql.buildlink3.mk"
.endif
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index b75d656f186..0227d25fa5b 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2004/08/27 06:29:08 jlam Exp $
# Global and legacy options
#
@@ -67,7 +67,7 @@ PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl
# . endif
# CCARGS+= -DHAS_SSL
# AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
-# -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
+# ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
# -lssl -lcrypto
# PLIST_SRC+= ${PKGDIR}/PLIST.tls
# MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
@@ -80,7 +80,7 @@ PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl
. include "../../devel/pcre/buildlink3.mk"
CCARGS+= -DHAS_PCRE
AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
-lpcre
.else
CCARGS+= -DNO_PCRE
@@ -93,13 +93,13 @@ CCARGS+= -DNO_PCRE
. include "../../databases/openldap/buildlink3.mk"
CCARGS+= -DHAS_LDAP
AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
-lldap -llber
. if ${OPSYS} != "Linux"
. include "../../databases/db4/buildlink3.mk"
CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
-ldb4
. endif
.endif
@@ -116,7 +116,7 @@ AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs`
. include "../../databases/mysql-client/buildlink3.mk"
CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
-lmysqlclient -lz -lm
.endif
@@ -143,7 +143,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl2
PWCHECK_METHOD= auxprop
CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl2
. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
. include "../../security/cyrus-sasl2/buildlink3.mk"
@@ -152,7 +152,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl2
PWCHECK_METHOD= auxprop
CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl2
. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
. include "../../security/cyrus-sasl/buildlink3.mk"
@@ -160,7 +160,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl
PWCHECK_METHOD= sasldb
CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl
. endif
PLIST_SRC+= ${PKGDIR}/PLIST.sasl
@@ -173,6 +173,6 @@ MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
. include "../../databases/db/buildlink3.mk"
CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2
AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \
-ldb2
.endif
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index ba5b2e0f8b3..fff8102035b 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: options.mk,v 1.8 2004/08/27 06:29:08 jlam Exp $
# Global and legacy options
#
@@ -71,7 +71,7 @@ PATCH_DIST_STRIP.${TLS_PATCH}= -p1
. endif
CCARGS+= -DHAS_SSL
AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
-lssl -lcrypto
PLIST_SRC+= ${PKGDIR}/PLIST.tls
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
@@ -84,7 +84,7 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
. include "../../devel/pcre/buildlink3.mk"
CCARGS+= -DHAS_PCRE
AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \
-lpcre
.else
CCARGS+= -DNO_PCRE
@@ -97,13 +97,13 @@ CCARGS+= -DNO_PCRE
. include "../../databases/openldap/buildlink3.mk"
CCARGS+= -DHAS_LDAP
AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
-lldap -llber
. if ${OPSYS} != "Linux"
. include "../../databases/db4/buildlink3.mk"
CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
-ldb4
. endif
.endif
@@ -120,7 +120,7 @@ AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs`
. include "../../databases/mysql-client/buildlink3.mk"
CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
-lmysqlclient -lz -lm
.endif
@@ -147,7 +147,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl2
PWCHECK_METHOD= auxprop
CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl2
. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
. include "../../security/cyrus-sasl2/buildlink3.mk"
@@ -156,7 +156,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl2
PWCHECK_METHOD= auxprop
CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl2
. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
. include "../../security/cyrus-sasl/buildlink3.mk"
@@ -164,7 +164,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl
PWCHECK_METHOD= sasldb
CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl
. endif
PLIST_SRC+= ${PKGDIR}/PLIST.sasl
@@ -177,6 +177,6 @@ MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
. include "../../databases/db/buildlink3.mk"
CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2
AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \
-ldb2
.endif
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 373dbf4e4d8..42eda8e297b 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/08/23 23:22:29 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2004/08/27 06:29:08 jlam Exp $
.if ${OPSYS} == "Darwin"
PKG_DEFAULT_OPTIONS+= darwin
@@ -130,7 +130,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.tls
SUBST_CLASSES+= load
SUBST_STAGE.load= do-configure
SUBST_FILES.load= make-load.sh
-SUBST_SED.load= -e '$$s|$$| -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
+SUBST_SED.load= -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
. if ${OPSYS} == "Darwin"
SUBST_SED.load+= -e '$$s|$$| -bind_at_load|'
. endif
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 893eae1776e..eb410c5fe37 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/04/27 21:26:08 snj Exp $
+# $NetBSD: Makefile,v 1.48 2004/08/27 06:29:08 jlam Exp $
# FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
DISTNAME= octave-2.0.17
@@ -28,7 +28,7 @@ USE_LIBTOOL= yes
USE_GNU_TOOLS+= make
CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
CPPFLAGS+= -I${WRKDIR}/include
-LDFLAGS+= -Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
USE_MAKEINFO= YES
INFO_FILES= liboctave.info octave.info
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 8dc288c733d..7ab69465845 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/07/15 04:00:46 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.55 2004/08/27 06:29:08 jlam Exp $
#
DISTNAME= ${SCIBASE}.src
@@ -44,7 +44,7 @@ CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT}
CONFIGURE_ENV+= X11BASE=${X11BASE}
PLIST_SUBST+= SCIBASE=${SCIBASE}
-UNBUILDLINK_FILES+= Makemex config/configuration config/Makeso.incl
+UNWRAP_FILES+= Makemex config/configuration config/Makeso.incl
BUILDLINK_DEPMETHOD.sablotron= build
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index d23e6132a1f..bdadd2db59f 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/08/16 12:30:04 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/08/27 06:29:08 jlam Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -151,8 +151,8 @@ USE_LANGUAGES= c c++
. if !target(post-extract)
GLOBAL_LDFLAGS= -L${LOCALBASE}/lib -L${X11ROOT}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+ ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \
+ ${COMPILER_RPATH_FLAG}${X11BASE}/lib
post-extract:
@${SED} \
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index e027ebba3e0..e479d2ac682 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/08/16 12:27:23 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/08/27 06:29:08 jlam Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -145,8 +145,8 @@ USE_LANGUAGES= c c++
. if !target(post-extract)
GLOBAL_LDFLAGS= -L${LOCALBASE}/lib -L${X11ROOT}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+ ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \
+ ${COMPILER_RPATH_FLAG}${X11BASE}/lib
post-extract:
@${SED} \
@@ -163,8 +163,7 @@ post-extract:
-e "s|@LOCALBASE@|${LOCALBASE}|g" \
-e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \
-e "s|@WRKSRC@|${WRKSRC}|g" \
- -e "s|@_COMPILER_LD_FLAG@|${_COMPILER_LD_FLAG}|g" \
- -e "s|@RPATH_FLAG@|${RPATH_FLAG}|g" \
+ -e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \
${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util
diff --git a/misc/gkrellm-leds/distinfo b/misc/gkrellm-leds/distinfo
index 2ebc20226bc..5713c411128 100644
--- a/misc/gkrellm-leds/distinfo
+++ b/misc/gkrellm-leds/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/25 00:52:33 cube Exp $
+$NetBSD: distinfo,v 1.2 2004/08/27 06:29:08 jlam Exp $
SHA1 (gkleds-0.8.1.tar.gz) = 4b126ea47470430adf2938b79c6e1aa70371912e
Size (gkleds-0.8.1.tar.gz) = 44904 bytes
-SHA1 (patch-aa) = 12d84074a4cc3a5562700ff7be06677fcad417c2
+SHA1 (patch-aa) = 8240be1e14291bc795e9b09ab377f5dbc53d174c
diff --git a/misc/gkrellm-leds/patches/patch-aa b/misc/gkrellm-leds/patches/patch-aa
index 9b7a4d8e669..7a403447b6d 100644
--- a/misc/gkrellm-leds/patches/patch-aa
+++ b/misc/gkrellm-leds/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/25 00:52:33 cube Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:08 jlam Exp $
--- Makefile.orig 2003-01-29 00:14:08.000000000 +0100
+++ Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/02/25 00:52:33 cube Exp $
GTK_LIBS = `pkg-config gtk+-2.0 --libs`
-X11_LIB = -L/usr/X11R6/lib -lX11 -lXtst
-+X11_LIB = -L$(X11BASE)/lib $(RPATH_FLAG)$(X11BASE)/lib -lX11 -lXtst
++X11_LIB = -L$(X11BASE)/lib $(LINKER_RPATH_FLAG) $(X11BASE)/lib -lX11 -lXtst
WIN32_LIBS = -luser32 -lkernel32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lws2_32 $(GTK_LIBS)
UNIX_LIBS = $(X11_LIB) $(GTK_LIBS)
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 55818a28a47..6d66cddf783 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1493 2004/08/25 04:09:10 schmonz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1494 2004/08/27 06:29:08 jlam Exp $
#
# This file is in the public domain.
#
@@ -440,24 +440,26 @@ SHCOMMENT?= ${ECHO_MSG} >/dev/null '***'
DISTINFO_FILE?= ${.CURDIR}/distinfo
.if defined(USE_X11)
-X11_LDFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib${ABI}
+X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
X11_LDFLAGS+= -L${X11BASE}/lib${ABI}
.endif
.if !empty(USE_BUILDLINK3:M[nN][oO])
-LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
. if defined(USE_X11)
LDFLAGS+= ${X11_LDFLAGS}
. endif
.endif
MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-MAKE_ENV+= RPATH_FLAG="${RPATH_FLAG}"
+MAKE_ENV+= LINKER_RPATH_FLAG="${LINKER_RPATH_FLAG}"
+MAKE_ENV+= COMPILER_RPATH_FLAG="${COMPILER_RPATH_FLAG}"
MAKE_ENV+= WHOLE_ARCHIVE_FLAG="${WHOLE_ARCHIVE_FLAG}"
MAKE_ENV+= NO_WHOLE_ARCHIVE_FLAG="${NO_WHOLE_ARCHIVE_FLAG}"
MAKE_ENV+= LINK_ALL_LIBGCC_HACK="${LINK_ALL_LIBGCC_HACK}"
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS:M*}" M4="${M4}" YACC="${YACC}"
-CONFIGURE_ENV+= RPATH_FLAG="${RPATH_FLAG}"
+CONFIGURE_ENV+= LINKER_RPATH_FLAG="${LINKER_RPATH_FLAG}"
+CONFIGURE_ENV+= COMPILER_RPATH_FLAG="${COMPILER_RPATH_FLAG}"
MAKE_FLAGS?=
MAKEFILE?= Makefile
@@ -2289,7 +2291,7 @@ do-config-star-override:
.endif
PKGCONFIG_OVERRIDE_SED= \
- -e 's|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1${_COMPILER_LD_FLAG}${RPATH_FLAG}\2 -L\2\3|'
+ -e 's|^\(Libs:.*[ ]\)-L\([ ]*[^ ]*\)\(.*\)$$|\1${COMPILER_RPATH_FLAG}\2 -L\2\3|'
.if defined(PKGCONFIG_OVERRIDE) && !empty(PKGCONFIG_OVERRIDE)
_CONFIGURE_PREREQ+= subst-pkgconfig
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 2adc58540cb..bad614c97d3 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.164 2004/07/30 20:59:08 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.165 2004/08/27 06:29:09 jlam Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -356,10 +356,23 @@ XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf
DEPOT_SUBDIR?= packages
DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR}
-# RPATH_FLAG publicly exports the linker flag used to specify run-time
-# library search paths.
+# LINK_RPATH_FLAG publicly exports the linker flag used to set the
+# run-time library search path.
#
-RPATH_FLAG?= ${_OPSYS_RPATH_NAME}
+.if defined(_OPSYS_LINKER_RPATH_FLAG)
+LINKER_RPATH_FLAG= ${_OPSYS_LINKER_RPATH_FLAG}
+.else
+LINKER_RPATH_FLAG?= ${_LINKER_RPATH_FLAG}
+.endif
+
+# COMPILER_RPATH_FLAG publicly exports the compiler flag used to pass
+# run-time library search path directives to the linker.
+#
+.if defined(_OPSYS_COMPILER_RPATH_FLAG)
+COMPILER_RPATH_FLAG= ${_OPSYS_COMPILER_RPATH_FLAG}
+.else
+COMPILER_RPATH_FLAG?= ${_COMPILER_RPATH_FLAG}
+.endif
# WHOLE_ARCHIVE_FLAG and NO_WHOLE_ARCHIVE_FLAG publically export the
# linker flags to extract all symbols from a static archive.
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 0c2b7b566df..e9540a9ec94 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.149 2004/08/13 03:43:23 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.150 2004/08/27 06:29:09 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -414,8 +414,8 @@ BUILDLINK_LDFLAGS+= -L${_dir_}
. if !empty(BUILDLINK_RPATHDIRS.${_pkg_}) && (${_USE_RPATH} == "yes")
. for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
. if exists(${_dir_})
-. if empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
-BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+. if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_dir_}
. endif
. endif
. endfor
@@ -427,8 +427,8 @@ BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
#
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
. if (${_USE_RPATH} == "yes") && \
- empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib)
-BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib
+ empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${PREFIX}/lib)
+BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
. endif
.endif
#
@@ -440,8 +440,8 @@ BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib
. if !empty(BUILDLINK_RPATHDIRS.${_pkg_}) && (${_USE_RPATH} == "yes")
. for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${LOCALBASE}\//}
. if exists(${_dir_})
-. if empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
-BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+. if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_dir_}
. endif
. endif
. endfor
@@ -451,8 +451,8 @@ BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
# Ensure that ${LOCALBASE}/lib is in the runtime library search path.
#
.if (${_USE_RPATH} == "yes") && \
- empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib)
-BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
+ empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${LOCALBASE}/lib)
+BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
.endif
#
# Add the X11 library directory to the library search paths if the package
@@ -463,8 +463,8 @@ BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
BUILDLINK_LDFLAGS+= -L${X11BASE}/lib${ABI}
. endif
. if (${_USE_RPATH} == "yes") && \
- empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI})
-BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI}
+ empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI})
+BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
. endif
.endif
@@ -1619,8 +1619,6 @@ ${BUILDLINK_DIR}/bin/.libtool-fix-la: \
# Seed the common transforming cache with obvious values that greatly
# speed up the wrappers.
#
-_BLNK_RPATH_FLAGS= ${RPATH_FLAG}
-_BLNK_RPATH_FLAGS+= -Wl,${RPATH_FLAG}
.for _rflag_ in \
-Wl,-R -Wl,-rpath, -Wl,--rpath, -Wl,-rpath-link, -Wl,--rpath-link
. if empty(_BLNK_RPATH_FLAGS:M${_rflag_})
@@ -1748,8 +1746,6 @@ ${_BLNK_GEN_TRANSFORM}: ${.CURDIR}/../../mk/buildlink3/gen-transform.sh
-e "s|@_BLNK_TRANSFORM_SEDFILE@|${_BLNK_TRANSFORM_SEDFILE:Q}|g" \
-e "s|@_BLNK_UNTRANSFORM_SEDFILE@|${_BLNK_UNTRANSFORM_SEDFILE:Q}|g" \
-e "s|@_BLNK_REORDERLIBS@|${_BLNK_REORDERLIBS:Q}|g" \
- -e "s|@_COMPILER_LD_FLAG@|${_COMPILER_LD_FLAG:Q}|g" \
- -e "s|@_OPSYS_RPATH_NAME@|${_OPSYS_RPATH_NAME:Q}|g" \
-e "s|@BUILDLINK_SHELL@|${BUILDLINK_SHELL:Q}|g" \
-e "s|@CAT@|${CAT:Q}|g" \
${.ALLSRC} > ${.TARGET}.tmp
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh
index d0734b4ae7c..0de88add302 100644
--- a/mk/buildlink3/gen-transform.sh
+++ b/mk/buildlink3/gen-transform.sh
@@ -1,6 +1,6 @@
#!@BUILDLINK_SHELL@
#
-# $NetBSD: gen-transform.sh,v 1.28 2004/08/10 15:13:25 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.29 2004/08/27 06:29:09 jlam Exp $
transform="@_BLNK_TRANSFORM_SEDFILE@"
untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -93,7 +93,6 @@ EOF
gen $action mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
gen $action mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
gen $action mangle:-Wl,-R$2:-Wl,-R$3
- gen $action mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
gen $action mangle:-R$2:-R$3
;;
sub-rpath)
@@ -102,7 +101,6 @@ EOF
gen $action sub-mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
gen $action sub-mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
gen $action sub-mangle:-Wl,-R$2:-Wl,-R$3
- gen $action sub-mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
gen $action sub-mangle:-R$2:-R$3
;;
abs-rpath)
@@ -111,7 +109,6 @@ EOF
gen $action __r:-Wl,-rpath-link,\\.
gen $action __r:-Wl,-rpath,\\.
gen $action __r:-Wl,-R\\.
- gen $action __r:-Wl,@_OPSYS_RPATH_NAME@\\.
gen $action __r:-R\\.
;;
no-rpath)
@@ -120,7 +117,6 @@ EOF
gen $action __r:-Wl,-rpath-link,
gen $action __r:-Wl,-rpath,
gen $action __r:-Wl,-R
- gen $action __r:-Wl,@_OPSYS_RPATH_NAME@
gen $action __r:-R
;;
reorder)
@@ -274,7 +270,6 @@ EOF
gen $action $r:-Wl,-rpath-link,$2
gen $action $r:-Wl,-rpath,$2
gen $action $r:-Wl,-R$2
- gen $action $r:-Wl,@_OPSYS_RPATH_NAME@$2
gen $action $r:-R$2
;;
S)
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index fa359e4c9e9..f9a44bf31dd 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.69 2004/07/06 22:49:18 wiz Exp $
+# $NetBSD: gcc.mk,v 1.70 2004/08/27 06:29:09 jlam Exp $
.if !defined(COMPILER_GCC_MK)
COMPILER_GCC_MK= defined
@@ -244,6 +244,12 @@ _NEED_NEWER_GCC!= \
PKG_SKIP_REASON= "Unable to satisfy dependency: ${_GCC_DEPENDS}"
.endif
+# GNU ld option used to set the rpath
+_LINKER_RPATH_FLAG= -R
+
+# GCC passes rpath directives to the linker using "-Wl,-R".
+_COMPILER_RPATH_FLAG= -Wl,${_LINKER_RPATH_FLAG}
+
.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
#
# Ensure that the correct rpath is passed to the linker if we need to
@@ -287,7 +293,7 @@ _GCC_SUBPREFIX:= ${_GCC_ARCHDIR:H:H:H:H:T}/
_GCC_LIBDIRS= ${_GCC_ARCHDIR} ${_GCC_PREFIX}lib
_GCC_LDFLAGS= # empty
. for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
-_GCC_LDFLAGS+= -L${_dir_} ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+_GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}
. endfor
LDFLAGS+= ${_GCC_LDFLAGS}
.endif
@@ -329,9 +335,6 @@ FC= ${PKG_FC:T}
F77= ${PKG_FC:T}
.endif
-# GCC passes flags to the linker using "-Wl,".
-_COMPILER_LD_FLAG= -Wl,
-
# Pass the required flags to imake to tell it we're using gcc on Solaris.
.if ${OPSYS} == "SunOS"
IMAKEOPTS+= -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index ace179cbd15..4e0a92f910a 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.24 2004/06/10 20:34:08 jschauma Exp $
+# $NetBSD: mipspro.mk,v 1.25 2004/08/27 06:29:09 jlam Exp $
.if !defined(COMPILER_MIPSPRO_MK)
COMPILER_MIPSPRO_MK= defined
@@ -41,8 +41,11 @@ CC_VERSION_STRING?= ${CC_VERSION}
CC_VERSION?= MIPSpro Compilers
.endif
-# MIPSPro passes flags to the linker using "-Wl,".
-_COMPILER_LD_FLAG= -Wl,
+# MIPSPro linker option used to set the rpath.
+_LINKER_RPATH_FLAG= -rpath
+
+# MIPSPro passes rpath directives to the linker using "-Wl,-rpath,".
+_COMPILER_RPATH_FLAG= -Wl,${_LINKER_RPATH_FLAG},
# Prepend the path to the compiler to the PATH.
.if !empty(_LANGUAGES.mipspro)
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index e62ff6dcc83..ba67f68fab2 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.20 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.21 2004/08/27 06:29:09 jlam Exp $
.if !defined(COMPILER_SUNPRO_MK)
COMPILER_SUNPRO_MK= defined
@@ -32,7 +32,11 @@ PKG_CXX= ${_SUNPRO_CXX}
CXX= ${PKG_CXX:T}
.endif
-_COMPILER_LD_FLAG= # empty
+# SunPro passes rpath directives to the linker using "-R".
+_LINKER_RPATH_FLAG= -R
+
+# SunPro passes rpath directives to the linker using "-R".
+_COMPILER_RPATH_FLAG= -R
.if exists(${SUNWSPROBASE}/bin/cc)
CC_VERSION_STRING!= ${SUNWSPROBASE}/bin/cc -V 2>&1 || ${TRUE}
diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk
index 9be9822bc76..15d00437fdf 100644
--- a/mk/defs.AIX.mk
+++ b/mk/defs.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.AIX.mk,v 1.12 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the AIX operating system.
@@ -155,7 +155,6 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= aixlib # type of shared lib
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk
index 1e7240c6166..ad0f7121844 100644
--- a/mk/defs.BSDOS.mk
+++ b/mk/defs.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.12 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -141,7 +141,6 @@ _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.4.20010614nb18 # base version of libtool required
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 890204f56a1..b31534bc031 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.79 2004/08/14 19:35:39 schmonz Exp $
+# $NetBSD: defs.Darwin.mk,v 1.80 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the Darwin operating system.
@@ -131,7 +131,8 @@ _OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_LIBTOOL_REQD= 1.5.2nb5 # base version of libtool required
_OPSYS_PERL_REQD= 5.8.0 # base version of perl required
_OPSYS_PTHREAD_AUTO= yes # -lpthread not needed for pthreads
-_OPSYS_RPATH_NAME= -L # darwin has no rpath, use -L instead
+_OPSYS_LINKER_RPATH_FLAG= -L # darwin has no rpath, use -L instead
+_OPSYS_COMPILER_RPATH_FLAG= -L # compiler flag to pass rpaths to linker
_OPSYS_SHLIB_TYPE= dylib # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 7823f274323..ffedd8f9687 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.42 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.43 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -141,7 +141,6 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 7832b288d31..5884aba5e73 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.55 2004/08/26 00:41:45 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.56 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the IRIX operating system.
@@ -132,7 +132,6 @@ _OPSYS_LIBTOOL_REQD= 1.4.20010614nb14 # base version of libtool required
_OPSYS_NEEDS_XPKGWEDGE= yes # xpkgwedge is required for X11
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -rpath, # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
.if defined(_OPSYS_GPATCH_REQD) && ${_OPSYS_GPATCH_REQD} == "YES"
_PATCH_CAN_BACKUP= yes # patch(1) can make backups
diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk
index 4853c3d0eb4..3f082bf1fe9 100644
--- a/mk/defs.Interix.mk
+++ b/mk/defs.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Interix.mk,v 1.26 2004/08/23 23:34:45 tv Exp $
+# $NetBSD: defs.Interix.mk,v 1.27 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the Interix operating system.
@@ -134,7 +134,6 @@ _OPSYS_LIBTOOL_REQD= 1.5.2nb7 # base version of libtool required
_OPSYS_PERL_REQD= 5.8.3nb1 # base version of perl required
_OPSYS_PKGTOOLS_REQD= 20040330
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF # shared lib type - not exactly true, but near enough
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 2f3601e8af0..ea80b5ab3d9 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.74 2004/06/27 22:54:21 jschauma Exp $
+# $NetBSD: defs.Linux.mk,v 1.75 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the Linux operating system.
@@ -173,7 +173,6 @@ _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 10bd9eb089a..36f31b94bfa 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.68 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.69 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -139,7 +139,6 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 1079f4a0d26..88feea39312 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.36 2004/07/21 21:50:41 xtraeme Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.37 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -129,7 +129,6 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
.if ${OS_VERSION} >= 3.4
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index d324e2d8cd7..1b45a2ddb28 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.88 2004/07/03 22:04:57 grant Exp $
+# $NetBSD: defs.SunOS.mk,v 1.89 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -128,7 +128,6 @@ _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-_OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
diff --git a/mk/defs.UnixWare.mk b/mk/defs.UnixWare.mk
index 9a822030d3e..281af759a3e 100644
--- a/mk/defs.UnixWare.mk
+++ b/mk/defs.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.UnixWare.mk,v 1.6 2004/08/10 15:11:58 jlam Exp $
+# $NetBSD: defs.UnixWare.mk,v 1.7 2004/08/27 06:29:09 jlam Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -124,8 +124,6 @@ _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_OPSYS_PERL_REQD= # no base version of perl required
_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
-# XXX native linker for UnixWare doesn't have this, see also _USE_RPATH
-_OPSYS_RPATH_NAME= -L # name of symbol in rpath directive to linker
_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk
index 8959c7740bd..9e36b943953 100644
--- a/mk/motif.buildlink3.mk
+++ b/mk/motif.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: motif.buildlink3.mk,v 1.4 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: motif.buildlink3.mk,v 1.5 2004/08/27 06:29:09 jlam Exp $
#
# MOTIFBASE
# choose the Motif-2.0 installation at the named location.
@@ -84,8 +84,8 @@ MAKE_ENV+= MOTIFLIB="${MOTIFLIB}"
MAKE_ENV+= MOTIFBASE="${_MOTIFBASE}"
CPPFLAGS+= -I${_MOTIFBASE}/include
LDFLAGS+= -L${_MOTIFBASE}/lib
-LDFLAGS+= ${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib
-MOTIFLIB?= ${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib \
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib
+MOTIFLIB?= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \
-L${_MOTIFBASE}/lib -lXm -lXp
.endif # MOTIF_BUILDLINK3_MK
diff --git a/net/bind9-current/Makefile b/net/bind9-current/Makefile
index 7af367532a6..6b97d126785 100644
--- a/net/bind9-current/Makefile
+++ b/net/bind9-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/05/15 21:00:57 itojun Exp $
+# $NetBSD: Makefile,v 1.45 2004/08/27 06:29:09 jlam Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= bind-${BIND_VERSION}
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-libtool=yes \
--sysconfdir=/etc \
--localstatedir=/var
-#LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
+#LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
# use external OpenSSL. comment out the following line and the buildlink
# include at the bottom to use OpenSSL shipped with BIND9.
CONFIGURE_ARGS+=--with-openssl=${SSLBASE}
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 45ebb567a33..c56ce96d1e1 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2004/04/15 20:13:20 tron Exp $
+# $NetBSD: Makefile,v 1.60 2004/08/27 06:29:09 jlam Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= bind-${BIND_VERSION}
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-libtool=yes \
--sysconfdir=/etc \
--localstatedir=/var
-#LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
+#LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
# use external OpenSSL. comment out the following line and the buildlink
# include at the bottom to use OpenSSL shipped with BIND9.
CONFIGURE_ARGS+=--with-openssl=${SSLBASE}
diff --git a/net/scli/Makefile b/net/scli/Makefile
index c0f7dba1f3d..1144872cad7 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/25 07:40:23 snj Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/27 06:29:09 jlam Exp $
#
DISTNAME= scli-0.2.12
@@ -24,7 +24,7 @@ INFO_FILES= scli.info
.for _p_ in ncurses readline
CPPFLAGS+= -I${BUILDLINK_PREFIX.${_p_}}/include
-LDFLAGS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.${_p_}}/lib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${_p_}}/lib
LDFLAGS+= -L${BUILDLINK_PREFIX.${_p_}}/lib
.endfor
diff --git a/net/waste/Makefile b/net/waste/Makefile
index c207926812b..c372f7bdce6 100644
--- a/net/waste/Makefile
+++ b/net/waste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/18 07:21:49 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/27 06:29:09 jlam Exp $
#
DISTNAME= waste-source
@@ -26,7 +26,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
USE_BUILDLINK3= yes
-MAKE_ENV+= LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib"
+MAKE_ENV+= LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wastesrv ${PREFIX}/sbin/wastesrv
diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index cc3295a6403..3a23a163703 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/08/05 00:23:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.16 2004/08/27 06:29:09 jlam Exp $
SHA1 (pvm3.4.4.tgz) = 95bfabee61383fe2223ee2f539129bb54b5afb40
Size (pvm3.4.4.tgz) = 967852 bytes
@@ -14,7 +14,7 @@ SHA1 (patch-ai) = d44e1b5f28dfa7d626895994fca79109239ee856
SHA1 (patch-aj) = 4245e2a742022a0465015027361cae847cd6cbd6
SHA1 (patch-ak) = 9c5115017a05e184221de465ac8d9dad636f9c45
SHA1 (patch-al) = 7d5e0aa7e2c7177493fcfb7e799c7538143911a9
-SHA1 (patch-am) = b306f7d99d3b7f77d1da33671931e7ad5fa25441
+SHA1 (patch-am) = d006193cdd138fdae3cff9d0621b04839c38c676
SHA1 (patch-an) = 7b0ba18a78a649a3ca20e17bc4a61e3b558b6ced
SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d
SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9
@@ -48,7 +48,7 @@ SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
SHA1 (patch-bt) = d9331073d273a197f4a03499d69693b63f7fb473
-SHA1 (patch-bu) = 0ee41192bf7c350b22e3f4dd804f20792dbfee47
-SHA1 (patch-bv) = bf9a53cceb5d0c0cbe541a612e014c8421b470da
+SHA1 (patch-bu) = 952c6f9c7657447809698950f01ca88784792df6
+SHA1 (patch-bv) = 70e40116da06dcd3ef8cc939c2f885c16fe0c45c
SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
diff --git a/parallel/pvm3/patches/patch-am b/parallel/pvm3/patches/patch-am
index d69f8337d7e..629ddd640c3 100644
--- a/parallel/pvm3/patches/patch-am
+++ b/parallel/pvm3/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2004/08/05 00:23:32 dmcmahill Exp $
+$NetBSD: patch-am,v 1.6 2004/08/27 06:29:10 jlam Exp $
--- xep/Makefile.aimk.orig Fri Aug 29 14:17:48 1997
+++ xep/Makefile.aimk
@@ -20,7 +20,7 @@ $NetBSD: patch-am,v 1.5 2004/08/05 00:23:32 dmcmahill Exp $
-XLIBS = -lXaw -lXmu -lXext -lXt -lX11
-XCFLAGS = -I/usr/local/X11R5/include -I/usr/local/X11/include \
- -L/usr/local/X11R5/lib -L/usr/local/X11/lib
-+XLIBS = -L${X11BASE}/lib -Wl,${RPATH_FLAG}$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
++XLIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
+XCFLAGS = -I${X11BASE}/include
HEADERS = $(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \
diff --git a/parallel/pvm3/patches/patch-bu b/parallel/pvm3/patches/patch-bu
index e1e27e9d4c6..250b72272a5 100644
--- a/parallel/pvm3/patches/patch-bu
+++ b/parallel/pvm3/patches/patch-bu
@@ -1,4 +1,4 @@
-$NetBSD: patch-bu,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bu,v 1.2 2004/08/27 06:29:10 jlam Exp $
--- examples/Makefile.aimk.orig Wed Feb 16 21:49:35 2000
+++ examples/Makefile.aimk Thu Mar 25 03:43:25 2004
@@ -13,9 +13,9 @@ $NetBSD: patch-bu,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
- mkdir $(XDIR)
+LTCC= ${LIBTOOL} --mode=compile ${CC}
-+LTCC_LINK= ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTCC_LINK= ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
+LTFORT= ${LIBTOOL} --mode=compile ${FC}
-+LTFORT_LINK= ${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTFORT_LINK= ${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
+
hello$(EXESFX): $(SDIR)/hello.c $(XDIR)
- $(CC) $(CFLAGS) -o $@ $(SDIR)/hello.c $(LDFLAGS) $(LIBS)
diff --git a/parallel/pvm3/patches/patch-bv b/parallel/pvm3/patches/patch-bv
index da038bfbff8..a91fbf6cf12 100644
--- a/parallel/pvm3/patches/patch-bv
+++ b/parallel/pvm3/patches/patch-bv
@@ -1,4 +1,4 @@
-$NetBSD: patch-bv,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bv,v 1.2 2004/08/27 06:29:10 jlam Exp $
--- gexamples/Makefile.aimk.orig Wed Feb 16 21:48:37 2000
+++ gexamples/Makefile.aimk Thu Mar 25 02:04:18 2004
@@ -6,9 +6,9 @@ $NetBSD: patch-bv,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
tjf$(EXESFX) trsg$(EXESFX) frsg$(EXESFX) gs$(EXESFX)
+LTCC= ${LIBTOOL} --mode=compile ${CC}
-+LTCC_LINK= ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTCC_LINK= ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
+LTFORT= ${LIBTOOL} --mode=compile ${FC}
-+LTFORT_LINK= ${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTFORT_LINK= ${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
+
all: $(PROGS)
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 84b478e6b33..60819a279a0 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/07/31 01:42:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.53 2004/08/27 06:29:10 jlam Exp $
DISTNAME= xpkgwedge-1.12
CATEGORIES= pkgtools devel x11
@@ -50,8 +50,7 @@ do-build:
.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) || \
defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
-X11TYPEFLAGS?= -L${X11BASE}/lib \
- ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+X11TYPEFLAGS?= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
SUBST_CLASSES= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= xpkgwedge.def
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 284faf45c90..89d3d216b27 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/08/27 06:29:10 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 7.07
@@ -55,7 +55,7 @@ MAKE_FLAGS+= XCFLAGS="${CFLAGS}"
MAKE_FLAGS+= XLDFLAGS="${LDFLAGS}"
.if ${OPSYS} == "SunOS"
-LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib
+LDFLAGS+= -L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib
.endif
REPLACE_PERL= lib/fixmswrd.pl
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 18bd249c0ec..577bdac85b1 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2004/05/09 04:14:51 snj Exp $
+# $NetBSD: Makefile.common,v 1.55 2004/08/27 06:29:10 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -142,7 +142,7 @@ GCC_REQD+= 3.0
.endif
.if defined(ZOULARISBASE)
-LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib
+LDFLAGS+= -L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib
.endif
.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
@@ -159,7 +159,7 @@ MAKE_FLAGS+= GS_DISPLAY_DEVICE="${GS_DISPLAY_DEVICE}"
MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS="${XLIBS}"
.if ${OPSYS} == "SunOS"
-LDFLAGS+= -L${LOCALBASE}/bsd/lib -Wl,${RPATH_FLAG}${LOCALBASE}/bsd/lib
+LDFLAGS+= -L${LOCALBASE}/bsd/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/bsd/lib
.endif
# Define whether this platform has floating point hardware:
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 22354d71681..bc40d4f09d7 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/01/20 12:25:34 agc Exp $
+# $NetBSD: Makefile,v 1.37 2004/08/27 06:29:10 jlam Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
#
@@ -24,7 +24,7 @@ LICENCE= fee-based-commercial-use
PKGNAME= pgp-2.6.3a
DEPENDS+= rsaref-2.0p3:../../security/rsaref
RSAINC= -I${PREFIX}/include
-RSALIBS= -Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib -lrsaref
+RSALIBS= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib -lrsaref
RSAOBJS= rsaglue2.o
CFLAGS= -DUSA
.else
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 8b2a389a920..2c04ca1b9bf 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2004/08/20 16:59:58 tron Exp $
+# $NetBSD: Makefile.common,v 1.17 2004/08/27 06:29:10 jlam Exp $
DISTNAME= zsh-${ZSH_VERSION}
CATEGORIES= shells
@@ -53,7 +53,7 @@ LDFLAGS+= -static
. if ${OPSYS} == "SunOS"
PLIST_SRC= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
. else
-LDFLAGS+= -Wl,${RPATH_FLAG}${PREFIX}/lib/zsh
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
PLIST_SRC= ${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
. endif
.endif
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index c8e1b5e483f..1a4f7b82b72 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2003/12/11 17:14:22 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/08/27 06:29:10 jlam Exp $
SHA1 (mtools-3.9.9.tar.bz2) = 91198d52fa405eff1ac9eec57cadcc86d06b6ef1
Size (mtools-3.9.9.tar.bz2) = 262148 bytes
SHA1 (patch-aa) = 4c04697a01eefcceef176a7816f367f95b06878c
-SHA1 (patch-ab) = 29ccd93cc6f2a2cf0020e91cbeaeac9d5e1a0fe4
+SHA1 (patch-ab) = 5193ddef1bce4b4116a39c3565e5729245a04557
SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e
SHA1 (patch-ad) = 891ed493888708d9fb835d9249852555938a84a0
SHA1 (patch-ae) = 5281829c8c79f95ff4672fabb53acd22685c17bb
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
index f5bf03278ce..b47c0786fab 100644
--- a/sysutils/mtools/patches/patch-ab
+++ b/sysutils/mtools/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
+$NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
--- configure.orig 2003-02-16 11:06:45.000000000 +0000
+++ configure
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
# It would also be nice to do this for all -L options, not just this one.
if test -n "$x_libraries"; then
- X_LIBS="$X_LIBS -L$x_libraries"
-+ X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
++ X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
case `(uname -sr) 2>/dev/null` in
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
# Check for libraries that X11R6 Xt/Xaw programs need.
ac_save_LDFLAGS=$LDFLAGS
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
++ test -n "$x_libraries" && LDFLAGS="$LDFLAGS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
# check for ICE first), but we must link in the order -lSM -lICE or
# we get undefined symbols. So assume we have SM if we have ICE.
diff --git a/textproc/lua-expat/distinfo b/textproc/lua-expat/distinfo
index 7e18b05095f..24652e59213 100644
--- a/textproc/lua-expat/distinfo
+++ b/textproc/lua-expat/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/08/27 06:29:10 jlam Exp $
SHA1 (luaexpat-1.0a.tar.gz) = f9393bf4cc1f41b34336b4f2e14fdbf7adf06c55
Size (luaexpat-1.0a.tar.gz) = 16460 bytes
-SHA1 (patch-aa) = 6c7d49c6d153170b6475b4fcbfedc67cd8e34cd7
+SHA1 (patch-aa) = d43302660e93f44082a0b249490298db02d6f32d
SHA1 (patch-ab) = 3e083f15ef99fc6e0931416f092093ed821f4927
diff --git a/textproc/lua-expat/patches/patch-aa b/textproc/lua-expat/patches/patch-aa
index 6ef6534f47a..ea961946a19 100644
--- a/textproc/lua-expat/patches/patch-aa
+++ b/textproc/lua-expat/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $
--- makefile.orig 2004-01-29 22:54:22.000000000 +0000
+++ makefile 2004-01-29 22:58:13.000000000 +0000
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $
liblxp.so : lxplib.o
- ld -o liblxp.so -shared lxplib.o -lexpat
-+ ld -o liblxp.so -L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib -shared lxplib.o -lexpat
++ ld -o liblxp.so -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared lxplib.o -lexpat
liblxp.dylib : lxplib.o
gcc -o liblxp.dylib -dynamiclib lxplib.o -lexpat -llua.5.0 -llualib.5.0
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index df7492b50d5..23a3415f78c 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/22 09:16:02 recht Exp $
+# $NetBSD: Makefile,v 1.4 2004/08/27 06:29:10 jlam Exp $
#
DISTNAME= PyXML-0.8.3
@@ -19,7 +19,7 @@ PYBINMODULE= yes
BUILDLINK_DEPENDS.expat= expat>=1.95.6
PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR}
PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}"
-EXPAT_LDFLAGS= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
+EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
FIX_RPATH+= EXPAT_LDFLAGS
PYXML_SCRIPTS= scripts/xmlproc_parse \
diff --git a/time/bbdate/distinfo b/time/bbdate/distinfo
index 0aa35338d52..fe232e58eb3 100644
--- a/time/bbdate/distinfo
+++ b/time/bbdate/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/18 15:53:15 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2004/08/27 06:29:10 jlam Exp $
SHA1 (bbdate-0.2.4.tar.gz) = c48052eec337dfdca5fdfe6b87cd2bccf3a03921
Size (bbdate-0.2.4.tar.gz) = 60644 bytes
-SHA1 (patch-aa) = 424a58820cd2a14aaeedacbb9223abb034509e62
+SHA1 (patch-aa) = f3dcd43ff15b065b2e4e63a07743178490c1634d
SHA1 (patch-ab) = 4ba9c43992b476e8d515fb56fb18dad586533a3a
diff --git a/time/bbdate/patches/patch-aa b/time/bbdate/patches/patch-aa
index 925979f1c99..880082a79b2 100644
--- a/time/bbdate/patches/patch-aa
+++ b/time/bbdate/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/18 15:53:15 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $
--- Makefile.in.orig Fri Jul 18 11:31:51 2003
+++ Makefile.in Fri Jul 18 11:32:49 2003
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/18 15:53:15 jschauma Exp $
DEFS = @DEFS@ -I. -I$(srcdir)
-LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -Wl,${RPATH_FLAG}${X11PREFIX}/lib
++LDFLAGS = @LDFLAGS@ ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib
LIBS = @LIBS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 886c138d0f2..0f7b5e648be 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 14:12:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/27 06:29:11 jlam Exp $
#
DISTNAME= amiwm0.20pl48
@@ -22,7 +22,7 @@ CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \
X_PRE_LIBS="${X_PRE_LIBS}" \
X_EXTRA_LIBS="-lXt"
-X_PRE_LIBS= -Wl,${RPATH_FLAG}${X11BASE}/lib
+X_PRE_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
FIX_RPATH+= X_PRE_LIBS
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index 07b9087e432..f97014eff28 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/17 16:58:19 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2004/08/27 06:29:11 jlam Exp $
#
DISTNAME= libapache-mod-auth-mysql_4.3.1
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/
CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
LDFLAGS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
-lmysqlclient \
- -Wl,${RPATH_FLAG}${PREFIX}/lib/mysql
+ ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
APACHE_MODULE= YES
APACHE_MODULE_NAME= mod_auth_mysql.so
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index e0fdb7d5389..2bdb7837558 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2004/07/17 12:43:37 tron Exp $
+# $NetBSD: Makefile,v 1.82 2004/08/27 06:29:11 jlam Exp $
DISTNAME= mod_ssl-2.8.19-1.3.31
PKGNAME= ap-ssl-2.8.19
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
.include "../../mk/bsd.prefs.mk"
-SSL_RPATH_LDFLAGS= ${RPATH_FLAG}${SSLBASE}/lib
+SSL_RPATH_LDFLAGS= ${LINKER_RPATH_FLAG} ${SSLBASE}/lib
FIX_RPATH+= SSL_RPATH_LDFLAGS
MAKE_ENV+= SSL_RPATH_LDFLAGS="${SSL_RPATH_LDFLAGS}"
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index cb974a5a53d..e24c7f584f4 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/05/04 23:59:15 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/27 06:29:11 jlam Exp $
#
DISTNAME= mod_auth_mysql.c
@@ -34,7 +34,7 @@ do-build:
${APXS} -c -n ${APACHE_MODULE_NAME} \
-I${BUILDLINK_PREFIX.mysql-client}/include \
-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -Wl,${RPATH_FLAG} -Wl,${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
-lmysqlclient ${DISTNAME}
do-install:
diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index a5f7222f313..87deb2e2ef7 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/24 22:45:16 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/27 06:29:11 jlam Exp $
# FreeBSD Id: ports/www/mod_auth_pgsql2/Makefile,v 1.5 2004/02/06 11:21:00 clement Exp
DISTNAME= mod_auth_pgsql-2.0.2b1
@@ -21,7 +21,7 @@ do-build:
${APXS} -c -n ${APACHE_MODULE_NAME} \
-I${PGSQL_PREFIX}/include/postgresql \
-L${LOCALBASE}/lib \
- -Wl,${RPATH_FLAG} -Wl,${LOCALBASE}/lib \
+ ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \
-lpq ${DISTNAME:C/-[^-]*$//}.c
do-install:
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 6f09603da0b..3b3d48340ad 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2004/04/30 05:25:59 snj Exp $
+# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -134,7 +134,7 @@ CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
# on Solaris, we also need libdbm
. if ${OPSYS} == "SunOS"
CONFIGURE_ENV+= LIBS="-ldbm -ldb2"
-LDFLAGS+= -Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/ucblib -L/usr/ucblib
. else
CONFIGURE_ENV+= LIBS="-ldb2"
. endif
diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile
index c0fd24d84a7..e02e587fdbe 100644
--- a/www/galeon12/Makefile
+++ b/www/galeon12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/08/18 12:56:08 taya Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/27 06:29:11 jlam Exp $
DISTNAME= galeon-1.2.14
CATEGORIES= www
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --with-mozilla-snapshot=1.7
.include "../../x11/gnome-libs/buildlink3.mk"
MOZ_LIBDIR= ${MOZILLA_PREFIX}/lib/mozilla
-LDFLAGS+= -Wl,${RPATH_FLAG}${MOZ_LIBDIR}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 3dab04a93b6..cb8814185c7 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2004/06/19 00:25:04 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.43 2004/08/27 06:29:11 jlam Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-source-${MOZ_DIST_VER}
@@ -64,7 +64,7 @@ MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA}
MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA}
MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR}
CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR}
-LDFLAGS+= -Wl,${RPATH_FLAG}${MOZ_LIBDIR}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
.ifdef BUILD_SVG
MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 19835ff3995..a6369d0ab86 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/29 04:26:53 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/27 06:29:11 jlam Exp $
DISTNAME= libapreq-1.2
PKGNAME= p5-${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT= Lots of Apache specific httpd handling modules
USE_BUILDLINK3= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/libapreq/.packlist
-LDFLAGS+= -Wl,${RPATH_FLAG}${PERL5_SITEARCH}/auto/libapreq
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_SITEARCH}/auto/libapreq
.include "../../lang/perl5/module.mk"
.include "../../www/ap-perl/buildlink3.mk"
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 71395c44679..8de22626306 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/04/27 02:04:07 snj Exp $
+# $NetBSD: Makefile,v 1.42 2004/08/27 06:29:11 jlam Exp $
DISTNAME= gnome-python-1.4.4
PKGNAME= ${PYPKGPREFIX}-gnome-1.4.4
@@ -33,8 +33,8 @@ PYBINMODULE= yes
post-configure:
.for DIR in pygtk pygnome
${MV} ${WRKSRC}/${DIR}/Makefile ${WRKSRC}/${DIR}/Makefile.old
- ${SED} -e 's#-Wl,-R#${RPATH_FLAG}#g' ${WRKSRC}/${DIR}/Makefile.old \
- >${WRKSRC}/${DIR}/Makefile
+ ${SED} -e 's#-Wl,-R#${LINKER_RPATH_FLAG} #g' \
+ ${WRKSRC}/${DIR}/Makefile.old >${WRKSRC}/${DIR}/Makefile
.endfor
.endif
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index b8a207e4e17..b40d6572c0d 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/05/07 15:25:13 cjep Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/08/27 06:29:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+
@@ -38,7 +38,7 @@ PTHREAD_OPTS+= require
CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
MAKE_ENV+= MOC="${QTDIR}/bin/moc"
-#LDFLAGS+= -Wl,${RPATH_FLAG}${QTDIR}/lib
+#LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTDIR}/lib
.if !defined(BUILD_QT3)
CONFIGURE_ENV+= QTDIR="${QTDIR}"
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 2042eaa2b24..f880d15ad71 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/19 05:26:33 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/27 06:29:11 jlam Exp $
DISTNAME= xcursorgen-4.3.0
CATEGORIES= x11
@@ -21,6 +21,6 @@ PKG_SKIP_REASON="This package requires XFree86 4.3.0 or newer."
.include "../../graphics/png/buildlink3.mk"
-MAKE_ENV+= LOCAL_LDFLAGS="-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.png_DEFAULT}/lib"
+MAKE_ENV+= LOCAL_LDFLAGS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.png_DEFAULT}/lib"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def
index 626a116e187..6465593d6b1 100644
--- a/x11/xorg-server/files/host.def
+++ b/x11/xorg-server/files/host.def
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.3 2004/08/11 15:36:36 recht Exp $ */
+/* $NetBSD: host.def,v 1.4 2004/08/27 06:29:11 jlam Exp $ */
#define ProjectRoot @PREFIX@
#define BuildHtmlManPages NO
@@ -32,7 +32,7 @@
#define StandardIncludes -I@BLNK@/include
#define ExtraLoadFlags @LDFLAGS@
-#define PkgRpathFlags @_COMPILER_LD_FLAG@@RPATH_FLAG@
+#define PkgRpathFlags @COMPILER_RPATH_FLAG@
#define LinkerRuntimeLibraryPathFlag(path) Concat(PkgRpathFlags, path)
#define XTrueTypeInstallCConvHeaders NO