View | Details | Raw Unified | Return to bug 213311 | Differences between
and this patch

Collapse All | Expand All

(-)GIDs (-1 / +1 lines)
Lines 254-260 Link Here
254
# free: 310
254
# free: 310
255
# free: 311
255
# free: 311
256
_sphinx:*:312:
256
_sphinx:*:312:
257
# free: 313
257
_fastdfs:*:313:
258
# free: 314
258
# free: 314
259
# free: 315
259
# free: 315
260
# free: 316
260
# free: 316
(-)UIDs (-1 / +1 lines)
Lines 259-265 Link Here
259
# free: 310
259
# free: 310
260
# free: 311
260
# free: 311
261
_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin
261
_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin
262
# free: 313
262
_fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin
263
# free: 314
263
# free: 314
264
# free: 315
264
# free: 315
265
# free: 316
265
# free: 316
(-)devel/Makefile (+1 lines)
Lines 1234-1239 Link Here
1234
    SUBDIR += libewf
1234
    SUBDIR += libewf
1235
    SUBDIR += libexecinfo
1235
    SUBDIR += libexecinfo
1236
    SUBDIR += libexplain
1236
    SUBDIR += libexplain
1237
    SUBDIR += libfastcommon
1237
    SUBDIR += libfastjson
1238
    SUBDIR += libfastjson
1238
    SUBDIR += libffi
1239
    SUBDIR += libffi
1239
    SUBDIR += libfirm
1240
    SUBDIR += libfirm
(-)devel/libfastcommon/Makefile (+22 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	libfastcommon
4
PORTVERSION=	1.30
5
CATEGORIES=	devel
6
7
LICENSE=	GPLv3
8
9
MAINTAINER=	daniel@blodan.se
10
11
USE_GITHUB=	yes
12
GH_ACCOUNT=	happyfish100
13
GH_PROJECT=	libfastcommon
14
GH_TAGNAME=	b80de986b2a269cd15d56e4978c6df844a9c2e59
15
16
do-build:
17
	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|DESTDIR =|DESTDIR = ${STAGEDIR}|' src/Makefile.in && ${SETENV} ${MAKE_ENV} ${SH} make.sh
18
19
do-install:
20
	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} make.sh install
21
22
.include <bsd.port.mk>
(-)devel/libfastcommon/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1475950577
2
SHA256 (happyfish100-libfastcommon-1.30-b80de986b2a269cd15d56e4978c6df844a9c2e59_GH0.tar.gz) = 9be2ee4a33fe8a359f9ddf9afd561afc9a43b1fa3e520c8104a0ba3294e129f3
3
SIZE (happyfish100-libfastcommon-1.30-b80de986b2a269cd15d56e4978c6df844a9c2e59_GH0.tar.gz) = 121845
(-)devel/libfastcommon/files/patch-make.sh (+60 lines)
Line 0 Link Here
1
--- make.sh.orig	2016-09-08 09:44:31.000000000 +0200
2
+++ make.sh	2016-10-07 14:54:11.931652000 +0200
3
@@ -1,53 +1,11 @@
4
-tmp_src_filename=fast_check_bits.c
5
-cat <<EOF > $tmp_src_filename
6
-#include <stdio.h>
7
-#include <unistd.h>
8
-#include <fcntl.h>
9
-int main()
10
-{
11
-	printf("%d\n", (int)sizeof(void*));
12
-	printf("%d\n", (int)sizeof(off_t));
13
-	return 0;
14
-}
15
-EOF
16
-
17
-gcc -D_FILE_OFFSET_BITS=64 -o a.out $tmp_src_filename
18
-output=`./a.out`
19
-
20
-if [ -f /bin/expr ]; then
21
-  EXPR=/bin/expr
22
-else
23
-  EXPR=/usr/bin/expr
24
-fi
25
-
26
-count=0
27
-int_bytes=4
28
-off_bytes=8
29
-LIB_VERSION=lib64
30
-
31
-for col in $output; do
32
-    if [ $count -eq 0 ]; then
33
-        int_bytes=$col
34
-    else
35
-        off_bytes=$col
36
-    fi
37
-
38
-    count=`$EXPR $count + 1`
39
-done
40
-
41
-/bin/rm -f a.out $tmp_src_filename
42
-if [ "$int_bytes" -eq 8 ]; then
43
+if [ "$(/usr/bin/uname -m)" = "amd64"  ]; then
44
  OS_BITS=64
