svn commit: r432624 - in head: devel/libfastcommon devel/libfastcommon/files ftp/php56-fastdfs ftp/php70-fastdfs ftp/php71-fastdfs
John Marino
marino at FreeBSD.org
Sat Jan 28 14:22:55 UTC 2017
Author: marino
Date: Sat Jan 28 14:22:53 2017
New Revision: 432624
URL: https://svnweb.freebsd.org/changeset/ports/432624
Log:
devel/libfastcommon: fix misbuild, add DF, bump deps minus nginx-full
The fastcommon library is being built as 32-bit on amd64 due to the
misuse of uname (uname -p returns "amd64", not uname alone).
Additionally, the hardcoded install commands (added via patch) have been
updated to the BSD_INSTALL* macros to satisfy QA tests.
While here, fix building on DragonFly (sacrificing unused Darwin support
in the process).
Finally, bump all ports dependend on fault libfastcommon.so except
www/nginx-full which has no separate PORTREVISION setting. I can't bump
it without bumping www/nginx too (bug??).
Approvd by: just-fix-it
Added:
head/devel/libfastcommon/files/patch-src_system__info.c (contents, props changed)
Modified:
head/devel/libfastcommon/Makefile
head/devel/libfastcommon/files/patch-make.sh
head/devel/libfastcommon/files/patch-src_Makefile.in
head/ftp/php56-fastdfs/Makefile
head/ftp/php70-fastdfs/Makefile
head/ftp/php71-fastdfs/Makefile
Modified: head/devel/libfastcommon/Makefile
==============================================================================
--- head/devel/libfastcommon/Makefile Sat Jan 28 13:18:37 2017 (r432623)
+++ head/devel/libfastcommon/Makefile Sat Jan 28 14:22:53 2017 (r432624)
@@ -2,6 +2,7 @@
PORTNAME= libfastcommon
PORTVERSION= 1.0.30
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= daniel at blodan.se
Modified: head/devel/libfastcommon/files/patch-make.sh
==============================================================================
--- head/devel/libfastcommon/files/patch-make.sh Sat Jan 28 13:18:37 2017 (r432623)
+++ head/devel/libfastcommon/files/patch-make.sh Sat Jan 28 14:22:53 2017 (r432624)
@@ -1,6 +1,6 @@
--- make.sh.orig 2016-09-08 07:44:31 UTC
+++ make.sh
-@@ -1,55 +1,13 @@
+@@ -1,55 +1,15 @@
-tmp_src_filename=fast_check_bits.c
-cat <<EOF > $tmp_src_filename
-#include <stdio.h>
@@ -37,10 +37,11 @@
-
- count=`$EXPR $count + 1`
-done
--
++unamep=$(/usr/bin/uname -p)
+
-/bin/rm -f a.out $tmp_src_filename
-if [ "$int_bytes" -eq 8 ]; then
-+if [ "$(/usr/bin/uname)" = "amd64" ]; then
++if [ "$unamep" = "amd64" -o "$unamep" = "x86_64" ]; then
OS_BITS=64
- LIB_VERSION=lib64
-else
@@ -60,3 +61,26 @@
DEBUG_FLAG=0
CFLAGS='-Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE'
+@@ -67,12 +27,9 @@ HAVE_USER_H=0
+ if [ "$uname" = "Linux" ]; then
+ OS_NAME=OS_LINUX
+ IOEVENT_USE=IOEVENT_USE_EPOLL
+-elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
++elif [ "$uname" = "FreeBSD" -o "$uname" = "DragonFly" ]; then
+ OS_NAME=OS_FREEBSD
+ IOEVENT_USE=IOEVENT_USE_KQUEUE
+- if [ "$uname" = "Darwin" ]; then
+- CFLAGS="$CFLAGS -DDARWIN"
+- fi
+
+ if [ -f /usr/include/sys/vmmeter.h ]; then
+ HAVE_VMMETER_H=1
+@@ -138,7 +95,7 @@ sed_replace()
+ {
+ sed_cmd=$1
+ filename=$2
+- if [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
++ if [ "$uname" = "FreeBSD" -o "$uname" = "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 Sat Jan 28 13:18:37 2017 (r432623)
+++ head/devel/libfastcommon/files/patch-src_Makefile.in Sat Jan 28 14:22:53 2017 (r432624)
@@ -20,9 +20,9 @@
- mkdir -p $(DESTDIR)/usr/include/fastcommon
- install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon
+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIB_VERSION)
-+ install -m 755 $(SHARED_LIBS) $(DESTDIR)$(PREFIX)/$(LIB_VERSION)
++ ${BSD_INSTALL_LIB} $(SHARED_LIBS) $(DESTDIR)$(PREFIX)/$(LIB_VERSION)
+ mkdir -p $(DESTDIR)$(PREFIX)/include/fastcommon
-+ install -m 644 $(HEADER_FILES) $(DESTDIR)$(PREFIX)/include/fastcommon
++ ${BSD_INSTALL_DATA} $(HEADER_FILES) $(DESTDIR)$(PREFIX)/include/fastcommon
clean:
rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)
Added: head/devel/libfastcommon/files/patch-src_system__info.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/libfastcommon/files/patch-src_system__info.c Sat Jan 28 14:22:53 2017 (r432624)
@@ -0,0 +1,23 @@
+--- src/system_info.c.orig 2016-09-08 07:44:31 UTC
++++ src/system_info.c
+@@ -582,6 +582,20 @@ int get_sysinfo(struct fast_sysinfo*info
+ #define ki_rgid kp_eproc.e_pcred.p_rgid
+ #define GET_SIGNAL(sig) sig
+
++#elif defined __DragonFly__
++#define ki_pid kp_pid
++#define ki_comm kp_comm
++#define ki_ppid kp_ppid
++#define ki_start kp_start
++#define ki_flag kp_flags
++#define ki_stat kp_stat
++#define ki_sigignore kp_sigignore
++#define ki_sigcatch kp_sigcatch
++#define ki_priority kp_lwp.kl_prio
++#define ki_ruid kp_ruid
++#define ki_rgid kp_rgid
++#define GET_SIGNAL(sig) *((int *)&sig)
++
+ #else
+ #define ki_priority ki_pri.pri_level
+ #define GET_SIGNAL(sig) *((int *)&sig)
Modified: head/ftp/php56-fastdfs/Makefile
==============================================================================
--- head/ftp/php56-fastdfs/Makefile Sat Jan 28 13:18:37 2017 (r432623)
+++ head/ftp/php56-fastdfs/Makefile Sat Jan 28 14:22:53 2017 (r432624)
@@ -2,6 +2,7 @@
PORTNAME= php56-fastdfs
PORTVERSION= 5.0.8
+PORTREVISION= 1
CATEGORIES= ftp
MAINTAINER= daniel at blodan.se
Modified: head/ftp/php70-fastdfs/Makefile
==============================================================================
--- head/ftp/php70-fastdfs/Makefile Sat Jan 28 13:18:37 2017 (r432623)
+++ head/ftp/php70-fastdfs/Makefile Sat Jan 28 14:22:53 2017 (r432624)
@@ -2,6 +2,7 @@
PORTNAME= fastdfs
PORTVERSION= 5.0.8
+PORTREVISION= 1
CATEGORIES= ftp
PKGNAMEPREFIX= php70-
Modified: head/ftp/php71-fastdfs/Makefile
==============================================================================
--- head/ftp/php71-fastdfs/Makefile Sat Jan 28 13:18:37 2017 (r432623)
+++ head/ftp/php71-fastdfs/Makefile Sat Jan 28 14:22:53 2017 (r432624)
@@ -2,6 +2,7 @@
PORTNAME= fastdfs
PORTVERSION= 5.0.8
+PORTREVISION= 1
CATEGORIES= ftp
PKGNAMEPREFIX= php71-
More information about the svn-ports-all
mailing list