From 6bc6a8af31b7049b7e69b8b725824851bcfc9f4b Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 16 Apr 2012 04:01:10 +0000 Subject: Add patch comments, add missing rcsid to patch-ai, fix some pkglint and a couple other minor glitches. --- databases/sdbm/Makefile | 4 ++-- databases/sdbm/distinfo | 14 +++++++------- databases/sdbm/patches/patch-aa | 9 +++++++-- databases/sdbm/patches/patch-ab | 8 ++++++-- databases/sdbm/patches/patch-ac | 5 ++++- databases/sdbm/patches/patch-af | 8 +++++++- databases/sdbm/patches/patch-ah | 4 +++- databases/sdbm/patches/patch-ai | 4 ++++ 8 files changed, 40 insertions(+), 16 deletions(-) (limited to 'databases/sdbm') diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile index 9eb2b42468f..fdf67e3e2a5 100644 --- a/databases/sdbm/Makefile +++ b/databases/sdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/01/04 15:09:38 dholland Exp $ +# $NetBSD: Makefile,v 1.19 2012/04/16 04:01:10 dholland Exp $ # DISTNAME= sdbm @@ -21,6 +21,6 @@ USE_LIBTOOL= yes PKG_DESTDIR_SUPPORT= user-destdir post-extract: - @cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null + cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null .include "../../mk/bsd.pkg.mk" diff --git a/databases/sdbm/distinfo b/databases/sdbm/distinfo index 7c058bfaa3b..193c98d6a7f 100644 --- a/databases/sdbm/distinfo +++ b/databases/sdbm/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.11 2012/04/16 03:50:38 dholland Exp $ +$NetBSD: distinfo,v 1.12 2012/04/16 04:01:10 dholland Exp $ SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712 RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa Size (sdbm.tar.Z) = 63557 bytes -SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090 -SHA1 (patch-ab) = 9dd9ce20db82283c8692f91d337348e1e952403a -SHA1 (patch-ac) = 6455fcb75d5d11173dd5063919e3336989e1e821 +SHA1 (patch-aa) = 9ebe008e7119939b5d47abdb1c15cc03e4548698 +SHA1 (patch-ab) = 0d432aa2f4a8b33077aa045386da499b494bcd24 +SHA1 (patch-ac) = dccfcb2b7a2f68188bb55bb514021cc091274678 SHA1 (patch-ad) = 7857dbfc168d12985a9fa0b5cefc39ac90bc4fba SHA1 (patch-ae) = 69e4e40277ecae8e6023d72dbbd4a738583f46dd -SHA1 (patch-af) = d990ecba1b79c04130c4d24666ea2b3da4b1d91c -SHA1 (patch-ah) = 63019f2175766d73ef213297e54597e6fd5fba13 -SHA1 (patch-ai) = 2fd5408efe990534d474bd2bb59b8776f0f808df +SHA1 (patch-af) = 2ff85561125381a10e1b2ee0dd18db04192bc738 +SHA1 (patch-ah) = 90dba8033eba363f246fd785e8897724ab7eb718 +SHA1 (patch-ai) = fdaaa656ea9aff3b90edd2397d7dd1309f7040eb diff --git a/databases/sdbm/patches/patch-aa b/databases/sdbm/patches/patch-aa index 7e49d599fc2..5d212b2cec2 100644 --- a/databases/sdbm/patches/patch-aa +++ b/databases/sdbm/patches/patch-aa @@ -1,4 +1,9 @@ -$NetBSD: patch-aa,v 1.5 2005/12/05 20:50:01 rillig Exp $ +$NetBSD: patch-aa,v 1.6 2012/04/16 04:01:10 dholland Exp $ + +- Use standard headers. +- Don't declare own errno. +- Don't declare own malloc/free/lseek. +- Remove wrong cast calling malloc. --- sdbm.c.orig 2004-04-27 19:10:43.000000000 -0500 +++ sdbm.c @@ -36,7 +41,7 @@ $NetBSD: patch-aa,v 1.5 2005/12/05 20:50:01 rillig Exp $ n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2; - if ((dirname = malloc((unsigned) n)) == NULL) -+ if ((dirname = (char *) malloc(n)) == NULL) ++ if ((dirname = malloc(n)) == NULL) return errno = ENOMEM, (DBM *) NULL; /* * build the file names diff --git a/databases/sdbm/patches/patch-ab b/databases/sdbm/patches/patch-ab index d84e822cb4b..b2cebf0b6f4 100644 --- a/databases/sdbm/patches/patch-ab +++ b/databases/sdbm/patches/patch-ab @@ -1,4 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2011/08/29 01:33:49 dholland Exp $ +$NetBSD: patch-ab,v 1.4 2012/04/16 04:01:10 dholland Exp $ + +- Configure for pkgsrc. +- libtoolize, build as shared library. +- Provide working install target. --- makefile 2008/08/12 12:14:05 1.1 +++ makefile 2008/08/12 11:24:23 @@ -67,7 +71,7 @@ $NetBSD: patch-ab,v 1.3 2011/08/29 01:33:49 dholland Exp $ + mkdir ${DESTDIR}$(LIBDIR) + mkdir ${DESTDIR}$(INCDIR) + mkdir ${DESTDIR}$(MANDIR)/man3 -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBS:.a=.la} ${DESTDIR}${PREFIX}/lib ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIBS:.a=.la} ${DESTDIR}${PREFIX}/lib + ${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dbu ${DESTDIR}$(BINDIR) + ${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dba ${DESTDIR}$(BINDIR) + ${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dbd ${DESTDIR}$(BINDIR) diff --git a/databases/sdbm/patches/patch-ac b/databases/sdbm/patches/patch-ac index 8dfb027e648..d9e31b4d1de 100644 --- a/databases/sdbm/patches/patch-ac +++ b/databases/sdbm/patches/patch-ac @@ -1,4 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2008/08/12 13:11:30 agc Exp $ +$NetBSD: patch-ac,v 1.3 2012/04/16 04:01:10 dholland Exp $ + +- Use standard headers. +- Don't provide own definitions of now-standard symbols. --- tune.h.orig Mon Sep 25 23:22:26 2000 +++ tune.h diff --git a/databases/sdbm/patches/patch-af b/databases/sdbm/patches/patch-af index be192060094..c48b4e51b9f 100644 --- a/databases/sdbm/patches/patch-af +++ b/databases/sdbm/patches/patch-af @@ -1,4 +1,10 @@ -$NetBSD: patch-af,v 1.2 2008/08/12 13:11:30 agc Exp $ +$NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ + +- Use standard headers. +- Don't provide own getopt on BSD platforms. +- Use functions correctly. +- Avoid signed bitwise operations. +- Use the modern regexp library interface. --- dbe.c.orig Mon Sep 25 23:28:28 2000 +++ dbe.c diff --git a/databases/sdbm/patches/patch-ah b/databases/sdbm/patches/patch-ah index f0bfb4eb10a..5377f6ebf02 100644 --- a/databases/sdbm/patches/patch-ah +++ b/databases/sdbm/patches/patch-ah @@ -1,4 +1,6 @@ -$NetBSD: patch-ah,v 1.1 2008/08/12 13:13:34 agc Exp $ +$NetBSD: patch-ah,v 1.2 2012/04/16 04:01:10 dholland Exp $ + +Use standard headers --- dba.c 2008/08/12 11:32:24 1.1 +++ dba.c 2008/08/12 11:32:58 diff --git a/databases/sdbm/patches/patch-ai b/databases/sdbm/patches/patch-ai index 6dee4fa53b5..a57cdbe5421 100644 --- a/databases/sdbm/patches/patch-ai +++ b/databases/sdbm/patches/patch-ai @@ -1,3 +1,7 @@ +$NetBSD: patch-ai,v 1.2 2012/04/16 04:01:10 dholland Exp $ + +Use standard headers. + --- dbd.c 2008/08/12 12:19:22 1.1 +++ dbd.c 2008/08/12 12:19:53 @@ -3,6 +3,8 @@ -- cgit v1.2.3