45
- LIB_VERSION=lib64
46
-else
47
- OS_BITS=32
48
- LIB_VERSION=lib
49
-fi
50
-
51
-if [ "$off_bytes" -eq 8 ]; then
52
  OFF_BITS=64
53
+ LIB_VERSION=lib
54
 else
55
+ OS_BITS=32
56
  OFF_BITS=32
57
+ LIB_VERSION=lib
58
 fi
59
 
60
 DEBUG_FLAG=0
(-)devel/libfastcommon/files/patch-src-Makefile.in (+36 lines)
Line 0 Link Here
1
--- src/Makefile.in.orig	2016-09-08 09:44:31.000000000 +0200
2
+++ src/Makefile.in	2016-10-08 19:44:30.807406000 +0200
3
@@ -1,5 +1,7 @@
4
 .SUFFIXES: .c .o .lo
5
 
6
+DESTDIR = 
7
+
8
 COMPILE = $(CC) $(CFLAGS)
9
 INC_PATH = 
10
 LIB_PATH = $(LIBS)
11
@@ -41,7 +43,7 @@
12
 
13
 all: $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)
14
 libfastcommon.so:
15
-	$(COMPILE) -o $@ $< -shared $(FAST_SHARED_OBJS) $(LIB_PATH)
16
+	$(COMPILE) -o $@ $< -shared -Wl,-soname,libfastcommon.so $(FAST_SHARED_OBJS) $(LIB_PATH)
17
 libfastcommon.a: $(FAST_STATIC_OBJS)
18
 	ar rcs $@ $(FAST_STATIC_OBJS)
19
 .o:
20
@@ -53,12 +55,10 @@
21
 .c.lo:
22
 	$(COMPILE) -c -fPIC -o $@ $<  $(INC_PATH)
23
 install:
24
-	mkdir -p $(DESTDIR)/usr/$(LIB_VERSION)
25
-	mkdir -p $(DESTDIR)/usr/lib
26
-	install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION)
27
-	install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/lib
28
-	mkdir -p $(DESTDIR)/usr/include/fastcommon
29
-	install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon
30
+	mkdir -p $(DESTDIR)/usr/local/$(LIB_VERSION)
31
+	install -s -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/local/$(LIB_VERSION)
32
+	mkdir -p $(DESTDIR)/usr/local/include/fastcommon
33
+	install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/local/include/fastcommon
34
 clean:
35
 	rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)
36
 
(-)devel/libfastcommon/pkg-descr (+4 lines)
Line 0 Link Here
1
c common functions library for FastDFS and FastDHT
2
3
WWW: https://github.com/happyfish100/libfastcommon
4
(-)devel/libfastcommon/pkg-plist (+34 lines)
Line 0 Link Here
1
include/fastcommon/_os_define.h
2
include/fastcommon/avl_tree.h
3
include/fastcommon/base64.h
4
include/fastcommon/chain.h
5
include/fastcommon/common_define.h
6
include/fastcommon/connection_pool.h
7
include/fastcommon/fast_allocator.h
8
include/fastcommon/fast_blocked_queue.h
9
include/fastcommon/fast_buffer.h
10
include/fastcommon/fast_mblock.h
11
include/fastcommon/fast_mpool.h
12
include/fastcommon/fast_task_queue.h
13
include/fastcommon/fast_timer.h
14
include/fastcommon/flat_skiplist.h
15
include/fastcommon/hash.h
16
include/fastcommon/http_func.h
17
include/fastcommon/id_generator.h
18
include/fastcommon/ini_file_reader.h
19
include/fastcommon/ioevent.h
20
include/fastcommon/ioevent_loop.h
21
include/fastcommon/local_ip_func.h
22
include/fastcommon/logger.h
23
include/fastcommon/md5.h
24
include/fastcommon/multi_skiplist.h
25
include/fastcommon/php7_ext_wrapper.h
26
include/fastcommon/process_ctrl.h
27
include/fastcommon/pthread_func.h
28
include/fastcommon/sched_thread.h
29
include/fastcommon/shared_func.h
30
include/fastcommon/skiplist.h
31
include/fastcommon/skiplist_common.h
32
include/fastcommon/sockopt.h
33
include/fastcommon/system_info.h
34
lib/libfastcommon.so
(-)ftp/Makefile (+3 lines)
Lines 17-22 Link Here
17
    SUBDIR += curl-hiphop
17
    SUBDIR += curl-hiphop
18
    SUBDIR += curlpp
18
    SUBDIR += curlpp
19
    SUBDIR += dmachine
