[Midnightbsd-cvs] mports [17346] trunk/databases/libmemcache: add patch

[laffer1 at midnightbsd.org]

Revision: 17346
          http://svnweb.midnightbsd.org/mports/?rev=17346
Author:   laffer1
Date:     2014-09-15 23:16:34 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
add patch

Modified Paths:
--------------
    trunk/databases/libmemcache/Makefile
    trunk/databases/libmemcache/pkg-plist

Added Paths:
-----------
    trunk/databases/libmemcache/files/
    trunk/databases/libmemcache/files/patch-fix-inline

Modified: trunk/databases/libmemcache/Makefile
===================================================================
--- trunk/databases/libmemcache/Makefile	2014-09-16 03:11:05 UTC (rev 17345)
+++ trunk/databases/libmemcache/Makefile	2014-09-16 03:16:34 UTC (rev 17346)
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	libmemcache
-PORTVERSION=	1.4.0.rc2
+DISTVERSION=	1.4.0.rc2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://people.FreeBSD.org/~seanc/libmemcache/
 
@@ -18,13 +19,14 @@
 USES=	 	libtool tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
-OPTIONS=	DEBUG	"Build with debugging turned on" off
+OPTIONS_DEFINE=	DEBUG
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: trunk/databases/libmemcache/files/patch-fix-inline
===================================================================
--- trunk/databases/libmemcache/files/patch-fix-inline	                        (rev 0)
+++ trunk/databases/libmemcache/files/patch-fix-inline	2014-09-16 03:16:34 UTC (rev 17346)
@@ -0,0 +1,69 @@
+--- include/memcache/buffer.h.orig	2010-01-31 13:27:07.000000000 -0200
++++ include/memcache/buffer.h	2010-01-31 13:27:21.000000000 -0200
+@@ -63,14 +63,14 @@
+ 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 *);
++u_int32_t	 mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
+ 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 *);
++size_t	 mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
++size_t	 mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
+ 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 *);
+--- include/memcache.h.in.orig	2010-01-31 13:29:55.000000000 -0200
++++ include/memcache.h.in	2010-01-31 13:30:04.000000000 -0200
+@@ -923,7 +923,7 @@
+ 		 mcMallocFunc *mallocAtomicFunc, mcReallocFunc *reallocFunc);
+ 
+ /* Returns a pointer to the global context. */
+-inline struct memcache_ctxt *mc_global_ctxt(void);
++struct memcache_ctxt *mc_global_ctxt(void);
+ 
+ /* The next two functions are used to setup an error handler. */
+ int	mcErrSetup(mcErrFunc errFunc);
+--- src/buffer.c.orig	2010-01-31 13:27:33.000000000 -0200
++++ src/buffer.c	2010-01-31 13:27:43.000000000 -0200
+@@ -259,7 +259,7 @@
+ }
+ 
+ 
+-inline u_int32_t
++u_int32_t
+ mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) {
+   return s->len;
+ }
+@@ -425,13 +425,13 @@
+ }
+ 
+ 
+-inline size_t
++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
++size_t
+ mcm_buf_remain_off(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
+   return mcm_buf_len(ctxt, buf) - buf->off;
+ }
+--- src/memcache.c.orig	2010-01-31 13:27:50.000000000 -0200
++++ src/memcache.c	2010-01-31 13:29:28.000000000 -0200
+@@ -278,7 +278,7 @@
+ }
+ 
+ 
+-inline struct memcache_ctxt *
++struct memcache_ctxt *
+ mc_global_ctxt(void) {
+   return &mcGlobalCtxt;
+ }

Modified: trunk/databases/libmemcache/pkg-plist
===================================================================
--- trunk/databases/libmemcache/pkg-plist	2014-09-16 03:11:05 UTC (rev 17345)
+++ trunk/databases/libmemcache/pkg-plist	2014-09-16 03:16:34 UTC (rev 17346)
@@ -1,8 +1,8 @@
+include/memcache.h
 include/memcache/_buffer.h
 include/memcache/buffer.h
+lib/libmemcache.a
+lib/libmemcache.so
+lib/libmemcache.so.0
+lib/libmemcache.so.0.4.0
 @dirrm include/memcache
-include/memcache.h
-lib/libmemcache.so.4
-lib/libmemcache.so
-lib/libmemcache.la
-lib/libmemcache.a