Sun Mar 3 11:55:12 2013 UTC ()
.so in PLIST are handled by framework, no need to take care here anymore.


(obache)
diff -r1.65 -r1.66 pkgsrc/databases/db4/Makefile
diff -r1.17 -r1.18 pkgsrc/databases/db4/PLIST
cvs diff -r1.65 -r1.66 pkgsrc/databases/db4/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/db4/Makefile 2013/03/01 16:10:23 1.65
+++ pkgsrc/databases/db4/Makefile 2013/03/03 11:55:12 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.65 2013/03/01 16:10:23 jperkin Exp $ 1# $NetBSD: Makefile,v 1.66 2013/03/03 11:55:12 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
@@ -27,33 +27,26 @@ USE_LIBTOOL= yes @@ -27,33 +27,26 @@ USE_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 36OPSYSVARS+= LIBSO_LIBS
37LIBSO_LIBS.SunOS+= -lnsl -lrt 37LIBSO_LIBS.SunOS+= -lnsl -lrt
38CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q} 38CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q}
39 39
40.include "../../mk/bsd.prefs.mk" 
41 
42PLIST_VARS+= norm_so 
43.if ${OPSYS} != "Cygwin" 
44PLIST.norm_so= yes 
45.endif 
46 
47.include "options.mk" 40.include "options.mk"
48 41
49# DB4 only want pthreads because it's really after POSIX 1003.1 42# DB4 only want pthreads because it's really after POSIX 1003.1
50# inter-process mutexes. In this case, we only care to use the native 43# inter-process mutexes. In this case, we only care to use the native
51# threads. 44# threads.
52PTHREAD_OPTS+= native 45PTHREAD_OPTS+= native
53.include "../../mk/pthread.buildlink3.mk" 46.include "../../mk/pthread.buildlink3.mk"
54 47
55INSTALLATION_DIRS= include/db4 lib share/doc/db4 48INSTALLATION_DIRS= include/db4 lib share/doc/db4
56 49
57post-install: 50post-install:
58 chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db4 51 chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db4
59 52
cvs diff -r1.17 -r1.18 pkgsrc/databases/db4/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/db4/PLIST 2013/03/01 16:10:23 1.17
+++ pkgsrc/databases/db4/PLIST 2013/03/03 11:55:12 1.18
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1@comment $NetBSD: PLIST,v 1.17 2013/03/01 16:10:23 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.18 2013/03/03 11:55:12 obache Exp $
2bin/db4_archive 2bin/db4_archive
3bin/db4_checkpoint 3bin/db4_checkpoint
4bin/db4_deadlock 4bin/db4_deadlock
5bin/db4_dump 5bin/db4_dump
6bin/db4_hotbackup 6bin/db4_hotbackup
7bin/db4_load 7bin/db4_load
8bin/db4_printlog 8bin/db4_printlog
9bin/db4_recover 9bin/db4_recover
10bin/db4_sql 10bin/db4_sql
11bin/db4_stat 11bin/db4_stat
12bin/db4_upgrade 12bin/db4_upgrade
13bin/db4_verify 13bin/db4_verify
14include/db4/db.h 14include/db4/db.h
15include/db4/db_185.h 15include/db4/db_185.h
16include/db4/db_cxx.h 16include/db4/db_cxx.h
17lib/libdb4-4.8.la 17lib/libdb4-4.8.la
18${PLIST.norm_so}lib/libdb4-4.so 18lib/libdb4-4.so
19lib/libdb4.a 19lib/libdb4.a
20${PLIST.norm_so}lib/libdb4.so 20lib/libdb4.so
21lib/libdb4_cxx-4.8.la 21lib/libdb4_cxx-4.8.la
22${PLIST.norm_so}lib/libdb4_cxx-4.so 22lib/libdb4_cxx-4.so
23lib/libdb4_cxx.a 23lib/libdb4_cxx.a
24${PLIST.norm_so}lib/libdb4_cxx.so 24lib/libdb4_cxx.so