Index: GIDs
===================================================================
--- GIDs (revision 423513)
+++ GIDs (working copy)
@@ -254,7 +254,7 @@
# free: 310
# free: 311
_sphinx:*:312:
-# free: 313
+_fastdfs:*:313:
# free: 314
# free: 315
# free: 316
Index: UIDs
===================================================================
--- UIDs (revision 423513)
+++ UIDs (working copy)
@@ -259,7 +259,7 @@
# free: 310
# free: 311
_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin
-# free: 313
+_fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin
# free: 314
# free: 315
# free: 316
Index: devel/Makefile
===================================================================
--- devel/Makefile (revision 423513)
+++ devel/Makefile (working copy)
@@ -1234,6 +1234,7 @@
SUBDIR += libewf
SUBDIR += libexecinfo
SUBDIR += libexplain
+ SUBDIR += libfastcommon
SUBDIR += libfastjson
SUBDIR += libffi
SUBDIR += libfirm
Index: devel/libfastcommon/Makefile
===================================================================
--- devel/libfastcommon/Makefile (nonexistent)
+++ devel/libfastcommon/Makefile (working copy)
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME= libfastcommon
+PORTVERSION= 1.30
+CATEGORIES= devel
+
+LICENSE= GPLv3
+
+MAINTAINER= daniel@blodan.se
+
+USE_GITHUB= yes
+GH_ACCOUNT= happyfish100
+GH_PROJECT= libfastcommon
+GH_TAGNAME= b80de986b2a269cd15d56e4978c6df844a9c2e59
+
+do-build:
+ cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|DESTDIR =|DESTDIR = ${STAGEDIR}|' src/Makefile.in && ${SETENV} ${MAKE_ENV} ${SH} make.sh
+
+do-install:
+ cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} make.sh install
+
+.include <bsd.port.mk>
Property changes on: devel/libfastcommon/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/libfastcommon/distinfo
===================================================================
--- devel/libfastcommon/distinfo (nonexistent)
+++ devel/libfastcommon/distinfo (working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1475950577
+SHA256 (happyfish100-libfastcommon-1.30-b80de986b2a269cd15d56e4978c6df844a9c2e59_GH0.tar.gz) = 9be2ee4a33fe8a359f9ddf9afd561afc9a43b1fa3e520c8104a0ba3294e129f3
+SIZE (happyfish100-libfastcommon-1.30-b80de986b2a269cd15d56e4978c6df844a9c2e59_GH0.tar.gz) = 121845
Property changes on: devel/libfastcommon/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/libfastcommon/files/patch-make.sh
===================================================================
--- devel/libfastcommon/files/patch-make.sh (nonexistent)
+++ devel/libfastcommon/files/patch-make.sh (working copy)
@@ -0,0 +1,60 @@
+--- make.sh.orig 2016-09-08 09:44:31.000000000 +0200
++++ make.sh 2016-10-07 14:54:11.931652000 +0200
+@@ -1,53 +1,11 @@
+-tmp_src_filename=fast_check_bits.c
+-cat <<EOF > $tmp_src_filename
+-#include <stdio.h>
+-#include <unistd.h>
+-#include <fcntl.h>
+-int main()
+-{
+- printf("%d\n", (int)sizeof(void*));
+- 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
+-LIB_VERSION=lib64
+-
+-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
+- LIB_VERSION=lib64
+-else
+- OS_BITS=32
+- LIB_VERSION=lib
+-fi
+-
+-if [ "$off_bytes" -eq 8 ]; then
+ OFF_BITS=64
++ LIB_VERSION=lib
+ else
++ OS_BITS=32
+ OFF_BITS=32
++ LIB_VERSION=lib
+ fi
+
+ DEBUG_FLAG=0
Property changes on: devel/libfastcommon/files/patch-make.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/libfastcommon/files/patch-src-Makefile.in
===================================================================
--- devel/libfastcommon/files/patch-src-Makefile.in (nonexistent)
+++ devel/libfastcommon/files/patch-src-Makefile.in (working copy)
@@ -0,0 +1,36 @@
+--- src/Makefile.in.orig 2016-09-08 09:44:31.000000000 +0200
++++ src/Makefile.in 2016-10-08 19:44:30.807406000 +0200
+@@ -1,5 +1,7 @@
+ .SUFFIXES: .c .o .lo
+
++DESTDIR =
++
+ COMPILE = $(CC) $(CFLAGS)
+ INC_PATH =
+ LIB_PATH = $(LIBS)
+@@ -41,7 +43,7 @@
+
+ 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.a: $(FAST_STATIC_OBJS)
+ ar rcs $@ $(FAST_STATIC_OBJS)
+ .o:
+@@ -53,12 +55,10 @@
+ .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)/usr/local/$(LIB_VERSION)
++ install -s -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/local/$(LIB_VERSION)
++ mkdir -p $(DESTDIR)/usr/local/include/fastcommon
++ install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/local/include/fastcommon
+ clean:
+ rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)
+
Property changes on: devel/libfastcommon/files/patch-src-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/libfastcommon/pkg-descr
===================================================================
--- devel/libfastcommon/pkg-descr (nonexistent)
+++ devel/libfastcommon/pkg-descr (working copy)
@@ -0,0 +1,4 @@
+c common functions library for FastDFS and FastDHT
+
+WWW: https://github.com/happyfish100/libfastcommon
+
Property changes on: devel/libfastcommon/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/libfastcommon/pkg-plist
===================================================================
--- devel/libfastcommon/pkg-plist (nonexistent)
+++ devel/libfastcommon/pkg-plist (working copy)
@@ -0,0 +1,34 @@
+include/fastcommon/_os_define.h
+include/fastcommon/avl_tree.h
+include/fastcommon/base64.h
+include/fastcommon/chain.h
+include/fastcommon/common_define.h
+include/fastcommon/connection_pool.h
+include/fastcommon/fast_allocator.h
+include/fastcommon/fast_blocked_queue.h
+include/fastcommon/fast_buffer.h
+include/fastcommon/fast_mblock.h
+include/fastcommon/fast_mpool.h
+include/fastcommon/fast_task_queue.h
+include/fastcommon/fast_timer.h
+include/fastcommon/flat_skiplist.h
+include/fastcommon/hash.h
+include/fastcommon/http_func.h
+include/fastcommon/id_generator.h
+include/fastcommon/ini_file_reader.h
+include/fastcommon/ioevent.h
+include/fastcommon/ioevent_loop.h
+include/fastcommon/local_ip_func.h
+include/fastcommon/logger.h
+include/fastcommon/md5.h
+include/fastcommon/multi_skiplist.h
+include/fastcommon/php7_ext_wrapper.h
+include/fastcommon/process_ctrl.h
+include/fastcommon/pthread_func.h
+include/fastcommon/sched_thread.h
+include/fastcommon/shared_func.h
+include/fastcommon/skiplist.h
+include/fastcommon/skiplist_common.h
+include/fastcommon/sockopt.h
+include/fastcommon/system_info.h
+lib/libfastcommon.so
Property changes on: devel/libfastcommon/pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/Makefile
===================================================================
--- ftp/Makefile (revision 423513)
+++ ftp/Makefile (working copy)
@@ -17,6 +17,7 @@
SUBDIR += curl-hiphop
SUBDIR += curlpp
SUBDIR += dmachine
+ SUBDIR += fastdfs
SUBDIR += filezilla
SUBDIR += fmirror
SUBDIR += fpc-libcurl
@@ -65,8 +66,10 @@
SUBDIR += php55-curl
SUBDIR += php55-ftp
SUBDIR += php56-curl
+ SUBDIR += php56-fastdfs
SUBDIR += php56-ftp
SUBDIR += php70-curl
+ SBUDIR += php70-fastdfs
SUBDIR += php70-ftp
SUBDIR += phpwebftp
SUBDIR += plasma-applet-ftpmonitor
Index: ftp/fastdfs/Makefile
===================================================================
--- ftp/fastdfs/Makefile (nonexistent)
+++ ftp/fastdfs/Makefile (working copy)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME= fastdfs
+PORTVERSION= 5.08
+CATEGORIES= ftp
+
+LICENSE= GPLv3
+
+MAINTAINER= daniel@blodan.se
+
+BUILD_DEPENDS= ${PREFIX}/include/fastcommon/logger.h:devel/libfastcommon
+LIB_DEPENDS= libfastcommon.so:devel/libfastcommon
+
+USES= perl5
+
+USE_RC_SUBR= fdfs_storaged fdfs_trackerd
+USERS= _fastdfs
+GROUPS= _fastdfs
+
+USE_GITHUB= yes
+GH_ACCOUNT= happyfish100
+GH_PROJECT= fastdfs
+GH_TAGNAME= 87659981148a362812912b6d4752d281ac05f0b6
+
+do-build:
+ cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|DESTDIR=|DESTDIR=${STAGEDIR}|' make.sh && ${SETENV} ${MAKE_ENV} ${SH} make.sh
+
+do-install:
+ cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} make.sh install
+ @${INSTALL} -d ${STAGEDIR}/var/db/fastdfs
+ @${INSTALL} -d ${STAGEDIR}/var/db/fastdfs/tracker
+ @${INSTALL} -d ${STAGEDIR}/var/db/fastdfs/storage
+
+.include <bsd.port.mk>
Property changes on: ftp/fastdfs/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/distinfo
===================================================================
--- ftp/fastdfs/distinfo (nonexistent)
+++ ftp/fastdfs/distinfo (working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1475767067
+SHA256 (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = c901415de55cad67fe31678091ce131ad4973bce19770f1a03b0be38ba02662d
+SIZE (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = 335406
Property changes on: ftp/fastdfs/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/fdfs_storaged.in
===================================================================
--- ftp/fastdfs/files/fdfs_storaged.in (nonexistent)
+++ ftp/fastdfs/files/fdfs_storaged.in (working copy)
@@ -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/storaged.conf"}
+
+command_args="${fdfs_storaged_config}"
+required_files="${fdfs_storaged_config}"
+
+run_rc_command "$1"
+
Property changes on: ftp/fastdfs/files/fdfs_storaged.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/fdfs_trackerd.in
===================================================================
--- ftp/fastdfs/files/fdfs_trackerd.in (nonexistent)
+++ ftp/fastdfs/files/fdfs_trackerd.in (working copy)
@@ -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"
+
Property changes on: ftp/fastdfs/files/fdfs_trackerd.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-client-Makefile.in
===================================================================
--- ftp/fastdfs/files/patch-client-Makefile.in (nonexistent)
+++ ftp/fastdfs/files/patch-client-Makefile.in (working copy)
@@ -0,0 +1,28 @@
+--- client/Makefile.in.orig 2016-08-08 09:17:50.000000000 +0200
++++ client/Makefile.in 2016-10-08 18:21:09.123345000 +0200
+@@ -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/usr/local/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)
+
+@@ -66,9 +66,9 @@
+ 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
Property changes on: ftp/fastdfs/files/patch-client-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-conf-client.conf
===================================================================
--- ftp/fastdfs/files/patch-conf-client.conf (nonexistent)
+++ ftp/fastdfs/files/patch-conf-client.conf (working copy)
@@ -0,0 +1,11 @@
+--- conf/client.conf.orig 2016-10-08 16:45:14.597135000 +0200
++++ conf/client.conf 2016-10-08 16:46:20.003693000 +0200
+@@ -7,7 +7,7 @@
+ 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
Property changes on: ftp/fastdfs/files/patch-conf-client.conf
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-conf-storage.conf
===================================================================
--- ftp/fastdfs/files/patch-conf-storage.conf (nonexistent)
+++ ftp/fastdfs/files/patch-conf-storage.conf (working copy)
@@ -0,0 +1,36 @@
+--- conf/storage.conf.orig 2016-08-08 09:17:50.000000000 +0200
++++ conf/storage.conf 2016-10-08 16:52:27.811443000 +0200
+@@ -38,7 +38,7 @@
+ 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#, 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 @@
+
+ #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
Property changes on: ftp/fastdfs/files/patch-conf-storage.conf
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-conf-tracker.conf
===================================================================
--- ftp/fastdfs/files/patch-conf-tracker.conf (nonexistent)
+++ ftp/fastdfs/files/patch-conf-tracker.conf (working copy)
@@ -0,0 +1,25 @@
+--- conf/tracker.conf.orig 2016-08-08 09:17:50.000000000 +0200
++++ conf/tracker.conf 2016-10-08 16:52:43.329253000 +0200
+@@ -19,7 +19,7 @@
+ 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 @@
+
+ #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
Property changes on: ftp/fastdfs/files/patch-conf-tracker.conf
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-make.sh
===================================================================
--- ftp/fastdfs/files/patch-make.sh (nonexistent)
+++ ftp/fastdfs/files/patch-make.sh (working copy)
@@ -0,0 +1,103 @@
+--- make.sh.orig 2016-08-08 09:17:50.000000000 +0200
++++ make.sh 2016-10-07 18:02:59.835681000 +0200
+@@ -1,58 +1,21 @@
+-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)
++DESTDIR=
+
+-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/usr/local
++TARGET_CONF_PATH=$DESTDIR/usr/local/etc/fdfs
+ TARGET_INIT_PATH=$DESTDIR/etc/init.d
+
+-WITH_LINUX_SERVICE=1
++WITH_LINUX_SERVICE=0
+
+ DEBUG_FLAG=1
+
+@@ -74,7 +37,7 @@
+ 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 +143,3 @@
+ 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
+-
Property changes on: ftp/fastdfs/files/patch-make.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-storage-Makefile.in
===================================================================
--- ftp/fastdfs/files/patch-storage-Makefile.in (nonexistent)
+++ ftp/fastdfs/files/patch-storage-Makefile.in (working copy)
@@ -0,0 +1,20 @@
+--- storage/Makefile.in.orig 2016-08-08 09:17:50.000000000 +0200
++++ storage/Makefile.in 2016-10-08 18:12:27.153613000 +0200
+@@ -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/usr/local/include/fastcommon
+ LIB_PATH = $(LIBS) -lfastcommon
+ TARGET_PATH = $(TARGET_PREFIX)/bin
+ CONFIG_PATH = $(TARGET_CONF_PATH)
+@@ -34,7 +34,7 @@
+ 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)
Property changes on: ftp/fastdfs/files/patch-storage-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/files/patch-tracker-Makefile.in
===================================================================
--- ftp/fastdfs/files/patch-tracker-Makefile.in (nonexistent)
+++ ftp/fastdfs/files/patch-tracker-Makefile.in (working copy)
@@ -0,0 +1,20 @@
+--- tracker/Makefile.in.orig 2016-08-08 09:17:50.000000000 +0200
++++ tracker/Makefile.in 2016-10-08 18:13:28.211552000 +0200
+@@ -1,7 +1,7 @@
+ .SUFFIXES: .c .o
+
+ COMPILE = $(CC) $(CFLAGS)
+-INC_PATH = -I../common -I/usr/include/fastcommon
++INC_PATH = -I../common -I/usr/local/include/fastcommon
+ LIB_PATH = $(LIBS) -lfastcommon
+ TARGET_PATH = $(TARGET_PREFIX)/bin
+ CONFIG_PATH = $(TARGET_CONF_PATH)
+@@ -26,7 +26,7 @@
+ 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
+ clean:
+ rm -f $(ALL_OBJS) $(ALL_PRGS)
Property changes on: ftp/fastdfs/files/patch-tracker-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/pkg-descr
===================================================================
--- ftp/fastdfs/pkg-descr (nonexistent)
+++ ftp/fastdfs/pkg-descr (working copy)
@@ -0,0 +1,6 @@
+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
+
Property changes on: ftp/fastdfs/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/fastdfs/pkg-plist
===================================================================
--- ftp/fastdfs/pkg-plist (nonexistent)
+++ ftp/fastdfs/pkg-plist (working copy)
@@ -0,0 +1,36 @@
+bin/fdfs_append_file
+bin/fdfs_appender_test
+bin/fdfs_appender_test1
+bin/fdfs_crc32
+bin/fdfs_delete_file
+bin/fdfs_download_file
+bin/fdfs_file_info
+bin/fdfs_monitor
+bin/fdfs_storaged
+bin/fdfs_test
+bin/fdfs_test1
+bin/fdfs_trackerd
+bin/fdfs_upload_appender
+bin/fdfs_upload_file
+@sample etc/fdfs/client.conf.sample
+@sample etc/fdfs/storage.conf.sample
+@sample etc/fdfs/tracker.conf.sample
+include/fastdfs/client_func.h
+include/fastdfs/client_global.h
+include/fastdfs/fdfs_client.h
+include/fastdfs/fdfs_define.h
+include/fastdfs/fdfs_global.h
+include/fastdfs/fdfs_http_shared.h
+include/fastdfs/fdfs_shared_func.h
+include/fastdfs/mime_file_parser.h
+include/fastdfs/storage_client.h
+include/fastdfs/storage_client1.h
+include/fastdfs/tracker_client.h
+include/fastdfs/tracker_proto.h
+include/fastdfs/tracker_types.h
+include/fastdfs/trunk_shared.h
+lib/libfdfsclient.so
+@dir /var/db/fastdfs/storage
+@dir /var/db/fastdfs/tracker
+@dir /var/db/fastdfs
+
Property changes on: ftp/fastdfs/pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php56-fastdfs/Makefile
===================================================================
--- ftp/php56-fastdfs/Makefile (nonexistent)
+++ ftp/php56-fastdfs/Makefile (working copy)
@@ -0,0 +1,25 @@
+PORTNAME= php56-fastdfs
+PORTVERSION= 5.08
+CATEGORIES= ftp
+
+LICENSE= GPLv3
+
+MAINTAINER= daniel@blodan.se
+
+BUILD_DEPENDS= ${PREFIX}/include/fastcommon/logger.h:devel/libfastcommon \
+ ${PREFIX}/include/fastdfs/fdfs_client.h:ftp/fastdfs
+
+USE_GITHUB= yes
+GH_ACCOUNT= happyfish100
+GH_PROJECT= fastdfs
+GH_TAGNAME= 87659981148a362812912b6d4752d281ac05f0b6
+
+USES= php:ext
+IGNORE_WITH_PHP= 55 70
+PHP_DEFAULT= 5.6
+
+WRKSRC_SUBDIR= php_client
+
+PHP_MODNAME= fastdfs_client
+
+.include <bsd.port.mk>
Property changes on: ftp/php56-fastdfs/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php56-fastdfs/distinfo
===================================================================
--- ftp/php56-fastdfs/distinfo (nonexistent)
+++ ftp/php56-fastdfs/distinfo (working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1475924306
+SHA256 (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = c901415de55cad67fe31678091ce131ad4973bce19770f1a03b0be38ba02662d
+SIZE (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = 335406
Property changes on: ftp/php56-fastdfs/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php56-fastdfs/files/patch-config.m4
===================================================================
--- ftp/php56-fastdfs/files/patch-config.m4 (nonexistent)
+++ ftp/php56-fastdfs/files/patch-config.m4 (working copy)
@@ -0,0 +1,11 @@
+--- config.m4.orig 2016-10-08 13:00:34.348486000 +0200
++++ config.m4 2016-10-08 13:00:44.757703000 +0200
+@@ -7,7 +7,7 @@
+ PHP_SUBST(FASTDFS_CLIENT_SHARED_LIBADD)
+
+ if test -z "$ROOT"; then
+- ROOT=/usr
++ ROOT=/usr/local
+ fi
+
+ PHP_ADD_INCLUDE($ROOT/include/fastcommon)
Property changes on: ftp/php56-fastdfs/files/patch-config.m4
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php56-fastdfs/pkg-descr
===================================================================
--- ftp/php56-fastdfs/pkg-descr (nonexistent)
+++ ftp/php56-fastdfs/pkg-descr (working copy)
@@ -0,0 +1,4 @@
+PHP module for accessing a FastDFS cluster
+
+WWW: https://github.com/happyfish100/fastdfs
+
Property changes on: ftp/php56-fastdfs/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php56-fastdfs/pkg-message
===================================================================
--- ftp/php56-fastdfs/pkg-message (nonexistent)
+++ ftp/php56-fastdfs/pkg-message (working copy)
@@ -0,0 +1,14 @@
+Before you can start using this module;
+- Make sure you have configured client.conf to point to your FastDFS cluster
+- Add this to your php.ini file
+==================================================================
+fastdfs_client.base_path = /var/tmp
+fastdfs_client.connect_timeout = 2
+fastdfs_client.network_timeout = 60
+fastdfs_client.log_level = info
+fastdfs_client.log_filename =
+fastdfs_client.http.anti_steal_secret_key =
+fastdfs_client.tracker_group_count = 1
+fastdfs_client.tracker_group0 = /usr/local/etc/fdfs/client.conf
+fastdfs_client.use_connection_pool = false
+fastdfs_client.connection_pool_max_idle_time = 3600
Property changes on: ftp/php56-fastdfs/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php70-fastdfs/Makefile
===================================================================
--- ftp/php70-fastdfs/Makefile (nonexistent)
+++ ftp/php70-fastdfs/Makefile (working copy)
@@ -0,0 +1,25 @@
+PORTNAME= php70-fastdfs
+PORTVERSION= 5.08
+CATEGORIES= ftp
+
+LICENSE= GPLv3
+
+MAINTAINER= daniel@blodan.se
+
+BUILD_DEPENDS= ${PREFIX}/include/fastcommon/logger.h:devel/libfastcommon \
+ ${PREFIX}/include/fastdfs/fdfs_client.h:ftp/fastdfs
+
+USE_GITHUB= yes
+GH_ACCOUNT= happyfish100
+GH_PROJECT= fastdfs
+GH_TAGNAME= 87659981148a362812912b6d4752d281ac05f0b6
+
+USES= php:ext
+IGNORE_WITH_PHP= 55 56
+PHP_DEFAULT= 7.0
+
+WRKSRC_SUBDIR= php_client
+
+PHP_MODNAME= fastdfs_client
+
+.include <bsd.port.mk>
Property changes on: ftp/php70-fastdfs/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php70-fastdfs/distinfo
===================================================================
--- ftp/php70-fastdfs/distinfo (nonexistent)
+++ ftp/php70-fastdfs/distinfo (working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1475924306
+SHA256 (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = c901415de55cad67fe31678091ce131ad4973bce19770f1a03b0be38ba02662d
+SIZE (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = 335406
Property changes on: ftp/php70-fastdfs/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php70-fastdfs/files/patch-config.m4
===================================================================
--- ftp/php70-fastdfs/files/patch-config.m4 (nonexistent)
+++ ftp/php70-fastdfs/files/patch-config.m4 (working copy)
@@ -0,0 +1,11 @@
+--- config.m4.orig 2016-10-08 13:00:34.348486000 +0200
++++ config.m4 2016-10-08 13:00:44.757703000 +0200
+@@ -7,7 +7,7 @@
+ PHP_SUBST(FASTDFS_CLIENT_SHARED_LIBADD)
+
+ if test -z "$ROOT"; then
+- ROOT=/usr
++ ROOT=/usr/local
+ fi
+
+ PHP_ADD_INCLUDE($ROOT/include/fastcommon)
Property changes on: ftp/php70-fastdfs/files/patch-config.m4
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php70-fastdfs/pkg-descr
===================================================================
--- ftp/php70-fastdfs/pkg-descr (nonexistent)
+++ ftp/php70-fastdfs/pkg-descr (working copy)
@@ -0,0 +1,4 @@
+PHP module for accessing a FastDFS cluster
+
+WWW: https://github.com/happyfish100/fastdfs
+
Property changes on: ftp/php70-fastdfs/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ftp/php70-fastdfs/pkg-message
===================================================================
--- ftp/php70-fastdfs/pkg-message (nonexistent)
+++ ftp/php70-fastdfs/pkg-message (working copy)
@@ -0,0 +1,14 @@
+Before you can start using this module;
+- Make sure you have configured client.conf to point to your FastDFS cluster
+- Add this to your php.ini file
+==================================================================
+fastdfs_client.base_path = /var/tmp
+fastdfs_client.connect_timeout = 2
+fastdfs_client.network_timeout = 60
+fastdfs_client.log_level = info
+fastdfs_client.log_filename =
+fastdfs_client.http.anti_steal_secret_key =
+fastdfs_client.tracker_group_count = 1
+fastdfs_client.tracker_group0 = /usr/local/etc/fdfs/client.conf
+fastdfs_client.use_connection_pool = false
+fastdfs_client.connection_pool_max_idle_time = 3600
Property changes on: ftp/php70-fastdfs/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property