diff options
| author | mat <mat@FreeBSD.org> | 2015-10-15 14:55:14 +0000 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-10-15 14:55:14 +0000 |
| commit | abc87d0c357422181c7606b270d496816179270f (patch) | |
| tree | d30bee8baf5be305289898828fb58299162e2f54 | |
| parent | 94989b64a49d831e3af8a38f926ad94d0e2bcc11 (diff) | |
| download | FreeBSD-ports-abc87d0c357422181c7606b270d496816179270f.zip FreeBSD-ports-abc87d0c357422181c7606b270d496816179270f.tar.gz | |
Drop 8 support.
With hat: portmgr
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D3694
128 files changed, 145 insertions, 1059 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 7d77a55..3d539cd 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -158,10 +158,6 @@ CPP= ${LOCALBASE}/bin/clang-cpp36 CC= ${LOCALBASE}/bin/clang36 CXX= ${LOCALBASE}/bin/clang++36 CHOSEN_COMPILER_TYPE= clang -.if ${OSVERSION} < 900033 -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -.endif .endif .endif .endif @@ -184,10 +180,6 @@ CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 CHOSEN_COMPILER_TYPE= clang -.if ${OSVERSION} < 900033 -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -.endif .endif .endif .endif @@ -210,10 +202,6 @@ CHOSEN_COMPILER_TYPE= clang CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 -.if ${OSVERSION} < 900033 -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -.endif .endif .endif .endif @@ -236,10 +224,6 @@ CHOSEN_COMPILER_TYPE= clang CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 -.if ${OSVERSION} < 900033 -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -.endif .endif .endif .endif diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 96888a8..631fa85 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -50,10 +50,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 -.if ${OSVERSION} < 900033 -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -.endif .endif .endif diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile index 9d02db6..d5e82ee 100644 --- a/astro/google-earth/Makefile +++ b/astro/google-earth/Makefile @@ -35,9 +35,7 @@ NVIDIA_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-drive NVIDIA_USE_OFF= LINUX_APPS=dri,libpciaccess # Fixed by the first post-patch target line? Also, linprocfs needs to be mounted. -#.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64" #BROKEN= seems to crash on >= 9.x/amd64: http://www.freebsd.org/cgi/query-pr.cgi?pr=160422 -#.endif do-extract: @${MKDIR} ${WRKSRC} diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile index ad6d8d2..5d7d13b 100644 --- a/comms/dabstick-radio/Makefile +++ b/comms/dabstick-radio/Makefile @@ -32,9 +32,7 @@ ONLY_FOR_ARCHS_REASON= uses MMX and SSE2 instructions OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if (${OSVERSION} >= 900014) && exists(${DESTDIR}/usr/bin/clang) +.if exists(${DESTDIR}/usr/bin/clang) CC= clang CXX= clang++ CPP= clang-cpp diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 2b5b5b8..22ab0df 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -24,7 +24,8 @@ CONFIGURE_ARGS= --with-INSTALL="" \ --with-TIFFINC="-I${LOCALBASE}/include" \ --with-GCOPTS=" " --with-GCXXOPTS=" " \ --with-REGEX=no --with-LIBREGEX='' --with-REGEXINC=-I/usr/include \ - --with-DIR_HTML="${DOCSDIR}" + --with-DIR_HTML="${DOCSDIR}" \ + --with-GETTY=SysV CFLAGS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -Wall -L${LOCALBASE}/lib CONFIGURE_ENV= ENVOPTS="${CFLAGS}" MAKE_ENV+= ROOT=${STAGEDIR} @@ -66,10 +67,6 @@ PLIST_SUB+= HYLAFAX_SPOOL=${HYLAFAX_SPOOL} CONFIGURE_ARGS+=--nointeractive .endif -.if ${OSVERSION} >= 900007 -CONFIGURE_ARGS+= --with-GETTY=SysV -.endif - post-patch: ${REINPLACE_CMD} \ -e 's,/usr/local,${LOCALBASE},g' \ diff --git a/comms/lysdr/Makefile b/comms/lysdr/Makefile index 3e4083c..75b6f93 100644 --- a/comms/lysdr/Makefile +++ b/comms/lysdr/Makefile @@ -23,7 +23,6 @@ PLIST_FILES= bin/lysdr post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC} - ${CP} ${FILESDIR}/cexp.c ${WRKSRC} do-install: @${INSTALL_PROGRAM} ${WRKSRC}/lysdr ${STAGEDIR}${PREFIX}/bin/lysdr diff --git a/comms/lysdr/files/Makefile b/comms/lysdr/files/Makefile index 6903040..70d4ede 100644 --- a/comms/lysdr/files/Makefile +++ b/comms/lysdr/files/Makefile @@ -6,9 +6,6 @@ CFLAGS+= `pkg-config -cflags ${PACKAGES}` LDFLAGS+= `pkg-config -libs ${PACKAGES}` -lm SRCS= gui.c sdr.c filter.c audio_jack.c smeter.c waterfall.c lysdr.c -.if ${OSVERSION} < 900000 -SRCS+= cexp.c -.endif PROG= lysdr WITHOUT_MAN= yes diff --git a/comms/lysdr/files/cexp.c b/comms/lysdr/files/cexp.c deleted file mode 100644 index 595e913..0000000 --- a/comms/lysdr/files/cexp.c +++ /dev/null @@ -1,46 +0,0 @@ -/* $NetBSD: cexp.c,v 1.1 2007/08/20 16:01:34 drochner Exp $ */ - -/*- - * Copyright (c) 2007 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software written by Stephen L. Moshier. - * It is redistributed by the NetBSD Foundation by permission of the author. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include <complex.h> -#include <math.h> - -double complex -cexp(double complex z) -{ - double complex w; - double r, x, y; - - x = creal(z); - y = cimag(z); - r = exp(x); - w = r * cos(y) + r * sin(y) * I; - return w; -} diff --git a/comms/remserial/files/patch-stty.c b/comms/remserial/files/patch-stty.c index ec2a3e8..89e948c 100644 --- a/comms/remserial/files/patch-stty.c +++ b/comms/remserial/files/patch-stty.c @@ -27,12 +27,6 @@ +#define VT0 0000000 +#define VT1 0040000 +#define VTDLY 0040000 -+#if OSVERSION < 800000 -+/* for older FreeBSD versions */ -+#define TAB0 0000000 -+#define TAB3 0014000 -+#define TABDLY 0014000 -+#endif +#endif + extern int errno; diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 623603c..1c6b68e 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -64,10 +64,6 @@ PICKLE_DESC= Pickle support .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900506 -IGNORE= need __WORDSIZE found in FreeBSD 9 -.endif - .if ${PORT_OPTIONS:MBOOSTPOOL} MAKE_ARGS+= boost_pool=1 .endif diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index 288cc93..63d23cb 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -86,7 +86,7 @@ OPTIONS_DEFAULT+= ARIADB ARCHIVE BLACKHOLE SPHINX FEDX XTRADB HANDLERSOCKET .include <bsd.port.options.mk> -.if ${OSVERSION} > 900000 && ${PORT_OPTIONS:MSTATIC} +.if ${PORT_OPTIONS:MSTATIC} BROKEN= WITH_STATIC is not functional on 9-current .endif diff --git a/databases/php5-tarantool/Makefile b/databases/php5-tarantool/Makefile index e3d9d88..c928bbd 100644 --- a/databases/php5-tarantool/Makefile +++ b/databases/php5-tarantool/Makefile @@ -23,10 +23,4 @@ TR_VER= 20150708 CONFIGURE_ARGS+= --with-tarantool -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 900000 -IGNORE= does not support FreeBSD versions < 9.0 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile index 81faf1f..8402b4c 100644 --- a/databases/postgis21/Makefile +++ b/databases/postgis21/Makefile @@ -48,14 +48,6 @@ SFCGAL_LIB_DEPENDS= libSFCGAL.so:${PORTSDIR}/databases/sfcgal SFCGAL_CONFIGURE_ON= --with-sfcgal=${LOCALBASE}/bin/sfcgal-config SFCGAL_CONFIGURE_OFF= --without-sfcgal -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MRASTER} -.if ${OSVERSION} < 900033 -BROKEN= Raster suppport is broken on FreeBSD < 9.x -.endif -.endif - CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 9b4da14..aa0ffac 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -167,9 +167,6 @@ PATCH_DIST_STRIP=-p1 . if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf -. if ${OSVERSION} < 900021 -IGNORE= need userland DTrace support found in FreeBSD 9.0 -. endif . endif .if ${PORT_OPTIONS:MGSSAPI} diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index c5359f9..ebfee4a 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -167,9 +167,6 @@ PATCH_DIST_STRIP=-p1 . if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace LDFLAGS+=-lelf -. if ${OSVERSION} < 900021 -IGNORE= need userland DTrace support found in FreeBSD 9.0 -. endif . endif .if ${PORT_OPTIONS:MGSSAPI} diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile index f9548bf..b89d6f4 100644 --- a/deskutils/gnome-initial-setup/Makefile +++ b/deskutils/gnome-initial-setup/Makefile @@ -34,10 +34,6 @@ OPTIONS_DEFAULT=KERBEROS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-initial-setup_pages_account_um-utils.c -.endif - .if !${PORT_OPTIONS:MKERBEROS} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-initial-setup_gis-account-page.c .endif diff --git a/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_account_um-utils.c b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-utils.c index 2799ea8..2799ea8 100644 --- a/deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_account_um-utils.c +++ b/deskutils/gnome-initial-setup/files/patch-gnome-initial-setup_pages_account_um-utils.c diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 6bf6110..0f6605d 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -26,10 +26,4 @@ INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.Charmap.enums.xml \ org.gnome.Charmap.gschema.xml -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 900000 -CONFIGURE_ARGS+= --disable-Bsymbolic -.endif - .include <bsd.port.mk> diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index 946179b..3958abc 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -37,12 +37,6 @@ DESKTOP_ENTRIES="TreeSheets" "${COMMENT}" \ OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900014 -CXXFLAGS+= -D__LONG_LONG_SUPPORTED -.endif - post-patch: .SILENT ${REINPLACE_CMD} -e 's|sys->frame->GetPath(L"|(L"${DOCSDIR}/|' \ ${BUILD_WRKSRC}/document.h @@ -60,4 +54,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/TS/images/icon32.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index df1825e..5044311 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -54,12 +54,8 @@ NLS_CONFIGURE_ENABLE= nls .include <bsd.port.pre.mk> -.if ! defined(PKGNAMEPREFIX) && ${OSVERSION} < 900000 -EXTRA_PATCHES+= ${FILESDIR}/allow-missing-group-info -.endif - # Actual earliest version may differ slightly -.if ${ARCH} != ia64 && ${ARCH} != mips && ${ARCH} != mips64 && ${OSVERSION} >= 900044 && !defined(PKGNAMEPREFIX) && (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 34 || ${COMPILER_TYPE} == gcc) +.if ${ARCH} != ia64 && ${ARCH} != mips && ${ARCH} != mips64 && !defined(PKGNAMEPREFIX) && (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 34 || ${COMPILER_TYPE} == gcc) CONFIGURE_ARGS+= --enable-gold --enable-plugins PLIST_SUB+= GOLD="" .else @@ -74,9 +70,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} post-install: .if !defined(PKGNAMEPREFIX) -.if ${OSVERSION} >= 900044 ${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/ -.endif @${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d | \ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} ${RM} ${STAGEDIR}${PREFIX}/include/ansidecl.h diff --git a/devel/binutils/files/allow-missing-group-info b/devel/binutils/files/allow-missing-group-info deleted file mode 100644 index 0276fed..0000000 --- a/devel/binutils/files/allow-missing-group-info +++ /dev/null @@ -1,10 +0,0 @@ ---- bfd/elf.c.orig 2014-12-23 08:47:10 UTC -+++ bfd/elf.c -@@ -741,7 +741,6 @@ setup_group (bfd *abfd, Elf_Internal_Shd - { - (*_bfd_error_handler) (_("%B: no group info for section %A"), - abfd, newsect); -- return FALSE; - } - return TRUE; - } diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile index 07f0543..3e577b7 100644 --- a/devel/gettext-runtime/Makefile +++ b/devel/gettext-runtime/Makefile @@ -31,7 +31,7 @@ CPE_VENDOR= gnu .include <bsd.port.options.mk> -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506) +.if ${OPSYS} == DragonFly CONFIGURE_ARGS+=--disable-threads .endif diff --git a/devel/ioncube/Makefile b/devel/ioncube/Makefile index 5ec4f7b..1a2f35b 100644 --- a/devel/ioncube/Makefile +++ b/devel/ioncube/Makefile @@ -21,17 +21,8 @@ USE_PHP= yes SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD -# Detect OS version for distname -VER= 8 -.if ${OSVERSION} >= 900000 VER= 9 -.endif -.else -IGNORE= is unsupported on ${OPSYS} -.endif +IGNORE_DragonFly= is unsupported on DragonFly PHP_INSTVER= ${PHP_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -42,4 +33,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/ioncube_loader_fre_${PHP_INSTVER}_ts.so \ ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader_ts.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ioncube/distinfo b/devel/ioncube/distinfo index 57e3aa1..0f712a8 100644 --- a/devel/ioncube/distinfo +++ b/devel/ioncube/distinfo @@ -1,7 +1,3 @@ -SHA256 (ioncube/4.7.5/ioncube_loaders_fre_8_x86.tar.bz2) = a98967f07349d838b1d36f8090981a8dbc53403e79784159213bfcabcf2749dc -SIZE (ioncube/4.7.5/ioncube_loaders_fre_8_x86.tar.bz2) = 4984347 -SHA256 (ioncube/4.7.5/ioncube_loaders_fre_8_x86-64.tar.bz2) = d0e01b00bc5e8ea6c9f6769659aa8f95b92656e802b172634635b6688b4497aa -SIZE (ioncube/4.7.5/ioncube_loaders_fre_8_x86-64.tar.bz2) = 5178358 SHA256 (ioncube/4.7.5/ioncube_loaders_fre_9_x86.tar.bz2) = 0faa46268d1aba0c8ebab7005df2d57a6324ad816ded468ea40d0149dc9c1b0b SIZE (ioncube/4.7.5/ioncube_loaders_fre_9_x86.tar.bz2) = 5001121 SHA256 (ioncube/4.7.5/ioncube_loaders_fre_9_x86-64.tar.bz2) = 2ee10517c8baf20176e71c833d70e1435820afd5ba78fa7778d663ca762127b4 diff --git a/devel/libc++/Makefile b/devel/libc++/Makefile index 7aa1351..f792030 100644 --- a/devel/libc++/Makefile +++ b/devel/libc++/Makefile @@ -34,16 +34,6 @@ CXXRT_INCS= ${LOCALBASE}/include/cxxrt/ CXXRT_LIB= ${LOCALBASE}/lib/libcxxrt.so .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 -LIB_DEPENDS+= libmissing.so:${PORTSDIR}/math/libmissing \ - libxlocale.so:${PORTSDIR}/devel/xlocale -EXTRA_PATCHES= ${FILESDIR}/extra-libmissing -CXXFLAGS+= -I${LOCALBASE}/include -D__LONG_LONG_SUPPORTED -LDFLAGS+= -lmissing -EXTRALIB= ${LOCALBASE}/lib/libmissing.so.2 ${LOCALBASE}/lib/libxlocale.so.0 -.endif - - CMAKE_ARGS= -DLIBCXX_CXX_ABI=libcxxrt -DLIBCXX_LIBCXXRT_INCLUDE_PATHS=${CXXRT_INCS} .if !defined(SVN_REV) diff --git a/devel/libc++/files/extra-libmissing b/devel/libc++/files/extra-libmissing deleted file mode 100644 index f547dff..0000000 --- a/devel/libc++/files/extra-libmissing +++ /dev/null @@ -1,10 +0,0 @@ ---- ./include/cmath.orig 2014-01-06 19:12:50.000000000 +0100 -+++ ./include/cmath 2014-05-06 14:14:44.388681947 +0200 -@@ -299,6 +299,7 @@ - - #include <__config> - #include <math.h> -+#include <missing_math.h> - #include <type_traits> - - #ifdef _LIBCPP_MSVCRT diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index f114677..f89479c 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -84,7 +84,7 @@ OPTIONS_DEFAULT= CLANG CLANG_DESC= Build with LLVM/Clang (required for blocks support) .endif -.if ((${OSVERSION} > 900000) && (${OSVERSION} < 1000706)) +.if (${OSVERSION} < 1000706) .if ${ARCH} == "powerpc BROKEN= Does not configure on powerpc-9 .elif ${ARCH} == "sparc64 @@ -93,17 +93,8 @@ BROKEN= Does not link on sparc64-9 .endif .if ${PORT_OPTIONS:MCLANG} -. if ${OSVERSION} < 900024 -BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 \ - ${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt -RUN_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 \ - ${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt -CONFIGURE_ARGS+= --with-blocks-runtime=${LOCALBASE}/lib -CONFIGURE_ENV+= CC="${LOCALBASE}/bin/clang33" CPPFLAGS="-I${LOCALBASE}/include" -. else CONFIGURE_ARGS+= --with-blocks-runtime=/usr/lib CONFIGURE_ENV+= CC="/usr/bin/clang" -. endif .endif # diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index 1ce94b9..477d2e6 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -104,10 +104,6 @@ PLIST_SUB+= XEN="@comment " .endif post-patch: -.if ${OSVERSION} < 900000 - @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||' \ - ${WRKSRC}/configure -.endif @${MV} ${WRKSRC}/daemon/libvirtd.conf ${WRKSRC}/daemon/libvirtd.conf.sample @${REINPLACE_CMD} -e 's|libvirtd\.conf|libvirtd.conf.sample|' \ ${WRKSRC}/daemon/Makefile.in diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile index f81baf5..c5731e1 100644 --- a/devel/llvm35/Makefile +++ b/devel/llvm35/Makefile @@ -138,10 +138,6 @@ NOT_FOR_ARCH= ia64 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -BROKEN= GCC failing on 8.x -.endif - .if ${PORT_OPTIONS:MCMAKE} && ${COMPILER_TYPE} != clang BROKEN= CMake support only works with clang .endif diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile index ccf3cff..34311cb 100644 --- a/devel/llvm36/Makefile +++ b/devel/llvm36/Makefile @@ -148,10 +148,6 @@ NOT_FOR_ARCH= ia64 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -BROKEN= GCC failing on 8.x -.endif - .if ${PORT_OPTIONS:MCMAKE} && ${COMPILER_TYPE} != clang BROKEN= CMake support only works with clang .endif diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile index c4361e1..7b8488d 100644 --- a/devel/py-freebsd/Makefile +++ b/devel/py-freebsd/Makefile @@ -18,9 +18,6 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 900030 -EXTRA_PATCHES+= ${FILESDIR}/freebsd9_patch-src-sysctl.c -.endif .if ${OSVERSION} >= 1100002 EXTRA_PATCHES+= ${FILESDIR}/freebsd11_patch-src__.const.def \ ${FILESDIR}/freebsd11_patch-src__netstat.c diff --git a/devel/py-freebsd/files/freebsd9_patch-src-sysctl.c b/devel/py-freebsd/files/patch-src-sysctl.c index 112e209..112e209 100644 --- a/devel/py-freebsd/files/freebsd9_patch-src-sysctl.c +++ b/devel/py-freebsd/files/patch-src-sysctl.c diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile index 3db7bc8..6992ee1 100644 --- a/editors/libreoffice4/Makefile +++ b/editors/libreoffice4/Makefile @@ -337,10 +337,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-libc++.i386:-p0 EXTRA_PATCHES+= ${FILESDIR}/extra-configure.ac .endif -.if ${OSVERSION} < 900506 -CONFIGURE_ARGS+= --with-linker-hash-style=sysv -.endif - .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX=${LOCALBASE}/bin/flex diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index 2c339d5..c513864 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -69,10 +69,6 @@ NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 -BROKEN= does not build: absence of xlocale.h -.endif - # XXX Temporary workaround for ports/184540 .if ${PORT_OPTIONS:MDEBUG} INSTALL_TARGET= install diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index 6e429a9..903b88e 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -50,7 +50,7 @@ PORTSCOUT= limitw:1,even # Included for OPSYS and OSVERSION .include <bsd.port.pre.mk> -.for osrel in 8 9 10 11 +.for osrel in 9 10 11 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .else @@ -58,8 +58,9 @@ PLIST_SUB+= OSREL${osrel}="@comment " .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) -IGNORE= binaries compiled for FreeBSD 8.4+, 9.1+, 10.0+ and -current only +# This looks like it could be OPSYS != FreeBSD but... +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) +IGNORE= binaries compiled for FreeBSD 9.3, 10.0+ and -current only DISTFILES= .endif diff --git a/emulators/i386-wine/pkg-plist b/emulators/i386-wine/pkg-plist index 8b95df5..a052208 100644 --- a/emulators/i386-wine/pkg-plist +++ b/emulators/i386-wine/pkg-plist @@ -793,7 +793,6 @@ lib32/libXrender.so.1 lib32/libXxf86vm.so.1 %%OSREL10%%lib32/libdevq.so.0 %%OSREL11%%lib32/libdevq.so.0 -%%OSREL8%%lib32/libdricore9.1.7.so.1 %%OSREL9%%lib32/libdricore9.1.7.so.1 lib32/libdrm.so.2 lib32/libdrm_intel.so.1 @@ -802,12 +801,9 @@ lib32/libexpat.so.1 lib32/libfontconfig.so.1 lib32/libfreetype.so.6 lib32/libglapi.so.0 -%%OSREL8%%lib32/libglapi.so.0 -%%OSREL8%%lib32/libiconv.so.2 %%OSREL9%%lib32/libiconv.so.2 lib32/libjpeg.so.8 lib32/liblcms2.so.2 -%%OSREL8%%lib32/libllvmradeon9.1.7.so %%OSREL9%%lib32/libllvmradeon9.1.7.so lib32/libpciaccess.so.0 lib32/libpng16.so.16 @@ -2129,4 +2125,3 @@ share/wine/generic.ppd share/wine/l_intl.nls share/wine/patch-nvidia.sh share/wine/wine.inf -%%OSREL8%%share/wine/wine.inf diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 5e962a4..ded0f05 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -221,25 +221,13 @@ MAKE_ARGS+= ARCH=ppc64 CONFIGURE_ARGS+= --sparc_cpu=v9 .endif -.if ${OSVERSION} < 900033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= AS=${LOCALBASE}/bin/as -CONFIGURE_ENV+= LD=${LOCALBASE}/bin/ld -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - CONFIGURE_ARGS+= --python=${PYTHON_CMD} # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much post-patch: -.if ${OSVERSION} < 900000 - @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat||' ${WRKSRC}/configure -.else @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ ${WRKSRC}/configure -.endif @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure .if ${PORT_OPTIONS:MPCAP} @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile index 3e09ec2..a3f7574 100644 --- a/emulators/qemu-sbruno/Makefile +++ b/emulators/qemu-sbruno/Makefile @@ -237,25 +237,14 @@ MAKE_ARGS+= ARCH=ppc64 CONFIGURE_ARGS+= --sparc_cpu=v9 .endif -.if ${OSVERSION} < 900033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= LD=${LOCALBASE}/bin/ld -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - CONFIGURE_ARGS+= --python=${PYTHON_CMD} # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) # but it shouldn't matter much post-patch: @${MV} ${WRKDIR}/dtc ${WRKSRC} -.if ${OSVERSION} < 900000 - @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat||' ${WRKSRC}/configure -.else @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ ${WRKSRC}/configure -.endif @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure #.if ${PORT_OPTIONS:MPCAP} # @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 8d74e42..27c1233 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -195,11 +195,6 @@ KMK_FLAGS= -j${MAKE_JOBS_NUMBER} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl \ - ${PATCHDIR}/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp -.endif - .if ${COMPILER_TYPE} == clang PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:${PORTSDIR}/devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl deleted file mode 100644 index 0de4a37..0000000 --- a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl +++ /dev/null @@ -1,21 +0,0 @@ -Workaround for an regression in acpica 20101015. - -Compile error: -kBuild: iasl DevicesR3 - src/VBox/Devices/PC/vbox.dsl - 736: Name (_CID, "smc-napa") -Error 4001 - String must be entirely alphanumeric ^ -(smc-napa) - -See: http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html - ---- src/VBox/Devices/PC/vbox.dsl.orig 2010-10-08 22:10:12.000000000 +0200 -+++ src/VBox/Devices/PC/vbox.dsl 2010-10-27 14:45:38.000000000 +0200 -@@ -733,7 +733,7 @@ - Device (SMC) - { - Name (_HID, EisaId ("APP0001")) -- Name (_CID, "smc-napa") -+ Name (_CID, "smcnapa") - - Method (_STA, 0, NotSerialized) - { diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp deleted file mode 100644 index 18702f2..0000000 --- a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/VBox/Main/src-server/generic/NetIf-generic.cpp.orig 2013-08-21 13:05:31.000000000 +0400 -+++ src/VBox/Main/src-server/generic/NetIf-generic.cpp 2013-08-27 18:17:51.598216723 +0400 -@@ -22,6 +22,7 @@ - #include <iprt/path.h> - #include <iprt/param.h> - #include <sys/ioctl.h> -+#include <sys/socket.h> - #include <netinet/in.h> - #include <net/if.h> - #include <errno.h> diff --git a/ftp/ncftpd/Makefile b/ftp/ncftpd/Makefile index 5b30d0d..24bd6ad 100644 --- a/ftp/ncftpd/Makefile +++ b/ftp/ncftpd/Makefile @@ -27,15 +27,10 @@ OPTIONS_DEFINE= DOCS PORTDOCS= install.html README README.freebsd LICENSE -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 900000 BINVER= 9.0 -.elif ${OPSYS} == FreeBSD -BINVER= 8.0 -.else -IGNORE= requires FreeBSD -.endif +IGNORE_DragonFly= requires FreeBSD + +.include <bsd.port.pre.mk> .if ${ARCH} == amd64 DIST_ARCH= x86_64 diff --git a/games/0ad/Makefile b/games/0ad/Makefile index 0cc4e29..e75ccbf 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -46,10 +46,6 @@ PORTDATA= * .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900044 -BROKEN= Fails to build on FreeBSD 8.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ diff --git a/games/oolite/Makefile b/games/oolite/Makefile index eba47f4..07691e1b1c 100644 --- a/games/oolite/Makefile +++ b/games/oolite/Makefile @@ -54,9 +54,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900014 -WITH_PORTS_CLANG= yes -.elif exists(${CC}) +.if exists(${CC}) CCVERSION!= ${CC} --version COMPILER_VERSION= ${CCVERSION:M[0-9].[0-9]*:C/([0-9]).?/\1/g} COMPILER_IS_CLANG= ${CCVERSION:Mclang} diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 9bf0955..543ae32 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -81,12 +81,6 @@ PLIST_SUB+= UFORADIANT="@comment " FAVORITE_COMPILER= gcc .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 900000 -BROKEN= Fails to build on 8.x -.endif - post-extract: @${MKDIR} ${WRKSRC}/base/maps ${WRKSRC}/base/models ${REINPLACE_CMD} \ @@ -144,4 +138,4 @@ do-install: ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; ${LN} -s ${PREFIX}/${DATADIR}/base ${STAGEDIR}${UFO_DIR}/base -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 994e733..cd26b4a 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -67,10 +67,6 @@ CONFIGURE_ARGS+=--disable-dbus CONFIGURE_ARGS+=--enable-dbus .endif -.if ${OSVERSION} < 900000 -BROKEN= Fails to build -.endif - .if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB} USE_TEX= latex diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 9314af2..c5e6962 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -42,12 +42,6 @@ OPTIONS_DEFINE= DEBUG DEBUG_MAKE_ENV= LIBTYPE=debug -.include <bsd.port.options.mk> - -.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033) -LDFLAGS+= -Wl,--add-needed -.endif - post-patch: @${REINPLACE_CMD} 's|/usr\(/include/freetype2\)|${LOCALBASE}\1|' \ ${WRKSRC}/libFL/ang/GNUmakefile diff --git a/graphics/mitsuba/Makefile b/graphics/mitsuba/Makefile index bf38a72..35e0941 100644 --- a/graphics/mitsuba/Makefile +++ b/graphics/mitsuba/Makefile @@ -41,11 +41,8 @@ FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} .include <bsd.port.pre.mk> # Unfortunately, the code is not GCC 4.2.1 compatible (due to bugs in GCC -# itself). Try to use system compiler if it is Clang, otherwise fallback -# to modern GCC (on older versions of FreeBSD). -.if ${OSVERSION} < 900014 -USE_GCC= yes -.elif ${OSVERSION} < 1000024 +# itself). Use system compiler if it is Clang. +.if ${OSVERSION} < 1000024 CC= clang CXX= clang++ CPP= clang-cpp diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile index 7a840f4..cd2e1f7 100644 --- a/graphics/opennurbs/Makefile +++ b/graphics/opennurbs/Makefile @@ -76,8 +76,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS/ ${INSTALL_DATA} ${WRKSRC}/zlib/*.h \ ${STAGEDIR}${PREFIX}/include/openNURBS/zlib -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 - ${TOUCH} ${STAGEDIR}${PREFIX}/include/openNURBS/zlib/gzguts.h -.endif .include <bsd.port.post.mk> diff --git a/graphics/pecomato/files/patch-Makefile.unix b/graphics/pecomato/files/patch-Makefile.unix index 2bc36b1..a7f96d0 100644 --- a/graphics/pecomato/files/patch-Makefile.unix +++ b/graphics/pecomato/files/patch-Makefile.unix @@ -6,10 +6,6 @@ TARGET = $(PRODUCT) -OBJECTS = main.o gnu-strndup.o gnu-getline.o util.o exif.o iptc.o jfif.o adobe.o tiff.o +OBJECTS = main.o util.o exif.o iptc.o jfif.o adobe.o tiff.o -+NEEDEXT = $(shell expr $(OSVERSION) \< 800067) -+ifeq ($(NEEDEXT),1) -+OBJECTS += gnu-strndup.o gnu-getline.o -+endif DOC_DEFS = doc/Makefile.defs diff --git a/irc/znc/Makefile b/irc/znc/Makefile index d172058..41db2eb 100644 --- a/irc/znc/Makefile +++ b/irc/znc/Makefile @@ -49,10 +49,6 @@ TCL_CONFIGURE_ENABLE= tcl .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900014 -CXXFLAGS+= -D__LONG_LONG_SUPPORTED -.endif - .if ${PORT_OPTIONS:MOPENSSL} .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} diff --git a/java/sigar/Makefile b/java/sigar/Makefile index 70bc7d1..5172593 100644 --- a/java/sigar/Makefile +++ b/java/sigar/Makefile @@ -34,16 +34,14 @@ ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} .if ${OPSYS} == FreeBSD . if ${OSVERSION} >= 1000000 PLATFORM_VER= 1 -. elif ${OSVERSION} >= 900000 -PLATFORM_VER= 9 . else -PLATFORM_VER= 8 +PLATFORM_VER= 9 . endif .else BROKEN= ${OPSYS} platform is not supported .endif -LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-${PLATFORM_VER}.so +LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-${LATFORM_VER}.so PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ %%JAVAJARDIR%%/${LIBNAME} diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile index 7a34e2c..928d558 100644 --- a/lang/gcc-aux/Makefile +++ b/lang/gcc-aux/Makefile @@ -48,11 +48,7 @@ BOOTSTRAP_DESC= Create bootstrap compiler (overrides other options) .if ${OPSYS} == FreeBSD MODERN_BINUTILS= yes -. if ${OSVERSION} < 900000 -BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.84.tar.bz2 -. else BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 -. endif .endif .if ${OPSYS} == DragonFly BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2 @@ -107,10 +103,8 @@ DISTFILES+= ${BOOTSTRAP_COMPILER}:boot DISTFILES= \ ${IDENTIFICATION}.tar.bz2 \ ada-bootstrap.i386.dragonfly.36A.tar.bz2:boot \ - ada-bootstrap.i386.freebsd.84.tar.bz2:boot \ ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \ ada-bootstrap.x86_64.dragonfly.36A.tar.bz2:boot \ - ada-bootstrap.x86_64.freebsd.84.tar.bz2:boot \ ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot .endif diff --git a/lang/gcc-aux/distinfo b/lang/gcc-aux/distinfo index b6d7cfc..25ce91d 100644 --- a/lang/gcc-aux/distinfo +++ b/lang/gcc-aux/distinfo @@ -2,13 +2,9 @@ SHA256 (gcc-4.9.3.tar.bz2) = 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33 SIZE (gcc-4.9.3.tar.bz2) = 90006707 SHA256 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = 6b1a6ff0fe0e3bf13c667db2fef177b811329cd998400a1303969a86911cb1c8 SIZE (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = 39357314 -SHA256 (ada-bootstrap.i386.freebsd.84.tar.bz2) = b410336cb0e71c8a29dd5f831a17b4b7282e7d590f452475a94c6a625cfc8846 -SIZE (ada-bootstrap.i386.freebsd.84.tar.bz2) = 39727003 SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3 SIZE (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 41229192 SHA256 (ada-bootstrap.x86_64.dragonfly.36A.tar.bz2) = ba9b193f1f5c780c0e94086a9af6f1c8e843b6782c133b9948789b95b2e605c4 SIZE (ada-bootstrap.x86_64.dragonfly.36A.tar.bz2) = 40747242 -SHA256 (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = ba1a407d936e7b3f2bfe825d1fb5a1f0e85e8edbdd9e8440bb49ef643fec05fc -SIZE (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = 40227668 SHA256 (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 1066d7c5e71d78b4416de3b73348227678ca07db52488409e270db7b00467f55 SIZE (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 42163803 diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile index 6aa836f..fd2bce5 100644 --- a/lang/gcc5-aux/Makefile +++ b/lang/gcc5-aux/Makefile @@ -52,11 +52,7 @@ BOOTSTRAP_DESC= Create bootstrap compiler (overrides other options) .if ${OPSYS} == FreeBSD ONLY_FOR_ARCHS= amd64 i386 MODERN_BINUTILS= yes -. if ${OSVERSION} < 900000 -BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.84.tar.bz2 -. else BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 -. endif .endif .if ${OPSYS} == DragonFly ONLY_FOR_ARCHS= x86_64 @@ -112,10 +108,8 @@ DISTFILES+= ${BOOTSTRAP_COMPILER}:boot .if defined(PLUS_BOOTSTRAPS) DISTFILES= \ ${IDENTIFICATION}.tar.bz2 \ - ada-bootstrap.i386.freebsd.84.tar.bz2:boot \ ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \ ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \ - ada-bootstrap.x86_64.freebsd.84.tar.bz2:boot \ ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot .endif diff --git a/lang/gcc5-aux/distinfo b/lang/gcc5-aux/distinfo index d1f3267..bf1a55a 100644 --- a/lang/gcc5-aux/distinfo +++ b/lang/gcc5-aux/distinfo @@ -1,12 +1,8 @@ SHA256 (gcc-5.2.0.tar.bz2) = 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad SIZE (gcc-5.2.0.tar.bz2) = 95221552 -SHA256 (ada-bootstrap.i386.freebsd.84.tar.bz2) = b410336cb0e71c8a29dd5f831a17b4b7282e7d590f452475a94c6a625cfc8846 -SIZE (ada-bootstrap.i386.freebsd.84.tar.bz2) = 39727003 SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3 SIZE (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 41229192 SHA256 (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = eb7785d8b842aee2bb04b43adfb1346b178ee4e83d8775b4e6705fd23f1586f0 SIZE (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = 44956630 -SHA256 (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = ba1a407d936e7b3f2bfe825d1fb5a1f0e85e8edbdd9e8440bb49ef643fec05fc -SIZE (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = 40227668 SHA256 (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 1066d7c5e71d78b4416de3b73348227678ca07db52488409e270db7b00467f55 SIZE (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 42163803 diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile index d5b889c..41a9173 100644 --- a/lang/harbour/Makefile +++ b/lang/harbour/Makefile @@ -50,6 +50,7 @@ HB_WITH_X11= no HB_ARCH= bsd HB_GT_LIB= gtsln +HB_COMPILER= clang HB_INSTALL_PREFIX= ${STAGEDIR}/${LOCALBASE} HB_INSTALL_BIN= ${STAGEDIR}${LOCALBASE}/bin @@ -87,12 +88,6 @@ MAKE_ENV= HB_ARCHITECTURE=${HB_ARCH} \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900033 -HB_COMPILER= gcc -.else -HB_COMPILER= clang -.endif - .if ${PORT_OPTIONS:MDOCS} MAKE_ENV+= HB_INSTALL_DOC=${HB_INSTALL_DOC} .else @@ -130,9 +125,7 @@ MAKE_ENV+= HB_WITH_PGSQL=no .endif post-patch: -.if ${OSVERSION} > 900007 ${REINPLACE_CMD} \ -e 's|utmp.h|utmpx.h|g' ${WRKSRC}/src/rtl/gtcrs/gtcrs.h -.endif .include <bsd.port.post.mk> diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile index 68f73aa..864ce69 100644 --- a/lang/intercal/Makefile +++ b/lang/intercal/Makefile @@ -20,10 +20,4 @@ post-patch: @${REINPLACE_CMD} -e '/ICK_SPECIFIC_SUBDIR/s/-@PACKAGE_VERSION@// ' \ ${WRKSRC}/buildaux/Makefile.in -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 900000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile index db3de99..af76d08 100644 --- a/lang/mit-scheme/Makefile +++ b/lang/mit-scheme/Makefile @@ -24,10 +24,6 @@ MHASH_DESC= mhash library support .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 && ${ARCH} == "amd64" -USE_GCC= yes -.endif - # TODO implement db4 support CONFIGURE_ARGS+=--without-db-4 diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 65285bc..eb55d13 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -158,9 +158,6 @@ CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MDTRACE} -.if ${OSVERSION} < 900000 -IGNORE= cannot be built with DTrace support on FreeBSD < 9.x -.endif CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 11e007f..098df85 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -154,9 +154,6 @@ CONFIGURE_ARGS+=--enable-maintainer-zts .endif .if ${PORT_OPTIONS:MDTRACE} -.if ${OSVERSION} < 900000 -IGNORE= cannot be built with DTrace support on FreeBSD < 9.x -.endif CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else diff --git a/lang/php56/Makefile b/lang/php56/Makefile index 1610b05..11a1e5f 100644 --- a/lang/php56/Makefile +++ b/lang/php56/Makefile @@ -157,9 +157,6 @@ CONFIGURE_ARGS+=--enable-maintainer-zts .endif .if ${PORT_OPTIONS:MDTRACE} -.if ${OSVERSION} < 900000 -IGNORE= cannot be built with DTrace support on FreeBSD < 9.x -.endif CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else diff --git a/lang/pure/Makefile b/lang/pure/Makefile index a8b7f23..bfce164 100644 --- a/lang/pure/Makefile +++ b/lang/pure/Makefile @@ -79,12 +79,6 @@ USE_EMACS= yes MAKE_ARGS+= emacs_prefix=${PREFIX} .endif -.if ${OSVERSION} < 900014 -SUB_LIST+= NOCLANG="" -.else -SUB_LIST+= NOCLANG="@comment " -.endif - # automatically disable readline support if editline support is available .if exists(/usr/include/edit/readline/readline.h) CONFIGURE_ARGS+= --without-readline diff --git a/lang/pure/files/pkg-message.in b/lang/pure/files/pkg-message.in index b26d7ad..c54345f 100644 --- a/lang/pure/files/pkg-message.in +++ b/lang/pure/files/pkg-message.in @@ -9,10 +9,4 @@ A text-based browser, such as one of following is recommended to use the `help' command inside the interpreter. Check pure(1) for details. -%%NOCLANG%% -%%NOCLANG%%To enable the inline C/C++ code compilation, -%%NOCLANG%% -%%NOCLANG%% clang: lang/clang%%LLVM_VERSION%% -%%NOCLANG%% -%%NOCLANG%%is required. ==== diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index e6d0a87..12932ce 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -50,13 +50,8 @@ ONLY_FOR_ARCHS= i386 amd64 # stable/N/sys/i386/include, r196045 (N=8) and r225736 (N=9). EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_SIGNAL=\\\"freebsd-8-i386-signal.h\\\" EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_IEEEFP=\\\"freebsd-8-i386-ieeefp.h\\\" -.if (${OSVERSION} < 900000) -EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386__TYPES=\\\"freebsd-8-i386-_types.h\\\" -EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_ENDIAN=\\\"freebsd-8-i386-endian.h\\\" -.else EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386__TYPES=\\\"freebsd-9-i386-_types.h\\\" EXTRA_DEFS+= -DINCLUDE_FREEBSD_I386_ENDIAN=\\\"freebsd-9-i386-endian.h\\\" -.endif .else ONLY_FOR_ARCHS= i386 .endif diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile index 0641de0..72a7f7b 100644 --- a/lang/spidermonkey17/Makefile +++ b/lang/spidermonkey17/Makefile @@ -20,6 +20,8 @@ MAKE_ARGS+= JS_THREADSAFE=YES \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -I${LOCALBASE}/include/nspr +BROKEN_sparc64= Does not build on sparc64: fails to link + USES= gmake readline MAKEFILE= Makefile.ref ALL_TARGET= ${OPSYS}`${UNAME} -r`_DBG.OBJ/js @@ -61,10 +63,4 @@ do-install: ${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC} @${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/include/ -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000 -BROKEN= Does not build on sparc64-9: fails to link -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile index 24983a4..0252f01 100644 --- a/lang/spidermonkey185/Makefile +++ b/lang/spidermonkey185/Makefile @@ -65,8 +65,8 @@ UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif -.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000 -BROKEN= Does not build on sparc64-9: fails to link +.if ${ARCH} == "sparc64" +BROKEN= Does not build on sparc64: fails to link .endif .if ${ARCH} == "amd64" diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index fe342bc..1fc6d7c 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -63,13 +63,9 @@ IMAGES= Squeak${IMAGE_FULL_VERSION}.image \ Squeak${IMAGE_FULL_VERSION}.changes \ ${SQUEAK_SRC} -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} > 900007 @${REINPLACE_CMD} -e 's,<utmp\.h>,<utmpx.h>,' \ ${WRKSRC}/unix/plugins/PseudoTTYPlugin/openpty.h -.endif @${REINPLACE_CMD} -e 's,return;,return 0;,' \ ${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c \ ${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c @@ -89,4 +85,4 @@ post-install: ${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/,} \ ${STAGEDIR}${PREFIX}/lib/squeak -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile index 9749937..b4851ae 100644 --- a/mail/mailagent/Makefile +++ b/mail/mailagent/Makefile @@ -32,12 +32,6 @@ SUB_LIST+= ORGFILE="${ORGFILE}" SUB_FILES= pkg-message PLIST_SUB+= ORGFILE="${ORGFILE}" -.include <bsd.port.pre.mk> -.if ${OSVERSION} > 900006 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-utmpx-agent_pl_utmp_utmp.pl \ - ${PATCHDIR}/extra-patch-utmpx-agent_pl_utmp_Makefile.SH -.endif - pre-extract: @if [ `${SH} -c umask` != 0022 ]; then \ ${ECHO} "Please set umask to 022 before running make,"; \ @@ -67,4 +61,4 @@ post-install: cd ${WRKSRC}/misc && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/misc ${MV} ${STAGEDIR}${PREFIX}/lib/mailagent/examples ${STAGEDIR}${EXAMPLESDIR}/agent -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH b/mail/mailagent/files/patch-utmpx-agent_pl_utmp_Makefile.SH index ac898bb..ac898bb 100644 --- a/mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH +++ b/mail/mailagent/files/patch-utmpx-agent_pl_utmp_Makefile.SH diff --git a/mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl b/mail/mailagent/files/patch-utmpx-agent_pl_utmp_utmp.pl index 0d4ee40..0d4ee40 100644 --- a/mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl +++ b/mail/mailagent/files/patch-utmpx-agent_pl_utmp_utmp.pl diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index d96d354..15c7d92 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -49,10 +49,4 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.2.0 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 900044 -IGNORE= requires zlib at least 1.2.5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 174a563..911325a 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -396,15 +396,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-amd64 DOCSDIR= ${PREFIX}/doc .endif -.if ${OSVERSION} >= 900007 -SUB_LIST+= MANPATH="@comment " -. if defined(SLAVE_LDAP) +.if defined(SLAVE_LDAP) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx-ldap -. elif !defined(SLAVE_SPAMCONTROL) +.elif !defined(SLAVE_SPAMCONTROL) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx -. endif -.else -SUB_LIST+= MANPATH="" .endif .if defined(SLAVE_TLS) @@ -673,10 +668,6 @@ post-extract: # running a script) before PATCHFILES get applied. .if defined(SLAVE_SPAMCONTROL) pre-patch: -. if ${OSVERSION} < 900007 -# Prevent applying utmpx patch - @${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch -. endif @${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail @${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \ > ${WRKSRC}/conf-spamcontrol diff --git a/mail/qmail/files/pkg-message-ldap.in b/mail/qmail/files/pkg-message-ldap.in index 4ec5628..30c83c7 100644 --- a/mail/qmail/files/pkg-message-ldap.in +++ b/mail/qmail/files/pkg-message-ldap.in @@ -1,8 +1,5 @@ ATTENTION: -%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1) -%%MANPATH%%or login.conf(5)). -%%MANPATH%% Do not forget to read %%PREFIX%%/doc/QLDAPINSTALL. After all, this is NOT our old stock qmail. And, %%PREFIX%%/doc/ANTISPAM for some antispam control measures. diff --git a/mail/qmail/files/pkg-message-mysql.in b/mail/qmail/files/pkg-message-mysql.in index f93c92e..a4c8eee 100644 --- a/mail/qmail/files/pkg-message-mysql.in +++ b/mail/qmail/files/pkg-message-mysql.in @@ -1,8 +1,5 @@ ATTENTION: -%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1) -%%MANPATH%%or login.conf(5)). -%%MANPATH%% Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all, this is NOT our old stock qmail. diff --git a/mail/qmail/files/pkg-message-tls.in b/mail/qmail/files/pkg-message-tls.in index d59be8d..f67bbb5 100644 --- a/mail/qmail/files/pkg-message-tls.in +++ b/mail/qmail/files/pkg-message-tls.in @@ -1,8 +1,5 @@ ATTENTION: -%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1) -%%MANPATH%%or login.conf(5)). -%%MANPATH%% Do not forget to read %%PREFIX%%/doc/TLS.readme. After all, this is NOT our old stock qmail. diff --git a/mail/qmail/files/pkg-message.in b/mail/qmail/files/pkg-message.in index d04a155..d418350 100644 --- a/mail/qmail/files/pkg-message.in +++ b/mail/qmail/files/pkg-message.in @@ -1,7 +1,4 @@ ATTENTION: -%%MANPATH%%You should also add %%PREFIX%%/man to your MANPATH (see manpath(1) -%%MANPATH%%or login.conf(5)). -%%MANPATH%% You can enable qmail as your default mailer executing: > %%PREFIX%%/scripts/enable-qmail diff --git a/math/blacs/Makefile b/math/blacs/Makefile index a829622..2a51aae 100644 --- a/math/blacs/Makefile +++ b/math/blacs/Makefile @@ -21,10 +21,6 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 -BROKEN= does not build on 8.x -.endif - .if ! ${PORT_OPTIONS:MDOCS} DISTFILES+= blacs_install.ps f77blacsqref.ps lawn94.ps \ cblacsqref.ps mpi_prop.ps mpiblacs_issues.ps diff --git a/misc/compat9x/Makefile b/misc/compat9x/Makefile index 6c59459..6f4082b 100644 --- a/misc/compat9x/Makefile +++ b/misc/compat9x/Makefile @@ -22,10 +22,6 @@ USE_LDCONFIG= ${TARGET_DIR} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -IGNORE= is for FreeBSD 9.x and newer -.endif - .if ${ARCH} == amd64 USE_LDCONFIG32= ${TARGET32_DIR} .endif diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 9d2c64b..40499c3 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -71,7 +71,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .if ! ${PORT_OPTIONS:MFFMPEG} -.if ${OSVERSION} < 900033 || ${ARCH} == ia64 +.if ${ARCH} == ia64 BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile index 438be97..cc6bbfe 100644 --- a/multimedia/gstreamer1-libav/Makefile +++ b/multimedia/gstreamer1-libav/Makefile @@ -28,4 +28,29 @@ CONFIGURE_ARGS= --with-system-libav INSTALL_TARGET= install-strip -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${ARCH} == "armv6" +CONFIGURE_ENV+= ASFLAGS=-no-integrated-as +.endif + +.if ${ARCH} == ia64 +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin +.endif + +.if ${COMPILER_TYPE} == clang && ${ARCH} == i386 +CFLAGS+= -mstack-alignment=16 -mstackrealign +.endif + +post-patch: + @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \ + ${WRKSRC}/gst-libs/ext/libav/Makefile \ + ${WRKSRC}/gst-libs/ext/libav/common.mak \ + ${WRKSRC}/gst-libs/ext/libav/configure \ + ${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \ + ${WRKSRC}/gst-libs/ext/libav/library.mak + @${REINPLACE_CMD} '/libgstlibav_la_LDFLAGS =/s/$$/ -Wl,-Bsymbolic/' \ + ${WRKSRC}/ext/libav/Makefile.in + +.include <bsd.port.post.mk> diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile index ea03b51..95c0478 100644 --- a/multimedia/mythtv-frontend/Makefile +++ b/multimedia/mythtv-frontend/Makefile @@ -71,15 +71,6 @@ VDPAU_CONFIGURE_ENABLE= vdpau OPENGL_CONFIGURE_ENABLE= opengl-video -.include <bsd.port.pre.mk> - -# for too old binutils in base -.if ${OSVERSION} < 900033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - .if ${PORT_OPTIONS:MOPENGL} USE_QT4+= opengl .endif @@ -94,4 +85,4 @@ post-patch: ${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \ ${WRKSRC}/programs/mythcommflag/mythcommflag-analyze -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index c49a2e1..5e9f859 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -77,13 +77,6 @@ OPENGL_CONFIGURE_ENABLE= opengl-video SUB_FILES= pkg-message -# for too old binutils in base -.if ${OSVERSION} < 900033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif - .if ${PORT_OPTIONS:MBINDINGS} CONFIGURE_ARGS+= --python=${PYTHON_CMD} USES+= python diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile index 50fd8aa..42145aa 100644 --- a/multimedia/plexmediaserver/Makefile +++ b/multimedia/plexmediaserver/Makefile @@ -36,15 +36,9 @@ ONLY_FOR_ARCHS_REASON= binary-only program, source code not available .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 900000 -IGNORE= supplied binaries compiled for FreeBSD 9 -.endif - -.if ${OSVERSION} >= 1000054 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054 RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x .endif -.endif post-patch: # binaries don't come pre-stripped diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 61f6fd1..770c1e7 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -316,11 +316,10 @@ ZVBI_CONFIGURE_ENABLE= zvbi PORTDATA= * PORTDOCS= * -.include <bsd.port.options.mk> +WITH_CDROM_DEVICE?=/dev/cd0 +WITH_DVD_DEVICE?=/dev/cd0 -.if ${PORT_OPTIONS:MPULSEAUDIO} && ${OSVERSION} <= 900044 -IGNORE= Pulseaudio is unsupported with rtld prior to FreeBSD-9.x -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes @@ -349,16 +348,6 @@ IGNORE= SKINS option requires QT4 or QT5 option CONFIGURE_ARGS+=--disable-skins2 --disable-libtar .endif -# Define these to override -# FreeBSD 9.x uses CAM devices -.if (${OSVERSION} > 900037) -WITH_CDROM_DEVICE?=/dev/cd0 -WITH_DVD_DEVICE?=/dev/cd0 -.else -WITH_CDROM_DEVICE?=/dev/acd0 -WITH_DVD_DEVICE?=/dev/acd0 -.endif - post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 808dca1..c72eaf3 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -103,10 +103,6 @@ PORTDOCS= AUTHORS \ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-scripts_ZoneMinder_lib_ZoneMinder_Memory.pm.in .endif -.if ${OSVERSION} < 900000 -BROKEN= does not compile on 7.X and 8.X -.endif - post-configure: post-patch: diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 55a8f45..446f429 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -154,6 +154,7 @@ CONFIGURE_ARGS+= \ --enable-threshold \ --enable-unixsock \ --enable-uptime \ + --enable-users \ --enable-uuid \ --enable-write_graphite \ --enable-write_log \ @@ -473,16 +474,6 @@ CONFIGURE_ARGS+=--without-libstatgrab PLIST_SUB+= STATGRAB="@comment " .endif -.if ${OSVERSION} >= 900007 -CONFIGURE_ARGS+=--enable-users -PLIST_SUB+= USERS="" -.elif ${PORT_OPTIONS:MSTATGRAB} -CONFIGURE_ARGS+=--enable-users -PLIST_SUB+= USERS="" -.else -PLIST_SUB+= USERS="@comment " -.endif - .if ${PORT_OPTIONS:MSIGROK} USE_GNOME+= glib20 LIB_DEPENDS+= libsigrok.so:${PORTSDIR}/devel/libsigrok diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist index 2fb983e..3c5a59d 100644 --- a/net-mgmt/collectd5/pkg-plist +++ b/net-mgmt/collectd5/pkg-plist @@ -90,7 +90,7 @@ lib/collectd/threshold.so %%TOKYOTYRANT%%lib/collectd/tokyotyrant.so lib/collectd/unixsock.so lib/collectd/uptime.so -%%USERS%%lib/collectd/users.so +lib/collectd/users.so lib/collectd/uuid.so %%VARNISH%%lib/collectd/varnish.so %%VIRT%%lib/collectd/virt.so diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index d32da97..11b9718 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -239,10 +239,8 @@ post-patch: .for filename in ${SCRIPT_FILES} @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/local/${filename} .endfor -.if ${OSVERSION} >= 900007 @${REINPLACE_CMD} -e 's!utmp_p->ut_name!utmp_p->ut_user!' \ ${WRKSRC}/agent/mibgroup/host/hr_system.c -.endif @${REINPLACE_CMD} -E -e 's|return pci_lookup_name|disabled broken|g' \ ${WRKSRC}/configure diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index 3743045..0d53ab9 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -44,10 +44,6 @@ EXAMPLE_FILES= README ascend.rw c3620.rw cisco.rw comos.rw config.syntax \ .include <bsd.port.options.mk> -.if ${OSVERSION} >= 900007 -EXTRA_PATCHES= ${FILESDIR}/extra-utmpx -.endif - .if ${PORT_OPTIONS:MSNMP} CONFIGURE_ARGS+=--enable-snmp .endif diff --git a/net/gnu-radius/files/extra-utmpx b/net/gnu-radius/files/patch-radwho_radwho.c index 17848c5..17848c5 100644 --- a/net/gnu-radius/files/extra-utmpx +++ b/net/gnu-radius/files/patch-radwho_radwho.c diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile index 287e5e1..eb09677 100644 --- a/net/kamailio/Makefile +++ b/net/kamailio/Makefile @@ -60,10 +60,6 @@ EXTRA_PATCHES+= ${.CURDIR}/files/extra-patch-atomic-amd64 EXTRA_PATCHES+= ${.CURDIR}/files/extra-patch-atomic-i386 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 -BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 -.endif - DEFAULT_GROUP_INCLUDE= standard standard-dep .if ${PORT_OPTIONS:MMYSQL} @@ -126,9 +122,6 @@ post-patch: ${REINPLACE_CMD} -e 's#install-doc install-man#install-man#' \ ${WRKSRC}/Makefile .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 - ${REINPLACE_CMD} -e 's/clang/clang33/g' ${WRKSRC}/Makefile.defs -.endif pre-build: cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} cfg diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index cb1ffe87..12c463c 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -36,12 +36,6 @@ NLS_USES= gettext USE_RC_SUBR= ntopng -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 900000 -BROKEN= Does not build on 8.X due to *ENDIAN implementations -.endif - post-extract: @${FIND} ${WRKSRC} -name "*~" -delete @${RMDIR} ${WRKSRC}/httpdocs/ssl diff --git a/ports-mgmt/dialog4ports/Makefile b/ports-mgmt/dialog4ports/Makefile index 3735021..18d7e33 100644 --- a/ports-mgmt/dialog4ports/Makefile +++ b/ports-mgmt/dialog4ports/Makefile @@ -41,7 +41,7 @@ MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" DIALOG4PORTS= ${WRKSRC}/dialog4ports .endif -.if ${OSVERSION} < 900030 || defined(D4P_SLAVE) +.if defined(D4P_SLAVE) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DIALOGNAME}.tgz:dialog DIALOGNAME= dialog-1.1-20120706 diff --git a/security/openssh-portable-devel/Makefile b/security/openssh-portable-devel/Makefile index 988aea1..e60d41d 100644 --- a/security/openssh-portable-devel/Makefile +++ b/security/openssh-portable-devel/Makefile @@ -113,16 +113,9 @@ PATCHFILES+= openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex .endif -.if ${OSVERSION} >= 900000 CONFIGURE_LIBS+= -lutil -.endif -# 900007 is when utmp(5) was removed and utmpx(3) added -.if ${OSVERSION} >= 900007 CONFIGURE_ARGS+= --disable-utmp --disable-wtmp --disable-wtmpx --without-lastlog -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sshd-utmp-size -.endif # Keep this last EXTRA_PATCHES+= ${FILESDIR}/extra-patch-version-addendum diff --git a/security/openssh-portable-devel/files/extra-patch-sshd-utmp-size b/security/openssh-portable-devel/files/extra-patch-sshd-utmp-size deleted file mode 100644 index f6a48e8..0000000 --- a/security/openssh-portable-devel/files/extra-patch-sshd-utmp-size +++ /dev/null @@ -1,36 +0,0 @@ -r184122 | des | 2008-10-21 06:58:26 -0500 (Tue, 21 Oct 2008) | 11 lines -Changed paths: - M /head/crypto/openssh/loginrec.c - M /head/crypto/openssh/sshd.c - -At some point, construct_utmp() was changed to use realhostname() to fill -in the struct utmp due to concerns about the length of the hostname buffer. -However, this breaks the UseDNS option. There is a simpler and better -solution: initialize utmp_len to the correct value (UT_HOSTSIZE instead of -MAXHOSTNAMELEN) and let get_remote_name_or_ip() worry about the size of the -buffer. - -PR: bin/97499 -Submitted by: Bruce Cran <bruce@cran.org.uk> - -Index: sshd.c -=================================================================== ---- sshd.c.orig 2015-04-04 11:40:24.175508000 -0500 -+++ sshd.c 2015-04-04 11:40:38.082324000 -0500 -@@ -72,6 +72,7 @@ - #include <string.h> - #include <unistd.h> - #include <limits.h> -+#include <utmp.h> - - #ifdef WITH_OPENSSL - #include <openssl/dh.h> -@@ -229,7 +230,7 @@ u_char *session_id2 = NULL; - u_int session_id2_len = 0; - - /* record remote hostname or ip */ --u_int utmp_len = HOST_NAME_MAX+1; -+u_int utmp_len = UT_HOSTSIZE; - - /* options.max_startup sized array of fd ints */ - int *startup_pipes = NULL; diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 8053cc7..64d782b 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -109,17 +109,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn:-p2 PATCHFILES+= openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex .endif - -.if ${OSVERSION} >= 900000 CONFIGURE_LIBS+= -lutil -.endif -# 900007 is when utmp(5) was removed and utmpx(3) added -.if ${OSVERSION} >= 900007 CONFIGURE_ARGS+= --disable-utmp --disable-wtmp --disable-wtmpx --without-lastlog -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sshd-utmp-size -.endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hostkeyalg_plus:-p1 diff --git a/security/openssh-portable/files/extra-patch-sshd-utmp-size b/security/openssh-portable/files/extra-patch-sshd-utmp-size deleted file mode 100644 index f6a48e8..0000000 --- a/security/openssh-portable/files/extra-patch-sshd-utmp-size +++ /dev/null @@ -1,36 +0,0 @@ -r184122 | des | 2008-10-21 06:58:26 -0500 (Tue, 21 Oct 2008) | 11 lines -Changed paths: - M /head/crypto/openssh/loginrec.c - M /head/crypto/openssh/sshd.c - -At some point, construct_utmp() was changed to use realhostname() to fill -in the struct utmp due to concerns about the length of the hostname buffer. -However, this breaks the UseDNS option. There is a simpler and better -solution: initialize utmp_len to the correct value (UT_HOSTSIZE instead of -MAXHOSTNAMELEN) and let get_remote_name_or_ip() worry about the size of the -buffer. - -PR: bin/97499 -Submitted by: Bruce Cran <bruce@cran.org.uk> - -Index: sshd.c -=================================================================== ---- sshd.c.orig 2015-04-04 11:40:24.175508000 -0500 -+++ sshd.c 2015-04-04 11:40:38.082324000 -0500 -@@ -72,6 +72,7 @@ - #include <string.h> - #include <unistd.h> - #include <limits.h> -+#include <utmp.h> - - #ifdef WITH_OPENSSL - #include <openssl/dh.h> -@@ -229,7 +230,7 @@ u_char *session_id2 = NULL; - u_int session_id2_len = 0; - - /* record remote hostname or ip */ --u_int utmp_len = HOST_NAME_MAX+1; -+u_int utmp_len = UT_HOSTSIZE; - - /* options.max_startup sized array of fd ints */ - int *startup_pipes = NULL; diff --git a/security/putty/Makefile b/security/putty/Makefile index 17e05a9..1ac9150 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -45,9 +45,7 @@ MAKE_ARGS+= GTK_CONFIG=: .if ${PORT_OPTIONS:MGSSAPI} _COMPAT= -DSTATIC_GSSAPI -.if ${OSVERSION} >= 900000 LIB_DEPENDS+= libkrb5support.so:${PORTSDIR}/security/krb5 -.endif .else _COMPAT= -DNO_GSSAPI .endif diff --git a/security/pwauth/Makefile b/security/pwauth/Makefile index 0d5e737..1775da6 100644 --- a/security/pwauth/Makefile +++ b/security/pwauth/Makefile @@ -17,12 +17,6 @@ PLIST_FILES= bin/pwauth bin/checkfaillog ALL_TARGET= pwauth checkfaillog MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIB="-lcrypt -lpam" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx -.endif - WWWUID= `${ID} -u ${WWWOWN}` MINUID?= 1000 @@ -35,4 +29,4 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/checkfaillog ${STAGEDIR}${PREFIX}/bin @${CHMOD} u=rxs ${STAGEDIR}${PREFIX}/bin/pwauth -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/pwauth/files/extra-patch-utmpx b/security/pwauth/files/patch-utmpx index eef7e8e..eef7e8e 100644 --- a/security/pwauth/files/extra-patch-utmpx +++ b/security/pwauth/files/patch-utmpx diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index b025c18..2348f87 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -47,8 +47,7 @@ CONFLICTS= tor-[0-9]* .include <bsd.port.options.mk> -.if ( (${OSVERSION} < 900000) || \ -(${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ +.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening .else diff --git a/security/tor/Makefile b/security/tor/Makefile index bd9b248..45fe7f3 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -44,8 +44,7 @@ CONFLICTS= tor-devel-[0-9]* .include <bsd.port.options.mk> -.if ( (${OSVERSION} < 900000) || \ -(${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ +.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening .else diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile index 5a4d248..e50cc65 100644 --- a/sysutils/arcconf/Makefile +++ b/sysutils/arcconf/Makefile @@ -22,18 +22,14 @@ SUB_FILES+= ${PERIODICSCRIPT} RESTRICTED= May not be redistributed in binary form NO_CDROM= May not be redistributed in binary form +DIST_OSVER= 9 + .include <bsd.port.pre.mk> .if ${OPSYS} != FreeBSD IGNORE= installs incompatible binaries for FreeBSD .endif -.if ${OSVERSION} >= 900000 -DIST_OSVER= 9 -.else -DIST_OSVER= 8 -.endif - .if ${ARCH} == amd64 DIST_EXT= _x64 .endif diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile index db20a72..9d48bea 100644 --- a/sysutils/boxbackup/Makefile +++ b/sysutils/boxbackup/Makefile @@ -44,7 +44,7 @@ USES+= execinfo LDFLAGS+= -lexecinfo .endif -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 && ${OSVERSION} > 900000 +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 USE_GCC= yes .endif diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile index 2824ee0..d61f23b 100644 --- a/sysutils/consul/Makefile +++ b/sysutils/consul/Makefile @@ -150,10 +150,6 @@ do-install: .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900044 && ${ARCH} == i386 -BROKEN= Does not build -.endif - # golang assumes that if clang is in use, it is called "clang" and not "cc". If # it's called "cc", go fails. .if ${COMPILER_TYPE} == clang diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile index 2f33835..e5b502b 100644 --- a/sysutils/fusefs-kmod/Makefile +++ b/sysutils/fusefs-kmod/Makefile @@ -27,11 +27,7 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vfsops.c -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vnops.c -.endif -.if ${OSVERSION} >= 900000 && ${OSVERSION} < 1000000 +.if ${OSVERSION} < 1000000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_main.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_vfsops.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_vnops.c diff --git a/sysutils/fusefs-kmod/files/extra-patch-8-fuse_vfsops.c b/sysutils/fusefs-kmod/files/extra-patch-8-fuse_vfsops.c deleted file mode 100644 index 2a5bb20..0000000 --- a/sysutils/fusefs-kmod/files/extra-patch-8-fuse_vfsops.c +++ /dev/null @@ -1,47 +0,0 @@ ---- fs/fuse/fuse_vfsops.c.orig -+++ fs/fuse/fuse_vfsops.c -@@ -62,8 +62,8 @@ - #include <sys/errno.h> - #include <sys/param.h> - #include <sys/kernel.h> --#include <sys/capsicum.h> - #include <sys/conf.h> -+#include <sys/file.h> - #include <sys/filedesc.h> - #include <sys/uio.h> - #include <sys/malloc.h> -@@ -206,7 +206,7 @@ - { - int err; - -- uint64_t mntopts, __mntopts; -+ u_int mntopts, __mntopts; - int max_read_set; - uint32_t max_read; - int daemon_timeout; -@@ -220,7 +220,6 @@ - struct file *fp, *fptmp; - char *fspec, *subtype; - struct vfsoptlist *opts; -- cap_rights_t rights; - - subtype = NULL; - max_read_set = 0; -@@ -290,7 +289,7 @@ - - FS_DEBUG2G("mntopts 0x%jx\n", (uintmax_t)mntopts); - -- err = fget(td, fd, cap_rights_init(&rights, CAP_READ), &fp); -+ err = fget(td, fd, &fp); - if (err != 0) { - FS_DEBUG("invalid or not opened device: data=%p\n", data); - goto out; -@@ -459,7 +458,7 @@ - FUSE_UNLOCK(); - VOP_UNLOCK(*vpp, 0); - vrele(*vpp); -- vrecycle(*vpp); -+ vrecycle(*vpp, curthread); - *vpp = data->vroot; - } else - FUSE_UNLOCK(); diff --git a/sysutils/fusefs-kmod/files/extra-patch-8-fuse_vnops.c b/sysutils/fusefs-kmod/files/extra-patch-8-fuse_vnops.c deleted file mode 100644 index b18b819..0000000 --- a/sysutils/fusefs-kmod/files/extra-patch-8-fuse_vnops.c +++ /dev/null @@ -1,146 +0,0 @@ ---- fs/fuse/fuse_vnops.c.orig -+++ fs/fuse/fuse_vnops.c -@@ -190,10 +190,10 @@ - - int fuse_pbuf_freecnt = -1; - --#define fuse_vm_page_lock(m) vm_page_lock((m)); --#define fuse_vm_page_unlock(m) vm_page_unlock((m)); --#define fuse_vm_page_lock_queues() ((void)0) --#define fuse_vm_page_unlock_queues() ((void)0) -+#define fuse_vm_page_lock(m) ((void)0) -+#define fuse_vm_page_unlock(m) ((void)0) -+#define fuse_vm_page_lock_queues() vm_page_lock_queues() -+#define fuse_vm_page_unlock_queues() vm_page_unlock_queues() - - /* - struct vnop_access_args { -@@ -579,7 +579,7 @@ - } - - if ((fvdat->flag & FN_REVOKED) != 0 && fuse_reclaim_revoked) { -- vrecycle(vp); -+ vrecycle(vp, curthread); - } - return 0; - } -@@ -706,7 +706,7 @@ - op = FUSE_GETATTR; - goto calldaemon; - } else if (fuse_lookup_cache_enable) { -- err = cache_lookup(dvp, vpp, cnp, NULL, NULL); -+ err = cache_lookup(dvp, vpp, cnp); - switch (err) { - - case -1: /* positive match */ -@@ -1758,7 +1758,7 @@ - * can only occur at the file EOF. - */ - -- VM_OBJECT_WLOCK(vp->v_object); -+ VM_OBJECT_LOCK(vp->v_object); - fuse_vm_page_lock_queues(); - if (pages[ap->a_reqpage]->valid != 0) { - for (i = 0; i < npages; ++i) { -@@ -1769,11 +1769,11 @@ - } - } - fuse_vm_page_unlock_queues(); -- VM_OBJECT_WUNLOCK(vp->v_object); -+ VM_OBJECT_UNLOCK(vp->v_object); - return 0; - } - fuse_vm_page_unlock_queues(); -- VM_OBJECT_WUNLOCK(vp->v_object); -+ VM_OBJECT_UNLOCK(vp->v_object); - - /* - * We use only the kva address for the buffer, but this is extremely -@@ -1803,7 +1803,7 @@ - - if (error && (uio.uio_resid == count)) { - FS_DEBUG("error %d\n", error); -- VM_OBJECT_WLOCK(vp->v_object); -+ VM_OBJECT_LOCK(vp->v_object); - fuse_vm_page_lock_queues(); - for (i = 0; i < npages; ++i) { - if (i != ap->a_reqpage) { -@@ -1813,7 +1813,7 @@ - } - } - fuse_vm_page_unlock_queues(); -- VM_OBJECT_WUNLOCK(vp->v_object); -+ VM_OBJECT_UNLOCK(vp->v_object); - return VM_PAGER_ERROR; - } - /* -@@ -1823,7 +1823,7 @@ - */ - - size = count - uio.uio_resid; -- VM_OBJECT_WLOCK(vp->v_object); -+ VM_OBJECT_LOCK(vp->v_object); - fuse_vm_page_lock_queues(); - for (i = 0, toff = 0; i < npages; i++, toff = nextoff) { - vm_page_t m; -@@ -1843,7 +1843,7 @@ - * Read operation filled a partial page. - */ - m->valid = 0; -- vm_page_set_valid_range(m, 0, size - toff); -+ vm_page_set_valid(m, 0, size - toff); - KASSERT(m->dirty == 0, - ("fuse_getpages: page %p is dirty", m)); - } else { -@@ -1854,11 +1854,36 @@ - */ - ; - } -- if (i != ap->a_reqpage) -- vm_page_readahead_finish(m); -+ if (i != ap->a_reqpage) { -+ /* -+ * whether or not to leave the page activated is up in -+ * the air, but we should put the page on a page queue -+ * somewhere. (it already is in the object). Result: -+ * It appears that empirical results show that -+ * deactivating pages is best. -+ */ -+ -+ /* -+ * just in case someone was asking for this page we -+ * now tell them that it is ok to use -+ */ -+ if (!error) { -+#ifdef VPO_WANTED -+ if (m->oflags & VPO_WANTED) -+#else -+ if (m->flags & PG_WANTED) -+#endif -+ vm_page_activate(m); -+ else -+ vm_page_deactivate(m); -+ vm_page_wakeup(m); -+ } else { -+ vm_page_free(m); -+ } -+ } - } - fuse_vm_page_unlock_queues(); -- VM_OBJECT_WUNLOCK(vp->v_object); -+ VM_OBJECT_UNLOCK(vp->v_object); - return 0; - } - -@@ -1947,9 +1972,9 @@ - - for (i = 0; i < nwritten; i++) { - rtvals[i] = VM_PAGER_OK; -- VM_OBJECT_WLOCK(pages[i]->object); -+ VM_OBJECT_LOCK(pages[i]->object); - vm_page_undirty(pages[i]); -- VM_OBJECT_WUNLOCK(pages[i]->object); -+ VM_OBJECT_UNLOCK(pages[i]->object); - } - } - return rtvals[0]; diff --git a/sysutils/libutempter/Makefile b/sysutils/libutempter/Makefile index 1711f8d..c9c6281 100644 --- a/sysutils/libutempter/Makefile +++ b/sysutils/libutempter/Makefile @@ -13,10 +13,6 @@ COMMENT= Interface to record user sessions to utmp and wtmp files USES= gmake tar:bzip2 USE_LDCONFIG= yes -.include <bsd.port.pre.mk> +IGNORE_FreeBSD= is now contained in the base system -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 900004 -IGNORE= is now contained in the base system -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile index 9cd364f..1eb06db 100644 --- a/sysutils/msyslog/Makefile +++ b/sysutils/msyslog/Makefile @@ -32,12 +32,6 @@ USE_LDCONFIG= yes PORTSCOUT= skipv:1.09a,1.09b,1.09c,1.09d -.include <bsd.port.options.mk> - -.if ${OSVERSION} > 900006 -EXTRA_PATCHES= ${PATCHDIR}/utmpx-src-modules-om_classic.c -.endif - post-patch: @${FIND} ${WRKSRC}/src/modules -name "*.c" | \ ${XARGS} ${REINPLACE_CMD} -e "s|typedef int socklen_t;||g" diff --git a/sysutils/msyslog/files/utmpx-src-modules-om_classic.c b/sysutils/msyslog/files/patch-src_modules_om__classic.c index 36fedba..36fedba 100644 --- a/sysutils/msyslog/files/utmpx-src-modules-om_classic.c +++ b/sysutils/msyslog/files/patch-src_modules_om__classic.c diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index af01ae3..292c2c7 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -17,10 +17,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bpf_dump.c \ ${FILESDIR}/extra-patch-sf-gencode.h .endif -.if ${OSVERSION} < 900039 -MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=41 -CFLAGS+= -DHAVE_ALTQ=1 -.else MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=45 CFLAGS+= -DHAVE_ALTQ=1 -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cache.c \ @@ -31,7 +27,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cache.c \ .if ${OSVERSION} > 1000017 CFLAGS+= -DHAVE_FINE_GRAINED_LOCKING=1 .endif -.endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-engine.c diff --git a/sysutils/rmonitor/files/patch-src__rmonitor.c b/sysutils/rmonitor/files/patch-src__rmonitor.c index dcd449f..bb7929c 100644 --- a/sysutils/rmonitor/files/patch-src__rmonitor.c +++ b/sysutils/rmonitor/files/patch-src__rmonitor.c @@ -1,6 +1,15 @@ ---- ./src/rmonitor.c.orig 2001-07-20 18:31:10.000000000 +0300 -+++ ./src/rmonitor.c 2009-02-20 11:24:12.000000000 +0200 -@@ -294,7 +294,7 @@ +--- src/rmonitor.c.orig 2015-09-18 17:10:16 UTC ++++ src/rmonitor.c +@@ -88,7 +88,7 @@ static const char rcsid[] = "$Id: rmonit + #include <sys/vmmeter.h> + #include <time.h> + #include <unistd.h> +-#include <utmp.h> ++#include <utmpx.h> + + + #define DEFTOL 2.5 /* default tolerance */ +@@ -294,13 +294,13 @@ void getstat ( char *stat ) /* ----- #define samples 2 double lavg[samples]; int dbufs = 0; @@ -9,3 +18,41 @@ int maxf = -1; int maxp = -1; int memfre = 0; + int memtot = 0; + int memuse = 0; +- int nu = -1; ++ int nu = 0; + int np = -1; + int openf = -1; + int pgcnt = 0; +@@ -309,9 +309,8 @@ void getstat ( char *stat ) /* ----- + int pgsize = 0; + int slvl = 0; + int vn[3]; +- int utfd; + time_t ct; +- struct utmp utmprec; ++ struct utmpx *utmprec; + + union { + char buf[STRLEN]; +@@ -402,14 +401,12 @@ void getstat ( char *stat ) /* ----- + + if (getloadavg(lavg, samples) != samples) errmsg("getloadavg"); + +- if ((utfd = open(_PATH_UTMP, O_RDONLY)) >= 0) { +- nu = 0; +- while (read(utfd, &utmprec, sizeof utmprec) > 0) +- if (*(utmprec.ut_name)) nu++; +- if (close(utfd) < 0) errmsg("close"); ++ setutxent(); ++ while ((utmprec = getutxent()) != NULL) { ++ if (utmprec->ut_type == USER_PROCESS) ++ nu++; + } +- else +- errmsg("open"); ++ endutxent(); + + #if __FreeBSD_version >= 420000 + snprintf(stat, STRLEN, diff --git a/sysutils/rmonitor/files/patch-utmpx b/sysutils/rmonitor/files/patch-utmpx deleted file mode 100644 index 7470101..0000000 --- a/sysutils/rmonitor/files/patch-utmpx +++ /dev/null @@ -1,51 +0,0 @@ ---- src/rmonitor.c -+++ src/rmonitor.c -@@ -88,7 +88,7 @@ - #include <sys/vmmeter.h> - #include <time.h> - #include <unistd.h> --#include <utmp.h> -+#include <utmpx.h> - - - #define DEFTOL 2.5 /* default tolerance */ -@@ -300,7 +300,7 @@ - int memfre = 0; - int memtot = 0; - int memuse = 0; -- int nu = -1; -+ int nu = 0; - int np = -1; - int openf = -1; - int pgcnt = 0; -@@ -309,9 +309,8 @@ - int pgsize = 0; - int slvl = 0; - int vn[3]; -- int utfd; - time_t ct; -- struct utmp utmprec; -+ struct utmpx *utmprec; - - union { - char buf[STRLEN]; -@@ -402,14 +401,12 @@ - - if (getloadavg(lavg, samples) != samples) errmsg("getloadavg"); - -- if ((utfd = open(_PATH_UTMP, O_RDONLY)) >= 0) { -- nu = 0; -- while (read(utfd, &utmprec, sizeof utmprec) > 0) -- if (*(utmprec.ut_name)) nu++; -- if (close(utfd) < 0) errmsg("close"); -+ setutxent(); -+ while ((utmprec = getutxent()) != NULL) { -+ if (utmprec->ut_type == USER_PROCESS) -+ nu++; - } -- else -- errmsg("open"); -+ endutxent(); - - #if __FreeBSD_version >= 420000 - snprintf(stat, STRLEN, diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index ba4dfd1..f890bce 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -48,9 +48,9 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking --enable-manpages \ + --disable-linux-caps \ --datadir=${PREFIX}/share/syslog-ng/ - BROKEN_sparc64= Does not compile on sparc64: gcc core dump .include <bsd.port.options.mk> @@ -149,16 +149,6 @@ PLIST_FILES+= lib/syslog-ng/libmod-python.so CONFIGURE_ARGS+= --disable-python .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 900000 -BROKEN= Does not build under 8.X. -.endif - -.if ${OSVERSION} >= 900034 -CONFIGURE_ARGS+= --disable-linux-caps -.endif - post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \ ${WRKSRC}/configure @@ -182,4 +172,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ ${STAGEDIR}${PREFIX}/include/syslog-ng/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 142009b..0e70b48 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -41,7 +41,7 @@ SUB_FILES= pkg-message INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ - --enable-dynamic-linking \ + --enable-dynamic-linking --disable-linux-caps \ --enable-debug --enable-manpages \ --datadir=${PREFIX}/share/syslog-ng/ @@ -125,12 +125,6 @@ PLIST_FILES+= lib/syslog-ng/libjson-plugin.so CONFIGURE_ARGS+= --disable-json .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900034 -CONFIGURE_ARGS+= --disable-linux-caps -.endif - post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \ ${WRKSRC}/configure @@ -154,4 +148,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ ${STAGEDIR}${PREFIX}/include/syslog-ng/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/syslog-ng34/Makefile b/sysutils/syslog-ng34/Makefile index 70f58d1..66ddb87 100644 --- a/sysutils/syslog-ng34/Makefile +++ b/sysutils/syslog-ng34/Makefile @@ -40,7 +40,7 @@ SUB_FILES= pkg-message CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking \ - --enable-debug + --enable-debug --disable-linux-caps BROKEN_sparc64= Does not compile on sparc64: gcc core dump @@ -120,12 +120,6 @@ PLIST_FILES+= lib/syslog-ng/libjson-plugin.so CONFIGURE_ARGS+= --disable-json .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900034 -CONFIGURE_ARGS+= --disable-linux-caps -.endif - post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure @${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.sample @@ -142,4 +136,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/syslog-ng35/Makefile b/sysutils/syslog-ng35/Makefile index 943e824..db81984 100644 --- a/sysutils/syslog-ng35/Makefile +++ b/sysutils/syslog-ng35/Makefile @@ -43,7 +43,7 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking \ - --enable-debug \ + --enable-debug --disable-linux-caps \ --datadir=${PREFIX}/share/syslog-ng/ BROKEN_sparc64= Does not compile on sparc64: gcc core dump @@ -134,12 +134,6 @@ PLIST_FILES+= lib/syslog-ng/libjson-plugin.so CONFIGURE_ARGS+= --disable-json .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900034 -CONFIGURE_ARGS+= --disable-linux-caps -.endif - post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \ ${WRKSRC}/configure @@ -163,4 +157,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ ${STAGEDIR}${PREFIX}/include/syslog-ng/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile index 7946952..c927f2a 100644 --- a/textproc/elasticsearch/Makefile +++ b/textproc/elasticsearch/Makefile @@ -68,10 +68,8 @@ ELASTIC_LOGDIR= /var/log/elasticsearch .if ${OPSYS} == FreeBSD . if ${OSVERSION} >= 1000000 PLATFORM_VER= 1 -. elif ${OSVERSION} >= 900000 -PLATFORM_VER= 9 . else -PLATFORM_VER= 8 +PLATFORM_VER= 9 . endif .else BROKEN= ${OPSYS} platform is not supported diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile index 4f10a67..ad1bd1f 100644 --- a/www/mod_spdy/Makefile +++ b/www/mod_spdy/Makefile @@ -50,7 +50,7 @@ GCC_DESC= Build mod_spdy with GCC 4.6+ .include <bsd.port.options.mk> -.if ${OSVERSION} < 900033 || ${PORT_OPTIONS:MGCC} +.if ${PORT_OPTIONS:MGCC} BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin @@ -60,15 +60,8 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin USE_GCC?= yes GYP_DEFINES+= gcc_version=${CXX:S/g++//} .else -.if ${OSVERSION} < 902000 -BROKEN= Depends on deleted lang/llvm32 -#BUILD_DEPENDS+= ${LOCALBASE}/bin/clang32:${PORTSDIR}/lang/clang32 -CC= ${LOCALBASE}/bin/clang32 -CXX= ${LOCALBASE}/bin/clang++32 -.else CC= clang CXX= clang++ -.endif GYP_DEFINES+= clang=1 .endif @@ -97,10 +90,6 @@ MAKE_ENV+= BUILDTYPE=${BUILDTYPE} .include <bsd.port.pre.mk> -.if ${ARCH} == i386 && ${OSVERSION} < 901000 -BROKEN= does not link due to libtool not respecting CC -.endif - post-extract: @${MKDIR} ${WRKSRC}/temp/progress @${CP} ${DISTDIR}/${DIST_SUBDIR}/httpd-2.2.22.tar.gz ${WRKSRC}/temp/ && \ diff --git a/www/node-devel/Makefile b/www/node-devel/Makefile index a2b8c38..f15c94b 100644 --- a/www/node-devel/Makefile +++ b/www/node-devel/Makefile @@ -26,7 +26,7 @@ REINPLACE_ARGS= -i '' .include <bsd.port.options.mk> -.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang) +.if exists(/usr/bin/clang) CC= clang CXX= clang++ GYP_DEFINES+= clang=1 diff --git a/www/tengine/Makefile b/www/tengine/Makefile index 3aa4074..3170fc4 100644 --- a/www/tengine/Makefile +++ b/www/tengine/Makefile @@ -164,11 +164,6 @@ XSS_DESC= 3rd party xss module .include <bsd.port.options.mk> -# FreeBSD 8 and earlier are unsupported -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900500 -IGNORE= is unsupported on FreeBSD 8 and earlier -.endif - NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log NGINX_RUNDIR?= ${NGINX_VARDIR}/run diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 9d8e452..2fb43ec 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -77,7 +77,7 @@ CONFIGURE_ARGS+= --disable-freelist IGNORE= no allocation strategy selected .endif -.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang) +.if exists(/usr/bin/clang) CC= clang CXX= clang++ .endif diff --git a/x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c b/x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c deleted file mode 100644 index bc0877b..0000000 --- a/x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c +++ /dev/null @@ -1,40 +0,0 @@ ---- gnome-pty-helper/gnome-utmp.c.orig Sat Oct 28 23:15:53 2006 -+++ gnome-pty-helper/gnome-utmp.c Sat Oct 28 23:15:40 2006 -@@ -258,10 +258,18 @@ write_logout_record (char *login_name, v - #endif - - if (utmp) -+#if defined(__FreeBSD__) -+ logout (put.ut_line); -+#else - update_utmp (&put); -+#endif - - if (wtmp) -+#if defined(__FreeBSD__) -+ logwtmp (put.ut_line, "", ""); -+#else - update_wtmp (WTMP_OUTPUT_FILENAME, &put); -+#endif - - free (ut); - } -@@ -347,10 +355,18 @@ write_login_record (char *login_name, ch - # endif - #endif - if (utmp) -+#if defined(__FreeBSD__) -+ login (ut); -+#else - update_utmp (ut); -+#endif - - if (wtmp) -+#if defined(__FreeBSD__) -+ logwtmp (ut->ut_line, ut->ut_name, ut->ut_host); -+#else - update_wtmp (WTMP_OUTPUT_FILENAME, ut); -+#endif - - if (lastlog) - update_lastlog(login_name, ut); diff --git a/x11-toolkits/vte290/files/extra-patch-gnome-pty-helper_gnome-utmp.c b/x11-toolkits/vte290/files/extra-patch-gnome-pty-helper_gnome-utmp.c deleted file mode 100644 index bc0877b..0000000 --- a/x11-toolkits/vte290/files/extra-patch-gnome-pty-helper_gnome-utmp.c +++ /dev/null @@ -1,40 +0,0 @@ ---- gnome-pty-helper/gnome-utmp.c.orig Sat Oct 28 23:15:53 2006 -+++ gnome-pty-helper/gnome-utmp.c Sat Oct 28 23:15:40 2006 -@@ -258,10 +258,18 @@ write_logout_record (char *login_name, v - #endif - - if (utmp) -+#if defined(__FreeBSD__) -+ logout (put.ut_line); -+#else - update_utmp (&put); -+#endif - - if (wtmp) -+#if defined(__FreeBSD__) -+ logwtmp (put.ut_line, "", ""); -+#else - update_wtmp (WTMP_OUTPUT_FILENAME, &put); -+#endif - - free (ut); - } -@@ -347,10 +355,18 @@ write_login_record (char *login_name, ch - # endif - #endif - if (utmp) -+#if defined(__FreeBSD__) -+ login (ut); -+#else - update_utmp (ut); -+#endif - - if (wtmp) -+#if defined(__FreeBSD__) -+ logwtmp (ut->ut_line, ut->ut_name, ut->ut_host); -+#else - update_wtmp (WTMP_OUTPUT_FILENAME, ut); -+#endif - - if (lastlog) - update_lastlog(login_name, ut); diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 4e9c4d9..4d26a3f 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -156,9 +156,4 @@ post-install: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ | /usr/bin/fmt 75 79 > ${PKGMESSAGE} -# logwtmp lives here. -.if ${OSVERSION} < 900000 -CONFIGLIBS+= -lutil -.endif - .include <bsd.port.mk> diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index b7fe98bf..55342ab 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -136,7 +136,7 @@ post-patch: .SILENT # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h # Adjust legacy drivers for updated d_mmap() since FreeBSD src SVN r201223 -.if ${OSVERSION} > 900005 && ${NVVERSION} < 195.022 +.if ${NVVERSION} < 195.022 ${REINPLACE_CMD} -e 's/vm_offset_t offset/vm_ooffset_t offset/ ; \ s/vm_offset_t \*address/vm_paddr_t *address/ ; \ s/int nprot/&, vm_memattr_t *memattr/' \ @@ -146,13 +146,13 @@ post-patch: .SILENT # around vm_page_(un)wire() after FreeBSD src SVN r207410, r207617, and # r207644; also remove page queue locking around vm_page_wakeup() after # FreeBSD src SVN r163622 -.if ${OSVERSION} > 900011 && ${NVVERSION} < 304.064 +.if ${NVVERSION} < 304.064 ${REINPLACE_CMD} -E '/vm_page_(un)?lock_queues\(\);/d ; \ s/(vm_page_(un)?wire\()([^,]+)(, 0)?(\);)/vm_page_lock(\3); & vm_page_unlock(\3);/' \ ${WRKSRC}/src/nvidia_subr.c .endif # Catch up legacy drivers with FreeBSD src SVN r225617 -.if ${OSVERSION} > 900043 && ${NVVERSION} < 195.022 +.if ${NVVERSION} < 195.022 ${REINPLACE_CMD} -e '/return/s/ioctl/sys_&/' \ ${WRKSRC}/src/nvidia_linux.c .endif |
