9 files changed, 345 insertions, 0 deletions
diff --git a/ftp/fastdfs/files/fdfs_storaged.in b/ftp/fastdfs/files/fdfs_storaged.in
new file mode 100644
index 000000000000..09a6e52ebb29
--- /dev/null
+++ b/ftp/fastdfs/files/fdfs_storaged.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: fdfs_storaged
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable `fdfs_storaged':
+#
+# fdfs_storaged_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="fdfs_storaged"
+rcvar=fdfs_storaged_enable
+
+command="%%PREFIX%%/bin/fdfs_storaged"
+pidfile="/var/run/fdfs_storaged.pid"
+
+start_postcmd="${name}_poststart"
+stop_postcmd="rm ${pidfile}"
+
+fdfs_storaged_poststart()
+{
+        /bin/ps auxwww|/usr/bin/grep fdfs_storaged|/usr/bin/grep -v 'grep'|grep -v 'rc.d'|/usr/bin/awk '{print $2;}' > /var/run/fdfs_storaged.pid
+
+        currpid=`/bin/cat /var/run/fdfs_storaged.pid`
+
+        if [ "$currpid" -gt 0 ]; then
+                echo "Started fdfs_storaged."
+        fi
+}
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${fdfs_storaged_enable="NO"}
+: ${fdfs_storaged_config="%%PREFIX%%/etc/fdfs/storage.conf"}
+
+command_args="${fdfs_storaged_config}"
+required_files="${fdfs_storaged_config}"
+
+run_rc_command "$1"
+
diff --git a/ftp/fastdfs/files/fdfs_trackerd.in b/ftp/fastdfs/files/fdfs_trackerd.in
new file mode 100644
index 000000000000..66739d6ad8be
--- /dev/null
+++ b/ftp/fastdfs/files/fdfs_trackerd.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: fdfs_trackerd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable `fdfs_trackerd':
+#
+# fdfs_trackerd_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="fdfs_trackerd"
+rcvar=fdfs_trackerd_enable
+
+command="%%PREFIX%%/bin/fdfs_trackerd"
+pidfile="/var/run/fdfs_trackerd.pid"
+
+start_postcmd="${name}_poststart"
+stop_postcmd="rm ${pidfile}"
+
+fdfs_trackerd_poststart()
+{
+        /bin/ps auxwww|/usr/bin/grep fdfs_trackerd|/usr/bin/grep -v 'grep'|grep -v 'rc.d'|/usr/bin/awk '{print $2;}' > /var/run/fdfs_trackerd.pid
+
+        currpid=`/bin/cat /var/run/fdfs_trackerd.pid`
+
+        if [ "$currpid" -gt 0 ]; then
+                echo "Started fdfs_trackerd."
+        fi
+}
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${fdfs_trackerd_enable="NO"}
+: ${fdfs_trackerd_config="%%PREFIX%%/etc/fdfs/tracker.conf"}
+
+command_args="${fdfs_trackerd_config}"
+required_files="${fdfs_trackerd_config}"
+
+run_rc_command "$1"
+
diff --git a/ftp/fastdfs/files/patch-client-Makefile.in b/ftp/fastdfs/files/patch-client-Makefile.in
new file mode 100644
index 000000000000..9d31939b16f8
--- /dev/null
+++ b/ftp/fastdfs/files/patch-client-Makefile.in
@@ -0,0 +1,38 @@
+--- client/Makefile.in.orig	2016-08-08 07:17:50 UTC
++++ client/Makefile.in
+@@ -3,10 +3,10 @@
+ COMPILE = $(CC) $(CFLAGS)
+ ENABLE_STATIC_LIB = $(ENABLE_STATIC_LIB)
+ ENABLE_SHARED_LIB = $(ENABLE_SHARED_LIB)
+-INC_PATH = -I../common -I../tracker -I/usr/include/fastcommon
++INC_PATH = -I../common -I../tracker -I$(LOCALBASE)/include/fastcommon
+ LIB_PATH = $(LIBS) -lfastcommon
+ TARGET_PATH = $(TARGET_PREFIX)/bin
+-TARGET_LIB = $(TARGET_PREFIX)/lib64
++TARGET_LIB = $(TARGET_PREFIX)/lib
+ TARGET_INC = $(TARGET_PREFIX)/include
+ CONFIG_PATH = $(TARGET_CONF_PATH)
+ 
+@@ -50,7 +50,8 @@ ALL_LIBS = $(STATIC_LIBS) $(SHARED_LIBS)
+ 
+ all: $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)
+ libfdfsclient.so:
+-	$(COMPILE) -o $@ $< -shared $(FDFS_SHARED_OBJS) $(LIB_PATH)
++	$(COMPILE) -o $@ $< -shared $(FDFS_SHARED_OBJS) $(LIB_PATH) \
++	    -Wl,-soname,libfdfsclient.so
+ libfdfsclient.a:
+ 	ar cru $@ $< $(FDFS_STATIC_OBJS)
+ .o:
+@@ -66,9 +67,9 @@ install:
+ 	mkdir -p $(CONFIG_PATH)
+ 	mkdir -p $(TARGET_LIB)
+ 	mkdir -p $(TARGET_PREFIX)/lib
+-	cp -f $(ALL_PRGS) $(TARGET_PATH)
+-	if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then cp -f $(STATIC_LIBS) $(TARGET_LIB); cp -f $(STATIC_LIBS) $(TARGET_PREFIX)/lib/;fi
+-	if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then cp -f $(CLIENT_SHARED_LIBS) $(TARGET_LIB); cp -f $(CLIENT_SHARED_LIBS) $(TARGET_PREFIX)/lib/;fi
++	install -s $(ALL_PRGS) $(TARGET_PATH)
++	if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then install -s $(STATIC_LIBS) $(TARGET_LIB); install -s $(STATIC_LIBS) $(TARGET_PREFIX)/lib/;fi
++	if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then install -s $(CLIENT_SHARED_LIBS) $(TARGET_LIB); install -s $(CLIENT_SHARED_LIBS) $(TARGET_PREFIX)/lib/;fi
+ 
+ 	mkdir -p $(TARGET_INC)/fastdfs
+ 	cp -f $(FDFS_HEADER_FILES) $(TARGET_INC)/fastdfs
diff --git a/ftp/fastdfs/files/patch-conf-client.conf b/ftp/fastdfs/files/patch-conf-client.conf
new file mode 100644
index 000000000000..161990d6dd6a
--- /dev/null
+++ b/ftp/fastdfs/files/patch-conf-client.conf
@@ -0,0 +1,11 @@
+--- conf/client.conf.orig	2016-08-08 07:17:50 UTC
++++ conf/client.conf
+@@ -7,7 +7,7 @@ connect_timeout=30
+ network_timeout=60
+ 
+ # the base path to store log files
+-base_path=/home/yuqing/fastdfs
++base_path=/var/db/fastdfs
+ 
+ # tracker_server can ocur more than once, and tracker_server format is
+ #  "host:port", host can be hostname or ip address
diff --git a/ftp/fastdfs/files/patch-conf-storage.conf b/ftp/fastdfs/files/patch-conf-storage.conf
new file mode 100644
index 000000000000..51b71c74fa2d
--- /dev/null
+++ b/ftp/fastdfs/files/patch-conf-storage.conf
@@ -0,0 +1,36 @@
+--- conf/storage.conf.orig	2016-08-08 07:17:50 UTC
++++ conf/storage.conf
+@@ -38,7 +38,7 @@ heart_beat_interval=30
+ stat_report_interval=60
+ 
+ # the base path to store data and log files
+-base_path=/home/yuqing/fastdfs
++base_path=/var/db/fastdfs/storage
+ 
+ # max concurrent connections the server supported
+ # default value is 256
+@@ -106,8 +106,8 @@ store_path_count=1
+ 
+ # store_path#, based 0, if store_path0 not exists, it's value is base_path
+ # the paths must be exist
+-store_path0=/home/yuqing/fastdfs
+-#store_path1=/home/yuqing/fastdfs2
++store_path0=/var/db/fastdfs/storage
++#store_path1=/var/db/fastdfs/storage2
+ 
+ # subdir_count  * subdir_count directories will be auto created under each 
+ # store_path (disk), value can be 1 to 256, default value is 256
+@@ -130,11 +130,11 @@ log_level=info
+ 
+ #unix group name to run this program, 
+ #not set (empty) means run by the group of current user
+-run_by_group=
++run_by_group=_fastdfs
+ 
+ #unix username to run this program,
+ #not set (empty) means run by current user
+-run_by_user=
++run_by_user=_fastdfs
+ 
+ # allow_hosts can ocur more than once, host can be hostname or ip address,
+ # "*" (only one asterisk) means match all ip addresses
diff --git a/ftp/fastdfs/files/patch-conf-tracker.conf b/ftp/fastdfs/files/patch-conf-tracker.conf
new file mode 100644
index 000000000000..42ff48d4e902
--- /dev/null
+++ b/ftp/fastdfs/files/patch-conf-tracker.conf
@@ -0,0 +1,25 @@
+--- conf/tracker.conf.orig	2016-08-08 07:17:50 UTC
++++ conf/tracker.conf
+@@ -19,7 +19,7 @@ connect_timeout=30
+ network_timeout=60
+ 
+ # the base path to store data and log files
+-base_path=/home/yuqing/fastdfs
++base_path=/var/db/fastdfs/tracker
+ 
+ # max concurrent connections this server supported
+ max_connections=256
+@@ -85,11 +85,11 @@ log_level=info
+ 
+ #unix group name to run this program, 
+ #not set (empty) means run by the group of current user
+-run_by_group=
++run_by_group=_fastdfs
+ 
+ #unix username to run this program,
+ #not set (empty) means run by current user
+-run_by_user=
++run_by_user=_fastdfs
+ 
+ # allow_hosts can ocur more than once, host can be hostname or ip address,
+ # "*" (only one asterisk) means match all ip addresses
diff --git a/ftp/fastdfs/files/patch-make.sh b/ftp/fastdfs/files/patch-make.sh
new file mode 100644
index 000000000000..50e709575b69
--- /dev/null
+++ b/ftp/fastdfs/files/patch-make.sh
@@ -0,0 +1,102 @@
+--- make.sh.orig	2016-08-08 07:17:50 UTC
++++ make.sh
+@@ -1,58 +1,19 @@
+-tmp_src_filename=fdfs_check_bits.c
+-cat <<EOF > $tmp_src_filename
+-#include <stdio.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-int main()
+-{
+-	printf("%d\n", (int)sizeof(long));
+-	printf("%d\n", (int)sizeof(off_t));
+-	return 0;
+-}
+-EOF
+-
+-gcc -D_FILE_OFFSET_BITS=64 -o a.out $tmp_src_filename
+-output=$(./a.out)
+ 
+-if [ -f /bin/expr ]; then
+-  EXPR=/bin/expr
+-else
+-  EXPR=/usr/bin/expr
+-fi
+-
+-count=0
+-int_bytes=4
+-off_bytes=8
+-for col in $output; do
+-    if [ $count -eq 0 ]; then
+-        int_bytes=$col
+-    else
+-        off_bytes=$col
+-    fi
+-
+-    count=$($EXPR $count + 1)
+-done
+-
+-/bin/rm -f a.out $tmp_src_filename
+-if [ "$int_bytes" -eq 8 ]; then
++if [ "$(/usr/bin/uname -m)" = "amd64"  ]; then
+  OS_BITS=64
+-else
+- OS_BITS=32
+-fi
+-
+-if [ "$off_bytes" -eq 8 ]; then
+  OFF_BITS=64
+ else
++ OS_BITS=32
+  OFF_BITS=32
+ fi
+ 
+ ENABLE_STATIC_LIB=0
+ ENABLE_SHARED_LIB=1
+-TARGET_PREFIX=$DESTDIR/usr
+-TARGET_CONF_PATH=$DESTDIR/etc/fdfs
++TARGET_PREFIX=$DESTDIR$PREFIX
++TARGET_CONF_PATH=$DESTDIR$PREFIX/etc/fdfs
+ TARGET_INIT_PATH=$DESTDIR/etc/init.d
+ 
+-WITH_LINUX_SERVICE=1
++WITH_LINUX_SERVICE=0
+ 
+ DEBUG_FLAG=1
+ 
+@@ -74,7 +35,7 @@ if [ "$uname" = "Linux" ]; then
+   fi
+   CFLAGS="$CFLAGS"
+ elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
+-  LIBS="$LIBS -L/usr/lib"
++  LIBS="$LIBS -L/usr/local/lib"
+   CFLAGS="$CFLAGS"
+   if [ "$uname" = "Darwin" ]; then
+     CFLAGS="$CFLAGS -DDARWIN"
+@@ -180,26 +141,3 @@ perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Mak
+ perl -pi -e "s#\\\$\(TARGET_PREFIX\)#$TARGET_PREFIX#g" Makefile
+ cd ..
+ 
+-if [ "$1" = "install" ]; then
+-  cd ..
+-  cp -f restart.sh $TARGET_PREFIX/bin
+-  cp -f stop.sh $TARGET_PREFIX/bin
+-
+-  if [ "$uname" = "Linux" ]; then
+-    if [ "$WITH_LINUX_SERVICE" = "1" ]; then
+-      if [ ! -d /etc/fdfs ]; then
+-        mkdir -p /etc/fdfs
+-        cp -f conf/tracker.conf $TARGET_CONF_PATH/tracker.conf.sample
+-        cp -f conf/storage.conf $TARGET_CONF_PATH/storage.conf.sample
+-        cp -f conf/client.conf $TARGET_CONF_PATH/client.conf.sample
+-        cp -f conf/storage_ids.conf $TARGET_CONF_PATH/storage_ids.conf.sample
+-      fi
+-      mkdir -p $TARGET_INIT_PATH
+-      cp -f init.d/fdfs_trackerd $TARGET_INIT_PATH
+-      cp -f init.d/fdfs_storaged $TARGET_INIT_PATH
+-#      /sbin/chkconfig --add fdfs_trackerd 
+-#      /sbin/chkconfig --add fdfs_storaged
+-    fi
+-  fi
+-fi
+-
diff --git a/ftp/fastdfs/files/patch-storage-Makefile.in b/ftp/fastdfs/files/patch-storage-Makefile.in
new file mode 100644
index 000000000000..6db80da6b740
--- /dev/null
+++ b/ftp/fastdfs/files/patch-storage-Makefile.in
@@ -0,0 +1,20 @@
+--- storage/Makefile.in.orig	2016-08-08 07:17:50 UTC
++++ storage/Makefile.in
+@@ -1,7 +1,7 @@
+ .SUFFIXES: .c .o
+ 
+ COMPILE = $(CC) $(CFLAGS)
+-INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon
++INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I$(LOCALBASE)/include/fastcommon
+ LIB_PATH = $(LIBS)  -lfastcommon
+ TARGET_PATH = $(TARGET_PREFIX)/bin
+ CONFIG_PATH = $(TARGET_CONF_PATH)
+@@ -34,7 +34,7 @@ all: $(ALL_OBJS) $(ALL_PRGS)
+ install:
+ 	mkdir -p $(TARGET_PATH)
+ 	mkdir -p $(CONFIG_PATH)
+-	cp -f $(ALL_PRGS) $(TARGET_PATH)
++	install -s $(ALL_PRGS) $(TARGET_PATH)
+ 	if [ ! -f $(CONFIG_PATH)/storage.conf.sample ]; then cp -f ../conf/storage.conf $(CONFIG_PATH)/storage.conf.sample; fi
+ clean:
+ 	rm -f $(ALL_OBJS) $(ALL_PRGS)
diff --git a/ftp/fastdfs/files/patch-tracker-Makefile.in b/ftp/fastdfs/files/patch-tracker-Makefile.in
new file mode 100644
index 000000000000..1ee70efc45e5
--- /dev/null
+++ b/ftp/fastdfs/files/patch-tracker-Makefile.in
@@ -0,0 +1,21 @@
+--- tracker/Makefile.in.orig	2016-08-08 07:17:50 UTC
++++ tracker/Makefile.in
+@@ -1,7 +1,7 @@
+ .SUFFIXES: .c .o
+ 
+ COMPILE = $(CC) $(CFLAGS)
+-INC_PATH = -I../common -I/usr/include/fastcommon
++INC_PATH = -I../common -I$(LOCALBASE)/include/fastcommon
+ LIB_PATH = $(LIBS) -lfastcommon
+ TARGET_PATH = $(TARGET_PREFIX)/bin
+ CONFIG_PATH = $(TARGET_CONF_PATH)
+@@ -26,7 +26,8 @@ all: $(ALL_OBJS) $(ALL_PRGS)
+ install:
+ 	mkdir -p $(TARGET_PATH)
+ 	mkdir -p $(CONFIG_PATH)
+-	cp -f $(ALL_PRGS) $(TARGET_PATH)
++	install -s $(ALL_PRGS) $(TARGET_PATH)
+ 	if [ ! -f $(CONFIG_PATH)/tracker.conf.sample ]; then cp -f ../conf/tracker.conf $(CONFIG_PATH)/tracker.conf.sample; fi
++	if [ ! -f $(CONFIG_PATH)/storage_ids.conf.sample ]; then cp -f ../conf/storage_ids.conf $(CONFIG_PATH)/storage_ids.conf.sample; fi
+ clean:
+ 	rm -f $(ALL_OBJS) $(ALL_PRGS)