diff options
| -rw-r--r-- | databases/gdbm/Makefile | 7 | ||||
| -rw-r--r-- | databases/gdbm/patches/patch-aa | 14 | ||||
| -rw-r--r-- | databases/gdbm/patches/patch-ab | 65 | ||||
| -rw-r--r-- | databases/gdbm/pkg/PLIST | 6 |
4 files changed, 77 insertions, 15 deletions
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 2e13e1794cf..b45cb4c4b16 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/22 11:05:02 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/05/08 12:30:19 frueauf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp # @@ -6,7 +6,7 @@ DISTNAME= gdbm-1.7.3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GNU} -MAINTAINER= bjn@visi.com +MAINTAINER= packages@netbsd.org GNU_CONFIGURE= yes MAKE_FLAGS= CFLAGS="${CFLAGS}" LDFLAGS=-s -f @@ -16,4 +16,7 @@ INFO_FILES= gdbm.info post-build: cd ${WRKSRC} ; ${RM} gdbm.info ; make gdbm.info +post-install: + ${LDCONFIG} || ${TRUE} + .include "../../mk/bsd.pkg.mk" diff --git a/databases/gdbm/patches/patch-aa b/databases/gdbm/patches/patch-aa index 2e35747c21c..51d32c1d117 100644 --- a/databases/gdbm/patches/patch-aa +++ b/databases/gdbm/patches/patch-aa @@ -1,5 +1,5 @@ ---- gdbm.texinfo.BAK Sun Oct 26 03:45:23 1997 -+++ gdbm.texinfo Sun Oct 26 03:46:09 1997 +--- gdbm.texinfo.orig Fri May 20 00:14:11 1994 ++++ gdbm.texinfo Fri May 8 13:45:20 1998 @@ -2,6 +2,9 @@ @comment %**start of header (This is for running Texinfo on a region.) @setfilename gdbm.info @@ -10,13 +10,3 @@ @c @setchapternewpage odd @comment %**end of header (This is for running Texinfo on a region.) ---- Makefile.in 1997/11/20 11:43:20 1.1 -+++ Makefile.in 1997/11/20 11:44:10 -@@ -94,6 +94,7 @@ - - install: libgdbm.a gdbm.h gdbm.info - $(INSTALL_DATA) libgdbm.a $(libdir)/libgdbm.a -+ $(RANLIB) $(libdir)/libgdbm.a - $(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h - $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 - $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab new file mode 100644 index 00000000000..dfcf51a22a8 --- /dev/null +++ b/databases/gdbm/patches/patch-ab @@ -0,0 +1,65 @@ +--- Makefile.in.orig Sun May 15 11:28:49 1994 ++++ Makefile.in Fri May 8 14:22:13 1998 +@@ -74,9 +74,7 @@ + + TEXI_F = gdbm.info + +-SRCS = $(DBM_CF) $(NDBM_CF) $(GDBM_CF) $(TEST_CF) +- +-OBJS = $(DBM_OF) $(NDBM_OF) $(GDBM_OF) @ALLOCA@ ++SRCS = $(DBM_CF) $(NDBM_CF) $(GDBM_CF) + + HDRS = gdbmdefs.h extern.h gdbmerrno.h systems.h dbm.h ndbm.h gdbmconst.h \ + proto.h +@@ -88,12 +86,21 @@ + + DISTFILES = $(SRCS) $(HDRS) $(MSCFILES) + +-all: libgdbm.a ++# for bsd.lib.mk to build shared lib easily ++LIB = gdbm ++SHLIB_MAJOR=1 ++SHLIB_MINOR=73 ++NOPROFILE=1 ++NOLINT=1 ++ ++all: libgdbm.a libgdbm_pic.a libgdbm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} + + progs: $(PROGS) + +-install: libgdbm.a gdbm.h gdbm.info ++install: libgdbm.a libgdbm_pic.a libgdbm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} gdbm.h gdbm.info + $(INSTALL_DATA) libgdbm.a $(libdir)/libgdbm.a ++ $(INSTALL_DATA) libgdbm_pic.a $(libdir)/libgdbm_pic.a ++ $(INSTALL_DATA) libgdbm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} $(libdir) + $(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h + $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 + $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info +@@ -102,11 +109,6 @@ + $(INSTALL_DATA) $(srcdir)/dbm.h $(includedir)/dbm.h + $(INSTALL_DATA) $(srcdir/ndbm.h $(includedir)/ndbm.h + +-libgdbm.a: $(OBJS) gdbm.h +- rm -f libgdbm.a +- ar q libgdbm.a $(OBJS) +- $(RANLIB) libgdbm.a +- + gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 + rm -f gdbm.h + cp $(srcdir)/gdbm.proto gdbm.h +@@ -157,9 +159,6 @@ + gdbm.dvi: + $(TEXI2DVI) $(srcdir)/gdbm.texinfo + +-clean: +- rm -f $(PROGS) $(TEX_F) *.o core junk* +- + mostlyclean: clean + + distclean: clean +@@ -227,3 +226,5 @@ + testndbm.o: autoconf.h ndbm.h + tdbm.o: autoconf.h + conv2gdbm.o: autoconf.h gdbm.h ++ ++.include <bsd.lib.mk> diff --git a/databases/gdbm/pkg/PLIST b/databases/gdbm/pkg/PLIST index 7d55e7fa94b..2989327095f 100644 --- a/databases/gdbm/pkg/PLIST +++ b/databases/gdbm/pkg/PLIST @@ -1,7 +1,11 @@ -@comment $NetBSD: PLIST,v 1.3 1997/11/06 09:58:55 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/05/08 12:30:20 frueauf Exp $ include/gdbm.h @unexec %D/bin/install-info --delete %D/info/gdbm.info %D/info/dir info/gdbm.info @exec %D/bin/install-info %D/info/gdbm.info %D/info/dir lib/libgdbm.a +lib/libgdbm_pic.a +lib/libgdbm.so.1.73 +@exec /sbin/ldconfig || /usr/bin/true +@unexec /sbin/ldconfig || /usr/bin/true man/man3/gdbm.3.gz |