Attachment #84646 for bug #120684

View | Details | Raw Unified | Return to bug 120684
Collapse All | Expand All




#

PORTNAME=	memcachedb
DISTVERSION=	1.0.0-beta
CATEGORIES=	databases
MASTER_SITES=	http://memcachedb.googlecode.com/files/	\
		http://freebsd.csie.nctu.edu.tw/~gslin/files/

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:
	${CHMOD} a+x ${WRKSRC}/install-sh

post-install:
	${MKDIR} ${MCDBDIR} || ${TRUE}
	${CHOWN} nobody:nobody ${MCDBDIR}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/memcachedb ${PREFIX}/sbin
	${MKDIR} /var/db/memcachedb || ${TRUE}
	${CHOWN} nobody:nobody /var/db/memcachedb

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/home/staff/gslin/work/ports/memcachedb/distinfo (-3 / +3 lines)
1	MD5 (memcachedb-0.1.0.tar.gz) = 0384dd0ec076cb3405861c06c2e47dd7	1	MD5 (memcachedb-1.0.0-beta.tar.gz) = 2b23109d94a6d5b0f51fc6ecf7e1ae3a
2	SHA256 (memcachedb-0.1.0.tar.gz) = 40cbb9cf860f359bd37ec45d597f366c63db8815b40638b49dfa6981f8c106e7	2	SHA256 (memcachedb-1.0.0-beta.tar.gz) = b46d560c2b6dc56b57f133f8ba3ea079627676d50d78809c5c685da8c093dbfc
3	SIZE (memcachedb-0.1.0.tar.gz) = 15679	3	SIZE (memcachedb-1.0.0-beta.tar.gz) = 118130




--- 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

Lines 1-10 Link Here

(-)/home/staff/gslin/work/ports/memcachedb/files/patch-memcachedb.c (-10 lines)
1	--- memcachedb.c.orig 2007-09-21 18:52:54.000000000 +0800
2	+++ memcachedb.c 2007-09-27 09:26:43.000000000 +0800
3	@@ -39,7 +39,6 @@
4	#include <assert.h>
5	#include <db.h>
6	#include <signal.h>
7	-#include <malloc.h>
8
9	#include "memcachedb.h"
10




--- 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 */

Lines 1-4 Link Here

(-)/home/staff/gslin/work/ports/memcachedb/pkg-plist (-2 / +2 lines)
1	@comment $FreeBSD: ports/databases/memcachedb/pkg-plist,v 1.1 2007/09/27 03:02:34 clsung Exp $	1	@comment $FreeBSD: ports/databases/memcachedb/pkg-plist,v 1.1 2007/09/27 03:02:34 clsung Exp $
2	@stopdaemon memcachedb	2	@stopdaemon memcachedb
3	sbin/memcachedb	3	bin/memcachedb
4	@unexec rmdir /var/db/memcachedb 2>/dev/null \|\| true	4	@dirrmtry /var/db/memcachedb

Return to bug 120684

Lines 6-36 Link Here

(-)/home/staff/gslin/work/ports/memcachedb/Makefile (-17 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= memcachedb	8	PORTNAME= memcachedb
9	PORTVERSION= 0.1.0	9	DISTVERSION= 1.0.0-beta
10	CATEGORIES= databases	10	CATEGORIES= databases
11	MASTER_SITES= http://memcachedb.googlecode.com/files/	11	MASTER_SITES= http://memcachedb.googlecode.com/files/ \
		12	http://freebsd.csie.nctu.edu.tw/~gslin/files/
12		13
13	MAINTAINER= gslin@gslin.org	14	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Distributed storage system designed for persistent	15	COMMENT= Distributed storage system designed for persistent
15		16
16	LIB_DEPENDS= event-1.3e:${PORTSDIR}/devel/libevent	17	LIB_DEPENDS= event-1.3e:${PORTSDIR}/devel/libevent
17		18
		19	CFLAGS= -I"${BDB_INCLUDE_DIR}"
		20	CONFIUGRE_ARGS= --enable-threads --with-bdb="${LOCALBASE}" \
		21	--with-libevent="${LOCALBASE}"
		22	CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
		23	GNU_CONFIGURE= yes
		24	LDFLAGS= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
		25	MCDBDIR?= /var/db/memcachedb
18	USE_BDB= 46+	26	USE_BDB= 46+
19	USE_DOS2UNIX= YES
20	USE_RC_SUBR= ${PORTNAME}	27	USE_RC_SUBR= ${PORTNAME}
21		28
22	.include <bsd.port.pre.mk>
23
24	post-patch:	29	post-patch:
25	${REINPLACE_CMD} \	30	${CHMOD} a+x ${WRKSRC}/install-sh
26	-e "s,%%BDB_LIB_NAME%%,${BDB_LIB_NAME}," \	31
27	-e "s,%%BDB_LIB_DIR%%,${BDB_LIB_DIR}," \	32	post-install:
28	-e "s,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR}," \	33	${MKDIR} ${MCDBDIR} \|\| ${TRUE}
29	${WRKSRC}/Makefile	34	${CHOWN} nobody:nobody ${MCDBDIR}
30
31	do-install:
32	${INSTALL_PROGRAM} ${WRKSRC}/memcachedb ${PREFIX}/sbin
33	${MKDIR} /var/db/memcachedb \|\| ${TRUE}
34	${CHOWN} nobody:nobody /var/db/memcachedb
35		35
36	.include <bsd.port.post.mk>	36	.include <bsd.port.mk>

Lines 1-23 Link Here

(-)/home/staff/gslin/work/ports/memcachedb/files/patch-Makefile (-23 lines)
1	--- Makefile.orig 2007-11-06 16:55:06.000000000 +0800
2	+++ Makefile 2007-11-06 16:56:00.000000000 +0800
3	@@ -1,15 +1,15 @@
4	# $Id: Makefile 11833 2005-11-28 00:22:02Z midom $
5	# $Id: Makefile 11833 2007-09-06 10:56:02Z steve $
6
7	-LIBS=-ldb -levent
8	-DBLIBPATH=/usr/local/BerkeleyDB.4.6/lib
9	-DBINCPATH=/usr/local/BerkeleyDB.4.6/include
10	+LIBS=-l%%BDB_LIB_NAME%% -levent
11	+DBLIBPATH=%%BDB_LIB_DIR%%
12	+DBINCPATH=%%BDB_INCLUDE_DIR%%
13
14	LDFLAGS= -L/usr/local/lib/ -L${DBLIBPATH}
15	-CFLAGS =-Wall -O2 -I/usr/local/include -I${DBINCPATH}
16	+CFLAGS+=-Wall -I/usr/local/include -I${DBINCPATH}
17
18	all:
19	- cc -o memcachedb memcachedb.c ${LDFLAGS} ${CFLAGS} ${LIBS}
20	+ ${CC} -o memcachedb memcachedb.c ${LDFLAGS} ${CFLAGS} ${LIBS}
21
22	clean:
23	rm -f -- *.o memcachedb

Lines 1-13 Link Here

(-)/home/staff/gslin/work/ports/memcachedb/files/patch-memcachedb.h (-13 lines)
1	--- memcachedb.h.orig 2007-09-22 04:01:02.000000000 +0800
2	+++ memcachedb.h 2007-09-22 04:01:15.000000000 +0800
3	@@ -40,8 +40,8 @@
4	extern struct stats stats;
5	extern struct settings settings;
6
7	-#define END_LEN 32
8	-#define END_LEN_STR "31"
9	+#define END_LEN 128
10	+#define END_LEN_STR "127"
11
12	typedef struct _stritem {
13	int nbytes; /* size of data */