19
    SUBDIR += dmachine
20
    SUBDIR += fastdfs
20
    SUBDIR += filezilla
21
    SUBDIR += filezilla
21
    SUBDIR += fmirror
22
    SUBDIR += fmirror
22
    SUBDIR += fpc-libcurl
23
    SUBDIR += fpc-libcurl
Lines 65-72 Link Here
65
    SUBDIR += php55-curl
66
    SUBDIR += php55-curl
66
    SUBDIR += php55-ftp
67
    SUBDIR += php55-ftp
67
    SUBDIR += php56-curl
68
    SUBDIR += php56-curl
69
    SUBDIR += php56-fastdfs
68
    SUBDIR += php56-ftp
70
    SUBDIR += php56-ftp
69
    SUBDIR += php70-curl
71
    SUBDIR += php70-curl
72
    SBUDIR += php70-fastdfs
70
    SUBDIR += php70-ftp
73
    SUBDIR += php70-ftp
71
    SUBDIR += phpwebftp
74
    SUBDIR += phpwebftp
72
    SUBDIR += plasma-applet-ftpmonitor
75
    SUBDIR += plasma-applet-ftpmonitor
(-)ftp/fastdfs/Makefile (+34 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	fastdfs
4
PORTVERSION=	5.08
5
CATEGORIES=	ftp
6
7
LICENSE=	GPLv3
8
9
MAINTAINER=	daniel@blodan.se
10
11
BUILD_DEPENDS=	${PREFIX}/include/fastcommon/logger.h:devel/libfastcommon
12
LIB_DEPENDS=	libfastcommon.so:devel/libfastcommon
13
14
USES=		perl5
15
16
USE_RC_SUBR=	fdfs_storaged fdfs_trackerd
17
USERS=		_fastdfs
18
GROUPS=		_fastdfs
19
20
USE_GITHUB=	yes
21
GH_ACCOUNT=	happyfish100
22
GH_PROJECT=	fastdfs
23
GH_TAGNAME=	87659981148a362812912b6d4752d281ac05f0b6
24
25
do-build:
26
	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|DESTDIR=|DESTDIR=${STAGEDIR}|' make.sh && ${SETENV} ${MAKE_ENV} ${SH} make.sh
27
28
do-install:
29
	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} make.sh install
30
	@${INSTALL} -d ${STAGEDIR}/var/db/fastdfs
31
	@${INSTALL} -d ${STAGEDIR}/var/db/fastdfs/tracker
32
	@${INSTALL} -d ${STAGEDIR}/var/db/fastdfs/storage
