diff options
author | jlam <jlam> | 2001-07-19 19:16:43 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-07-19 19:16:43 +0000 |
commit | 1438a800504560ecf3d11ff60dab5c00299a8e09 (patch) | |
tree | d0ece82675d7e80ebda44adc9680409c5fa4f403 | |
parent | ec3700896b25b746934d33db431121dd78394fa5 (diff) | |
download | pkgsrc-1438a800504560ecf3d11ff60dab5c00299a8e09.tar.gz |
Remove hard-coded /usr/pkg/lib from rpath, and mark as USE_BUILDLINK_ONLY.
Also set includedir via configure argument instead of directly patching the
configure script, and add a buildlink.mk file for use by other package
Makefiles.
-rw-r--r-- | databases/db3/Makefile | 4 | ||||
-rw-r--r-- | databases/db3/buildlink.mk | 35 | ||||
-rw-r--r-- | databases/db3/distinfo | 4 | ||||
-rw-r--r-- | databases/db3/patches/patch-aa | 45 |
4 files changed, 69 insertions, 19 deletions
diff --git a/databases/db3/Makefile b/databases/db3/Makefile index 2230367f8d2..521269fd2f6 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/03/26 19:31:55 skrll Exp $ +# $NetBSD: Makefile,v 1.7 2001/07/19 19:16:43 jlam Exp $ DISTNAME= db-3.2.9 PKGNAME= db3-2.9 @@ -9,12 +9,14 @@ MAINTAINER= wrstuden@netbsd.org HOMEPAGE= http://www.sleepycat.com/ COMMENT= Sleepycat Software's Berkeley DB version 3 +USE_BUILDLINK_ONLY= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKDIR}/${DISTNAME}/dist/ltconfig GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure CONFIGURE_ARGS+= --program-transform-name=s,db_,db3_, +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db3 CONFIGURE_ARGS+= --enable-cxx CONFIGURE_ARGS+= --enable-shared diff --git a/databases/db3/buildlink.mk b/databases/db3/buildlink.mk new file mode 100644 index 00000000000..67e82db1b42 --- /dev/null +++ b/databases/db3/buildlink.mk @@ -0,0 +1,35 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/07/19 19:16:43 jlam Exp $ +# +# This Makefile fragment is included by packages that use db3. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.db3 to the dependency pattern +# for the version of db3 desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(DB3_BUILDLINK_MK) +DB3_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.db3?= db3>=2.9 +DEPENDS+= ${BUILDLINK_DEPENDS.db3}:../../databases/db3 + +BUILDLINK_PREFIX.db3= ${LOCALBASE} +BUILDLINK_FILES.db3= include/db3/db3_cxx.h +BUILDLINK_FILES.db3+= include/db3/db3.h +BUILDLINK_FILES.db3+= lib/libdb3.* +BUILDLINK_FILES.db3+= lib/libdb3_cxx.* + +BUILDLINK_TARGETS.db3= db3-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.db3} + +pre-configure: ${BUILDLINK_TARGETS.db3} +db3-buildlink: _BUILDLINK_USE + +.endif # DB3_BUILDLINK_MK diff --git a/databases/db3/distinfo b/databases/db3/distinfo index b705f491252..39909220e8b 100644 --- a/databases/db3/distinfo +++ b/databases/db3/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:10:57 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/19 19:16:44 jlam Exp $ SHA1 (db-3.2.9.tar.gz) = 1adcc34b6a56e51e4019e80bc56b509ac28e1035 Size (db-3.2.9.tar.gz) = 2085238 bytes -SHA1 (patch-aa) = dfb57f84e3de9764afbe4a6c184602e3382b2e27 +SHA1 (patch-aa) = 32a39969500b837357c2ce59fb2a90ea82181455 SHA1 (patch-ab) = 7d33cd81c1e23b44d72bb2018624af8dfd08fed4 diff --git a/databases/db3/patches/patch-aa b/databases/db3/patches/patch-aa index 82607164a5b..767ac733028 100644 --- a/databases/db3/patches/patch-aa +++ b/databases/db3/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2001/03/28 21:49:40 wennmach Exp $ +$NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $ ---- ../dist/Makefile.in.orig Thu Nov 30 23:07:33 2000 -+++ ../dist/Makefile.in Thu Mar 22 18:34:56 2001 +--- ../dist/Makefile.in.orig Thu Nov 30 15:07:33 2000 ++++ ../dist/Makefile.in @@ -17,7 +17,7 @@ INSTALLER= @INSTALLER@ LDFLAGS= @LDFLAGS@ -LIBDB_ARGS= @LIBDB_ARGS@ -+LIBDB_ARGS= -L. -Wl,-R/usr/pkg/lib libdb3.la ++LIBDB_ARGS= $(libso_linkname) LIBJSO_LIBS= @LIBJSO_LIBS@ LIBS= @LIBS@ LIBSO_LIBS= @LIBSO_LIBS@ @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.4 2001/03/28 21:49:40 wennmach Exp $ SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ -libdb= libdb.a -+libdb= libdb3.la ++libdb= $(libso_base).la -libso_base= libdb -libso_linkname= $(libso_base)-$(SOVERSION).la @@ -56,32 +56,45 @@ $NetBSD: patch-aa,v 1.4 2001/03/28 21:49:40 wennmach Exp $ ################################################## # JAVA -@@ -72,8 +72,8 @@ +@@ -72,13 +72,13 @@ JAVA_DBDIR= $(JAVA_SRCDIR)/$(JAVA_DBREL) JAVA_EXDIR= $(JAVA_SRCDIR)/com/sleepycat/examples -libj_jarfile= db.jar -libjso_base= libdb_java +-libjso= $(libjso_base)-$(SOVERSION).@SOSUFFIX@ +-libjso_target= $(libjso_base)-$(SOVERSION).la +libj_jarfile= db3.jar +libjso_base= libdb3_java - libjso= $(libjso_base)-$(SOVERSION).@SOSUFFIX@ - libjso_target= $(libjso_base)-$(SOVERSION).la ++libjso= $(libjso_base).@SOSUFFIX@.$(SOVERSION) ++libjso_target= $(libjso_base).la libjso_default= $(libjso_base).@SOSUFFIX@ -@@ -88,7 +88,7 @@ +-libjso_major= $(libjso_base)-$(SOMAJOR).@SOSUFFIX@ +-libjso_g= $(libjso_base)-$(SOVERSION)_g.@SOSUFFIX@ ++libjso_major= $(libjso_base).@SOSUFFIX@.$(SOMAJOR) ++libjso_g= $(libjso_base)_g.@SOSUFFIX@.$(SOVERSION) + + ################################################## + # TCL +@@ -88,11 +88,11 @@ # --enable-tcl --with-tcl=DIR --enable-dynamic ################################################## TCFLAGS= @TCFLAGS@ -libtso_base= libdb_tcl +-libtso= $(libtso_base)-$(SOVERSION).@SOSUFFIX@ +-libtso_target= $(libtso_base)-$(SOVERSION).la +libtso_base= libdb3_tcl - libtso= $(libtso_base)-$(SOVERSION).@SOSUFFIX@ - libtso_target= $(libtso_base)-$(SOVERSION).la ++libtso= $(libtso_base).@SOSUFFIX@.$(SOVERSION) ++libtso_target= $(libtso_base).la libtso_default= $(libtso_base).@SOSUFFIX@ -@@ -113,9 +113,9 @@ - prefix= @prefix@ - exec_prefix=@exec_prefix@ +-libtso_major= $(libtso_base)-$(SOMAJOR).@SOSUFFIX@ ++libtso_major= $(libtso_base).@SOSUFFIX@.$(SOMAJOR) + + ################################################## + # DB_DUMP185 UTILITY +@@ -115,7 +115,7 @@ bindir= @bindir@ --includedir=@includedir@ -+includedir=$(prefix)/include/db3 + includedir=@includedir@ libdir= @libdir@ -docdir= $(prefix)/docs +docdir= $(prefix)/share/doc/db3 |