pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a4f50e1ea49a
branches: trunk
changeset: 479962:a4f50e1ea49a
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Aug 27 06:29:06 2004 +0000
description:
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
diffstat:
audio/portaudio/distinfo | 4 ++--
audio/portaudio/patches/patch-ac | 4 ++--
cad/fasthenry/Makefile | 4 ++--
chat/eggdrop/distinfo | 4 ++--
chat/eggdrop/patches/patch-ag | 6 +++---
chat/fugu/Makefile | 4 ++--
chat/ser/distinfo | 4 ++--
chat/ser/patches/patch-aa | 4 ++--
comms/kermit/Makefile | 4 ++--
cross/bfd-mdsetimage/Makefile | 4 ++--
databases/db/buildlink3.mk | 4 ++--
databases/db3/buildlink3.mk | 4 ++--
databases/db4/buildlink3.mk | 4 ++--
databases/mysql-client/Makefile.common | 4 ++--
databases/mysql4-client/Makefile | 6 +++---
databases/mysql4-client/Makefile.common | 4 ++--
databases/p5-DBD-Sybase/Makefile | 4 ++--
databases/p5-DB_File/Makefile | 4 ++--
databases/p5-sybperl/Makefile | 4 ++--
databases/php4-mysql/Makefile | 4 ++--
databases/sqsh/Makefile.common | 4 ++--
devel/gnustep-make/gnustep.mk | 6 +++---
devel/jgrasp/Makefile | 4 ++--
devel/sdcc/Makefile | 3 +--
emulators/mips64emul/Makefile | 5 ++---
games/hugo/distinfo | 4 ++--
games/hugo/patches/patch-aa | 4 ++--
games/xbomber/distinfo | 4 ++--
games/xbomber/patches/patch-aa | 4 ++--
graphics/png2html/Makefile | 4 ++--
graphics/py-gdchart/distinfo | 4 ++--
graphics/py-gdchart/patches/patch-aa | 4 ++--
graphics/vtk/Makefile.vtkdist | 6 +++---
lang/cim/Makefile | 4 ++--
lang/gcc3/distinfo | 4 ++--
lang/gcc3/patches/patch-ab | 4 ++--
lang/guile14/distinfo | 4 ++--
lang/guile14/patches/patch-ab | 4 ++--
lang/perl5/Makefile | 6 +++---
lang/perl58/Makefile | 6 +++---
lang/python20/Makefile | 6 +++---
mail/exim/Makefile.common | 10 +++++-----
mail/exim3/Makefile | 6 +++---
mail/postfix-current/options.mk | 20 ++++++++++----------
mail/postfix/options.mk | 20 ++++++++++----------
mail/qmail/options.mk | 4 ++--
math/octave/Makefile | 4 ++--
math/scilab/Makefile | 4 ++--
meta-pkgs/XFree86/Makefile.common | 6 +++---
meta-pkgs/xorg/Makefile.common | 9 ++++-----
misc/gkrellm-leds/distinfo | 4 ++--
misc/gkrellm-leds/patches/patch-aa | 4 ++--
mk/bsd.pkg.mk | 14 ++++++++------
mk/bsd.prefs.mk | 21 +++++++++++++++++----
mk/buildlink3/bsd.buildlink3.mk | 26 +++++++++++---------------
mk/buildlink3/gen-transform.sh | 7 +------
mk/compiler/gcc.mk | 13 ++++++++-----
mk/compiler/mipspro.mk | 9 ++++++---
mk/compiler/sunpro.mk | 8 ++++++--
mk/defs.AIX.mk | 3 +--
mk/defs.BSDOS.mk | 3 +--
mk/defs.Darwin.mk | 5 +++--
mk/defs.FreeBSD.mk | 3 +--
mk/defs.IRIX.mk | 3 +--
mk/defs.Interix.mk | 3 +--
mk/defs.Linux.mk | 3 +--
mk/defs.NetBSD.mk | 3 +--
mk/defs.OpenBSD.mk | 3 +--
mk/defs.SunOS.mk | 3 +--
mk/defs.UnixWare.mk | 4 +---
mk/motif.buildlink3.mk | 6 +++---
net/bind9-current/Makefile | 4 ++--
net/bind9/Makefile | 4 ++--
net/scli/Makefile | 4 ++--
net/waste/Makefile | 4 ++--
parallel/pvm3/distinfo | 8 ++++----
parallel/pvm3/patches/patch-am | 4 ++--
parallel/pvm3/patches/patch-bu | 6 +++---
parallel/pvm3/patches/patch-bv | 6 +++---
pkgtools/xpkgwedge/Makefile | 5 ++---
print/ghostscript-gnu/Makefile.common | 4 ++--
print/ghostscript-nox11/Makefile.common | 6 +++---
security/pgp2/Makefile | 4 ++--
shells/zsh/Makefile.common | 4 ++--
sysutils/mtools/distinfo | 4 ++--
sysutils/mtools/patches/patch-ab | 6 +++---
textproc/lua-expat/distinfo | 4 ++--
textproc/lua-expat/patches/patch-aa | 4 ++--
textproc/py-xml/Makefile | 4 ++--
time/bbdate/distinfo | 4 ++--
time/bbdate/patches/patch-aa | 4 ++--
wm/amiwm/Makefile | 4 ++--
www/ap-auth-mysql/Makefile | 4 ++--
www/ap-ssl/Makefile | 4 ++--
www/ap2-auth-mysql/Makefile | 4 ++--
www/ap2-auth-pgsql/Makefile | 4 ++--
www/apache6/Makefile | 4 ++--
www/galeon12/Makefile | 4 ++--
www/mozilla/Makefile.common | 4 ++--
www/p5-libapreq/Makefile | 4 ++--
x11/gnome-python/Makefile | 6 +++---
x11/qt3-libs/buildlink3.mk | 4 ++--
x11/xcursorgen/Makefile | 4 ++--
x11/xorg-server/files/host.def | 4 ++--
104 files changed, 279 insertions(+), 277 deletions(-)
diffs (truncated from 2237 to 300 lines):
diff -r 815f1c59e772 -r a4f50e1ea49a audio/portaudio/distinfo
--- a/audio/portaudio/distinfo Fri Aug 27 05:57:47 2004 +0000
+++ b/audio/portaudio/distinfo Fri Aug 27 06:29:06 2004 +0000
@@ -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 -r 815f1c59e772 -r a4f50e1ea49a audio/portaudio/patches/patch-ac
--- a/audio/portaudio/patches/patch-ac Fri Aug 27 05:57:47 2004 +0000
+++ b/audio/portaudio/patches/patch-ac Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
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 -r 815f1c59e772 -r a4f50e1ea49a cad/fasthenry/Makefile
--- a/cad/fasthenry/Makefile Fri Aug 27 05:57:47 2004 +0000
+++ b/cad/fasthenry/Makefile Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
#>
. 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 -r 815f1c59e772 -r a4f50e1ea49a chat/eggdrop/distinfo
--- a/chat/eggdrop/distinfo Fri Aug 27 05:57:47 2004 +0000
+++ b/chat/eggdrop/distinfo Fri Aug 27 06:29:06 2004 +0000
@@ -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-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 -r 815f1c59e772 -r a4f50e1ea49a chat/eggdrop/patches/patch-ag
--- a/chat/eggdrop/patches/patch-ag Fri Aug 27 05:57:47 2004 +0000
+++ b/chat/eggdrop/patches/patch-ag Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
# 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 @@
# 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 -r 815f1c59e772 -r a4f50e1ea49a chat/fugu/Makefile
--- a/chat/fugu/Makefile Fri Aug 27 05:57:47 2004 +0000
+++ b/chat/fugu/Makefile Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
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 -r 815f1c59e772 -r a4f50e1ea49a chat/ser/distinfo
--- a/chat/ser/distinfo Fri Aug 27 05:57:47 2004 +0000
+++ b/chat/ser/distinfo Fri Aug 27 06:29:06 2004 +0000
@@ -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 -r 815f1c59e772 -r a4f50e1ea49a chat/ser/patches/patch-aa
--- a/chat/ser/patches/patch-aa Fri Aug 27 05:57:47 2004 +0000
+++ b/chat/ser/patches/patch-aa Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
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 -r 815f1c59e772 -r a4f50e1ea49a comms/kermit/Makefile
--- a/comms/kermit/Makefile Fri Aug 27 05:57:47 2004 +0000
+++ b/comms/kermit/Makefile Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
# 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 -r 815f1c59e772 -r a4f50e1ea49a cross/bfd-mdsetimage/Makefile
--- a/cross/bfd-mdsetimage/Makefile Fri Aug 27 05:57:47 2004 +0000
+++ b/cross/bfd-mdsetimage/Makefile Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
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 -r 815f1c59e772 -r a4f50e1ea49a databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/db/buildlink3.mk Fri Aug 27 06:29:06 2004 +0000
@@ -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_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 -r 815f1c59e772 -r a4f50e1ea49a databases/db3/buildlink3.mk
--- a/databases/db3/buildlink3.mk Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/db3/buildlink3.mk Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
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 -r 815f1c59e772 -r a4f50e1ea49a databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/db4/buildlink3.mk Fri Aug 27 06:29:06 2004 +0000
@@ -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_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 -r 815f1c59e772 -r a4f50e1ea49a databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/mysql-client/Makefile.common Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
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 -r 815f1c59e772 -r a4f50e1ea49a databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/mysql4-client/Makefile Fri Aug 27 06:29:06 2004 +0000
@@ -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 @@
.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 -r 815f1c59e772 -r a4f50e1ea49a databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/mysql4-client/Makefile.common Fri Aug 27 06:29:06 2004 +0000
@@ -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_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 -r 815f1c59e772 -r a4f50e1ea49a databases/p5-DBD-Sybase/Makefile
--- a/databases/p5-DBD-Sybase/Makefile Fri Aug 27 05:57:47 2004 +0000
+++ b/databases/p5-DBD-Sybase/Makefile Fri Aug 27 06:29:06 2004 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index