Index: head/devel/libfastcommon/Makefile =================================================================== --- head/devel/libfastcommon/Makefile (revision 432623) +++ head/devel/libfastcommon/Makefile (revision 432624) @@ -1,26 +1,27 @@ # $FreeBSD$ PORTNAME= libfastcommon PORTVERSION= 1.0.30 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= daniel@blodan.se COMMENT= C common functions library used mainly by FastDFS and FastDHT LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= happyfish100 GH_TAGNAME= b80de986b2a269cd15d56e4978c6df844a9c2e59 USE_LDCONFIG= yes MAKE_ENV += DESTDIR=${STAGEDIR} do-build: cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} make.sh do-install: cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} make.sh install .include Index: head/devel/libfastcommon/files/patch-make.sh =================================================================== --- head/devel/libfastcommon/files/patch-make.sh (revision 432623) +++ head/devel/libfastcommon/files/patch-make.sh (revision 432624) @@ -1,62 +1,86 @@ --- 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 < $tmp_src_filename -#include -#include -#include -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 -- ++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 - OS_BITS=32 - LIB_VERSION=lib -fi - -if [ "$off_bytes" -eq 8 ]; then OFF_BITS=64 else + OS_BITS=32 OFF_BITS=32 fi +LIB_VERSION=lib + 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 Index: head/devel/libfastcommon/files/patch-src_Makefile.in =================================================================== --- head/devel/libfastcommon/files/patch-src_Makefile.in (revision 432623) +++ head/devel/libfastcommon/files/patch-src_Makefile.in (revision 432624) @@ -1,28 +1,28 @@ --- src/Makefile.in.orig 2016-09-08 07:44:31 UTC +++ src/Makefile.in @@ -41,7 +41,7 @@ ALL_LIBS = $(SHARED_LIBS) $(STATIC_LIBS) 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 +53,10 @@ libfastcommon.a: $(FAST_STATIC_OBJS) .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)$(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) Index: head/devel/libfastcommon/files/patch-src_system__info.c =================================================================== --- head/devel/libfastcommon/files/patch-src_system__info.c (nonexistent) +++ head/devel/libfastcommon/files/patch-src_system__info.c (revision 432624) @@ -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) Property changes on: head/devel/libfastcommon/files/patch-src_system__info.c ___________________________________________________________________ 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: head/ftp/php56-fastdfs/Makefile =================================================================== --- head/ftp/php56-fastdfs/Makefile (revision 432623) +++ head/ftp/php56-fastdfs/Makefile (revision 432624) @@ -1,28 +1,29 @@ # $FreeBSD$ PORTNAME= php56-fastdfs PORTVERSION= 5.0.8 +PORTREVISION= 1 CATEGORIES= ftp MAINTAINER= daniel@blodan.se COMMENT= PHP 5.6 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= 87659981148a362812912b6d4752d281ac05f0b6 USES= php:ext IGNORE_WITH_PHP= 70 PHP_VER= 56 WRKSRC_SUBDIR= php_client PHP_MODNAME= fastdfs_client .include Index: head/ftp/php70-fastdfs/Makefile =================================================================== --- head/ftp/php70-fastdfs/Makefile (revision 432623) +++ head/ftp/php70-fastdfs/Makefile (revision 432624) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= fastdfs PORTVERSION= 5.0.8 +PORTREVISION= 1 CATEGORIES= ftp 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= 87659981148a362812912b6d4752d281ac05f0b6 USES= php:ext IGNORE_WITH_PHP= 56 71 PHP_VER= 70 WRKSRC_SUBDIR= php_client PHP_MODNAME= fastdfs_client .include Index: head/ftp/php71-fastdfs/Makefile =================================================================== --- head/ftp/php71-fastdfs/Makefile (revision 432623) +++ head/ftp/php71-fastdfs/Makefile (revision 432624) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= fastdfs PORTVERSION= 5.0.8 +PORTREVISION= 1 CATEGORIES= ftp 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= 87659981148a362812912b6d4752d281ac05f0b6 USES= php:ext IGNORE_WITH_PHP= 56 70 PHP_VER= 71 WRKSRC_SUBDIR= php_client PHP_MODNAME= fastdfs_client .include