Attachment #153404 for bug #194409




# $FreeBSD$

PORTNAME=	glusterfs
PORTVERSION=	3.6.2
CATEGORIES=	net
MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
DISTNAME=	${PORTNAME}-3.6.2

MAINTAINER=	craig001@lerwick.hopto.org
COMMENT=	GlusterFS distributed file system

		--localstatedir=/var \
		--disable-epoll \
		--enable-glupy \
		--disable-georeplication \
		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
		ac_cv_func_setfsuid=no 	ac_cv_func_fdatasync=no \
		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
CPPFLAGS+=	-I"${LOCALBASE}/include"
LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
INSTALL_TARGET=	install-strip
PLIST_SUB=	GLUSTERLIBDIR="${PREFIX}/lib/${PORTNAME}/3.6.2"

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)glusterfs/distinfo (-2 / +2 lines)
1	SHA256 (glusterfs-3.6.0beta3.tar.gz) = a5b7d2e41e27348232be74ff448b66c3df1241de8001c82a0e9344d1c42d076e	1	SHA256 (glusterfs-3.6.2.tar.gz) = 4ab515a5ed8316cf8a19d80d8fbe89312c03ba5ee2f81f789d705e05649de0cf
2	SIZE (glusterfs-3.6.0beta3.tar.gz) = 5888792	2	SIZE (glusterfs-3.6.2.tar.gz) = 6018636




--- configure.orig	2015-02-16 21:13:46.743376747 +0000
+++ configure	2015-02-16 21:20:20.085666758 +0000
@@ -16076,6 +16076,9 @@
      linux*)
 #do nothing
        ;;
+     freebsd*)
+#do nothing
+       ;;
      netbsd*)
 #do nothing
        ;;
@@ -19518,7 +19521,7 @@
 
 case $host_os in
-     linux*)
+     linux*|freebsd*)
        CFLAGS="`${PYTHON}-config --cflags`"
        CPPFLAGS=$CFLAGS
        LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
@@ -19507,7 +19507,7 @@
 esac
 
 
-for ac_header in python$PYTHON_VERSION/Python.h
+for ac_header in python$PYTHON_VERSION/Python.h Python.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then




%%GLUSTERLIBDIR%%/xlator/testing/features/template.so
%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so
lib/libgfapi.so
lib/libgfapi.so.0
lib/libgfapi.so.0.0.0
lib/libgfchangelog.so
lib/libgfchangelog.so.0
lib/libgfchangelog.so.0.0.1

man/man8/glusterfs.8.gz
man/man8/glusterfsd.8.gz
man/man8/mount.glusterfs.8.gz
sbin/glfsheal
sbin/gluster
sbin/glusterd
sbin/glusterfs
sbin/glusterfsd
sbin/mount_glusterfs
sbin/umountd
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/README
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh

%%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c
%%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el
%%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim
%%DATADIR%%/scripts/generate-gfid-file.sh
%%DATADIR%%/scripts/get-gfid.sh
%%DATADIR%%/scripts/gsync-sync-gfid
%%DATADIR%%/scripts/gsync-upgrade.sh
%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
%%DATADIR%%/scripts/slave-upgrade.sh
@sample /var/db/glusterd/groups/virt.sample
@dir /var/db/glusterd/groups
@dir /var/db/glusterd

Return to bug 194409

Lines 1-10 Link Here

