pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove zookeeper-client/server, they are now under devel/.
Module Name: pkgsrc-wip
Committed By: Filip Hajny <filip%joyent.com@localhost>
Pushed By: fhajny
Date: Thu Jan 28 13:45:28 2016 +0000
Changeset: 2e02c02f10c44ae7d6603ae6b37b5e82ec6f89be
Removed Files:
zookeeper-client/DESCR
zookeeper-client/Makefile
zookeeper-client/PLIST
zookeeper-server/DESCR
zookeeper-server/Makefile
zookeeper-server/Makefile.common
zookeeper-server/PLIST
zookeeper-server/distinfo
zookeeper-server/patches/patch-bin_zkEnv.sh
zookeeper-server/patches/patch-bin_zkServer.sh
zookeeper-server/patches/patch-build.xml
zookeeper-server/patches/patch-conf__zoo_sample.cfg
zookeeper-server/patches/patch-include_recordio.h
zookeeper-server/patches/patch-src__zk_log.c
zookeeper-server/patches/patch-src_packages_templates_conf_zookeeper-env.sh
zookeeper-server/patches/patch-src_recordio.c
Log Message:
Remove zookeeper-client/server, they are now under devel/.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e02c02f10c44ae7d6603ae6b37b5e82ec6f89be
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zookeeper-client/DESCR | 12 ----
zookeeper-client/Makefile | 22 ------
zookeeper-client/PLIST | 12 ----
zookeeper-server/DESCR | 12 ----
zookeeper-server/Makefile | 79 ----------------------
zookeeper-server/Makefile.common | 14 ----
zookeeper-server/PLIST | 71 -------------------
zookeeper-server/distinfo | 13 ----
zookeeper-server/patches/patch-bin_zkEnv.sh | 21 ------
zookeeper-server/patches/patch-bin_zkServer.sh | 44 ------------
zookeeper-server/patches/patch-build.xml | 15 ----
.../patches/patch-conf__zoo_sample.cfg | 14 ----
zookeeper-server/patches/patch-include_recordio.h | 16 -----
zookeeper-server/patches/patch-src__zk_log.c | 14 ----
...ch-src_packages_templates_conf_zookeeper-env.sh | 13 ----
zookeeper-server/patches/patch-src_recordio.c | 21 ------
16 files changed, 393 deletions(-)
diffs:
diff --git a/zookeeper-client/DESCR b/zookeeper-client/DESCR
deleted file mode 100644
index 27a73a8..0000000
--- a/zookeeper-client/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-ZooKeeper is a centralized service for maintaining configuration information,
-naming, providing distributed synchronization, and providing group services.
-All of these kinds of services are used in some form or another by distributed
-applications. Each time they are implemented there is a lot of work that goes
-into fixing the bugs and race conditions that are inevitable. Because of the
-difficulty of implementing these kinds of services, applications initially
-usually skimp on them ,which make them brittle in the presence of change and
-difficult to manage. Even when done correctly, different implementations of
-these services lead to management complexity when the applications are
-deployed.
-
-This is the C client package.
diff --git a/zookeeper-client/Makefile b/zookeeper-client/Makefile
deleted file mode 100644
index 35f106c..0000000
--- a/zookeeper-client/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2013/01/02 13:16:51 jonperkin Exp $
-#
-
-.include "../../wip/zookeeper-server/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/keeper/keeper-client/}
-COMMENT= Highly reliable distributed coordination server (client)
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++ c99
-USE_LIBTOOL= yes
-
-BUILD_DEPENDS+= cppunit-[0-9]*:../../devel/cppunit
-
-CONFIGURE_DIRS= src/c
-
-CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
-LIBS.SunOS+= -lnsl -lsocket
-
-TEST_TARGET= run-check
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/zookeeper-client/PLIST b/zookeeper-client/PLIST
deleted file mode 100644
index d8923ce..0000000
--- a/zookeeper-client/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/19 10:32:38 fhajny Exp $
-bin/cli_mt
-bin/cli_st
-bin/load_gen
-include/zookeeper/proto.h
-include/zookeeper/recordio.h
-include/zookeeper/zookeeper.h
-include/zookeeper/zookeeper.jute.h
-include/zookeeper/zookeeper_log.h
-include/zookeeper/zookeeper_version.h
-lib/libzookeeper_mt.la
-lib/libzookeeper_st.la
diff --git a/zookeeper-server/DESCR b/zookeeper-server/DESCR
deleted file mode 100644
index 7053b5a..0000000
--- a/zookeeper-server/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-ZooKeeper is a centralized service for maintaining configuration information,
-naming, providing distributed synchronization, and providing group services.
-All of these kinds of services are used in some form or another by distributed
-applications. Each time they are implemented there is a lot of work that goes
-into fixing the bugs and race conditions that are inevitable. Because of the
-difficulty of implementing these kinds of services, applications initially
-usually skimp on them ,which make them brittle in the presence of change and
-difficult to manage. Even when done correctly, different implementations of
-these services lead to management complexity when the applications are
-deployed.
-
-This is the Java based server package.
diff --git a/zookeeper-server/Makefile b/zookeeper-server/Makefile
deleted file mode 100644
index 1924d49..0000000
--- a/zookeeper-server/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2014/05/14 09:59:27 fhajny Exp $
-#
-
-.include "Makefile.common"
-
-PKGNAME= ${DISTNAME:S/keeper/keeper-server/}
-COMMENT= Highly reliable distributed coordination server
-PKGREVISION= 1
-
-USE_JAVA= yes
-USE_JAVA2= yes
-USE_TOOLS+= bash:run
-
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
-BUILD_DEPENDS+= apache-ivy-[0-9]*:../../devel/apache-ivy
-BUILD_DEPENDS+= apache-maven-[0-9]*:../../devel/apache-maven
-
-PKG_SYSCONFSUBDIR= zookeeper
-
-.include "../../mk/bsd.prefs.mk"
-
-ZK_DB?= ${VARBASE}/db/zookeeper
-ZK_LOG?= ${VARBASE}/log/zookeeper
-ZK_RUN?= ${VARBASE}/run/zookeeper
-ZK_USER?= zookeeper
-ZK_GROUP?= hadoop
-
-BUILD_DEFS+= VARBASE ZK_DB ZK_LOG ZK_RUN ZK_USER ZK_GROUP
-
-PKG_GROUPS+= ${ZK_GROUP}
-PKG_USERS+= ${ZK_USER}:${ZK_GROUP}
-
-PKG_GECOS.${ZK_USER}= ZooKeeper Daemon User
-PKG_HOME.${ZK_USER}= ${PREFIX}/share/zookeeper
-PKG_SHELL.${ZK_USER}= ${BASH}
-
-OWN_DIRS+= ${ZK_DB} ${ZK_DB}/data ${ZK_LOG} ${ZK_RUN}
-OWN_DIRS_PERMS+= ${ZK_DB} ${ZK_USER} ${ZK_GROUP} 755
-OWN_DIRS_PERMS+= ${ZK_DB} ${ZK_USER} ${ZK_GROUP} 755
-OWN_DIRS_PERMS+= ${ZK_LOG} ${ZK_USER} ${ZK_GROUP} 755
-OWN_DIRS_PERMS+= ${ZK_RUN} ${ZK_USER} ${ZK_GROUP} 755
-
-BUILDDIR= ${WRKSRC}/build/${DISTNAME}
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-patch
-SUBST_MESSAGE.paths= Fixing ZooKeeper default paths
-SUBST_FILES.paths= conf/zoo_sample.cfg
-SUBST_FILES.paths+= src/packages/templates/conf/zookeeper-env.sh
-SUBST_VARS.paths+= PKG_JAVA_HOME ZK_DB ZK_LOG ZK_RUN
-
-REPLACE_BASH= bin/zkCleanup.sh bin/zkCli.sh bin/zkEnv.sh bin/zkServer.sh
-
-INSTALLATION_DIRS+= bin libexec sbin share/examples/zookeeper share/zookeeper
-
-CONF_FILES+= share/examples/zookeeper/configuration.xsl ${PKG_SYSCONFDIR}/configuration.xsl
-CONF_FILES+= share/examples/zookeeper/log4j.properties ${PKG_SYSCONFDIR}/log4j.properties
-CONF_FILES+= share/examples/zookeeper/zoo.cfg ${PKG_SYSCONFDIR}/zoo.cfg
-CONF_FILES_PERMS+= share/examples/zookeeper/zookeeper-env.sh ${PKG_SYSCONFDIR}/zookeeper-env.sh \
- ${ROOT_USER} ${ROOT_GROUP} 0755
-
-do-build:
- cd ${WRKSRC} && ${SETENV} JAVA_HOME=${PKG_JAVA_HOME} ant bin-package
-
-do-install:
- ${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCleanup.sh ${DESTDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCli.sh ${DESTDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${BUILDDIR}/libexec/zkEnv.sh ${DESTDIR}${PREFIX}/libexec
- ${INSTALL_SCRIPT} ${BUILDDIR}/sbin/zkServer.sh ${DESTDIR}${PREFIX}/sbin
- ${INSTALL_DATA} ${BUILDDIR}/conf/configuration.xsl ${DESTDIR}${PREFIX}/share/examples/zookeeper
- ${INSTALL_DATA} ${BUILDDIR}/conf/log4j.properties ${DESTDIR}${PREFIX}/share/examples/zookeeper
- ${INSTALL_DATA} ${BUILDDIR}/conf/zoo_sample.cfg ${DESTDIR}${PREFIX}/share/examples/zookeeper/zoo.cfg
- ${INSTALL_DATA} ${BUILDDIR}/share/zookeeper/templates/conf/zookeeper-env.sh \
- ${DESTDIR}${PREFIX}/share/examples/zookeeper/zookeeper-env.sh
- ${CP} -Rp ${BUILDDIR}/share/zookeeper/* ${DESTDIR}${PREFIX}/share/zookeeper/
- ${RM} -f ${DESTDIR}${PREFIX}/share/zookeeper/templates/conf/zookeeper-env.sh.orig
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/zookeeper-server/Makefile.common b/zookeeper-server/Makefile.common
deleted file mode 100644
index 5ce7f08..0000000
--- a/zookeeper-server/Makefile.common
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.common,v 1.5 2014/05/14 09:51:07 fhajny Exp $
-#
-# used by wip/zookeeper-client/Makefile
-
-DISTNAME= zookeeper-3.4.6
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_APACHE:=zookeeper/${DISTNAME}/}
-
-MAINTAINER= filip%joyent.com@localhost
-HOMEPAGE= http://zookeeper.apache.org/
-LICENSE= apache-2.0
-
-PATCHDIR= ${.CURDIR}/../../wip/zookeeper-server/patches
-DISTINFO_FILE= ${.CURDIR}/../../wip/zookeeper-server/distinfo
diff --git a/zookeeper-server/PLIST b/zookeeper-server/PLIST
deleted file mode 100644
index d48a76d..0000000
--- a/zookeeper-server/PLIST
+++ /dev/null
@@ -1,71 +0,0 @@
-@comment $NetBSD$
-bin/zkCleanup.sh
-bin/zkCli.sh
-libexec/zkEnv.sh
-sbin/zkServer.sh
-share/examples/zookeeper/configuration.xsl
-share/examples/zookeeper/log4j.properties
-share/examples/zookeeper/zoo.cfg
-share/examples/zookeeper/zookeeper-env.sh
-share/zookeeper/cobertura/README.txt
-share/zookeeper/contrib/ZooInspector/zookeeper-${PKGVERSION}-ZooInspector.jar
-share/zookeeper/contrib/fatjar/zookeeper-${PKGVERSION}-fatjar.jar
-share/zookeeper/contrib/loggraph/zookeeper-${PKGVERSION}-loggraph.jar
-share/zookeeper/contrib/rest/zookeeper-${PKGVERSION}-rest.jar
-share/zookeeper/jdiff/zookeeper_3.1.1.xml
-share/zookeeper/jdiff/zookeeper_${PKGVERSION}-SNAPSHOT.xml
-share/zookeeper/jdiff/zookeeper_${PKGVERSION}.xml
-share/zookeeper/jline-0.9.94.LICENSE.txt
-share/zookeeper/jline-0.9.94.jar
-share/zookeeper/log4j-1.2.16.LICENSE.txt
-share/zookeeper/log4j-1.2.16.jar
-share/zookeeper/netty-3.7.0.Final.jar
-share/zookeeper/recipes/lock/build.xml
-share/zookeeper/recipes/lock/src/c/INSTALL
-share/zookeeper/recipes/lock/src/c/LICENSE
-share/zookeeper/recipes/lock/src/c/Makefile.am
-share/zookeeper/recipes/lock/src/c/README.txt
-share/zookeeper/recipes/lock/src/c/acinclude.m4
-share/zookeeper/recipes/lock/src/c/aminclude.am
-share/zookeeper/recipes/lock/src/c/c-doc.Doxyfile
-share/zookeeper/recipes/lock/src/c/configure.ac
-share/zookeeper/recipes/lock/src/c/include/zoo_lock.h
-share/zookeeper/recipes/lock/src/c/src/zoo_lock.c
-share/zookeeper/recipes/lock/src/c/tests/TestClient.cc
-share/zookeeper/recipes/lock/src/c/tests/TestDriver.cc
-share/zookeeper/recipes/lock/src/c/tests/Util.cc
-share/zookeeper/recipes/lock/src/c/tests/Util.h
-share/zookeeper/recipes/lock/src/c/tests/zkServer.sh
-share/zookeeper/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java
-share/zookeeper/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java
-share/zookeeper/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java
-share/zookeeper/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java
-share/zookeeper/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java
-share/zookeeper/recipes/lock/test/org/apache/zookeeper/recipes/lock/WriteLockTest.java
-share/zookeeper/recipes/lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java
-share/zookeeper/recipes/queue/build.xml
-share/zookeeper/recipes/queue/src/c/INSTALL
-share/zookeeper/recipes/queue/src/c/LICENSE
-share/zookeeper/recipes/queue/src/c/Makefile.am
-share/zookeeper/recipes/queue/src/c/README.txt
-share/zookeeper/recipes/queue/src/c/acinclude.m4
-share/zookeeper/recipes/queue/src/c/aminclude.am
-share/zookeeper/recipes/queue/src/c/c-doc.Doxyfile
-share/zookeeper/recipes/queue/src/c/configure.ac
-share/zookeeper/recipes/queue/src/c/include/zoo_queue.h
-share/zookeeper/recipes/queue/src/c/src/zoo_queue.c
-share/zookeeper/recipes/queue/src/c/tests/TestClient.cc
-share/zookeeper/recipes/queue/src/c/tests/TestDriver.cc
-share/zookeeper/recipes/queue/src/c/tests/Util.cc
-share/zookeeper/recipes/queue/src/c/tests/Util.h
-share/zookeeper/recipes/queue/src/c/tests/zkServer.sh
-share/zookeeper/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java
-share/zookeeper/recipes/queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java
-share/zookeeper/slf4j-api-1.6.1.jar
-share/zookeeper/slf4j-log4j12-1.6.1.jar
-share/zookeeper/templates/conf/zoo.cfg
-share/zookeeper/templates/conf/zookeeper-env.sh
-share/zookeeper/zookeeper-${PKGVERSION}.jar
-share/zookeeper/zookeeper-${PKGVERSION}.jar.md5
-share/zookeeper/zookeeper-${PKGVERSION}.jar.sha1
-@pkgdir share/zookeeper/recipes/election
diff --git a/zookeeper-server/distinfo b/zookeeper-server/distinfo
deleted file mode 100644
index d962ca5..0000000
--- a/zookeeper-server/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.4 2014/05/14 09:51:07 fhajny Exp $
-
-SHA1 (zookeeper-3.4.6.tar.gz) = 2a9e53f5990dfe0965834a525fbcad226bf93474
-RMD160 (zookeeper-3.4.6.tar.gz) = d9fadf07a40a85b8fd5a7e04e7200c74fd7393ce
-Size (zookeeper-3.4.6.tar.gz) = 17699306 bytes
-SHA1 (patch-bin_zkEnv.sh) = 210b94572a221cc46898750da0a822c90708ef9f
-SHA1 (patch-bin_zkServer.sh) = 2fd1d6c37aac2ee473b62de1ebf21ea8ad57ed75
-SHA1 (patch-build.xml) = 21ca6d1987ca3c64ee1b13bb77be981426e3ade6
-SHA1 (patch-conf__zoo_sample.cfg) = 74885bea53e5b9b723fb1564db362a08d7b47705
-SHA1 (patch-include_recordio.h) = ab07325a556eee1f6b595de241e9f7c7084c8065
-SHA1 (patch-src__zk_log.c) = 9dc6e801f53a96bf8b3ec1bac429f83a0ff2cae4
-SHA1 (patch-src_packages_templates_conf_zookeeper-env.sh) = 5abb72f885a5ac884dfcfa480438ce82d544d489
-SHA1 (patch-src_recordio.c) = 6c3082fba3d48d891276636aea400ad631fc5997
diff --git a/zookeeper-server/patches/patch-bin_zkEnv.sh b/zookeeper-server/patches/patch-bin_zkEnv.sh
deleted file mode 100644
index 3bf3cf2..0000000
--- a/zookeeper-server/patches/patch-bin_zkEnv.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bin_zkEnv.sh,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-Use a sane default prefix.
---- bin/zkEnv.sh.orig 2014-02-20 10:14:08.000000000 +0000
-+++ bin/zkEnv.sh
-@@ -23,7 +23,7 @@
- # or the conf directory that is
- # a sibling of this script's directory
-
--ZOOBINDIR="${ZOOBINDIR:-/usr/bin}"
-+ZOOBINDIR="${ZOOBINDIR:-@PREFIX@}"
- ZOOKEEPER_PREFIX="${ZOOBINDIR}/.."
-
- if [ "x$ZOOCFGDIR" = "x" ]
-@@ -112,4 +112,4 @@ then
- CLASSPATH=`cygpath -wp "$CLASSPATH"`
- fi
-
--#echo "CLASSPATH=$CLASSPATH"
-\ No newline at end of file
-+#echo "CLASSPATH=$CLASSPATH"
diff --git a/zookeeper-server/patches/patch-bin_zkServer.sh b/zookeeper-server/patches/patch-bin_zkServer.sh
deleted file mode 100644
index 566fc6b..0000000
--- a/zookeeper-server/patches/patch-bin_zkServer.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-bin_zkServer.sh,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-Use awk instead of grep/sed, and Bash echo for better portability.
---- bin/zkServer.sh.orig 2014-02-20 10:14:08.000000000 +0000
-+++ bin/zkServer.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/bash
-
- # Licensed to the Apache Software Foundation (ASF) under one or more
- # contributor license agreements. See the NOTICE file distributed with
-@@ -81,7 +81,7 @@ fi
- echo "Using config: $ZOOCFG" >&2
-
- if [ -z "$ZOOPIDFILE" ]; then
-- ZOO_DATADIR="$(grep "^[[:space:]]*dataDir" "$ZOOCFG" | sed -e 's/.*=//')"
-+ ZOO_DATADIR="$(awk -F= '{ if ($1=="dataDir") print $2}' "$ZOOCFG")"
- if [ ! -d "$ZOO_DATADIR" ]; then
- mkdir -p "$ZOO_DATADIR"
- fi
-@@ -110,7 +110,7 @@ start)
- -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" > "$_ZOO_DAEMON_OUT" 2>&1 < /dev/null &
- if [ $? -eq 0 ]
- then
-- if /bin/echo -n $! > "$ZOOPIDFILE"
-+ if echo -n $! > "$ZOOPIDFILE"
- then
- sleep 1
- echo STARTED
-@@ -161,12 +161,12 @@ restart)
- ;;
- status)
- # -q is necessary on some versions of linux where nc returns too quickly, and no stat result is output
-- clientPortAddress=`grep "^[[:space:]]*clientPortAddress[^[:alpha:]]" "$ZOOCFG" | sed -e 's/.*=//'`
-+ clientPortAddress=`awk -F= '{if ($1=="clientPortAddress") print $2}' "$ZOOCFG"`
- if ! [ $clientPortAddress ]
- then
- clientPortAddress="localhost"
- fi
-- clientPort=`grep "^[[:space:]]*clientPort[^[:alpha:]]" "$ZOOCFG" | sed -e 's/.*=//'`
-+ clientPort=`awk -F= '{if ($1=="clientPort") print $2}' "$ZOOCFG"`
- STAT=`"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
- -cp "$CLASSPATH" $JVMFLAGS org.apache.zookeeper.client.FourLetterWordMain \
- $clientPortAddress $clientPort srvr 2> /dev/null \
diff --git a/zookeeper-server/patches/patch-build.xml b/zookeeper-server/patches/patch-build.xml
deleted file mode 100644
index 200d7ea..0000000
--- a/zookeeper-server/patches/patch-build.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- build.xml.orig 2014-02-20 10:14:08.000000000 +0000
-+++ build.xml
-@@ -843,6 +843,10 @@ xmlns:maven="antlib:org.apache.maven.art
-
-
- <copy todir="${dist.dir}/bin">
-+ <fileset dir="bin" includes="zkCleanup*"/>
-+ </copy>
-+
-+ <copy todir="${dist.dir}/bin">
- <fileset dir="bin" includes="zkCli*"/>
- </copy>
-
diff --git a/zookeeper-server/patches/patch-conf__zoo_sample.cfg b/zookeeper-server/patches/patch-conf__zoo_sample.cfg
deleted file mode 100644
index 6df8045..0000000
--- a/zookeeper-server/patches/patch-conf__zoo_sample.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-conf__zoo_sample.cfg,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-Default paths.
---- conf/zoo_sample.cfg.orig 2014-02-20 10:14:08.000000000 +0000
-+++ conf/zoo_sample.cfg
-@@ -9,7 +9,7 @@ syncLimit=5
- # the directory where the snapshot is stored.
- # do not use /tmp for storage, /tmp here is just
- # example sakes.
--dataDir=/tmp/zookeeper
-+dataDir=@ZK_DB@
- # the port at which the clients will connect
- clientPort=2181
- # the maximum number of client connections.
diff --git a/zookeeper-server/patches/patch-include_recordio.h b/zookeeper-server/patches/patch-include_recordio.h
deleted file mode 100644
index d195379..0000000
--- a/zookeeper-server/patches/patch-include_recordio.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-include_recordio.h,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-SunOS has htonll since OpenSolaris.
---- src/c/include/recordio.h.orig 2014-02-20 10:14:08.000000000 +0000
-+++ src/c/include/recordio.h
-@@ -73,7 +73,10 @@ void close_buffer_iarchive(struct iarchi
- char *get_buffer(struct oarchive *);
- int get_buffer_len(struct oarchive *);
-
-+#ifndef __sun
-+/* Solaris already implements htonll */
- int64_t htonll(int64_t v);
-+#endif
-
- #ifdef __cplusplus
- }
diff --git a/zookeeper-server/patches/patch-src__zk_log.c b/zookeeper-server/patches/patch-src__zk_log.c
deleted file mode 100644
index d5cb2fd..0000000
--- a/zookeeper-server/patches/patch-src__zk_log.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src__zk_log.c,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-Needs to be cast as int.
---- src/c/src/zk_log.c.orig 2014-02-20 10:14:09.000000000 +0000
-+++ src/c/src/zk_log.c
-@@ -133,7 +133,7 @@ void log_message(ZooLogLevel curLevel,in
- #endif
- if(pid==0)pid=getpid();
- #ifndef THREADED
-- fprintf(LOGSTREAM, "%s:%d:%s@%s@%d: %s\n", time_now(get_time_buffer()),pid,
-+ fprintf(LOGSTREAM, "%s:%d:%s@%s@%d: %s\n", time_now(get_time_buffer()),(int)pid,
- dbgLevelStr[curLevel],funcName,line,message);
- #else
- #ifdef WIN32
diff --git a/zookeeper-server/patches/patch-src_packages_templates_conf_zookeeper-env.sh b/zookeeper-server/patches/patch-src_packages_templates_conf_zookeeper-env.sh
deleted file mode 100644
index 2ed6ea9..0000000
--- a/zookeeper-server/patches/patch-src_packages_templates_conf_zookeeper-env.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_packages_templates_conf_zookeeper-env.sh,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-Default paths.
---- src/packages/templates/conf/zookeeper-env.sh.orig 2014-02-20 10:14:10.000000000 +0000
-+++ src/packages/templates/conf/zookeeper-env.sh
-@@ -12,5 +12,5 @@
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
--export JAVA_HOME=${JAVA_HOME}
--export ZOO_LOG_DIR=${LOG_DIR}
-+export JAVA_HOME=@PKG_JAVA_HOME@
-+export ZOO_LOG_DIR=@ZK_LOG@
diff --git a/zookeeper-server/patches/patch-src_recordio.c b/zookeeper-server/patches/patch-src_recordio.c
deleted file mode 100644
index c77ed4a..0000000
--- a/zookeeper-server/patches/patch-src_recordio.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_recordio.c,v 1.2 2014/05/14 09:51:07 fhajny Exp $
-
-SunOS has had htonll since OpenSolaris.
---- src/c/src/recordio.c.orig 2014-02-20 10:14:08.000000000 +0000
-+++ src/c/src/recordio.c
-@@ -80,6 +80,7 @@ int oa_serialize_int(struct oarchive *oa
- priv->off+=sizeof(i);
- return 0;
- }
-+#ifndef __sun
- int64_t htonll(int64_t v)
- {
- int i = 0;
-@@ -95,6 +96,7 @@ int64_t htonll(int64_t v)
-
- return v;
- }
-+#endif
-
- int oa_serialize_long(struct oarchive *oa, const char *tag, const int64_t *d)
- {
Home |
Main Index |
Thread Index |
Old Index