Date: Fri, 3 Jul 2020 15:13:59 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541116 - in head: devel/libfastcommon devel/libfastcommon/files ftp/fastdfs ftp/fastdfs/files ftp/php-fastdfs ftp/php-fastdfs/files Message-ID: <202007031513.063FDx9D061304@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Fri Jul 3 15:13:58 2020 New Revision: 541116 URL: https://svnweb.freebsd.org/changeset/ports/541116 Log: Update to 6.06 PR: 246912 Submitted by: Daniel Ylitalo <daniel@blodan.se> (maintainer) Added: head/ftp/php-fastdfs/files/ head/ftp/php-fastdfs/files/patch-config.m4 (contents, props changed) Modified: head/devel/libfastcommon/Makefile head/devel/libfastcommon/distinfo head/devel/libfastcommon/files/patch-make.sh head/devel/libfastcommon/files/patch-src_Makefile.in head/devel/libfastcommon/files/patch-src_system__info.c head/devel/libfastcommon/pkg-plist head/ftp/fastdfs/Makefile head/ftp/fastdfs/distinfo head/ftp/fastdfs/files/patch-client-Makefile.in head/ftp/fastdfs/files/patch-conf-client.conf head/ftp/fastdfs/files/patch-conf-storage.conf head/ftp/fastdfs/files/patch-conf-tracker.conf head/ftp/fastdfs/files/patch-make.sh head/ftp/fastdfs/files/patch-storage-Makefile.in head/ftp/fastdfs/files/patch-tracker-Makefile.in head/ftp/fastdfs/pkg-descr head/ftp/fastdfs/pkg-plist head/ftp/php-fastdfs/Makefile head/ftp/php-fastdfs/distinfo Modified: head/devel/libfastcommon/Makefile ============================================================================== --- head/devel/libfastcommon/Makefile Fri Jul 3 14:54:09 2020 (r541115) +++ head/devel/libfastcommon/Makefile Fri Jul 3 15:13:58 2020 (r541116) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libfastcommon -PORTVERSION= 1.0.36 -PORTREVISION= 1 +PORTVERSION= 1.0.43 CATEGORIES= devel MAINTAINER= daniel@blodan.se @@ -12,7 +11,7 @@ LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= happyfish100 -GH_TAGNAME= aa4f5b2 +GH_TAGNAME= V1.0.43 USE_LDCONFIG= yes Modified: head/devel/libfastcommon/distinfo ============================================================================== --- head/devel/libfastcommon/distinfo Fri Jul 3 14:54:09 2020 (r541115) +++ head/devel/libfastcommon/distinfo Fri Jul 3 15:13:58 2020 (r541116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499761730 -SHA256 (happyfish100-libfastcommon-1.0.36-aa4f5b2_GH0.tar.gz) = 2c57ff7c5a14954c2073d252b4e9e4020b62aeecd47d51824d2f5f3d8229fad5 -SIZE (happyfish100-libfastcommon-1.0.36-aa4f5b2_GH0.tar.gz) = 434877 +TIMESTAMP = 1591013087 +SHA256 (happyfish100-libfastcommon-1.0.43-V1.0.43_GH0.tar.gz) = 05425aed8e6bc7ba283abba4e1bb500cc7f8c873c35bb86712d7123144a37b4c +SIZE (happyfish100-libfastcommon-1.0.43-V1.0.43_GH0.tar.gz) = 166526 Modified: head/devel/libfastcommon/files/patch-make.sh ============================================================================== --- head/devel/libfastcommon/files/patch-make.sh Fri Jul 3 14:54:09 2020 (r541115) +++ head/devel/libfastcommon/files/patch-make.sh Fri Jul 3 15:13:58 2020 (r541116) @@ -1,6 +1,6 @@ ---- make.sh.orig 2016-09-08 07:44:31 UTC +--- make.sh.orig 2019-12-25 12:35:44 UTC +++ make.sh -@@ -1,55 +1,15 @@ +@@ -1,57 +1,16 @@ -tmp_src_filename=fast_check_bits.c -cat <<EOF > $tmp_src_filename -#include <stdio.h> @@ -37,10 +37,13 @@ - - count=`$EXPR $count + 1` -done +- +-/bin/rm -f a.out $tmp_src_filename +unamep=$(/usr/bin/uname -p) --/bin/rm -f a.out $tmp_src_filename +-TARGET_PREFIX=$DESTDIR/usr -if [ "$int_bytes" -eq 8 ]; then ++TARGET_PREFIX=$DESTDIR$PREFIX +if [ "$unamep" = "amd64" -o "$unamep" = "x86_64" ]; then OS_BITS=64 - LIB_VERSION=lib64 @@ -61,7 +64,7 @@ DEBUG_FLAG=0 CFLAGS='-Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE' -@@ -67,12 +27,9 @@ HAVE_USER_H=0 +@@ -69,14 +28,9 @@ HAVE_USER_H=0 if [ "$uname" = "Linux" ]; then OS_NAME=OS_LINUX IOEVENT_USE=IOEVENT_USE_EPOLL @@ -71,16 +74,18 @@ IOEVENT_USE=IOEVENT_USE_KQUEUE - if [ "$uname" = "Darwin" ]; then - CFLAGS="$CFLAGS -DDARWIN" +- TARGET_PREFIX=$TARGET_PREFIX/local +- LIB_VERSION=lib - fi if [ -f /usr/include/sys/vmmeter.h ]; then HAVE_VMMETER_H=1 -@@ -138,7 +95,7 @@ sed_replace() +@@ -142,7 +96,7 @@ sed_replace() { sed_cmd=$1 filename=$2 - if [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then -+ if [ "$uname" = "FreeBSD" -o "$uname" = "DragonFly" ]; then ++ if [ "$uname" = "FreeBSD" -o "$name" = "DragonFly" ]; then sed -i "" "$sed_cmd" $filename else sed -i "$sed_cmd" $filename Modified: head/devel/libfastcommon/files/patch-src_Makefile.in ============================================================================== --- head/devel/libfastcommon/files/patch-src_Makefile.in Fri Jul 3 14:54:09 2020 (r541115) +++ head/devel/libfastcommon/files/patch-src_Makefile.in Fri Jul 3 15:13:58 2020 (r541116) @@ -1,28 +1,22 @@ ---- src/Makefile.in.orig 2016-09-08 07:44:31 UTC +--- src/Makefile.in.orig 2019-12-25 12:35:44 UTC +++ src/Makefile.in -@@ -41,7 +41,7 @@ ALL_LIBS = $(SHARED_LIBS) $(STATIC_LIBS) +@@ -51,7 +51,7 @@ ALL_LIBS = $(SHARED_LIBS) $(STATIC_LIBS) all: $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) - libfastcommon.so: -- $(COMPILE) -o $@ $< -shared $(FAST_SHARED_OBJS) $(LIB_PATH) -+ $(COMPILE) -o $@ $< -shared -Wl,-soname,libfastcommon.so $(FAST_SHARED_OBJS) $(LIB_PATH) + libfastcommon.so: $(FAST_SHARED_OBJS) +- $(COMPILE) -o $@ -shared $(FAST_SHARED_OBJS) $(LIB_PATH) ++ $(COMPILE) -o $@ -shared -Wl,-soname,libfastcommon.so $(FAST_SHARED_OBJS) $(LIB_PATH) libfastcommon.a: $(FAST_STATIC_OBJS) ar rcs $@ $(FAST_STATIC_OBJS) .o: -@@ -53,12 +53,10 @@ libfastcommon.a: $(FAST_STATIC_OBJS) - .c.lo: - $(COMPILE) -c -fPIC -o $@ $< $(INC_PATH) - install: -- mkdir -p $(DESTDIR)/usr/$(LIB_VERSION) -- mkdir -p $(DESTDIR)/usr/lib -- install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION) -- install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/lib -- mkdir -p $(DESTDIR)/usr/include/fastcommon -- install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon -+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIB_VERSION) -+ ${BSD_INSTALL_LIB} $(SHARED_LIBS) $(DESTDIR)$(PREFIX)/$(LIB_VERSION) -+ mkdir -p $(DESTDIR)$(PREFIX)/include/fastcommon -+ ${BSD_INSTALL_DATA} $(HEADER_FILES) $(DESTDIR)$(PREFIX)/include/fastcommon +@@ -67,8 +67,8 @@ install: + mkdir -p $(TARGET_PREFIX)/lib + mkdir -p $(TARGET_PREFIX)/include/fastcommon + +- install -m 755 $(SHARED_LIBS) $(TARGET_LIB) +- install -m 644 $(HEADER_FILES) $(TARGET_PREFIX)/include/fastcommon ++ ${BSD_INSTALL_LIB} $(SHARED_LIBS) $(TARGET_LIB) ++ ${BSD_INSTALL_DATA} $(HEADER_FILES) $(TARGET_PREFIX)/include/fastcommon + if [ ! -e $(TARGET_PREFIX)/lib/libfastcommon.so ]; then ln -s $(TARGET_LIB)/libfastcommon.so $(TARGET_PREFIX)/lib/libfastcommon.so; fi clean: rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) - Modified: head/devel/libfastcommon/files/patch-src_system__info.c ============================================================================== --- head/devel/libfastcommon/files/patch-src_system__info.c Fri Jul 3 14:54:09 2020 (r541115) +++ head/devel/libfastcommon/files/patch-src_system__info.c Fri Jul 3 15:13:58 2020 (r541116) @@ -1,6 +1,15 @@ ---- src/system_info.c.orig 2016-09-08 07:44:31 UTC +--- src/system_info.c.orig 2019-12-25 12:35:44 UTC +++ src/system_info.c -@@ -582,6 +582,20 @@ int get_sysinfo(struct fast_sysinfo*info +@@ -62,7 +62,7 @@ int get_sys_total_mem_size(int64_t *mem_ + size_t len; + + mib[0] = CTL_HW; +- mib[1] = HW_MEMSIZE; ++ mib[1] = HW_PHYSMEM; + len = sizeof(*mem_size); + if (sysctl(mib, 2, mem_size, &len, NULL, 0) != 0) + { +@@ -583,6 +583,20 @@ int get_sysinfo(struct fast_sysinfo*info #define ki_rgid kp_eproc.e_pcred.p_rgid #define GET_SIGNAL(sig) sig Modified: head/devel/libfastcommon/pkg-plist ============================================================================== --- head/devel/libfastcommon/pkg-plist Fri Jul 3 14:54:09 2020 (r541115) +++ head/devel/libfastcommon/pkg-plist Fri Jul 3 15:13:58 2020 (r541116) @@ -1,9 +1,11 @@ include/fastcommon/_os_define.h include/fastcommon/avl_tree.h include/fastcommon/base64.h +include/fastcommon/buffered_file_writer.h include/fastcommon/chain.h include/fastcommon/char_convert_loader.h include/fastcommon/char_converter.h +include/fastcommon/common_blocked_queue.h include/fastcommon/common_define.h include/fastcommon/connection_pool.h include/fastcommon/fast_allocator.h @@ -13,6 +15,7 @@ include/fastcommon/fast_mblock.h include/fastcommon/fast_mpool.h include/fastcommon/fast_task_queue.h include/fastcommon/fast_timer.h +include/fastcommon/fc_list.h include/fastcommon/flat_skiplist.h include/fastcommon/hash.h include/fastcommon/http_func.h @@ -20,10 +23,12 @@ include/fastcommon/id_generator.h include/fastcommon/ini_file_reader.h include/fastcommon/ioevent.h include/fastcommon/ioevent_loop.h +include/fastcommon/json_parser.h include/fastcommon/local_ip_func.h include/fastcommon/logger.h include/fastcommon/md5.h include/fastcommon/multi_skiplist.h +include/fastcommon/multi_socket_client.h include/fastcommon/php7_ext_wrapper.h include/fastcommon/process_ctrl.h include/fastcommon/pthread_func.h @@ -31,6 +36,7 @@ include/fastcommon/sched_thread.h include/fastcommon/shared_func.h include/fastcommon/skiplist.h include/fastcommon/skiplist_common.h +include/fastcommon/skiplist_set.h include/fastcommon/sockopt.h include/fastcommon/system_info.h lib/libfastcommon.so Modified: head/ftp/fastdfs/Makefile ============================================================================== --- head/ftp/fastdfs/Makefile Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/Makefile Fri Jul 3 15:13:58 2020 (r541116) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fastdfs -PORTVERSION= 5.0.11 -PORTREVISION= 1 +PORTVERSION= 6.0.6 CATEGORIES= ftp MAINTAINER= daniel@blodan.se @@ -25,7 +24,7 @@ GROUPS= _fastdfs USE_GITHUB= yes GH_ACCOUNT= happyfish100 -GH_TAGNAME= 1e50b4f +GH_TAGNAME= V6.06 SUB_FILES= fdfs_status Modified: head/ftp/fastdfs/distinfo ============================================================================== --- head/ftp/fastdfs/distinfo Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/distinfo Fri Jul 3 15:13:58 2020 (r541116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1502819381 -SHA256 (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 42ef67951c55fb416282cd20389dde5709016913debbb87465b9b744fa3dacf9 -SIZE (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 336996 +TIMESTAMP = 1591010695 +SHA256 (happyfish100-fastdfs-6.0.6-V6.06_GH0.tar.gz) = d724266719235c7901bf3281134903dfdbc925c44b4c4a9f7fb451ae916c80e1 +SIZE (happyfish100-fastdfs-6.0.6-V6.06_GH0.tar.gz) = 809328 Modified: head/ftp/fastdfs/files/patch-client-Makefile.in ============================================================================== --- head/ftp/fastdfs/files/patch-client-Makefile.in Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-client-Makefile.in Fri Jul 3 15:13:58 2020 (r541116) @@ -1,28 +1,25 @@ ---- client/Makefile.in.orig 2016-08-08 07:17:50 UTC +--- client/Makefile.in.orig 2019-12-30 23:36:03 UTC +++ client/Makefile.in -@@ -3,10 +3,10 @@ +@@ -3,8 +3,8 @@ 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 -LIB_PATH = $(LIBS) -lfastcommon -+INC_PATH = -I../common -I../tracker -I$(LOCALBASE)/include/fastcommon ++INC_PATH = -I../common -I../tracker -I$(LOCALBASE)/include +LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin --TARGET_LIB = $(TARGET_PREFIX)/lib64 -+TARGET_LIB = $(TARGET_PREFIX)/lib + TARGET_LIB = $(TARGET_PREFIX)/$(LIB_VERSION) 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 ++ -Wl,-soname,libfdfsclient.so libfdfsclient.a: - ar cru $@ $< $(FDFS_STATIC_OBJS) + ar rcs $@ $< $(FDFS_STATIC_OBJS) .o: @@ -66,9 +67,9 @@ install: mkdir -p $(CONFIG_PATH) Modified: head/ftp/fastdfs/files/patch-conf-client.conf ============================================================================== --- head/ftp/fastdfs/files/patch-conf-client.conf Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-conf-client.conf Fri Jul 3 15:13:58 2020 (r541116) @@ -1,11 +1,11 @@ ---- conf/client.conf.orig 2016-08-08 07:17:50 UTC +--- conf/client.conf.orig 2019-12-30 23:36:03 UTC +++ conf/client.conf -@@ -7,7 +7,7 @@ connect_timeout=30 - network_timeout=60 +@@ -8,7 +8,7 @@ connect_timeout = 5 + network_timeout = 60 # the base path to store log files --base_path=/home/yuqing/fastdfs -+base_path=/var/db/fastdfs +-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 + # tracker_server can ocur more than once for multi tracker servers. + # the value format of tracker_server is "HOST:PORT", Modified: head/ftp/fastdfs/files/patch-conf-storage.conf ============================================================================== --- head/ftp/fastdfs/files/patch-conf-storage.conf Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-conf-storage.conf Fri Jul 3 15:13:58 2020 (r541116) @@ -1,36 +1,36 @@ ---- conf/storage.conf.orig 2016-08-08 07:17:50 UTC +--- conf/storage.conf.orig 2019-12-30 23:36:03 UTC +++ conf/storage.conf -@@ -38,7 +38,7 @@ heart_beat_interval=30 - stat_report_interval=60 +@@ -46,7 +46,7 @@ stat_report_interval = 60 + # NOTE: the binlog files maybe are large, make sure + # the base path has enough disk space, + # eg. the disk free space should > 50GB +-base_path = /home/yuqing/fastdfs ++base_path = /var/db/fastdfs/storage - # 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, + # you should set this parameter larger, eg. 10240 +@@ -126,8 +126,8 @@ store_path_count = 1 + # the store paths' order is very important, don't mess up!!! + # the base_path should be independent (different) of the store paths - # max concurrent connections the server supported - # default value is 256 -@@ -106,8 +106,8 @@ store_path_count=1 +-store_path0 = /home/yuqing/fastdfs +-#store_path1 = /home/yuqing/fastdfs2 ++store_path0 = /var/db/fastdfs/storage ++#store_path1 = /var/db/fastdfs/storage2 - # 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 +@@ -158,11 +158,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 +-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 +-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 Modified: head/ftp/fastdfs/files/patch-conf-tracker.conf ============================================================================== --- head/ftp/fastdfs/files/patch-conf-tracker.conf Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-conf-tracker.conf Fri Jul 3 15:13:58 2020 (r541116) @@ -1,15 +1,15 @@ ---- conf/tracker.conf.orig 2016-08-08 07:17:50 UTC +--- conf/tracker.conf.orig 2019-12-30 23:36:03 UTC +++ conf/tracker.conf -@@ -19,7 +19,7 @@ connect_timeout=30 - network_timeout=60 +@@ -20,7 +20,7 @@ connect_timeout = 5 + network_timeout = 60 # the base path to store data and log files --base_path=/home/yuqing/fastdfs -+base_path=/var/db/fastdfs/tracker +-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 + # max concurrent connections this server support + # you should set this parameter larger, eg. 10240 +@@ -97,11 +97,11 @@ log_level = info #unix group name to run this program, #not set (empty) means run by the group of current user @@ -18,8 +18,8 @@ #unix username to run this program, #not set (empty) means run by current user --run_by_user= -+run_by_user=_fastdfs +-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 Modified: head/ftp/fastdfs/files/patch-make.sh ============================================================================== --- head/ftp/fastdfs/files/patch-make.sh Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-make.sh Fri Jul 3 15:13:58 2020 (r541116) @@ -1,56 +1,6 @@ ---- make.sh.orig 2016-08-08 07:17:50 UTC +--- make.sh.orig 2019-12-30 23:36:03 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 - +@@ -1,10 +1,10 @@ ENABLE_STATIC_LIB=0 ENABLE_SHARED_LIB=1 -TARGET_PREFIX=$DESTDIR/usr @@ -64,19 +14,37 @@ DEBUG_FLAG=1 -@@ -74,7 +35,7 @@ if [ "$uname" = "Linux" ]; then +@@ -25,15 +25,7 @@ fi + + uname=$(uname) + +-if [ "$OS_BITS" -eq 64 ]; then +- if [ "$uname" = "Darwin" ]; then +- LIB_VERSION=lib +- else +- LIB_VERSION=lib64 +- fi +-else +- LIB_VERSION=lib +-fi ++LIB_VERSION=lib + + LIBS='' + +@@ -46,7 +38,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" ++ LIBS="$LIBS -L$PREFIX/lib" CFLAGS="$CFLAGS" if [ "$uname" = "Darwin" ]; then CFLAGS="$CFLAGS -DDARWIN" -@@ -180,26 +141,3 @@ perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Mak +@@ -153,29 +145,3 @@ perl -pi -e "s#\\\$\(CFLAGS\)#$CFLAGS#g" + perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Makefile perl -pi -e "s#\\\$\(TARGET_PREFIX\)#$TARGET_PREFIX#g" Makefile cd .. - +- -if [ "$1" = "install" ]; then - cd .. - cp -f restart.sh $TARGET_PREFIX/bin @@ -90,6 +58,8 @@ - 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 +- cp -f conf/http.conf $TARGET_CONF_PATH/http.conf.sample +- cp -f conf/mime.types $TARGET_CONF_PATH/mime.types.sample - fi - mkdir -p $TARGET_INIT_PATH - cp -f init.d/fdfs_trackerd $TARGET_INIT_PATH Modified: head/ftp/fastdfs/files/patch-storage-Makefile.in ============================================================================== --- head/ftp/fastdfs/files/patch-storage-Makefile.in Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-storage-Makefile.in Fri Jul 3 15:13:58 2020 (r541116) @@ -1,4 +1,4 @@ ---- storage/Makefile.in.orig 2016-08-08 07:17:50 UTC +--- storage/Makefile.in.orig 2019-12-30 23:36:03 UTC +++ storage/Makefile.in @@ -1,8 +1,8 @@ .SUFFIXES: .c .o @@ -6,12 +6,12 @@ COMPILE = $(CC) $(CFLAGS) -INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon -LIB_PATH = $(LIBS) -lfastcommon -+INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I$(LOCALBASE)/include/fastcommon ++INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I$(LOCALBASE)/include +LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin CONFIG_PATH = $(TARGET_CONF_PATH) -@@ -34,7 +34,7 @@ all: $(ALL_OBJS) $(ALL_PRGS) +@@ -35,7 +35,7 @@ all: $(ALL_OBJS) $(ALL_PRGS) install: mkdir -p $(TARGET_PATH) mkdir -p $(CONFIG_PATH) Modified: head/ftp/fastdfs/files/patch-tracker-Makefile.in ============================================================================== --- head/ftp/fastdfs/files/patch-tracker-Makefile.in Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/files/patch-tracker-Makefile.in Fri Jul 3 15:13:58 2020 (r541116) @@ -1,23 +1,22 @@ ---- tracker/Makefile.in.orig 2016-08-08 07:17:50 UTC +--- tracker/Makefile.in.orig 2019-12-30 23:36:03 UTC +++ tracker/Makefile.in @@ -1,8 +1,8 @@ .SUFFIXES: .c .o COMPILE = $(CC) $(CFLAGS) --INC_PATH = -I../common -I/usr/include/fastcommon +-INC_PATH = -I../common -I/usr/local/include -LIB_PATH = $(LIBS) -lfastcommon -+INC_PATH = -I../common -I$(LOCALBASE)/include/fastcommon ++INC_PATH = -I../common -I$(LOCALBASE)/include +LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin CONFIG_PATH = $(TARGET_CONF_PATH) -@@ -26,7 +26,8 @@ all: $(ALL_OBJS) $(ALL_PRGS) +@@ -26,7 +26,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)/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 + 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) Modified: head/ftp/fastdfs/pkg-descr ============================================================================== --- head/ftp/fastdfs/pkg-descr Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/pkg-descr Fri Jul 3 15:13:58 2020 (r541116) @@ -1,5 +1,5 @@ -FastDFS is an open source high performance distributed file system (DFS). -It's major functions include: file storing, file syncing and +FastDFS is an open source high performance distributed file system (DFS). +It's major functions include: file storing, file syncing and file accessing, and design for high capacity and load balance. WWW: https://github.com/happyfish100/fastdfs Modified: head/ftp/fastdfs/pkg-plist ============================================================================== --- head/ftp/fastdfs/pkg-plist Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/fastdfs/pkg-plist Fri Jul 3 15:13:58 2020 (r541116) @@ -6,6 +6,7 @@ bin/fdfs_delete_file bin/fdfs_download_file bin/fdfs_file_info bin/fdfs_monitor +bin/fdfs_regenerate_filename bin/fdfs_status bin/fdfs_storaged bin/fdfs_test @@ -23,6 +24,7 @@ include/fastdfs/fdfs_client.h include/fastdfs/fdfs_define.h include/fastdfs/fdfs_global.h include/fastdfs/fdfs_http_shared.h +include/fastdfs/fdfs_server_id_func.h include/fastdfs/fdfs_shared_func.h include/fastdfs/mime_file_parser.h include/fastdfs/storage_client.h Modified: head/ftp/php-fastdfs/Makefile ============================================================================== --- head/ftp/php-fastdfs/Makefile Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/php-fastdfs/Makefile Fri Jul 3 15:13:58 2020 (r541116) @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= fastdfs -DISTVERSION= 5.0.11 +DISTVERSION= 6.0.6 CATEGORIES= ftp PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= daniel@blodan.se -COMMENT?= PHP module for accessing a FastDFS cluster +COMMENT= PHP module for accessing a FastDFS cluster LICENSE= GPLv3+ LIB_DEPENDS= libfastcommon.so:devel/libfastcommon \ libfdfsclient.so:ftp/fastdfs +USES= php:ext + USE_GITHUB= yes GH_ACCOUNT= happyfish100 GH_PROJECT= fastdfs -GH_TAGNAME= 1e50b4f - -USES= php:ext +GH_TAGNAME= V6.06 WRKSRC_SUBDIR= php_client CONFIGURE_ENV= ROOT=${LOCALBASE} Modified: head/ftp/php-fastdfs/distinfo ============================================================================== --- head/ftp/php-fastdfs/distinfo Fri Jul 3 14:54:09 2020 (r541115) +++ head/ftp/php-fastdfs/distinfo Fri Jul 3 15:13:58 2020 (r541116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1502819567 -SHA256 (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 42ef67951c55fb416282cd20389dde5709016913debbb87465b9b744fa3dacf9 -SIZE (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 336996 +TIMESTAMP = 1591016269 +SHA256 (happyfish100-fastdfs-6.0.6-V6.06_GH0.tar.gz) = d724266719235c7901bf3281134903dfdbc925c44b4c4a9f7fb451ae916c80e1 +SIZE (happyfish100-fastdfs-6.0.6-V6.06_GH0.tar.gz) = 809328 Added: head/ftp/php-fastdfs/files/patch-config.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/php-fastdfs/files/patch-config.m4 Fri Jul 3 15:13:58 2020 (r541116) @@ -0,0 +1,11 @@ +--- config.m4.orig 2019-12-30 23:36:03 UTC ++++ config.m4 +@@ -10,7 +10,7 @@ if test "$PHP_FASTDFS_CLIENT" != "no"; t + ROOT=/usr + fi + +- PHP_ADD_INCLUDE($ROOT/local/include) ++ PHP_ADD_INCLUDE($ROOT/include) + + PHP_ADD_LIBRARY_WITH_PATH(fastcommon, $ROOT/lib, FASTDFS_CLIENT_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(fdfsclient, $ROOT/lib, FASTDFS_CLIENT_SHARED_LIBADD)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007031513.063FDx9D061304>