Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -13077,3 +13077,4 @@ java/jakarta-commons-lang3|java/apache-commons-lang3|2019-10-07|Renamed upstream x11-clocks/xfce4-timer-out-plugin|x11-clocks/xfce4-time-out-plugin|2019-10-09|Port was incorrectly named different to upstream x11-toolkits/gai||2019-10-10|Abandonware since 2005 +graphics/drm-fbsd-11.2-kmod|graphics/drm-fbsd-11.3-kmod|2019-11-XX|FreeBSD 11.2 is end-of-life Index: Mk/bsd.options.mk =================================================================== --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -37,7 +37,7 @@ # OPTIONS_EXCLUDE_${ARCH} - List of options unsupported on a given ${ARCH} # OPTIONS_EXCLUDE_${OPSYS} - List of options unsupported on a given ${OPSYS} # OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R} - List of options unsupported on a given -# ${OPSYS} and major version (8/9/10...) +# ${OPSYS} and major version (11/12/13...) # OPTIONS_SLAVE - This is designed for slave ports, it removes an # option from the options list inherited from the # master port and it always adds it to PORT_OPTIONS Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -178,8 +178,8 @@ # can still be attempted using TRYBROKEN to # test this assumption. # BROKEN_${OPSYS}_${OSREL:R} - Port is believed to be broken on a single -# release of ${OPSYS}, e.g BROKEN_FreeBSD_8 -# would affect all point releases of FreeBSD 8 +# release of ${OPSYS}, e.g BROKEN_FreeBSD_11 +# would affect all point releases of FreeBSD 11 # unless TRYBROKEN is also set. # BROKEN_${OPSYS}_${OSREL:R}_${ARCH} - Port is believed to be broken on a # single release of ${OPSYS} and specific architecture, @@ -1162,7 +1162,7 @@ .endif _EXPORTED_VARS+= OSVERSION -.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1102000) || \ +.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1103000) || \ (${OPSYS} == DragonFly && ${DFLYVERSION} < 400400) _UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\ are guaranteed to build on this system. Please upgrade to a supported release. Index: audio/supercollider/Makefile =================================================================== --- audio/supercollider/Makefile +++ audio/supercollider/Makefile @@ -55,7 +55,7 @@ .endif .if ${OPSYS} == FreeBSD -.if (${OSVERSION} >= 1102507 && ${OSVERSION} < 1200000) || \ +.if ${OSVERSION} < 1200000 || \ (${OSVERSION} >= 1200506 && ${OSVERSION} < 1300000) || \ ${OSVERSION} >= 1300014 BROKEN= fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either Index: devel/ElectricFence/files/patch-Makefile =================================================================== --- devel/ElectricFence/files/patch-Makefile +++ devel/ElectricFence/files/patch-Makefile @@ -1,12 +1,12 @@ ---- Makefile.orig Wed Apr 14 03:22:49 1999 -+++ Makefile Sun Oct 22 14:27:23 2006 +--- Makefile.orig 1999-04-13 17:22:49 UTC ++++ Makefile @@ -1,8 +1,14 @@ PIC= -fPIC -CFLAGS= -g -DUSE_SEMAPHORE $(PIC) -LIBS= -lpthread +#CFLAGS= -g -DUSE_SEMAPHORE $(PIC) +CFLAGS+= -g $(PIC) -+.if ${MACHINE_ARCH} == "i386" && ${OSVERSION} < 700003 || (${MACHINE_ARCH} == "amd64" && ${OSVERSION} < 700003) || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" ++.if ${MACHINE_ARCH} == "sparc64" +CFLAGS+= -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS +.endif +#CFLAGS+= -pthread @@ -18,7 +18,7 @@ BIN_INSTALL_DIR= $(prefix)/bin LIB_INSTALL_DIR= $(prefix)/lib MAN_INSTALL_DIR= $(prefix)/man/man3 -@@ -17,14 +23,18 @@ +@@ -17,14 +23,18 @@ PACKAGE_SOURCE= README efence.3 Makefile efence.h \ OBJECTS= efence.o page.o print.o all: libefence.a libefence.so.0.0 tstheap eftest @@ -45,7 +45,7 @@ install: libefence.a efence.3 libefence.so.0.0 $(INSTALL) -m 755 ef.sh $(BIN_INSTALL_DIR)/ef -@@ -54,16 +64,16 @@ +@@ -54,16 +64,16 @@ libefence.a: $(OBJECTS) $(AR) crv libefence.a $(OBJECTS) libefence.so.0.0: $(OBJECTS) Index: devel/py-pycapsicum/files/patch-__pycapsicum.c =================================================================== --- devel/py-pycapsicum/files/patch-__pycapsicum.c +++ devel/py-pycapsicum/files/patch-__pycapsicum.c @@ -1,14 +0,0 @@ ---- _pycapsicum.c.orig 2019-09-01 13:05:23 UTC -+++ _pycapsicum.c -@@ -32,11 +32,7 @@ - #include - - #include "Python.h" --#if OSVERSION < 1020000 --#include "sys/capability.h" --#else - #include "sys/capsicum.h" --#endif - #include "sys/caprights.h" - #include "structmember.h" - Index: dns/knot-resolver/Makefile =================================================================== --- dns/knot-resolver/Makefile +++ dns/knot-resolver/Makefile @@ -101,9 +101,9 @@ # has to be tested if this is still is a bug. # if so, look in /usr/ports/multimedia/dav1d/Makefile for # CPU stuff / llvm bug/workaround/solution -#.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1120000 +#.if ${OPSYS} == FreeBSD #NOT_FOR_ARCHS= i386 -#NOT_FOR_ARCHS_REASON_i386= libknot (installed by knot2) is broken on 11.2 at i386 +#NOT_FOR_ARCHS_REASON_i386= libknot (installed by knot2) is broken at i386 #.endif USERS= kresd Index: emulators/i386-wine-devel/Makefile.inc =================================================================== --- emulators/i386-wine-devel/Makefile.inc +++ emulators/i386-wine-devel/Makefile.inc @@ -65,8 +65,8 @@ .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1102000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000)) -IGNORE= binaries compiled for FreeBSD 11.2+, 12.0+ and -current only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000)) +IGNORE= binaries compiled for FreeBSD 11.3+, 12.0+ and -current only DISTFILES= .endif Index: emulators/i386-wine/Makefile.inc =================================================================== --- emulators/i386-wine/Makefile.inc +++ emulators/i386-wine/Makefile.inc @@ -58,8 +58,8 @@ .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1102000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000)) -IGNORE= binaries compiled for FreeBSD 11.2+, 12.0+ and -current only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000)) +IGNORE= binaries compiled for FreeBSD 11.3+, 12.0+ and -current only DISTFILES= .endif Index: emulators/rtc/files/Makefile =================================================================== --- emulators/rtc/files/Makefile +++ emulators/rtc/files/Makefile @@ -28,11 +28,7 @@ SYS?= /sys NOMAN= YES KMOD= rtc -.if ${OSVERSION} < 500002 -KMODDEPS= linux -.else MODULE_DEPEND= linux -.endif CDEV_MAJOR?= 202 DEVNAME= ${KMOD} SRCS= rtc.c rtc_linux.c vnode_if.h Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -139,7 +139,7 @@ SUBDIR += driconf SUBDIR += drm-current-kmod SUBDIR += drm-devel-kmod - SUBDIR += drm-fbsd11.2-kmod + SUBDIR += drm-fbsd11.3-kmod SUBDIR += drm-fbsd12.0-kmod SUBDIR += drm-kmod SUBDIR += drm-legacy-kmod Index: graphics/drm-fbsd-11.3-kmod/Makefile =================================================================== --- graphics/drm-fbsd-11.3-kmod/Makefile +++ graphics/drm-fbsd-11.3-kmod/Makefile @@ -1,7 +1,7 @@ # Created by: Johannes Dieterich # $FreeBSD$ -PORTNAME= drm-fbsd11.2-kmod +PORTNAME= drm-fbsd11.3-kmod PORTVERSION= 4.11g20190906 CATEGORIES= graphics @@ -32,7 +32,7 @@ .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1102000 || ${OSVERSION} > 1200000) +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1103000 || ${OSVERSION} > 1200000) IGNORE= only supported on FreeBSD 11. .endif Index: graphics/drm-fbsd-11.3-kmod/pkg-descr =================================================================== --- graphics/drm-fbsd-11.3-kmod/pkg-descr +++ graphics/drm-fbsd-11.3-kmod/pkg-descr @@ -1,6 +1,6 @@ amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components. Currently corresponding to Linux 4.11 DRM. -This version is for FreeBSD 11.2. +This version is for FreeBSD 11.3. amdgpu and radeonkms are known to fail with EFI boot. WWW: https://github.com/FreeBSDDesktop/kms-drm Index: graphics/drm-fbsd-11.3-kmod/pkg-message =================================================================== --- graphics/drm-fbsd-11.3-kmod/pkg-message +++ graphics/drm-fbsd-11.3-kmod/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: < -# $FreeBSD$ - -PORTNAME= drm-fbsd11.2-kmod -PORTVERSION= 4.11g20190906 -CATEGORIES= graphics - -MAINTAINER= x11@FreeBSD.org -COMMENT= DRM modules for the linuxkpi-based KMS components - -LICENSE= BSD2CLAUSE MIT GPLv2 -LICENSE_COMB= multi - -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 - -RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod - -CONFLICTS_INSTALL= drm-devel-kmod \ - drm-fbsd12.0-kmod \ - drm-current-kmod \ - drm-legacy-kmod - -OPTIONS_DEFINE= DEBUG - -USES= kmod uidfix - -USE_GITHUB= yes -GH_ACCOUNT= FreeBSDDesktop -GH_PROJECT= kms-drm -GH_TAGNAME= 72300db - -.include - -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1102000 || ${OSVERSION} > 1200000) -IGNORE= only supported on FreeBSD 11. -.endif - -.if ${OPSYS} != FreeBSD -IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) -.endif - -.include Index: graphics/drm-fbsd11.2-kmod/distinfo =================================================================== --- graphics/drm-fbsd11.2-kmod/distinfo +++ graphics/drm-fbsd11.2-kmod/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1567783476 -SHA256 (FreeBSDDesktop-kms-drm-4.11g20190906-72300db_GH0.tar.gz) = cda252dd7a8174a295e07ec0e425e0592e642462f10f57555156cd51fd44d2f0 -SIZE (FreeBSDDesktop-kms-drm-4.11g20190906-72300db_GH0.tar.gz) = 7358902 Index: graphics/drm-fbsd11.2-kmod/pkg-descr =================================================================== --- graphics/drm-fbsd11.2-kmod/pkg-descr +++ graphics/drm-fbsd11.2-kmod/pkg-descr @@ -1,6 +0,0 @@ -amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components. -Currently corresponding to Linux 4.11 DRM. -This version is for FreeBSD 11.2. -amdgpu and radeonkms are known to fail with EFI boot. - -WWW: https://github.com/FreeBSDDesktop/kms-drm Index: graphics/drm-fbsd11.2-kmod/pkg-message =================================================================== --- graphics/drm-fbsd11.2-kmod/pkg-message +++ graphics/drm-fbsd11.2-kmod/pkg-message @@ -1,21 +0,0 @@ -[ -{ type: install - message: <= 1101510 && ${OSVERSION} < 1200000 -RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod +.if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000 +RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.3-kmod .elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045 IGNORE= not supported on older 12, no kernel support .elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058 -RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod +RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.3-kmod .elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300029 Index: japanese/man/files/patch-man__Makefile =================================================================== --- japanese/man/files/patch-man__Makefile +++ japanese/man/files/patch-man__Makefile @@ -1,6 +1,6 @@ ---- man/Makefile.orig 2014-08-26 12:12:08.000000000 +0900 -+++ man/Makefile 2014-08-26 12:12:36.000000000 +0900 -@@ -10,14 +10,14 @@ +--- man/Makefile.orig 2019-10-10 18:39:59 UTC ++++ man/Makefile +@@ -10,16 +10,13 @@ PROG= jman SRCS= man.c manpath.c glob.c locale.c MAN1= jman.1 EMAN1= jman.1.eng.gz @@ -15,11 +15,12 @@ DPADD= ${LIBMAN} LDADD= ${LIBMAN} -.if exists(/usr/lib/libxpg4.a) -+.if ${OSVERSION} < 400020 - LDADD+= -L/usr/lib -lxpg4 - .endif +-LDADD+= -L/usr/lib -lxpg4 +-.endif -@@ -48,16 +48,23 @@ + DPADD+= ${MAN1} ${EMAN1} + +@@ -48,16 +45,23 @@ ${EMAN1}: ${.CURDIR}/jman.man.eng ${.CURDIR}/jman.man.eng | \ ${compress} > ${EMAN1} Index: lang/gnatcross-aarch64/Makefile =================================================================== --- lang/gnatcross-aarch64/Makefile +++ lang/gnatcross-aarch64/Makefile @@ -8,12 +8,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C/Ada cross-compiler, target: ${LABEL_TARGET} -BROKEN= unfetchable -DEPRECATED= Unfetchable, unmaintained -EXPIRATION_DATE= 2019-10-16 - LABEL_TARGET= FreeBSD/ARM64 -DROID_TARGET= aarch64-aux-freebsd11.0 +DROID_TARGET= aarch64-aux-freebsd11.3 ARG_ARCH= # don't specify ARG_FPU= # don't specify ARG_FLOATSOFT= # don't specify Index: lang/gnatcross-binutils-aarch64/Makefile =================================================================== --- lang/gnatcross-binutils-aarch64/Makefile +++ lang/gnatcross-binutils-aarch64/Makefile @@ -1,7 +1,7 @@ # Created by: John Marino # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMEPREFIX= gnatcross- PKGNAMESUFFIX= -aarch64 @@ -9,7 +9,7 @@ COMMENT= Infrastructure for C/Ada FreeBSD cross-compiler (aarch64) BRANCH2= # Assume aarch64 will always be only CPU for FreeBSD/ARM64 -XCCTARGET= aarch64-aux-freebsd11.0 +XCCTARGET= aarch64-aux-freebsd11.3 PREFIX= ${LOCALBASE}/FreeBSD_ARM64 SRPREFIX= ${PREFIX}/sysroot SYSROOT= gnatcross-sysroot-aarch64 Index: lang/gnatcross-sysroot-aarch64/Makefile =================================================================== --- lang/gnatcross-sysroot-aarch64/Makefile +++ lang/gnatcross-sysroot-aarch64/Makefile @@ -3,32 +3,30 @@ PORTNAME= sysroot PORTVERSION= 1 +PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${PUB_FREEBSD}/releases/arm64/aarch64/11.0-RELEASE/:R11 +MASTER_SITES= ${PUB_FREEBSD}/releases/arm64/aarch64/11.3-RELEASE/ PKGNAMEPREFIX= gnatcross- PKGNAMESUFFIX= -aarch64 -DIST_SUBDIR= gnatcross/arm64-aarch64/${RELEASE} +DISTNAME= base +DIST_SUBDIR= gnatcross/arm64-aarch64/R11_3 MAINTAINER= ports@FreeBSD.org COMMENT= FreeBSD sysroots for C/Ada cross-compiler (${ARCH}) +# avoid aarch64 x aarch64 +ONLY_FOR_ARCHS= amd64 i386 + +USES= tar:txz + NO_BUILD= yes NO_MTREE= yes PUB_FREEBSD= ftp://ftp.freebsd.org/pub/FreeBSD PREFIX= ${LOCALBASE}/FreeBSD_ARM64 -ONLY_FOR_ARCHS= i386 amd64 # avoid aarch64 x aarch64 EXTRACT_AFTER_ARGS= lib/ usr/include/ usr/lib/ -OPTIONS_SINGLE= SG1 -OPTIONS_SINGLE_SG1= RELEASE_11_0 -OPTIONS_DEFAULT= RELEASE_11_0 - -RELEASE_11_0_DESC= FreeBSD 11.0 Release -RELEASE_11_0_DISTFILES= base.txz:R11 -RELEASE_11_0_VARS= RELEASE=R11_0 CTARGET=aarch64-aux-freebsd11.0 - post-extract: /bin/chflags -R noschg ${WRKDIR} @@ -36,7 +34,7 @@ @${MKDIR} ${STAGEDIR}${PREFIX}/sysroot @${MV} ${WRKDIR}/lib ${STAGEDIR}${PREFIX}/sysroot @${MV} ${WRKDIR}/usr ${STAGEDIR}${PREFIX}/sysroot - @echo ${CTARGET} > ${STAGEDIR}${PREFIX}/sysroot/target_triplet + @${ECHO_CMD} aarch64-aux-freebsd11.3 > ${STAGEDIR}${PREFIX}/sysroot/target_triplet @(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot -type d -empty -delete) @(cd ${STAGEDIR}${PREFIX}; ${FIND} sysroot \( -type f -or -type l \) \ | ${SORT} >> ${TMPPLIST}) Index: lang/gnatcross-sysroot-aarch64/distinfo =================================================================== --- lang/gnatcross-sysroot-aarch64/distinfo +++ lang/gnatcross-sysroot-aarch64/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486033400 -SHA256 (gnatcross/arm64-aarch64/R11_0/base.txz) = 16e9d744c39ef8ead3584815071a9086db10e71ef93e0108d5f490fe103b4bba -SIZE (gnatcross/arm64-aarch64/R11_0/base.txz) = 78856068 +TIMESTAMP = 1570735680 +SHA256 (gnatcross/arm64-aarch64/R11_3/base.txz) = 0c1ee2bdbec3b6b404edef6858f38f5cdacd727abc53b1dee23910cab939d0c1 +SIZE (gnatcross/arm64-aarch64/R11_3/base.txz) = 97990888 Index: lang/gnatcross-sysroot-aarch64/pkg-descr =================================================================== --- lang/gnatcross-sysroot-aarch64/pkg-descr +++ lang/gnatcross-sysroot-aarch64/pkg-descr @@ -1,4 +1,4 @@ This package is used by the lang/gnatcross-aarch64 Ada cross-compiler to -install the system root of FreeBSD ARM64 (aarch64). +install the system root of FreeBSD ARM64 (aarch64). WWW: http://www.dragonlace.net Index: multimedia/libva/Makefile =================================================================== --- multimedia/libva/Makefile +++ multimedia/libva/Makefile @@ -21,7 +21,6 @@ GH_ACCOUNT= intel # -lpthread is not necessary if pthread_getthreadid_np is a libc stub LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL}} -LDFLAGS_FreeBSD_11.2= -lpthread LDFLAGS_FreeBSD_11.3= -lpthread LDFLAGS_FreeBSD_12.0= -lpthread Index: net-mgmt/kapacitor/Makefile =================================================================== --- net-mgmt/kapacitor/Makefile +++ net-mgmt/kapacitor/Makefile @@ -46,8 +46,7 @@ .include -.if ${OPSYS} == "FreeBSD" && ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || \ - ${OSVERSION} >= 1200015) +.if ${OPSYS} == "FreeBSD" && (${OSVERSION} < 1200000 || ${OSVERSION} >= 1200015) SUB_LIST+= KAPACITORD_LOGCMD="daemon" .else SUB_LIST+= KAPACITORD_LOGCMD="logger" Index: net/mpd5/files/patch-src-Makefile =================================================================== --- net/mpd5/files/patch-src-Makefile +++ net/mpd5/files/patch-src-Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2016-01-06 22:42:06.000000000 +0700 -+++ src/Makefile 2018-11-25 13:48:31.977979000 +0700 -@@ -9,10 +9,20 @@ +--- src/Makefile.orig 2019-10-10 18:24:28 UTC ++++ src/Makefile +@@ -9,9 +9,11 @@ PROG?= mpd5 PREFIX?= /usr/local @@ -9,20 +9,11 @@ VERSION= 5.8 -NOMAN= + -+.if defined(OSVERSION) -+.if ${OSVERSION} > 1100100 +MK_MAN= no -+.else -+NO_MAN= -+.endif -+.else -+MK_MAN= no NO_MAN= -+.endif BINOWN!= /usr/bin/id -n -u - BINGRP!= /usr/bin/id -n -g -@@ -60,9 +70,6 @@ +@@ -59,9 +61,6 @@ USE_TCP_WRAP= yes USE_AUTH_PAM= yes USE_AUTH_SYSTEM= yes @@ -32,7 +23,7 @@ # Build without builtin web server. #NOWEB= yes -@@ -72,7 +79,7 @@ +@@ -71,7 +70,7 @@ SYSLOG_FACILITY= LOG_DAEMON # Print wide protocol names instead of short names. # Comment this line, to save about 10 KB space @@ -41,7 +32,7 @@ # Reduce some internal structures size to save more memory # This is to limit amount of active sessions -@@ -84,27 +91,27 @@ +@@ -83,27 +82,27 @@ COPTS+= -DPROTO_NAME_LIST ## filter TCP accept connections LDADD+= -lwrap DPADD+= ${LIBWRAP} @@ -73,7 +64,7 @@ .endif LDADD+= -lnetgraph -lutil -@@ -113,19 +120,12 @@ +@@ -112,19 +111,12 @@ DPADD+= ${LIBNETGRAPH} LDADD+= -L/usr/lib -lradius DPADD+= ${LIBRADIUS} @@ -97,7 +88,7 @@ -Wcast-align \ -Wchar-subscripts \ -Wformat \ -@@ -135,15 +135,14 @@ +@@ -134,15 +126,14 @@ COPTS+= -Wall \ -Wnested-externs \ -Wpointer-arith \ -Wwrite-strings \ @@ -116,7 +107,7 @@ .endif # Standard sources -@@ -155,14 +154,13 @@ +@@ -154,14 +145,13 @@ STDSRCS= assert.c auth.c bund.c rep.c ccp.c cha util.c vars.c eap.c msoft.c ippool.c .if defined ( NOWEB ) @@ -133,7 +124,7 @@ PDPATH1= contrib/libpdel/util:contrib/libpdel/structs PDPATH2= contrib/libpdel/structs/type .if defined ( NOWEB ) -@@ -200,60 +198,59 @@ +@@ -199,60 +189,59 @@ PDELSRCS+= http_connection.c \ string_fp.c \ timeout_fp.c .endif @@ -209,7 +200,7 @@ .endif .endif -@@ -262,46 +259,46 @@ +@@ -261,46 +250,46 @@ COPTS+= -DUSE_NG_PRED1 .if defined ( ECP_DES ) SRCS+= ecp_dese.c SRCS+= ecp_dese_bis.c @@ -267,7 +258,7 @@ .endif # Add in required support files and libraries -@@ -310,15 +307,12 @@ +@@ -309,15 +298,12 @@ DPADD+= ${LIBCRYPTO} .if exists ( /usr/lib/libexecinfo.so ) LDADD+= -lexecinfo Index: net/zerotier/Makefile =================================================================== --- net/zerotier/Makefile +++ net/zerotier/Makefile @@ -32,7 +32,7 @@ .if ${OPSYS} == "FreeBSD" # log output via syslog when daemon(8) supports it -.if ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1200015) +.if (${OSVERSION} < 1200000 || ${OSVERSION} >= 1200015) SUB_LIST+= ZEROTIER_SYSLOG="-s debug -T zerotier" .else SUB_LIST+= ZEROTIER_SYSLOG="" Index: security/ipsec-tools/Makefile =================================================================== --- security/ipsec-tools/Makefile +++ security/ipsec-tools/Makefile @@ -39,7 +39,7 @@ ADMINPORT_DESC= Enable Admin port STATS_DESC= Statistics logging function DPD_DESC= Dead Peer Detection -NATT_DESC= NAT-Traversal (kernel-patch required before 11.1) +NATT_DESC= NAT-Traversal NATTF_DESC= require NAT-Traversal (fail without kernel-patch) FRAG_DESC= IKE fragmentation payload support HYBRID_DESC= Hybrid, Xauth and Mode-cfg support @@ -82,7 +82,7 @@ .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100510 +.if ${OPSYS} == FreeBSD REQUIREMOD?= ipsec .endif