Index: security/hashcat/Makefile =================================================================== --- security/hashcat/Makefile +++ security/hashcat/Makefile @@ -4,6 +4,7 @@ PORTNAME= hashcat PORTVERSION= 3.20 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security MAINTAINER= lifanov@FreeBSD.org @@ -13,16 +14,21 @@ LICENSE_FILE= ${WRKSRC}/docs/license.txt BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl \ - ${LOCALBASE}/bin/gsed:textproc/gsed + gsed:textproc/gsed BROKEN_FreeBSD_9= does not build USE_GITHUB= yes ALL_TARGET= native -USES= gmake localbase +USES= gmake localbase shebangfix +SHEBANG_FILES= extra/tab_completion/install USE_CSTD= c99 +MAKE_ARGS= CC="${CC}" \ + CFLAGS_NATIVE="${CFLAGS} -Iinclude/ -IOpenCL/" \ + LFLAGS_NATIVE="${LDFLAGS} -lpthread" + pre-install: ${STRIP_CMD} ${WRKSRC}/hashcat Index: security/hashcat/files/patch-src_Makefile =================================================================== --- security/hashcat/files/patch-src_Makefile +++ security/hashcat/files/patch-src_Makefile @@ -1,56 +1,16 @@ --- src/Makefile.orig 2016-12-02 14:00:23 UTC +++ src/Makefile -@@ -101,25 +101,7 @@ BINARY_NATIVE := $(PROG_NAME) - ## General compiler and linker options - ## +@@ -163,11 +163,13 @@ LFLAGS_NATIVE += -lpthread -ld + endif # Linux --CFLAGS := -pipe -std=c99 -Iinclude/ -IOpenCL/ --CFLAGS += -W --CFLAGS += -Wall --CFLAGS += -Wextra --CFLAGS += -Wfloat-equal --CFLAGS += -Wundef --CFLAGS += -Wshadow --CFLAGS += -Wmissing-declarations --CFLAGS += -Wmissing-prototypes --CFLAGS += -Wpointer-arith --CFLAGS += -Wstrict-prototypes --CFLAGS += -Waggregate-return --CFLAGS += -Wswitch-enum --CFLAGS += -Wunreachable-code --CFLAGS += -Winit-self --CFLAGS += -Werror-implicit-function-declaration --CFLAGS += -Wformat --CFLAGS += -Wno-format-zero-length --CFLAGS += -ftrapv -+CFLAGS += -Iinclude/ -IOpenCL/ - - # the following compiler options produce warnings that should be fixed at some time - -@@ -137,18 +119,6 @@ CFLAGS += -ftrapv - - #CFLAGS += -Wstack-usage=524288 - --LFLAGS := -- --ifndef DEBUG --CFLAGS += -O2 --LFLAGS += -s --else --CFLAGS += -DDEBUG -g -ggdb --ifeq ($(DEBUG),2) --CFLAGS += -fsanitize=address -fno-omit-frame-pointer --endif --endif -- - ## - ## Native compilation target - ## -@@ -165,7 +135,6 @@ endif # Linux ifeq ($(UNAME),FreeBSD) ++ifndef PORTNAME CFLAGS_NATIVE := $(CFLAGS) CFLAGS_NATIVE += -I$(OPENCL_HEADERS_KHRONOS)/ --CFLAGS_NATIVE += -march=native + CFLAGS_NATIVE += -march=native LFLAGS_NATIVE := $(LFLAGS) LFLAGS_NATIVE += -lpthread ++endif endif # FreeBSD + + ifeq ($(UNAME),Darwin) Index: www/seahub/Makefile =================================================================== --- www/seahub/Makefile +++ www/seahub/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= seahub -PORTVERSION= 6.0.4 +PORTVERSION= 6.0.5 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -pro CATEGORIES= www Index: www/seahub/distinfo =================================================================== --- www/seahub/distinfo +++ www/seahub/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481503025 -SHA256 (haiwen-seahub-v6.0.4-pro_GH0.tar.gz) = b2666021fb11e356f33dfb48de2b0b0b66d5378802556cd5f77508ee176df9d4 -SIZE (haiwen-seahub-v6.0.4-pro_GH0.tar.gz) = 8413936 +TIMESTAMP = 1482859386 +SHA256 (haiwen-seahub-v6.0.5-pro_GH0.tar.gz) = 741e15a6ae572b5dcf431bbe57fefaf523dc6f22e4fcdf62f853b1dddd798168 +SIZE (haiwen-seahub-v6.0.5-pro_GH0.tar.gz) = 8413914 Index: www/seahub/pkg-plist =================================================================== --- www/seahub/pkg-plist +++ www/seahub/pkg-plist @@ -185,7 +185,7 @@ %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/dirent-rename.js %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-change-password.7c8f8db7a529.js %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-change-password.js -%%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-folder-perm-admin.8273386c97cb.js +%%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-folder-perm-admin.a73d294517e3.js %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-folder-perm-admin.js %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-history-settings.4803dcbb740a.js %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-history-settings.js @@ -347,7 +347,6 @@ %%SEAHUBDIR%%/media/assets/scripts/i18n/es-mx/djangojs.js %%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.210aa31910ac.js %%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.js -%%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.f66480b3d021.js %%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.js %%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.f701701595f1.js %%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.js @@ -727,15 +726,17 @@ %%SEAHUBDIR%%/media/assets/scripts/app/views/organization.f2b8e14eb3f3.js %%SEAHUBDIR%%/media/assets/scripts/common.40cfe3ae0e4a.js %%SEAHUBDIR%%/media/assets/scripts/dist/build.47e68614daea.txt -%%SEAHUBDIR%%/media/assets/scripts/dist/main.9f9fcaac3b37.js %%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.949967e72a2a.js %%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.8d877df126c1.js %%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.3a52c64c31bf.js +%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.js +%%SEAHUBDIR%%/media/assets/scripts/dist/main.37004de6ce75.js +%%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.b19b80108a06.js %%SEAHUBDIR%%/media/css/video-js.min.css %%SEAHUBDIR%%/media/js/video-js.swf %%SEAHUBDIR%%/media/js/video.min.js %%SEAHUBDIR%%/sql/oracle.sql -%%SEAHUBDIR%%/static/scripts/i18n/fi/djangojs.js %%SEAHUBDIR%%/tests/seahub/forms/test_add_user_form.py %%SEAHUBDIR%%/tests/seahub/utils/%%USERS%%-license.txt %%SEAHUBDIR%%/tests/seahub/utils/test_license_parse.py