33
34
.include <bsd.port.mk>
(-)ftp/fastdfs/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1475767067
2
SHA256 (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = c901415de55cad67fe31678091ce131ad4973bce19770f1a03b0be38ba02662d
3
SIZE (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = 335406
(-)ftp/fastdfs/files/fdfs_storaged.in (+46 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# $FreeBSD$
4
#
5
# PROVIDE: fdfs_storaged
6
# REQUIRE: LOGIN
7
# KEYWORD: shutdown
8
9
#
10
# Add the following line to /etc/rc.conf to enable `fdfs_storaged':
11
#
12
# fdfs_storaged_enable="YES"
13
#
14
15
. /etc/rc.subr
16
17
name="fdfs_storaged"
18
rcvar=fdfs_storaged_enable
19
20
command="%%PREFIX%%/bin/fdfs_storaged"
21
pidfile="/var/run/fdfs_storaged.pid"
22
23
start_postcmd="${name}_poststart"
24
stop_postcmd="rm ${pidfile}"
25
26
fdfs_storaged_poststart()
27
{
28
        /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
29
30
        currpid=`/bin/cat /var/run/fdfs_storaged.pid`
31
32
        if [ "$currpid" -gt 0 ]; then
33
                echo "Started fdfs_storaged."
34
        fi
35
}
36
37
# read configuration and set defaults
38
load_rc_config "$name"
39
: ${fdfs_storaged_enable="NO"}
40
: ${fdfs_storaged_config="%%PREFIX%%/etc/fdfs/storaged.conf"}
41
42
command_args="${fdfs_storaged_config}"
43
required_files="${fdfs_storaged_config}"
44
45
run_rc_command "$1"
46
(-)ftp/fastdfs/files/fdfs_trackerd.in (+46 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# $FreeBSD$
4
#
5
# PROVIDE: fdfs_trackerd
6
# REQUIRE: LOGIN
7
# KEYWORD: shutdown
8
9
#
10
# Add the following line to /etc/rc.conf to enable `fdfs_trackerd':
11
#
12
# fdfs_trackerd_enable="YES"
13
#
14
15
. /etc/rc.subr
16
17
name="fdfs_trackerd"
18
rcvar=fdfs_trackerd_enable
19
20
command="%%PREFIX%%/bin/fdfs_trackerd"
21
pidfile="/var/run/fdfs_trackerd.pid"
22
23
start_postcmd="${name}_poststart"
24
stop_postcmd="rm ${pidfile}"
25
26
fdfs_trackerd_poststart()
27
{
28
        /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
29
30
        currpid=`/bin/cat /var/run/fdfs_trackerd.pid`
31
32
        if [ "$currpid" -gt 0 ]; then
33
                echo "Started fdfs_trackerd."
34
        fi
35
}
36
37
# read configuration and set defaults
38
load_rc_config "$name"
39
: ${fdfs_trackerd_enable="NO"}
40
: ${fdfs_trackerd_config="%%PREFIX%%/etc/fdfs/tracker.conf"}
41
42
command_args="${fdfs_trackerd_config}"
43
required_files="${fdfs_trackerd_config}"
44
45
run_rc_command "$1"
46
(-)ftp/fastdfs/files/patch-client-Makefile.in (+28 lines)
Line 0 Link Here
1
--- client/Makefile.in.orig	2016-08-08 09:17:50.000000000 +0200
2
+++ client/Makefile.in	2016-10-08 18:21:09.123345000 +0200
3
@@ -3,10 +3,10 @@
4
 COMPILE = $(CC) $(CFLAGS)
5
 ENABLE_STATIC_LIB = $(ENABLE_STATIC_LIB)
6
 ENABLE_SHARED_LIB = $(ENABLE_SHARED_LIB)
7
-INC_PATH = -I../common -I../tracker -I/usr/include/fastcommon
8
+INC_PATH = -I../common -I../tracker -I/usr/local/include/fastcommon
9
 LIB_PATH = $(LIBS) -lfastcommon
10
 TARGET_PATH = $(TARGET_PREFIX)/bin
11
-TARGET_LIB = $(TARGET_PREFIX)/lib64
12
+TARGET_LIB = $(TARGET_PREFIX)/lib
13
 TARGET_INC = $(TARGET_PREFIX)/include
14
 CONFIG_PATH = $(TARGET_CONF_PATH)
15
 
16
@@ -66,9 +66,9 @@
17
 	mkdir -p $(CONFIG_PATH)
18
 	mkdir -p $(TARGET_LIB)
19
 	mkdir -p $(TARGET_PREFIX)/lib
20
-	cp -f $(ALL_PRGS) $(TARGET_PATH)
21
-	if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then cp -f $(STATIC_LIBS) $(TARGET_LIB); cp -f $(STATIC_LIBS) $(TARGET_PREFIX)/lib/;fi
22
-	if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then cp -f $(CLIENT_SHARED_LIBS) $(TARGET_LIB); cp -f $(CLIENT_SHARED_LIBS) $(TARGET_PREFIX)/lib/;fi
23
+	install -s $(ALL_PRGS) $(TARGET_PATH)
24
+	if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then install -s $(STATIC_LIBS) $(TARGET_LIB); install -s $(STATIC_LIBS) $(TARGET_PREFIX)/lib/;fi
25
+	if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then install -s $(CLIENT_SHARED_LIBS) $(TARGET_LIB); install -s $(CLIENT_SHARED_LIBS) $(TARGET_PREFIX)/lib/;fi
26
 
27
 	mkdir -p $(TARGET_INC)/fastdfs
28
 	cp -f $(FDFS_HEADER_FILES) $(TARGET_INC)/fastdfs
(-)ftp/fastdfs/files/patch-conf-client.conf (+11 lines)
Line 0 Link Here
1
--- conf/client.conf.orig	2016-10-08 16:45:14.597135000 +0200
2
+++ conf/client.conf	2016-10-08 16:46:20.003693000 +0200
3
@@ -7,7 +7,7 @@
4
 network_timeout=60
5
 
6
 # the base path to store log files
7
-base_path=/home/yuqing/fastdfs
8
+base_path=/var/db/fastdfs
9
 
10
 # tracker_server can ocur more than once, and tracker_server format is
11
 #  "host:port", host can be hostname or ip address
(-)ftp/fastdfs/files/patch-conf-storage.conf (+36 lines)
Line 0 Link Here
1
--- conf/storage.conf.orig	2016-08-08 09:17:50.000000000 +0200
2
+++ conf/storage.conf	2016-10-08 16:52:27.811443000 +0200
3
@@ -38,7 +38,7 @@
4
 stat_report_interval=60
5
 
6
 # the base path to store data and log files
7
-base_path=/home/yuqing/fastdfs
8
+base_path=/var/db/fastdfs/storage
9
 
10
 # max concurrent connections the server supported
11
 # default value is 256
12
@@ -106,8 +106,8 @@
13
 
14
 # store_path#, based 0, if store_path0 not exists, it's value is base_path
15
 # the paths must be exist
16
-store_path0=/home/yuqing/fastdfs
17
-#store_path1=/home/yuqing/fastdfs2
18
+store_path0=/var/db/fastdfs/storage
19
+#store_path1=/var/db/fastdfs/storage2
20
 
21
 # subdir_count  * subdir_count directories will be auto created under each 
22
 # store_path (disk), value can be 1 to 256, default value is 256
23
@@ -130,11 +130,11 @@
24
 
25
 #unix group name to run this program, 
26
 #not set (empty) means run by the group of current user
27
-run_by_group=
28
+run_by_group=_fastdfs
29
 
30
 #unix username to run this program,
31
 #not set (empty) means run by current user
32
-run_by_user=
33
+run_by_user=_fastdfs
34
 
35
 # allow_hosts can ocur more than once, host can be hostname or ip address,
36
 # "*" (only one asterisk) means match all ip addresses
(-)ftp/fastdfs/files/patch-conf-tracker.conf (+25 lines)
Line 0 Link Here
1
--- conf/tracker.conf.orig	2016-08-08 09:17:50.000000000 +0200
2
+++ conf/tracker.conf	2016-10-08 16:52:43.329253000 +0200
3
@@ -19,7 +19,7 @@
4
 network_timeout=60
5
 
6
 # the base path to store data and log files
7
-base_path=/home/yuqing/fastdfs
8
+base_path=/var/db/fastdfs/tracker
9
 
10
 # max concurrent connections this server supported
11
 max_connections=256
12
@@ -85,11 +85,11 @@
13
 
14
 #unix group name to run this program, 
15
 #not set (empty) means run by the group of current user
16
-run_by_group=
17
+run_by_group=_fastdfs
18
 
19
 #unix username to run this program,
20
 #not set (empty) means run by current user
21
-run_by_user=
22
+run_by_user=_fastdfs
23
 
24
 # allow_hosts can ocur more than once, host can be hostname or ip address,
25
 # "*" (only one asterisk) means match all ip addresses
(-)ftp/fastdfs/files/patch-make.sh (+103 lines)
Line 0 Link Here
1
--- make.sh.orig	2016-08-08 09:17:50.000000000 +0200
2
+++ make.sh	2016-10-07 18:02:59.835681000 +0200
3
@@ -1,58 +1,21 @@
4
-tmp_src_filename=fdfs_check_bits.c
5
-cat <<EOF > $tmp_src_filename
6
-#include <stdio.h>
7
-#include <unistd.h>
8
-#include <fcntl.h>
9
-int main()
10
-{
11
-	printf("%d\n", (int)sizeof(long));
12
-	printf("%d\n", (int)sizeof(off_t));
13
-	return 0;
14
-}
15
-EOF
16
 
17
-gcc -D_FILE_OFFSET_BITS=64 -o a.out $tmp_src_filename
18
-output=$(./a.out)
19
+DESTDIR=
20
 
21
-if [ -f /bin/expr ]; then
22
-  EXPR=/bin/expr
23
-else
24
-  EXPR=/usr/bin/expr
25
-fi
26
-
27
-count=0
28
-int_bytes=4
29
-off_bytes=8
30
-for col in $output; do
31
-    if [ $count -eq 0 ]; then
32
-        int_bytes=$col
33
-    else
34
-        off_bytes=$col
35
-    fi
36
-
37
-    count=$($EXPR $count + 1)
38
-done
39
-
40
-/bin/rm -f a.out $tmp_src_filename
41
-if [ "$int_bytes" -eq 8 ]; then
42
+if [ "$(/usr/bin/uname -m)" = "amd64"  ]; then
43
  OS_BITS=64
44
-else
45
- OS_BITS=32
46
-fi
47
-
48
-if [ "$off_bytes" -eq 8 ]; then
49
  OFF_BITS=64
50
 else
51
+ OS_BITS=32
52
  OFF_BITS=32
53
 fi
54
 
55
 ENABLE_STATIC_LIB=0
56
 ENABLE_SHARED_LIB=1
57
-TARGET_PREFIX=$DESTDIR/usr
58
-TARGET_CONF_PATH=$DESTDIR/etc/fdfs
59
+TARGET_PREFIX=$DESTDIR/usr/local
60
+TARGET_CONF_PATH=$DESTDIR/usr/local/etc/fdfs
61
 TARGET_INIT_PATH=$DESTDIR/etc/init.d
62
 
63
-WITH_LINUX_SERVICE=1
64
+WITH_LINUX_SERVICE=0
65
 
66
 DEBUG_FLAG=1
67
 
68
@@ -74,7 +37,7 @@
69
   fi
70
   CFLAGS="$CFLAGS"
71
 elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
72
-  LIBS="$LIBS -L/usr/lib"
73
+  LIBS="$LIBS -L/usr/local/lib"
74
   CFLAGS="$CFLAGS"
75
   if [ "$uname" = "Darwin" ]; then
76
     CFLAGS="$CFLAGS -DDARWIN"
77
@@ -180,26 +143,3 @@
78
 perl -pi -e "s#\\\$\(TARGET_PREFIX\)#$TARGET_PREFIX#g" Makefile
79
 cd ..
80
 
81
-if [ "$1" = "install" ]; then
82
-  cd ..
83
-  cp -f restart.sh $TARGET_PREFIX/bin
84
-  cp -f stop.sh $TARGET_PREFIX/bin
85
-
86
-  if [ "$uname" = "Linux" ]; then
87
-    if [ "$WITH_LINUX_SERVICE" = "1" ]; then
88
-      if [ ! -d /etc/fdfs ]; then
89
-        mkdir -p /etc/fdfs
90
-        cp -f conf/tracker.conf $TARGET_CONF_PATH/tracker.conf.sample
91
-        cp -f conf/storage.conf $TARGET_CONF_PATH/storage.conf.sample
92
-        cp -f conf/client.conf $TARGET_CONF_PATH/client.conf.sample
93
-        cp -f conf/storage_ids.conf $TARGET_CONF_PATH/storage_ids.conf.sample
94
-      fi
95
-      mkdir -p $TARGET_INIT_PATH
96
-      cp -f init.d/fdfs_trackerd $TARGET_INIT_PATH
97
-      cp -f init.d/fdfs_storaged $TARGET_INIT_PATH
98
-#      /sbin/chkconfig --add fdfs_trackerd 
99
-#      /sbin/chkconfig --add fdfs_storaged
100
-    fi
101
-  fi
102
-fi
103
-
(-)ftp/fastdfs/files/patch-storage-Makefile.in (+20 lines)
Line 0 Link Here
1
--- storage/Makefile.in.orig	2016-08-08 09:17:50.000000000 +0200
2
+++ storage/Makefile.in	2016-10-08 18:12:27.153613000 +0200
3
@@ -1,7 +1,7 @@
4
 .SUFFIXES: .c .o
5
 
6
 COMPILE = $(CC) $(CFLAGS)
7
-INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon
8
+INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/local/include/fastcommon
9
 LIB_PATH = $(LIBS)  -lfastcommon
10
 TARGET_PATH = $(TARGET_PREFIX)/bin
11
 CONFIG_PATH = $(TARGET_CONF_PATH)
12
@@ -34,7 +34,7 @@
13
 install:
14
 	mkdir -p $(TARGET_PATH)
15
 	mkdir -p $(CONFIG_PATH)
16
-	cp -f $(ALL_PRGS) $(TARGET_PATH)
17
+	install -s $(ALL_PRGS) $(TARGET_PATH)
18
 	if [ ! -f $(CONFIG_PATH)/storage.conf.sample ]; then cp -f ../conf/storage.conf $(CONFIG_PATH)/storage.conf.sample; fi
19
 clean:
20
 	rm -f $(ALL_OBJS) $(ALL_PRGS)
(-)ftp/fastdfs/files/patch-tracker-Makefile.in (+20 lines)
Line 0 Link Here
1
--- tracker/Makefile.in.orig	2016-08-08 09:17:50.000000000 +0200
2
+++ tracker/Makefile.in	2016-10-08 18:13:28.211552000 +0200
3
@@ -1,7 +1,7 @@
4
 .SUFFIXES: .c .o
5
 
6
 COMPILE = $(CC) $(CFLAGS)
7
-INC_PATH = -I../common -I/usr/include/fastcommon
8
+INC_PATH = -I../common -I/usr/local/include/fastcommon
9
 LIB_PATH = $(LIBS) -lfastcommon
10
 TARGET_PATH = $(TARGET_PREFIX)/bin
11
 CONFIG_PATH = $(TARGET_CONF_PATH)
12
@@ -26,7 +26,7 @@
13
 install:
14
 	mkdir -p $(TARGET_PATH)
15
 	mkdir -p $(CONFIG_PATH)
16
-	cp -f $(ALL_PRGS) $(TARGET_PATH)
17
+	install -s $(ALL_PRGS) $(TARGET_PATH)
18
 	if [ ! -f $(CONFIG_PATH)/tracker.conf.sample ]; then cp -f ../conf/tracker.conf $(CONFIG_PATH)/tracker.conf.sample; fi
19
 clean:
20
 	rm -f $(ALL_OBJS) $(ALL_PRGS)
(-)ftp/fastdfs/pkg-descr (+6 lines)
Line 0 Link Here
1
FastDFS is an open source high performance distributed file system (DFS). 
2
It's major functions include: file storing, file syncing and 
3
file accessing, and design for high capacity and load balance.
4
5
WWW: https://github.com/happyfish100/fastdfs
6
(-)ftp/fastdfs/pkg-plist (+36 lines)
Line 0 Link Here
1
bin/fdfs_append_file
2
bin/fdfs_appender_test
3
bin/fdfs_appender_test1
4
bin/fdfs_crc32
5
bin/fdfs_delete_file
6
bin/fdfs_download_file
7
bin/fdfs_file_info
8
bin/fdfs_monitor
9
bin/fdfs_storaged
10
bin/fdfs_test
11
bin/fdfs_test1
12
bin/fdfs_trackerd
13
bin/fdfs_upload_appender
14
bin/fdfs_upload_file
15
@sample etc/fdfs/client.conf.sample
16
@sample etc/fdfs/storage.conf.sample
17
@sample etc/fdfs/tracker.conf.sample
18
include/fastdfs/client_func.h
19
include/fastdfs/client_global.h
20
include/fastdfs/fdfs_client.h
21
include/fastdfs/fdfs_define.h
22
include/fastdfs/fdfs_global.h
23
include/fastdfs/fdfs_http_shared.h
24
include/fastdfs/fdfs_shared_func.h
25
include/fastdfs/mime_file_parser.h
26
include/fastdfs/storage_client.h
27
include/fastdfs/storage_client1.h
28
include/fastdfs/tracker_client.h
29
include/fastdfs/tracker_proto.h
30
include/fastdfs/tracker_types.h
31
include/fastdfs/trunk_shared.h
32
lib/libfdfsclient.so
33
@dir /var/db/fastdfs/storage
34
@dir /var/db/fastdfs/tracker
35
@dir /var/db/fastdfs
36
(-)ftp/php56-fastdfs/Makefile (+25 lines)
Line 0 Link Here
1
PORTNAME=	php56-fastdfs
2
PORTVERSION=	5.08
3
CATEGORIES=	ftp
4
5
LICENSE=	GPLv3
6
7
MAINTAINER=	daniel@blodan.se
8
9
BUILD_DEPENDS=	${PREFIX}/include/fastcommon/logger.h:devel/libfastcommon \
10
		${PREFIX}/include/fastdfs/fdfs_client.h:ftp/fastdfs
11
12
USE_GITHUB=	yes
13
GH_ACCOUNT=	happyfish100
14
GH_PROJECT=	fastdfs
15
GH_TAGNAME=	87659981148a362812912b6d4752d281ac05f0b6
16
17
USES=			php:ext
18
IGNORE_WITH_PHP=	55 70
19
PHP_DEFAULT=		5.6
20
21
WRKSRC_SUBDIR=	php_client
22
23
PHP_MODNAME=	fastdfs_client
24
25
.include <bsd.port.mk>
(-)ftp/php56-fastdfs/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1475924306
2
SHA256 (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = c901415de55cad67fe31678091ce131ad4973bce19770f1a03b0be38ba02662d
3
SIZE (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = 335406
(-)ftp/php56-fastdfs/files/patch-config.m4 (+11 lines)
Line 0 Link Here
1
--- config.m4.orig	2016-10-08 13:00:34.348486000 +0200
2
+++ config.m4	2016-10-08 13:00:44.757703000 +0200
3
@@ -7,7 +7,7 @@
4
   PHP_SUBST(FASTDFS_CLIENT_SHARED_LIBADD)
5
 
6
   if test -z "$ROOT"; then
7
-	ROOT=/usr
8
+	ROOT=/usr/local
9
   fi
10
 
11
   PHP_ADD_INCLUDE($ROOT/include/fastcommon)
(-)ftp/php56-fastdfs/pkg-descr (+4 lines)
Line 0 Link Here
1
PHP module for accessing a FastDFS cluster
2
3
WWW: https://github.com/happyfish100/fastdfs
4
(-)ftp/php56-fastdfs/pkg-message (+14 lines)
Line 0 Link Here
1
Before you can start using this module;
2
- Make sure you have configured client.conf to point to your FastDFS cluster
3
- Add this to your php.ini file
4
==================================================================
5
fastdfs_client.base_path = /var/tmp
6
fastdfs_client.connect_timeout = 2
7
fastdfs_client.network_timeout = 60
8
fastdfs_client.log_level = info
9
fastdfs_client.log_filename =
10
fastdfs_client.http.anti_steal_secret_key =
11
fastdfs_client.tracker_group_count = 1
12
fastdfs_client.tracker_group0 = /usr/local/etc/fdfs/client.conf
13
fastdfs_client.use_connection_pool = false
14
fastdfs_client.connection_pool_max_idle_time = 3600
(-)ftp/php70-fastdfs/Makefile (+25 lines)
Line 0 Link Here
1
PORTNAME=	php70-fastdfs
2
PORTVERSION=	5.08
3
CATEGORIES=	ftp
4
5
LICENSE=	GPLv3
6
7
MAINTAINER=	daniel@blodan.se
8
9
BUILD_DEPENDS=	${PREFIX}/include/fastcommon/logger.h:devel/libfastcommon \
10
		${PREFIX}/include/fastdfs/fdfs_client.h:ftp/fastdfs
11
12
USE_GITHUB=	yes
13
GH_ACCOUNT=	happyfish100
14
GH_PROJECT=	fastdfs
15
GH_TAGNAME=	87659981148a362812912b6d4752d281ac05f0b6
16
17
USES=			php:ext
18
IGNORE_WITH_PHP=	55 56
19
PHP_DEFAULT=		7.0
20
21
WRKSRC_SUBDIR=	php_client
22
23
PHP_MODNAME=	fastdfs_client
24
25
.include <bsd.port.mk>
(-)ftp/php70-fastdfs/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1475924306
2
SHA256 (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = c901415de55cad67fe31678091ce131ad4973bce19770f1a03b0be38ba02662d
3
SIZE (happyfish100-fastdfs-5.08-87659981148a362812912b6d4752d281ac05f0b6_GH0.tar.gz) = 335406
(-)ftp/php70-fastdfs/files/patch-config.m4 (+11 lines)
Line 0 Link Here
1
--- config.m4.orig	2016-10-08 13:00:34.348486000 +0200
2
+++ config.m4	2016-10-08 13:00:44.757703000 +0200
3
@@ -7,7 +7,7 @@
4
   PHP_SUBST(FASTDFS_CLIENT_SHARED_LIBADD)
5
 
6
   if test -z "$ROOT"; then
7
-	ROOT=/usr
8
+	ROOT=/usr/local
9
   fi
10
 
11
   PHP_ADD_INCLUDE($ROOT/include/fastcommon)
(-)ftp/php70-fastdfs/pkg-descr (+4 lines)
Line 0 Link Here
1
PHP module for accessing a FastDFS cluster
2
3
WWW: https://github.com/happyfish100/fastdfs
4
(-)ftp/php70-fastdfs/pkg-message (+14 lines)
Line 0 Link Here
1
Before you can start using this module;
2
- Make sure you have configured client.conf to point to your FastDFS cluster
3
- Add this to your php.ini file
4
==================================================================
5
fastdfs_client.base_path = /var/tmp
6
fastdfs_client.connect_timeout = 2
7
fastdfs_client.network_timeout = 60
8
fastdfs_client.log_level = info
9
fastdfs_client.log_filename =
10
fastdfs_client.http.anti_steal_secret_key =
11
fastdfs_client.tracker_group_count = 1
12
fastdfs_client.tracker_group0 = /usr/local/etc/fdfs/client.conf
13
fastdfs_client.use_connection_pool = false
14
fastdfs_client.connection_pool_max_idle_time = 3600

Return to bug 213311