ports/89493: Update port: databases/memcached fixes

[Marcus Alves Grando]

>Number:         89493
>Category:       ports
>Synopsis:       Update port: databases/memcached fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 24 14:00:06 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Alves Grando
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Nov 22 10:03:01 BRST 2005 root at marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386


	
>Description:

Add secondary master site
Mark right dependency
Use USE_RC_SUBR=memcached.sh
Add SHA256

	
>How-To-Repeat:
	
>Fix:

	

--- memcached.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	11 Jul 2005 09:01:49 -0000	1.12
+++ Makefile	23 Nov 2005 17:33:37 -0000
@@ -8,40 +8,36 @@
 PORTNAME=	memcached
 PORTVERSION=	1.1.12
 CATEGORIES=	databases
-MASTER_SITES=	http://www.danga.com/memcached/dist/
+MASTER_SITES=	http://www.danga.com/memcached/dist/ \
+		${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=	distfiles
 
 MAINTAINER=	seanc at FreeBSD.org
 COMMENT=	High-performance distributed memory object cache system
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	event-1.1a.1:${PORTSDIR}/devel/libevent
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE} --program-prefix=
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		memcached.1
 
 DOCS_LIST=	memory_management.txt protocol.txt
 
-USE_RC_SUBR=	yes
-
-SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g'	\
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+USE_RC_SUBR=	memcached.sh
 
 post-configure:
 	@${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile
 
-post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/memcached.sh >  ${WRKDIR}/memcached.sh
-
 post-install:
 	${INSTALL_MAN} ${MAN1:S!^!${WRKSRC}/doc/!} ${MAN1PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKDIR}/memcached.sh ${PREFIX}/etc/rc.d/memcached.sh
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS_LIST:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOCS_LIST:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	11 Jul 2005 09:01:49 -0000	1.5
+++ distinfo	23 Nov 2005 17:33:37 -0000
@@ -1,2 +1,3 @@
 MD5 (memcached-1.1.12.tar.gz) = a1236dad33e9ac6c36d53faa8da61780
+SHA256 (memcached-1.1.12.tar.gz) = 6a8e63b02d8576a937dc154232357dbb9c236890be53e9ce0d44e2dba21ca79a
 SIZE (memcached-1.1.12.tar.gz) = 114103
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	11 Jul 2005 09:01:49 -0000	1.4
+++ pkg-plist	23 Nov 2005 17:33:37 -0000
@@ -1,5 +1,4 @@
 bin/memcached
-etc/rc.d/memcached.sh
 %%PORTDOCS%%%%DOCSDIR%%/memory_management.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/memcached.sh
===================================================================
RCS file: files/memcached.sh
diff -N files/memcached.sh
--- files/memcached.sh	11 Jul 2005 09:01:50 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: memcached
-# REQUIRE: NETWORKING
-
-#
-# Add the following lines to /etc/rc.conf to run memcached:
-#
-#memcached_enable="YES"
-#memcached_flags=""
-#
-. %%RC_SUBR%%
-
-name="memcached"
-rcvar=`set_rcvar`
-command=%%PREFIX%%/bin/memcached
-command_args="-du nobody ${memcached_flags}"
-
-load_rc_config $name
-run_rc_command "$1"
Index: files/memcached.sh.in
===================================================================
RCS file: files/memcached.sh.in
diff -N files/memcached.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/memcached.sh.in	23 Nov 2005 17:33:37 -0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: memcached
+# REQUIRE: NETWORKING
+
+#
+# Add the following lines to /etc/rc.conf to run memcached:
+#
+#memcached_enable="YES"
+#memcached_flags=""
+#
+. %%RC_SUBR%%
+
+name="memcached"
+rcvar=`set_rcvar`
+command=%%PREFIX%%/bin/memcached
+command_args="-du nobody ${memcached_flags}"
+
+load_rc_config $name
+run_rc_command "$1"
--- memcached.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: