diff options
author | minskim <minskim@pkgsrc.org> | 2005-11-23 06:20:36 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2005-11-23 06:20:36 +0000 |
commit | 4d52c1c1fd8670643e3e8901f46bcb587bf8320d (patch) | |
tree | 291db47e6f24d4204a8b2be7fea37109f25087ce /databases/qdbm/patches | |
parent | fe34e666fbef15578194bb28dbacd52e2cf04a7e (diff) | |
download | pkgsrc-4d52c1c1fd8670643e3e8901f46bcb587bf8320d.tar.gz |
Update qdbm to 1.8.34. Patches from OBATA Akio (maintainer).
Change:
- A bug of i-node duplication on MinGW was fixed.
pkgsrc Change:
- Split Makefile to provide bindings for other languages in separate
packages.
Diffstat (limited to 'databases/qdbm/patches')
-rw-r--r-- | databases/qdbm/patches/patch-aa | 4 | ||||
-rw-r--r-- | databases/qdbm/patches/patch-ab | 32 | ||||
-rw-r--r-- | databases/qdbm/patches/patch-ac | 29 | ||||
-rw-r--r-- | databases/qdbm/patches/patch-ad | 13 | ||||
-rw-r--r-- | databases/qdbm/patches/patch-ae | 30 | ||||
-rw-r--r-- | databases/qdbm/patches/patch-af | 72 |
6 files changed, 178 insertions, 2 deletions
diff --git a/databases/qdbm/patches/patch-aa b/databases/qdbm/patches/patch-aa index 7b8861be771..c99b3c0753b 100644 --- a/databases/qdbm/patches/patch-aa +++ b/databases/qdbm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2005/10/29 15:33:35 minskim Exp $ +$NetBSD: patch-aa,v 1.3 2005/11/23 06:20:36 minskim Exp $ ---- Makefile.in.orig 2005-08-31 12:19:56.000000000 -0700 +--- Makefile.in.orig 2005-09-01 04:19:56.000000000 +0900 +++ Makefile.in @@ -45,13 +45,13 @@ MYLIBDIR = @libdir@ MYBINDIR = @bindir@ diff --git a/databases/qdbm/patches/patch-ab b/databases/qdbm/patches/patch-ab new file mode 100644 index 00000000000..e2e327470dc --- /dev/null +++ b/databases/qdbm/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1 2005/11/23 06:20:36 minskim Exp $ + +--- perl/Makefile.in.orig 2005-06-19 08:12:23.000000000 +0900 ++++ perl/Makefile.in +@@ -21,7 +21,7 @@ MYDOCS = plspex.html plspex-ja.html plap + prefix = @prefix@ + exec_prefix = @exec_prefix@ + MYBINDIR = @bindir@ +-MYDATADIR = @datadir@/$(PACKAGE)/perl ++MYDATADIR = @datadir@/doc/$(PACKAGE)/perl + DESTDIR = + + # Building binaries +@@ -42,15 +42,15 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr + all : + cd depot && [ -f Makefile ] || \ + $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ +- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ ++ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \ + $(RUNENV) make + cd curia && [ -f Makefile ] || \ + $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ +- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ ++ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \ + $(RUNENV) make + cd villa && [ -f Makefile ] || \ + $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ +- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ ++ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \ + $(RUNENV) make + @printf '\n' + @printf '#================================================================\n' diff --git a/databases/qdbm/patches/patch-ac b/databases/qdbm/patches/patch-ac new file mode 100644 index 00000000000..7560f04dbfc --- /dev/null +++ b/databases/qdbm/patches/patch-ac @@ -0,0 +1,29 @@ +$NetBSD: patch-ac,v 1.1 2005/11/23 06:20:36 minskim Exp $ + +--- cgi/Makefile.in.orig 2004-08-18 20:17:02.000000000 +0900 ++++ cgi/Makefile.in +@@ -22,20 +22,20 @@ MYDOCS = cgispex.html cgispex-ja.html + + # Building binaries + CC = gcc +-RELCFLAGS = -O2 -DNDEBUG ++RELCFLAGS = ${PTHREAD_CFLAGS} -O2 -DNDEBUG + CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 + CFLAGS = -Wall -ansi -pedantic -fsigned-char $(RELCFLAGS) + LIBS = -lqdbm @LIBS@ +-LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS) ++LDFLAGS = @LDFLAGS@ -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS) + LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib + + # Install destinations + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-MYLIBEXECDIR = @libexecdir@ +-MYDATADIR = @datadir@/$(PACKAGE)/cgi ++MYLIBEXECDIR = @libexecdir@/cgi-bin ++MYDATADIR = @datadir@/doc/$(PACKAGE)/cgi + DESTDIR = + + diff --git a/databases/qdbm/patches/patch-ad b/databases/qdbm/patches/patch-ad new file mode 100644 index 00000000000..93e12002852 --- /dev/null +++ b/databases/qdbm/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2005/11/23 06:20:36 minskim Exp $ + +--- java/Makefile.in.orig 2005-08-18 05:18:37.000000000 +0900 ++++ java/Makefile.in +@@ -37,7 +37,7 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + MYHEADDIR = @includedir@ + MYLIBDIR = @libdir@ +-MYDATADIR = @datadir@/$(PACKAGE)/java ++MYDATADIR = @datadir@/doc/$(PACKAGE)/java + DESTDIR = + + # Building binaries diff --git a/databases/qdbm/patches/patch-ae b/databases/qdbm/patches/patch-ae new file mode 100644 index 00000000000..2c6464b4886 --- /dev/null +++ b/databases/qdbm/patches/patch-ae @@ -0,0 +1,30 @@ +$NetBSD: patch-ae,v 1.1 2005/11/23 06:20:36 minskim Exp $ + +--- plus/Makefile.in.orig 2005-08-18 05:18:11.000000000 +0900 ++++ plus/Makefile.in +@@ -34,12 +34,12 @@ exec_prefix = @exec_prefix@ + MYHEADDIR = @includedir@ + MYLIBDIR = @libdir@ + MYBINDIR = @bindir@ +-MYDATADIR = @datadir@/$(PACKAGE)/plus ++MYDATADIR = @datadir@/doc/$(PACKAGE)/plus + DESTDIR = + + # Building binaries + CXX = @CXX@ +-RELCXXFLAGS = -O1 -DNDEBUG ++RELCXXFLAGS = -O1 -DNDEBUG ${PTHREAD_CFLAGS} + CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ +@@ -47,8 +47,8 @@ CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I + CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC $(RELCXXFLAGS) + LD = @LD@ + LIBS = -lqdbm @LIBS@ +-LIBLDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS) +-LDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS) ++LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS) ++LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS) + LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR) + AR = @AR@ + ARFLAGS = rcsv diff --git a/databases/qdbm/patches/patch-af b/databases/qdbm/patches/patch-af new file mode 100644 index 00000000000..ce5917df4eb --- /dev/null +++ b/databases/qdbm/patches/patch-af @@ -0,0 +1,72 @@ +$NetBSD: patch-af,v 1.1 2005/11/23 06:20:36 minskim Exp $ + +--- ruby/Makefile.in.orig 2004-05-12 20:36:57.000000000 +0900 ++++ ruby/Makefile.in +@@ -21,7 +21,7 @@ MYDOCS = rbspex.html rbspex-ja.html rbap + prefix = @prefix@ + exec_prefix = @exec_prefix@ + MYBINDIR = @bindir@ +-MYDATADIR = @datadir@/$(PACKAGE)/ruby ++MYDATADIR = @datadir@/doc/$(PACKAGE)/ruby + DESTDIR = + + # Building binaries +@@ -35,9 +35,9 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr + + + all : +- cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make +- cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make +- cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make ++ cd depot && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make ++ cd curia && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make ++ cd villa && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make + @printf '\n' + @printf '#================================================================\n' + @printf '# Ready to install.\n' +@@ -69,7 +69,7 @@ install : + + + uninstall : +- pprefix=`ruby -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \ ++ pprefix=`${RUBY} -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \ + find $$pprefix | sort | uniq | \ + egrep '(mod_depot\.so|depot\.rb|mod_curia\.so|curia\.rb|mod_villa\.so|villa\.rb)' | \ + xargs rm -f +@@ -85,27 +85,27 @@ check : + sync ; sync + cd depot && rm -rf casket + cd depot && \ +- $(RUNENV) ruby -w -Ilib rbdptest write casket 10000 1000 ++ $(RUNENV) ${RUBY} -w -Ilib rbdptest write casket 10000 1000 + cd depot && \ +- $(RUNENV) ruby -w -Ilib rbdptest read casket ++ $(RUNENV) ${RUBY} -w -Ilib rbdptest read casket + cd depot && \ +- $(RUNENV) ruby -w -Ilib rbdptest misc casket ++ $(RUNENV) ${RUBY} -w -Ilib rbdptest misc casket + cd depot && rm -rf casket + cd curia && rm -rf casket + cd curia && \ +- $(RUNENV) ruby -w -Ilib rbcrtest write casket 10000 1000 10 ++ $(RUNENV) ${RUBY} -w -Ilib rbcrtest write casket 10000 1000 10 + cd curia && \ +- $(RUNENV) ruby -w -Ilib rbcrtest read casket ++ $(RUNENV) ${RUBY} -w -Ilib rbcrtest read casket + cd curia && \ +- $(RUNENV) ruby -w -Ilib rbcrtest misc casket ++ $(RUNENV) ${RUBY} -w -Ilib rbcrtest misc casket + cd curia && rm -rf casket + cd villa && rm -rf casket + cd villa && \ +- $(RUNENV) ruby -w -Ilib rbvltest write casket 10000 ++ $(RUNENV) ${RUBY} -w -Ilib rbvltest write casket 10000 + cd villa && \ +- $(RUNENV) ruby -w -Ilib rbvltest read casket ++ $(RUNENV) ${RUBY} -w -Ilib rbvltest read casket + cd villa && \ +- $(RUNENV) ruby -w -Ilib rbvltest misc casket ++ $(RUNENV) ${RUBY} -w -Ilib rbvltest misc casket + cd villa && rm -rf casket + @printf '\n' + @printf '#================================================================\n' |