summaryrefslogtreecommitdiff
path: root/databases/db3/patches/patch-aa
blob: 9a99c8f58d74779e9db9a56bf6018d6ee0682951 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
$NetBSD: patch-aa,v 1.2 2001/02/21 15:56:02 fvdl Exp $

--- ../dist/Makefile.in.orig	Fri Dec  1 00:07:33 2000
+++ ../dist/Makefile.in	Wed Feb 21 13:10:10 2001
@@ -17,7 +17,7 @@
 INSTALLER=	@INSTALLER@
 
 LDFLAGS=	@LDFLAGS@
-LIBDB_ARGS=	@LIBDB_ARGS@
+LIBDB_ARGS=	-L. -Wl,-R/usr/pkg/lib libdb3.a
 LIBJSO_LIBS=	@LIBJSO_LIBS@
 LIBS=		@LIBS@
 LIBSO_LIBS=	@LIBSO_LIBS@
@@ -31,9 +31,9 @@
 SOMAJOR=	@DB_VERSION_MAJOR@
 SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
 
-libdb=		libdb.a
+libdb=		libdb3.a
 
-libso_base=	libdb
+libso_base=	libdb3
 libso_linkname=	$(libso_base)-$(SOVERSION).la
 libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
 libso_target=	$(libso_base)-$(SOVERSION).la
@@ -47,8 +47,8 @@
 # You must configure it using:
 #	--enable-cxx
 ##################################################
-libcxx=		libdb_cxx.a
-libxso_base=	libdb_cxx
+libcxx=		libdb3_cxx.a
+libxso_base=	libdb3_cxx
 libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
 libxso_target=	$(libxso_base)-$(SOVERSION).la
 libxso_default=	$(libxso_base).@SOSUFFIX@
@@ -72,8 +72,8 @@
 JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
 JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
 
-libj_jarfile=	db.jar
-libjso_base=	libdb_java
+libj_jarfile=	db3.jar
+libjso_base=	libdb3_java
 libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
 libjso_target=	$(libjso_base)-$(SOVERSION).la
 libjso_default=	$(libjso_base).@SOSUFFIX@
@@ -88,7 +88,7 @@
 #	--enable-tcl --with-tcl=DIR --enable-dynamic
 ##################################################
 TCFLAGS=	@TCFLAGS@
-libtso_base=	libdb_tcl
+libtso_base=	libdb3_tcl
 libtso=		$(libtso_base)-$(SOVERSION).@SOSUFFIX@
 libtso_target=	$(libtso_base)-$(SOVERSION).la
 libtso_default=	$(libtso_base).@SOSUFFIX@
@@ -113,9 +113,9 @@
 prefix=	@prefix@
 exec_prefix=@exec_prefix@
 bindir=	@bindir@
-includedir=@includedir@
+includedir=$(prefix)/include/db3
 libdir=	@libdir@
-docdir=	$(prefix)/docs
+docdir=	$(prefix)/share/doc/db3
 
 dmode=	755
 emode=	555
@@ -192,8 +192,8 @@
 	db_dump@o@ db_load@o@ db_printlog@o@ db_recover@o@ db_stat@o@ \
 	db_upgrade@o@ db_verify@o@ util_log@o@ util_sig@o@ 
 
-PROGS=  @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
-	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
+PROGS=  @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \
+	db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify
 
 JAVA_DBSRCS=\
 	$(JAVA_DBDIR)/Db.java $(JAVA_DBDIR)/DbAppendRecno.java \
@@ -275,57 +275,57 @@
 ##################################################
 # Utilities
 ##################################################
-berkeley_db_svc: $(RPC_SRV) util_log@o@ @DEFAULT_LIB@
+berkeley_db3_svc: $(RPC_SRV) util_log@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) $(RPC_SRV) util_log@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@
+db3_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_archive@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
+db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_checkpoint@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
+db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_deadlock@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@
+db3_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_dump185: db_dump185@o@ @LIBOBJS@
+db3_dump185: db_dump185@o@ @LIBOBJS@
 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
 	$(POSTLINK) $@
 
-db_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@
+db3_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@
+db3_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_printlog@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@
+db3_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_recover@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@
+db3_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@
+db3_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_upgrade@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@
 
-db_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@
+db3_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@
 	$(CCLINK) -o $@ $(LDFLAGS) \
 	    db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
 	$(POSTLINK) $@