Page MenuHomeFreeBSD
Files F144954358

D21974.id64003.diff
No OneTemporary
Actions

D21974.id64003.diff
View Options

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
@@ -162,12 +162,12 @@
# IGNORE_${ARCH} - Port should be ignored on ${ARCH}.
# IGNORE_${OPSYS} - Port should be ignored on ${OPSYS}.
# IGNORE_${OPSYS}_${OSREL:R} - Port should be ignored on a single
-# release of ${OPSYS}, e.g IGNORE_FreeBSD_8
-# would affect all point releases of FreeBSD 8.
+# release of ${OPSYS}, e.g IGNORE_FreeBSD_13
+# would affect all point releases of FreeBSD 13.
# IGNORE_${OPSYS}_${OSREL:R}_${ARCH} - Port should be ignored on a
# single release of ${OPSYS} and specific architecture,
-# e.g IGNORE_FreeBSD_8_i386 would affect all point
-# releases of FreeBSD 8 in i386.
+# e.g IGNORE_FreeBSD_13_i386 would affect all point
+# releases of FreeBSD 13 in i386.
# BROKEN - Port is believed to be broken. Package builds can
# still be attempted using TRYBROKEN to test this
# assumption.
@@ -178,13 +178,13 @@
# 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_13
+# would affect all point releases of FreeBSD 13
# 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,
-# e.g BROKEN_FreeBSD_8_i386 would affect all point
-# releases of FreeBSD 8 in i386
+# e.g BROKEN_FreeBSD_13 would affect all point
+# releases of FreeBSD 13 in i386
# unless TRYBROKEN is also set.
# DEPRECATED - Port is deprecated to install. Advisory only.
# EXPIRATION_DATE
Index: Tools/scripts/mfh
===================================================================
--- Tools/scripts/mfh
+++ Tools/scripts/mfh
@@ -135,7 +135,11 @@
done
"${svn}" up --quiet "${branch}"
"${svn}" status "${branch}"
-"${svn}" diff "${branch}"
+if [ -n "$(command -v colordiff 2>/dev/null)" ]; then
+ "${svn}" diff "${branch}" | colordiff
+else
+ "${svn}" diff "${branch}"
+fi
echo "All the merge work was done in ${dir}/${branch}"
ask "Do you want to commit? (no = start a shell)" || (
echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script."
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 <fcntl.h>
-
- #include "Python.h"
--#if OSVERSION < 1020000
--#include "sys/capability.h"
--#else
- #include "sys/capsicum.h"
--#endif
- #include "sys/caprights.h"
- #include "structmember.h"
-
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/drm-fbsd11.2-kmod/Makefile
===================================================================
--- graphics/drm-fbsd11.2-kmod/Makefile
+++ graphics/drm-fbsd11.2-kmod/Makefile
@@ -32,7 +32,7 @@
.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1102000 || ${OSVERSION} > 1200000)
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000
IGNORE= only supported on FreeBSD 11.
.endif
Index: graphics/drm-fbsd11.2-kmod/pkg-descr
===================================================================
--- graphics/drm-fbsd11.2-kmod/pkg-descr
+++ graphics/drm-fbsd11.2-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-kmod/Makefile
===================================================================
--- graphics/drm-kmod/Makefile
+++ graphics/drm-kmod/Makefile
@@ -22,7 +22,7 @@
IGNORE= legacy kmod not required on less than 12.0
.endif
.else
-.if ${OSVERSION} >= 1101510 && ${OSVERSION} < 1200000
+.if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
.elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045
IGNORE= not supported on older 12, no kernel support
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: 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 <bsd.port.pre.mk>
-.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 <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100510
+.if ${OPSYS} == FreeBSD
REQUIREMOD?= ipsec
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 15, 11:18 AM (17 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28738878
Default Alt Text
D21974.id64003.diff (14 KB)

Event Timeline