(-)glusterfs/Makefile (-3 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= glusterfs	3	PORTNAME= glusterfs
4	PORTVERSION= 3.6.0.b.3	4	PORTVERSION= 3.6.2
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/	6	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
7	DISTNAME= ${PORTNAME}-3.6.0beta3	7	DISTNAME= ${PORTNAME}-3.6.2
8		8
9	MAINTAINER= craig001@lerwick.hopto.org	9	MAINTAINER= craig001@lerwick.hopto.org
10	COMMENT= GlusterFS distributed file system	10	COMMENT= GlusterFS distributed file system
Lines 25-36 Link Here
25	--localstatedir=/var \	25	--localstatedir=/var \
26	--disable-epoll \	26	--disable-epoll \
27	--enable-glupy \	27	--enable-glupy \
		28	--disable-georeplication \
28	ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \	29	ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
29	ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \	30	ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \
30	ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no	31	ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
31	CPPFLAGS+= -I"${LOCALBASE}/include"	32	CPPFLAGS+= -I"${LOCALBASE}/include"
32	LDFLAGS+= -L"${LOCALBASE}/lib" -largp	33	LDFLAGS+= -L"${LOCALBASE}/lib" -largp
33	INSTALL_TARGET= install-strip	34	INSTALL_TARGET= install-strip
34	PLIST_SUB= GLUSTERLIBDIR="${PREFIX}/lib/${PORTNAME}/3.6.0beta3"	35	PLIST_SUB= GLUSTERLIBDIR="${PREFIX}/lib/${PORTNAME}/3.6.2"
35		36
36	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)glusterfs/files/patch-configure (-13 / +14 lines)
1	--- configure.orig 2014-10-01 03:18:06.000000000 +0900	1	--- configure.orig 2015-02-16 21:13:46.743376747 +0000
2	+++ configure 2014-11-24 18:52:14.000000000 +0900	2	+++ configure 2015-02-16 21:20:20.085666758 +0000
3	@@ -19494,7 +19494,7 @@	3	@@ -16076,6 +16076,9 @@
4	saved_LDFLAGS=$LDFLAGS	4	linux*)
		5	#do nothing
		6	;;
		7	+ freebsd*)
		8	+#do nothing
		9	+ ;;
		10	netbsd*)
		11	#do nothing
		12	;;
		13	@@ -19518,7 +19521,7 @@
5		14
6	case $host_os in
7	- linux*)
8	+ linux\|freebsd)
9	CFLAGS="`${PYTHON}-config --cflags`"
10	CPPFLAGS=$CFLAGS
11	LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`"
12	@@ -19507,7 +19507,7 @@
13	esac
14		15
15		16
16	-for ac_header in python$PYTHON_VERSION/Python.h	17	-for ac_header in python$PYTHON_VERSION/Python.h
17	+for ac_header in Python.h	18	+for ac_header in python$PYTHON_VERSION/Python.h Python.h
18	do	19	do
19	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	20	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
20	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then	21	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

Lines 78-85 Link Here

(-)glusterfs/pkg-plist (-7 / +4 lines)
78	%%GLUSTERLIBDIR%%/xlator/testing/features/template.so	78	%%GLUSTERLIBDIR%%/xlator/testing/features/template.so
79	%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so	79	%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so
80	lib/libgfapi.so	80	lib/libgfapi.so
81	lib/libgfapi.so.7	81	lib/libgfapi.so.0
82	lib/libgfapi.so.7.0.0	82	lib/libgfapi.so.0.0.0
83	lib/libgfchangelog.so	83	lib/libgfchangelog.so
84	lib/libgfchangelog.so.0	84	lib/libgfchangelog.so.0
85	lib/libgfchangelog.so.0.0.1	85	lib/libgfchangelog.so.0.0.1
Lines 107-117 Link Here
107	man/man8/glusterfs.8.gz	107	man/man8/glusterfs.8.gz
108	man/man8/glusterfsd.8.gz	108	man/man8/glusterfsd.8.gz
109	man/man8/mount.glusterfs.8.gz	109	man/man8/mount.glusterfs.8.gz
		110	sbin/glfsheal
110	sbin/gluster	111	sbin/gluster
111	sbin/glusterd	112	sbin/glusterd
112	sbin/glusterfs	113	sbin/glusterfs
113	sbin/glusterfsd	114	sbin/glusterfsd
114	sbin/mount_glusterfs	115	sbin/mount_glusterfs
		116	sbin/umountd
115	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/README	117	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/README
116	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c	118	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c
117	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh	119	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh
Lines 119-131 Link Here
119	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c	121	%%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c
120	%%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el	122	%%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el
121	%%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim	123	%%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim
122	%%DATADIR%%/scripts/generate-gfid-file.sh
123	%%DATADIR%%/scripts/get-gfid.sh
124	%%DATADIR%%/scripts/gsync-sync-gfid
125	%%DATADIR%%/scripts/gsync-upgrade.sh
126	%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh	124	%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
127	%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh	125	%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
128	%%DATADIR%%/scripts/slave-upgrade.sh
129	@sample /var/db/glusterd/groups/virt.sample	126	@sample /var/db/glusterd/groups/virt.sample
130	@dir /var/db/glusterd/groups	127	@dir /var/db/glusterd/groups
131	@dir /var/db/glusterd	128	@dir /var/db/glusterd