Attachment 188421 Details for Bug 223714 – Part 1: Master/Slave changes

[patch] Part 1: Master/Slave changes

fastdfs-master-slave.patch (text/plain), 6.87 KB, created by Daniel Ylitalo on 2017-11-30 11:05:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Ylitalo

Created: 2017-11-30 11:05:08 UTC

Size: 6.87 KB

patch

obsolete

>Index: php56-fastdfs/Makefile
>===================================================================
>--- php56-fastdfs/Makefile	(revision 455189)
>+++ php56-fastdfs/Makefile	(working copy)
>@@ -1,12 +1,13 @@
> # $FreeBSD$
> 
> PORTNAME=	fastdfs
>-PORTVERSION=	5.0.11
>+DISTVERSION=	5.0.11
> CATEGORIES=	ftp
>-PKGNAMEPREFIX=	php56-
>+PKGNAMEPREFIX?=	php56-
>+IGNORE_WITH_PHP?=	70 71 72
> 
> MAINTAINER=	daniel@blodan.se
>-COMMENT=	PHP 5.6 module for accessing a FastDFS cluster
>+COMMENT?=	PHP 5.6 module for accessing a FastDFS cluster
> 
> LICENSE=	GPLv3+
> 
>@@ -19,7 +20,7 @@
> GH_TAGNAME=	1e50b4f
> 
> USES=			php:ext
>-PHP_VER=		56
>+PHP_VER?=		56
> 
> WRKSRC_SUBDIR=	php_client
> CONFIGURE_ENV=	ROOT=${LOCALBASE}
>Index: php70-fastdfs/Makefile
>===================================================================
>--- php70-fastdfs/Makefile	(revision 455189)
>+++ php70-fastdfs/Makefile	(working copy)
>@@ -1,29 +1,12 @@
> # $FreeBSD$
> 
>-PORTNAME=	fastdfs
>-PORTVERSION=	5.0.11
>-CATEGORIES=	ftp
>+MASTERDIR=	${.CURDIR}/../php56-fastdfs
>+
> PKGNAMEPREFIX=	php70-
> 
>-MAINTAINER=	daniel@blodan.se
> COMMENT=	PHP 7 module for accessing a FastDFS cluster
> 
>-LICENSE=	GPLv3+
>-
>-LIB_DEPENDS=	libfastcommon.so:devel/libfastcommon \
>-		libfdfsclient.so:ftp/fastdfs
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	happyfish100
>-GH_PROJECT=	fastdfs
>-GH_TAGNAME=	1e50b4f
>-
>-USES=			php:ext
>+IGNORE_WITH_PHP=	56 71 72
> PHP_VER=		70
> 
>-WRKSRC_SUBDIR=	php_client
>-CONFIGURE_ENV=	ROOT=${LOCALBASE}
>-
>-PHP_MODNAME=	fastdfs_client
>-
>-.include <bsd.port.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: php70-fastdfs/distinfo
>===================================================================
>--- php70-fastdfs/distinfo	(revision 455189)
>+++ php70-fastdfs/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1502819550
>-SHA256 (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 42ef67951c55fb416282cd20389dde5709016913debbb87465b9b744fa3dacf9
>-SIZE (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 336996
>
>Property changes on: php70-fastdfs/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: php70-fastdfs/pkg-descr
>===================================================================
>--- php70-fastdfs/pkg-descr	(revision 455189)
>+++ php70-fastdfs/pkg-descr	(nonexistent)
>@@ -1,3 +0,0 @@
>-PHP module for accessing a FastDFS cluster
>-
>-WWW: https://github.com/happyfish100/fastdfs
>
>Property changes on: php70-fastdfs/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: php70-fastdfs/pkg-message
>===================================================================
>--- php70-fastdfs/pkg-message	(revision 455189)
>+++ php70-fastdfs/pkg-message	(nonexistent)
>@@ -1,15 +0,0 @@
>-Before you can start using this module;
>-- Make sure you have configured client.conf to point to your FastDFS cluster
>-  and that you see the cluster with fdfs_monitor
>-- 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: php70-fastdfs/pkg-message
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: php71-fastdfs/Makefile
>===================================================================
>--- php71-fastdfs/Makefile	(revision 455189)
>+++ php71-fastdfs/Makefile	(working copy)
>@@ -1,29 +1,12 @@
> # $FreeBSD$
> 
>-PORTNAME=	fastdfs
>-PORTVERSION=	5.0.11
>-CATEGORIES=	ftp
>+MASTERDIR=	${.CURDIR}/../php56-fastdfs
>+
> PKGNAMEPREFIX=	php71-
> 
>-MAINTAINER=	daniel@blodan.se
> COMMENT=	PHP 7.1 module for accessing a FastDFS cluster
> 
>-LICENSE=	GPLv3+
>-
>-LIB_DEPENDS=	libfastcommon.so:devel/libfastcommon \
>-		libfdfsclient.so:ftp/fastdfs
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	happyfish100
>-GH_PROJECT=	fastdfs
>-GH_TAGNAME=	1e50b4f
>-
>-USES=			php:ext
>+IGNORE_WITH_PHP=	56 70 72
> PHP_VER=		71
> 
>-WRKSRC_SUBDIR=	php_client
>-CONFIGURE_ENV=	ROOT=${LOCALBASE}
>-
>-PHP_MODNAME=	fastdfs_client
>-
>-.include <bsd.port.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: php71-fastdfs/distinfo
>===================================================================
>--- php71-fastdfs/distinfo	(revision 455189)
>+++ php71-fastdfs/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1502819531
>-SHA256 (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 42ef67951c55fb416282cd20389dde5709016913debbb87465b9b744fa3dacf9
>-SIZE (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 336996
>
>Property changes on: php71-fastdfs/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: php71-fastdfs/pkg-descr
>===================================================================
>--- php71-fastdfs/pkg-descr	(revision 455189)
>+++ php71-fastdfs/pkg-descr	(nonexistent)
>@@ -1,3 +0,0 @@
>-PHP module for accessing a FastDFS cluster
>-
>-WWW: https://github.com/happyfish100/fastdfs
>
>Property changes on: php71-fastdfs/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: php71-fastdfs/pkg-message
>===================================================================
>--- php71-fastdfs/pkg-message	(revision 455189)
>+++ php71-fastdfs/pkg-message	(nonexistent)
>@@ -1,15 +0,0 @@
>-Before you can start using this module;
>-- Make sure you have configured client.conf to point to your FastDFS cluster
>-  and that you see the cluster with fdfs_monitor
>-- 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: php71-fastdfs/pkg-message
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 223714: 188055 | 188068 | 188069 | 188421 | 188422