Sat Jun 7 08:06:01 2014 UTC ()
Drop settings of LIBSO_LIBS for configure.
Now, configure set LIBSO_LIBS with LIBS, so it is useless passing LIBSO_LIBS to
configure. Overmore, "nsl" and "rt" libraries are exactly checked.


(obache)
diff -r1.66 -r1.67 pkgsrc/databases/db4/Makefile
cvs diff -r1.66 -r1.67 pkgsrc/databases/db4/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/db4/Makefile 2013/03/03 11:55:12 1.66
+++ pkgsrc/databases/db4/Makefile 2014/06/07 08:06:01 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.66 2013/03/03 11:55:12 obache Exp $ 1# $NetBSD: Makefile,v 1.67 2014/06/07 08:06:01 obache Exp $
2# 2#
3# NOTE: 3# NOTE:
4# When updating this package, a change in the minor (4.n -> 4.(n+1)) 4# When updating this package, a change in the minor (4.n -> 4.(n+1))
5# usually incurs a shlib name change. Please make sure to update the 5# usually incurs a shlib name change. Please make sure to update the
6# ABI depends in buildlink3.mk and bump PKGREVISIONs for all dependencies. 6# ABI depends in buildlink3.mk and bump PKGREVISIONs for all dependencies.
7# In particular, take care to include BDB_ACCEPTED=db4 packages. 7# In particular, take care to include BDB_ACCEPTED=db4 packages.
8 8
9DISTNAME= db-4.8.30 9DISTNAME= db-4.8.30
10PKGNAME= ${DISTNAME:S/db/db4/} 10PKGNAME= ${DISTNAME:S/db/db4/}
11CATEGORIES= databases 11CATEGORIES= databases
12MASTER_SITES= http://download.oracle.com/berkeley-db/ \ 12MASTER_SITES= http://download.oracle.com/berkeley-db/ \
13 http://download-uk.oracle.com/berkeley-db/ 13 http://download-uk.oracle.com/berkeley-db/
14 14
@@ -23,30 +23,26 @@ LICENSE= sleepycat-public @@ -23,30 +23,26 @@ LICENSE= sleepycat-public
23PKG_INSTALLATION_TYPES= overwrite pkgviews 23PKG_INSTALLATION_TYPES= overwrite pkgviews
24 24
25USE_LANGUAGES= c c++ 25USE_LANGUAGES= c c++
26USE_LIBTOOL= yes 26USE_LIBTOOL= yes
27USE_TOOLS+= pax 27USE_TOOLS+= pax
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29CONFIGURE_DIRS= build_unix 29CONFIGURE_DIRS= build_unix
30CONFIGURE_SCRIPT= ../dist/configure 30CONFIGURE_SCRIPT= ../dist/configure
31CONFIGURE_ARGS+= --enable-compat185 31CONFIGURE_ARGS+= --enable-compat185
32CONFIGURE_ARGS+= --enable-cxx 32CONFIGURE_ARGS+= --enable-cxx
33CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db4 33CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db4
34CONFIGURE_ARGS+= --program-transform-name=s,db_,db4_, 34CONFIGURE_ARGS+= --program-transform-name=s,db_,db4_,
35 35
36OPSYSVARS+= LIBSO_LIBS 
37LIBSO_LIBS.SunOS+= -lnsl -lrt 
38CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q} 
39 
40.include "options.mk" 36.include "options.mk"
41 37
42# DB4 only want pthreads because it's really after POSIX 1003.1 38# DB4 only want pthreads because it's really after POSIX 1003.1
43# inter-process mutexes. In this case, we only care to use the native 39# inter-process mutexes. In this case, we only care to use the native
44# threads. 40# threads.
45PTHREAD_OPTS+= native 41PTHREAD_OPTS+= native
46.include "../../mk/pthread.buildlink3.mk" 42.include "../../mk/pthread.buildlink3.mk"
47 43
48INSTALLATION_DIRS= include/db4 lib share/doc/db4 44INSTALLATION_DIRS= include/db4 lib share/doc/db4
49 45
50post-install: 46post-install:
51 chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db4 47 chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db4
52 48