Fri Jan 29 03:44:53 2010 UTC ()
Fix the use of 'inline' to avoid undefined symbols in the shared library
which is installed.  Bump PKGREVISION.


(dmcmahill)
diff -r1.4 -r1.5 pkgsrc/devel/libmemcache/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/libmemcache/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/libmemcache/patches/patch-ab
diff -r0 -r1.1 pkgsrc/devel/libmemcache/patches/patch-ac
cvs diff -r1.4 -r1.5 pkgsrc/devel/libmemcache/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libmemcache/Makefile 2008/03/30 05:01:31 1.4
+++ pkgsrc/devel/libmemcache/Makefile 2010/01/29 03:44:53 1.5
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.4 2008/03/30 05:01:31 jlam Exp $ 1# $NetBSD: Makefile,v 1.5 2010/01/29 03:44:53 dmcmahill Exp $
2# 2#
3 3
4DISTNAME= libmemcache-1.4.0.b9 4DISTNAME= libmemcache-1.4.0.b9
5PKGNAME= ${DISTNAME:S/.b/beta/} 5PKGNAME= ${DISTNAME:S/.b/beta/}
 6PKGREVISION= 1
6CATEGORIES= devel 7CATEGORIES= devel
7MASTER_SITES= http://people.freebsd.org/~seanc/libmemcache/ 8MASTER_SITES= http://people.freebsd.org/~seanc/libmemcache/
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://people.freebsd.org/~seanc/libmemcache/ 12HOMEPAGE= http://people.freebsd.org/~seanc/libmemcache/
12COMMENT= C API for memcached 13COMMENT= C API for memcached
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.2 -r1.3 pkgsrc/devel/libmemcache/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libmemcache/distinfo 2008/07/27 13:39:24 1.2
+++ pkgsrc/devel/libmemcache/distinfo 2010/01/29 03:44:53 1.3
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.2 2008/07/27 13:39:24 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2010/01/29 03:44:53 dmcmahill Exp $
2 2
3SHA1 (libmemcache-1.4.0.b9.tar.bz2) = 09f8e059a7833a207b7dfbf6e30a42309801fdc9 3SHA1 (libmemcache-1.4.0.b9.tar.bz2) = 09f8e059a7833a207b7dfbf6e30a42309801fdc9
4RMD160 (libmemcache-1.4.0.b9.tar.bz2) = 8c97e89df37956584f743639440dd980fd277b92 4RMD160 (libmemcache-1.4.0.b9.tar.bz2) = 8c97e89df37956584f743639440dd980fd277b92
5Size (libmemcache-1.4.0.b9.tar.bz2) = 284358 bytes 5Size (libmemcache-1.4.0.b9.tar.bz2) = 284358 bytes
6SHA1 (patch-aa) = 379b0117e70316b02f61190d10e64fe04a765619 6SHA1 (patch-aa) = 379b0117e70316b02f61190d10e64fe04a765619
7SHA1 (patch-ab) = 0864a80c3ee18bf48fc142973db97366cc0f8848 7SHA1 (patch-ab) = fa91a0f9b9e6ed9c1d7abd4c7eb69f63045f5869
 8SHA1 (patch-ac) = f7dfb29b2e7f9c56d5d5bcb3c8dd63bb6f26825f
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/libmemcache/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/libmemcache/patches/patch-ab 2005/10/11 15:31:20 1.1.1.1
+++ pkgsrc/devel/libmemcache/patches/patch-ab 2010/01/29 03:44:53 1.2
@@ -1,13 +1,45 @@ @@ -1,13 +1,45 @@
1$NetBSD: patch-ab,v 1.1.1.1 2005/10/11 15:31:20 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2010/01/29 03:44:53 dmcmahill Exp $
2 2
3--- src/buffer.c.orig 2005-10-11 00:41:57.000000000 +0200 3--- src/buffer.c.orig 2005-09-25 17:39:45.000000000 +0000
4+++ src/buffer.c 4+++ src/buffer.c
5@@ -35,7 +35,7 @@ 5@@ -35,7 +35,7 @@
6 #include <sys/types.h> 6 #include <sys/types.h>
7 #include <sys/uio.h> 7 #include <sys/uio.h>
8 #include <unistd.h> 8 #include <unistd.h>
9-#include <sys/errno.h> 9-#include <sys/errno.h>
10+#include <errno.h> 10+#include <errno.h>
11  11
12 #include "memcache/buffer.h" 12 #include "memcache/buffer.h"
13  13
 14@@ -259,12 +259,6 @@ mcm_buf_free(struct memcache_ctxt *ctxt,
 15 }
 16
 17
 18-inline u_int32_t
 19-mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) {
 20- return s->len;
 21-}
 22-
 23-
 24 struct memcache_buf *
 25 mcm_buf_new(struct memcache_ctxt *ctxt) {
 26 struct memcache_buf *buf;
 27@@ -422,18 +416,6 @@ mcm_buf_realloc(struct memcache_ctxt *ct
 28 }
 29
 30
 31-inline size_t
 32-mcm_buf_remain(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
 33- return mcm_buf_size(ctxt, buf) - mcm_buf_len(ctxt, buf);
 34-}
 35-
 36-
 37-inline size_t
 38-mcm_buf_remain_off(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
 39- return mcm_buf_len(ctxt, buf) - buf->off;
 40-}
 41-
 42-
 43 int
 44 mcm_buf_replace(struct memcache_ctxt *ctxt, struct memcache_buf *buf, const char *cp, const u_int32_t len) {
 45 if (mcm_buf_reset(ctxt, buf) == 0)
File Added: pkgsrc/devel/libmemcache/patches/patch-ac
$NetBSD: patch-ac,v 1.1 2010/01/29 03:44:53 dmcmahill Exp $

--- include/memcache/buffer.h.orig	2005-09-25 17:36:12.000000000 +0000
+++ include/memcache/buffer.h
@@ -63,14 +63,25 @@ struct memcache_buf	*mcm_buf_find_replac
 struct memcache_buf	*mcm_buf_find_replace2(struct memcache_ctxt *, struct memcache_buf *,
 						    const char *, struct memcache_buf *);
 int	 mcm_buf_free(struct memcache_ctxt *, struct memcache_buf **);
-inline u_int32_t	 mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
+inline u_int32_t
+mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) {
+  return s->len;
+}
 struct memcache_buf	*mcm_buf_new(struct memcache_ctxt *);
 struct memcache_buf	*mcm_buf_new2(struct memcache_ctxt *, const char *, const u_int32_t);
 struct memcache_buf	*mcm_buf_new3(struct memcache_ctxt *, const char *);
 size_t	 mcm_buf_read(struct memcache_ctxt *, struct memcache_buf *, int);
 int	 mcm_buf_realloc(struct memcache_ctxt *, struct memcache_buf *, const u_int32_t);
-inline size_t	 mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
-inline size_t	 mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
+inline size_t   
+mcm_buf_remain(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
+  return mcm_buf_size(ctxt, buf) - mcm_buf_len(ctxt, buf);
+}
+
+
+inline size_t
+mcm_buf_remain_off(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
+  return mcm_buf_len(ctxt, buf) - buf->off;
+}
 int	 mcm_buf_replace(struct memcache_ctxt *, struct memcache_buf *, const char *, const u_int32_t);
 int	 mcm_buf_replace2(struct memcache_ctxt *, struct memcache_buf *, const char *);
 int	 mcm_buf_replace_buf(struct memcache_ctxt *, struct memcache_buf *, struct memcache_buf *);