summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-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
11 files changed, 23 insertions, 23 deletions
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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 22:15:30 +0000