Attachment 84646 Details for Bug 120684 – memcachedb-1.0.0.b.patch

[patch] memcachedb-1.0.0.b.patch

memcachedb-1.0.0.b.patch (text/plain), 5.25 KB, created by gslin on 2008-02-15 04:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gslin

Created: 2008-02-15 04:10:02 UTC

Size: 5.25 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/memcachedb/Makefile /home/staff/gslin/work/ports/memcachedb/Makefile
>--- /usr/ports/databases/memcachedb/Makefile	2008-01-05 22:48:38.000000000 +0800
>+++ /home/staff/gslin/work/ports/memcachedb/Makefile	2008-02-15 11:43:43.000000000 +0800
>@@ -6,31 +6,31 @@
> #
> 
> PORTNAME=	memcachedb
>-PORTVERSION=	0.1.0
>+DISTVERSION=	1.0.0-beta
> CATEGORIES=	databases
>-MASTER_SITES=	http://memcachedb.googlecode.com/files/
>+MASTER_SITES=	http://memcachedb.googlecode.com/files/	\
>+		http://freebsd.csie.nctu.edu.tw/~gslin/files/
> 
>-MAINTAINER=	gslin@gslin.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Distributed storage system designed for persistent
> 
> LIB_DEPENDS=	event-1.3e:${PORTSDIR}/devel/libevent
> 
>+CFLAGS=		-I"${BDB_INCLUDE_DIR}"
>+CONFIUGRE_ARGS=	--enable-threads --with-bdb="${LOCALBASE}" \
>+		--with-libevent="${LOCALBASE}"
>+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
>+GNU_CONFIGURE=	yes
>+LDFLAGS=	-l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
>+MCDBDIR?=	/var/db/memcachedb
> USE_BDB=	46+
>-USE_DOS2UNIX=	YES
> USE_RC_SUBR=	${PORTNAME}
> 
>-.include <bsd.port.pre.mk>
>-
> post-patch:
>-	${REINPLACE_CMD} \
>-		-e "s,%%BDB_LIB_NAME%%,${BDB_LIB_NAME}," \
>-		-e "s,%%BDB_LIB_DIR%%,${BDB_LIB_DIR}," \
>-		-e "s,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR}," \
>-		${WRKSRC}/Makefile
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/memcachedb ${PREFIX}/sbin
>-	${MKDIR} /var/db/memcachedb || ${TRUE}
>-	${CHOWN} nobody:nobody /var/db/memcachedb
>+	${CHMOD} a+x ${WRKSRC}/install-sh
>+
>+post-install:
>+	${MKDIR} ${MCDBDIR} || ${TRUE}
>+	${CHOWN} nobody:nobody ${MCDBDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/databases/memcachedb/distinfo /home/staff/gslin/work/ports/memcachedb/distinfo
>--- /usr/ports/databases/memcachedb/distinfo	2008-01-05 22:48:38.000000000 +0800
>+++ /home/staff/gslin/work/ports/memcachedb/distinfo	2008-02-15 11:22:20.000000000 +0800
>@@ -1,3 +1,3 @@
>-MD5 (memcachedb-0.1.0.tar.gz) = 0384dd0ec076cb3405861c06c2e47dd7
>-SHA256 (memcachedb-0.1.0.tar.gz) = 40cbb9cf860f359bd37ec45d597f366c63db8815b40638b49dfa6981f8c106e7
>-SIZE (memcachedb-0.1.0.tar.gz) = 15679
>+MD5 (memcachedb-1.0.0-beta.tar.gz) = 2b23109d94a6d5b0f51fc6ecf7e1ae3a
>+SHA256 (memcachedb-1.0.0-beta.tar.gz) = b46d560c2b6dc56b57f133f8ba3ea079627676d50d78809c5c685da8c093dbfc
>+SIZE (memcachedb-1.0.0-beta.tar.gz) = 118130
>diff -ruN --exclude=CVS /usr/ports/databases/memcachedb/files/patch-Makefile /home/staff/gslin/work/ports/memcachedb/files/patch-Makefile
>--- /usr/ports/databases/memcachedb/files/patch-Makefile	2008-01-05 22:48:39.000000000 +0800
>+++ /home/staff/gslin/work/ports/memcachedb/files/patch-Makefile	1970-01-01 08:00:00.000000000 +0800
>@@ -1,23 +0,0 @@
>---- Makefile.orig	2007-11-06 16:55:06.000000000 +0800
>-+++ Makefile	2007-11-06 16:56:00.000000000 +0800
>-@@ -1,15 +1,15 @@
>- # $Id: Makefile 11833 2005-11-28 00:22:02Z midom $
>- # $Id: Makefile 11833 2007-09-06 10:56:02Z steve $
>- 
>--LIBS=-ldb -levent
>--DBLIBPATH=/usr/local/BerkeleyDB.4.6/lib
>--DBINCPATH=/usr/local/BerkeleyDB.4.6/include
>-+LIBS=-l%%BDB_LIB_NAME%% -levent
>-+DBLIBPATH=%%BDB_LIB_DIR%%
>-+DBINCPATH=%%BDB_INCLUDE_DIR%%
>- 
>- LDFLAGS= -L/usr/local/lib/ -L${DBLIBPATH}
>--CFLAGS =-Wall -O2 -I/usr/local/include -I${DBINCPATH} 
>-+CFLAGS+=-Wall -I/usr/local/include -I${DBINCPATH} 
>- 
>- all: 
>--	cc -o memcachedb memcachedb.c ${LDFLAGS} ${CFLAGS} ${LIBS}
>-+	${CC} -o memcachedb memcachedb.c ${LDFLAGS} ${CFLAGS} ${LIBS}
>- 
>- clean:
>- 	rm -f -- *.o memcachedb
>diff -ruN --exclude=CVS /usr/ports/databases/memcachedb/files/patch-memcachedb.c /home/staff/gslin/work/ports/memcachedb/files/patch-memcachedb.c
>--- /usr/ports/databases/memcachedb/files/patch-memcachedb.c	2007-09-27 11:02:34.000000000 +0800
>+++ /home/staff/gslin/work/ports/memcachedb/files/patch-memcachedb.c	1970-01-01 08:00:00.000000000 +0800
>@@ -1,10 +0,0 @@
>---- memcachedb.c.orig	2007-09-21 18:52:54.000000000 +0800
>-+++ memcachedb.c	2007-09-27 09:26:43.000000000 +0800
>-@@ -39,7 +39,6 @@
>- #include <assert.h>
>- #include <db.h>
>- #include <signal.h>
>--#include <malloc.h>
>- 
>- #include "memcachedb.h"
>- 
>diff -ruN --exclude=CVS /usr/ports/databases/memcachedb/files/patch-memcachedb.h /home/staff/gslin/work/ports/memcachedb/files/patch-memcachedb.h
>--- /usr/ports/databases/memcachedb/files/patch-memcachedb.h	2007-09-27 11:02:34.000000000 +0800
>+++ /home/staff/gslin/work/ports/memcachedb/files/patch-memcachedb.h	1970-01-01 08:00:00.000000000 +0800
>@@ -1,13 +0,0 @@
>---- memcachedb.h.orig	2007-09-22 04:01:02.000000000 +0800
>-+++ memcachedb.h	2007-09-22 04:01:15.000000000 +0800
>-@@ -40,8 +40,8 @@
>- extern struct stats stats;
>- extern struct settings settings;
>- 
>--#define END_LEN 32
>--#define END_LEN_STR "31"
>-+#define END_LEN 128
>-+#define END_LEN_STR "127"
>- 
>- typedef struct _stritem {
>-     int nbytes;			/* size of data */
>diff -ruN --exclude=CVS /usr/ports/databases/memcachedb/pkg-plist /home/staff/gslin/work/ports/memcachedb/pkg-plist
>--- /usr/ports/databases/memcachedb/pkg-plist	2007-09-27 11:02:34.000000000 +0800
>+++ /home/staff/gslin/work/ports/memcachedb/pkg-plist	2008-02-15 11:42:55.000000000 +0800
>@@ -1,4 +1,4 @@
> @comment $FreeBSD: ports/databases/memcachedb/pkg-plist,v 1.1 2007/09/27 03:02:34 clsung Exp $
> @stopdaemon memcachedb
>-sbin/memcachedb
>-@unexec rmdir /var/db/memcachedb 2>/dev/null || true
>+bin/memcachedb
>+@dirrmtry /var/db/memcachedb

Actions: View | Diff

Attachments on bug 120684: 84646