Page MenuHomeFreeBSD
Files F153101549

D3694.id8835.diff
No OneTemporary
Actions

D3694.id8835.diff
View Options

Index: Mk/Uses/compiler.mk
===================================================================
--- Mk/Uses/compiler.mk
+++ Mk/Uses/compiler.mk
@@ -158,10 +158,6 @@
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 @@
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 @@
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 @@
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
Index: Mk/Uses/objc.mk
===================================================================
--- Mk/Uses/objc.mk
+++ Mk/Uses/objc.mk
@@ -50,10 +50,6 @@
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
Index: astro/google-earth/Makefile
===================================================================
--- astro/google-earth/Makefile
+++ astro/google-earth/Makefile
@@ -35,9 +35,7 @@
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}
Index: comms/dabstick-radio/Makefile
===================================================================
--- comms/dabstick-radio/Makefile
+++ comms/dabstick-radio/Makefile
@@ -32,9 +32,7 @@
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
Index: comms/hylafax/Makefile
===================================================================
--- comms/hylafax/Makefile
+++ comms/hylafax/Makefile
@@ -24,7 +24,8 @@
--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 @@
CONFIGURE_ARGS+=--nointeractive
.endif
-.if ${OSVERSION} >= 900007
-CONFIGURE_ARGS+= --with-GETTY=SysV
-.endif
-
post-patch:
${REINPLACE_CMD} \
-e 's,/usr/local,${LOCALBASE},g' \
Index: comms/lysdr/Makefile
===================================================================
--- comms/lysdr/Makefile
+++ comms/lysdr/Makefile
@@ -23,7 +23,6 @@
post-patch:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
- ${CP} ${FILESDIR}/cexp.c ${WRKSRC}
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/lysdr ${STAGEDIR}${PREFIX}/bin/lysdr
Index: comms/lysdr/files/Makefile
===================================================================
--- comms/lysdr/files/Makefile
+++ comms/lysdr/files/Makefile
@@ -6,9 +6,6 @@
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
Index: comms/lysdr/files/cexp.c
===================================================================
--- 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;
-}
Index: comms/remserial/files/patch-stty.c
===================================================================
--- comms/remserial/files/patch-stty.c
+++ 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;
Index: converters/pdf2djvu/Makefile
===================================================================
--- converters/pdf2djvu/Makefile
+++ converters/pdf2djvu/Makefile
@@ -20,12 +20,6 @@
PLIST_FILES= bin/pdf2djvu man/man1/pdf2djvu.1.gz
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 900014
-FAVORITE_COMPILER= gcc
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
Index: databases/galera/Makefile
===================================================================
--- databases/galera/Makefile
+++ databases/galera/Makefile
@@ -64,10 +64,6 @@
.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
Index: databases/hamsterdb/Makefile
===================================================================
--- databases/hamsterdb/Makefile
+++ databases/hamsterdb/Makefile
@@ -24,12 +24,6 @@
OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900000
-BROKEN= fails to compile on 8.x
-.endif
-
post-patch:
${REINPLACE_CMD} -e 's#-ldl##g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's#-ldl##g' ${WRKSRC}/unittests/Makefile.in
@@ -41,4 +35,4 @@
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: databases/mariadb-server/Makefile
===================================================================
--- databases/mariadb-server/Makefile
+++ databases/mariadb-server/Makefile
@@ -86,7 +86,7 @@
.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
Index: databases/php5-tarantool/Makefile
===================================================================
--- databases/php5-tarantool/Makefile
+++ databases/php5-tarantool/Makefile
@@ -23,10 +23,4 @@
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>
Index: databases/postgis21/Makefile
===================================================================
--- databases/postgis21/Makefile
+++ databases/postgis21/Makefile
@@ -48,14 +48,6 @@
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
Index: databases/postgresql91-server/Makefile
===================================================================
--- databases/postgresql91-server/Makefile
+++ databases/postgresql91-server/Makefile
@@ -168,9 +168,6 @@
. 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}
Index: databases/postgresql92-server/Makefile
===================================================================
--- databases/postgresql92-server/Makefile
+++ databases/postgresql92-server/Makefile
@@ -168,9 +168,6 @@
. 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}
Index: deskutils/gnome-initial-setup/Makefile
===================================================================
--- deskutils/gnome-initial-setup/Makefile
+++ deskutils/gnome-initial-setup/Makefile
@@ -34,10 +34,6 @@
.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
Index: deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_account_um-utils.c
===================================================================
--- /dev/null
+++ deskutils/gnome-initial-setup/files/extra-patch-gnome-initial-setup_pages_account_um-utils.c
@@ -1,12 +0,0 @@
---- gnome-initial-setup/pages/account/um-utils.c.orig 2014-03-10 04:47:29.000000000 +0000
-+++ gnome-initial-setup/pages/account/um-utils.c 2014-05-13 20:51:04.098992354 +0000
-@@ -26,7 +26,8 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <pwd.h>
--#include <utmp.h>
-+#include <utmpx.h>
-+#define UT_NAMESIZE 16
-
- #include <glib.h>
- #include <glib/gi18n.h>
Index: deskutils/gucharmap/Makefile
===================================================================
--- deskutils/gucharmap/Makefile
+++ deskutils/gucharmap/Makefile
@@ -26,10 +26,4 @@
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>
Index: deskutils/notify-osd/Makefile
===================================================================
--- deskutils/notify-osd/Makefile
+++ deskutils/notify-osd/Makefile
@@ -26,13 +26,7 @@
LIBS+= -L${LOCALBASE}/lib -lpixman-1 -lX11
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} '/SUBDIRS =/s/tests//' ${WRKSRC}/Makefile.in
-.if ${OSVERSION} < 900033
- @${REINPLACE_CMD} 's/-Bsymbolic-functions/-Bsymbolic/' \
- ${WRKSRC}/src/Makefile.in
-.endif
.include <bsd.port.mk>
Index: deskutils/treesheets/Makefile
===================================================================
--- deskutils/treesheets/Makefile
+++ deskutils/treesheets/Makefile
@@ -37,12 +37,6 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/TS/images/icon32.png \
${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/binutils/Makefile
===================================================================
--- devel/binutils/Makefile
+++ devel/binutils/Makefile
@@ -54,12 +54,8 @@
.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 @@
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
Index: devel/binutils/files/allow-missing-group-info
===================================================================
--- 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;
- }
Index: devel/gettext-runtime/Makefile
===================================================================
--- devel/gettext-runtime/Makefile
+++ devel/gettext-runtime/Makefile
@@ -30,7 +30,7 @@
.include <bsd.port.options.mk>
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506)
+.if ${OPSYS} == DragonFly
CONFIGURE_ARGS+=--disable-threads
.endif
Index: devel/ioncube/Makefile
===================================================================
--- devel/ioncube/Makefile
+++ devel/ioncube/Makefile
@@ -21,17 +21,8 @@
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 @@
${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>
Index: devel/ioncube/distinfo
===================================================================
--- devel/ioncube/distinfo
+++ 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
Index: devel/libc++/Makefile
===================================================================
--- devel/libc++/Makefile
+++ devel/libc++/Makefile
@@ -34,16 +34,6 @@
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)
Index: devel/libc++/files/extra-libmissing
===================================================================
--- 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
Index: devel/libdisorder/Makefile
===================================================================
--- devel/libdisorder/Makefile
+++ devel/libdisorder/Makefile
@@ -13,12 +13,6 @@
USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900027
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-disorder.c
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/src/Makefile
@@ -33,4 +27,4 @@
${INSTALL_PROGRAM} ${WRKSRC}/tool/ropy ${STAGEDIR}${PREFIX}/bin
${LN} -sf ${PREFIX}/lib/libdisorder.so.1 ${STAGEDIR}${PREFIX}/lib/libdisorder.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/libdisorder/files/extra-patch-disorder.c
===================================================================
--- devel/libdisorder/files/extra-patch-disorder.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/disorder.c.orig 2010-08-17 16:15:30.000000000 +0800
-+++ src/disorder.c 2010-08-17 16:22:27.000000000 +0800
-@@ -25,6 +25,10 @@
- #include <stdio.h> //for NULL
- #include "../include/disorder.h"
-
-+#if defined(__FreeBSD__)
-+#define log2(x) (log((x)) * (1./M_LN2))
-+#endif
-+
- /** Frequecies for each byte */
- static int m_token_freqs[LIBDO_MAX_BYTES]; //frequency of each token in sample
- static float m_token_probs[LIBDO_MAX_BYTES]; //P(each token appearing)
Index: devel/libdispatch/Makefile
===================================================================
--- devel/libdispatch/Makefile
+++ devel/libdispatch/Makefile
@@ -84,7 +84,7 @@
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 @@
.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
#
Index: devel/libvirt/Makefile
===================================================================
--- devel/libvirt/Makefile
+++ devel/libvirt/Makefile
@@ -95,10 +95,6 @@
.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
Index: devel/llvm35/Makefile
===================================================================
--- devel/llvm35/Makefile
+++ devel/llvm35/Makefile
@@ -138,10 +138,6 @@
.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
Index: devel/llvm36/Makefile
===================================================================
--- devel/llvm36/Makefile
+++ devel/llvm36/Makefile
@@ -148,10 +148,6 @@
.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
Index: devel/ncurses/Makefile
===================================================================
--- devel/ncurses/Makefile
+++ devel/ncurses/Makefile
@@ -126,12 +126,10 @@
. for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
. endfor
-.if ${OPSYS} != FreeBSD || ${OSVERSION} > 900000
${RM} -f ${STAGEDIR}${PREFIX}/lib/libncurses.so \
${STAGEDIR}${PREFIX}/lib/libncursesw.so
${ECHO} "INPUT(libncurses.so.${RELEASE:R} AS_NEEDED(-ltinfo))" > ${STAGEDIR}${PREFIX}/lib/libncurses.so
${ECHO} "INPUT(libncursesw.so.${RELEASE:R} AS_NEEDED(-ltinfow))" > ${STAGEDIR}${PREFIX}/lib/libncursesw.so
-.endif
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.5.9
.include <bsd.port.mk>
Index: devel/py-freebsd/Makefile
===================================================================
--- devel/py-freebsd/Makefile
+++ devel/py-freebsd/Makefile
@@ -18,9 +18,6 @@
.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
Index: devel/py-freebsd/files/freebsd9_patch-src-sysctl.c
===================================================================
--- /dev/null
+++ devel/py-freebsd/files/freebsd9_patch-src-sysctl.c
@@ -1,38 +0,0 @@
---- src/sysctl.c.orig 2011-04-12 12:30:50.000000000 +0400
-+++ src/sysctl.c 2011-04-12 12:37:45.000000000 +0400
-@@ -121,7 +121,7 @@ const size_t sysctl_type_sizes[CTLTYPE]
- 0, /* CTLTYPE_NODE */
- sizeof(int), /* CTLTYPE_INT */
- 0, /* CTLTYPE_STRING */
-- sizeof(quad_t), /* CTLTYPE_QUAD */
-+ sizeof(quad_t), /* CTLTYPE_S64 */
- 0, /* CTLTYPE_OPAQUE */
- sizeof(unsigned int), /* CTLTYPE_UINT */
- sizeof(long), /* CTLTYPE_LONG */
-@@ -329,7 +329,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
- case CTLTYPE_UINT:
- case CTLTYPE_LONG:
- case CTLTYPE_ULONG:
-- case CTLTYPE_QUAD:
-+ case CTLTYPE_S64:
- if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) {
- PyErr_SetString(PyExc_TypeError,
- "argument 2 must be integer for this node");
-@@ -350,7 +350,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
- case CTLTYPE_ULONG:
- val.m_ulong = PyLong_AsUnsignedLong(newobj);
- break;
-- case CTLTYPE_QUAD:
-+ case CTLTYPE_S64:
- val.m_quad = (quad_t)PyLong_AsLongLong(newobj);
- break;
- }
-@@ -439,7 +439,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
- case CTLTYPE_STRING:
- ret = PyString_FromStringAndSize(oldp, oldlen - 1);
- break;
-- case CTLTYPE_QUAD:
-+ case CTLTYPE_S64:
- assert(oldlen == sizeof(quad_t));
- ret = PyLong_FromLongLong((long long)*(quad_t *)oldp);
- break;
Index: editors/libreoffice4/Makefile
===================================================================
--- editors/libreoffice4/Makefile
+++ editors/libreoffice4/Makefile
@@ -338,10 +338,6 @@
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
Index: emulators/dolphin-emu/Makefile
===================================================================
--- emulators/dolphin-emu/Makefile
+++ emulators/dolphin-emu/Makefile
@@ -69,10 +69,6 @@
.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
Index: emulators/i386-wine/Makefile.inc
===================================================================
--- emulators/i386-wine/Makefile.inc
+++ emulators/i386-wine/Makefile.inc
@@ -50,7 +50,7 @@
# 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 @@
.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
Index: emulators/i386-wine/pkg-plist
===================================================================
--- emulators/i386-wine/pkg-plist
+++ emulators/i386-wine/pkg-plist
@@ -793,7 +793,6 @@
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/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/l_intl.nls
share/wine/patch-nvidia.sh
share/wine/wine.inf
-%%OSREL8%%share/wine/wine.inf
Index: emulators/qemu-devel/Makefile
===================================================================
--- emulators/qemu-devel/Makefile
+++ emulators/qemu-devel/Makefile
@@ -221,25 +221,13 @@
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
Index: emulators/qemu-sbruno/Makefile
===================================================================
--- emulators/qemu-sbruno/Makefile
+++ emulators/qemu-sbruno/Makefile
@@ -237,25 +237,14 @@
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
Index: emulators/virtualbox-ose/Makefile
===================================================================
--- emulators/virtualbox-ose/Makefile
+++ emulators/virtualbox-ose/Makefile
@@ -195,11 +195,6 @@
.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 \
Index: emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl
===================================================================
--- 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)
- {
Index: emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp
===================================================================
--- 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>
Index: ftp/ncftpd/Makefile
===================================================================
--- ftp/ncftpd/Makefile
+++ ftp/ncftpd/Makefile
@@ -27,15 +27,10 @@
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
Index: ftp/tnftpd/Makefile
===================================================================
--- ftp/tnftpd/Makefile
+++ ftp/tnftpd/Makefile
@@ -20,13 +20,7 @@
OPTIONS_DEFINE= DOCS EXAMPLES
SUB_FILES= pkg-message
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900007
CFLAGS+= -DSUPPORT_UTMPX
-.else
-CFLAGS+= -DSUPPORT_UTMP
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${STAGEDIR}${PREFIX}/libexec
@@ -42,4 +36,4 @@
${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: games/0ad/Makefile
===================================================================
--- games/0ad/Makefile
+++ games/0ad/Makefile
@@ -47,10 +47,6 @@
.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}|' \
Index: games/oolite/Makefile
===================================================================
--- games/oolite/Makefile
+++ games/oolite/Makefile
@@ -54,9 +54,7 @@
.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}
Index: games/ufoai/Makefile
===================================================================
--- games/ufoai/Makefile
+++ games/ufoai/Makefile
@@ -81,12 +81,6 @@
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 @@
${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>
Index: graphics/evince/Makefile
===================================================================
--- graphics/evince/Makefile
+++ graphics/evince/Makefile
@@ -67,10 +67,6 @@
CONFIGURE_ARGS+=--enable-dbus
.endif
-.if ${OSVERSION} < 900000
-BROKEN= Fails to build
-.endif
-
.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
USE_TEX= latex
Index: graphics/inventor/Makefile
===================================================================
--- graphics/inventor/Makefile
+++ graphics/inventor/Makefile
@@ -42,12 +42,6 @@
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
Index: graphics/mitsuba/Makefile
===================================================================
--- graphics/mitsuba/Makefile
+++ graphics/mitsuba/Makefile
@@ -41,11 +41,8 @@
.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
Index: graphics/opennurbs/Makefile
===================================================================
--- graphics/opennurbs/Makefile
+++ graphics/opennurbs/Makefile
@@ -76,8 +76,5 @@
${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>
Index: graphics/pecomato/files/patch-Makefile.unix
===================================================================
--- graphics/pecomato/files/patch-Makefile.unix
+++ 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
Index: irc/undernet-ircu/Makefile
===================================================================
--- irc/undernet-ircu/Makefile
+++ irc/undernet-ircu/Makefile
@@ -59,11 +59,6 @@
.include <bsd.port.options.mk>
-# always disable profile support on 8.x
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N--enable-profile}
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${STAGEDIR}${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/ircd/convert-conf \
Index: irc/znc/Makefile
===================================================================
--- irc/znc/Makefile
+++ irc/znc/Makefile
@@ -49,10 +49,6 @@
.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}
Index: java/sigar/Makefile
===================================================================
--- java/sigar/Makefile
+++ java/sigar/Makefile
@@ -34,16 +34,14 @@
.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}
Index: lang/gcc-aux/Makefile
===================================================================
--- lang/gcc-aux/Makefile
+++ lang/gcc-aux/Makefile
@@ -48,11 +48,7 @@
.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= \
${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
Index: lang/gcc-aux/distinfo
===================================================================
--- lang/gcc-aux/distinfo
+++ lang/gcc-aux/distinfo
@@ -2,13 +2,9 @@
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
Index: lang/gcc5-aux/Makefile
===================================================================
--- lang/gcc5-aux/Makefile
+++ lang/gcc5-aux/Makefile
@@ -52,11 +52,7 @@
.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 @@
.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
Index: lang/gcc5-aux/distinfo
===================================================================
--- lang/gcc5-aux/distinfo
+++ 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
Index: lang/harbour/Makefile
===================================================================
--- lang/harbour/Makefile
+++ lang/harbour/Makefile
@@ -50,6 +50,7 @@
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 @@
.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 @@
.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>
Index: lang/intercal/Makefile
===================================================================
--- lang/intercal/Makefile
+++ lang/intercal/Makefile
@@ -20,10 +20,4 @@
@${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>
Index: lang/mit-scheme/Makefile
===================================================================
--- lang/mit-scheme/Makefile
+++ lang/mit-scheme/Makefile
@@ -24,10 +24,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 900000 && ${ARCH} == "amd64"
-USE_GCC= yes
-.endif
-
# TODO implement db4 support
CONFIGURE_ARGS+=--without-db-4
Index: lang/php5/Makefile
===================================================================
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -154,9 +154,6 @@
.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
Index: lang/php55/Makefile
===================================================================
--- lang/php55/Makefile
+++ lang/php55/Makefile
@@ -154,9 +154,6 @@
.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
Index: lang/php56/Makefile
===================================================================
--- lang/php56/Makefile
+++ lang/php56/Makefile
@@ -157,9 +157,6 @@
.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
Index: lang/pure/Makefile
===================================================================
--- lang/pure/Makefile
+++ lang/pure/Makefile
@@ -79,12 +79,6 @@
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
Index: lang/pure/files/pkg-message.in
===================================================================
--- lang/pure/files/pkg-message.in
+++ lang/pure/files/pkg-message.in
@@ -9,10 +9,4 @@
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.
====
Index: lang/smlnj/Makefile
===================================================================
--- lang/smlnj/Makefile
+++ lang/smlnj/Makefile
@@ -50,13 +50,8 @@
# 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
Index: lang/spidermonkey17/Makefile
===================================================================
--- lang/spidermonkey17/Makefile
+++ lang/spidermonkey17/Makefile
@@ -20,6 +20,8 @@
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 @@
${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>
Index: lang/spidermonkey185/Makefile
===================================================================
--- lang/spidermonkey185/Makefile
+++ lang/spidermonkey185/Makefile
@@ -65,8 +65,8 @@
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"
Index: lang/squeak/Makefile
===================================================================
--- lang/squeak/Makefile
+++ lang/squeak/Makefile
@@ -63,13 +63,9 @@
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 @@
${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/,} \
${STAGEDIR}${PREFIX}/lib/squeak
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: mail/dma/Makefile
===================================================================
--- mail/dma/Makefile
+++ mail/dma/Makefile
@@ -35,12 +35,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 900000
-EXTRA_PATCHES= ${FILESDIR}/extrapatch-8-spool.c
-.else
-EXTRA_PATCHES= ${FILESDIR}/extrapatch-else-spool.c
-.endif
-
pre-patch:
@${MKDIR} ${WRKSRC}/dma ${WRKSRC}/dma-mbox-create
@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
Index: mail/dma/files/extrapatch-8-spool.c
===================================================================
--- mail/dma/files/extrapatch-8-spool.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- spool.c 2013-06-03 14:03:15.000000000 +0000
-+++ spool.c.8 2014-05-17 18:14:45.000000000 +0000
-@@ -36,6 +36,7 @@
-
- #include <sys/file.h>
- #include <sys/stat.h>
-+#include <sys/time.h>
-
- #include <ctype.h>
- #include <dirent.h>
-@@ -415,7 +416,7 @@
- return (0);
-
- /* Did the flush file get touched within the last period seconds? */
-- if (st.st_mtim.tv_sec + period >= now.tv_sec)
-+ if (st.st_mtime + (int)period >= now.tv_sec)
- return (1);
- else
- return (0);
Index: mail/dma/files/extrapatch-else-spool.c
===================================================================
--- /dev/null
+++ mail/dma/files/extrapatch-else-spool.c
@@ -1,11 +0,0 @@
---- spool.c.orig 2013-06-03 14:03:15.000000000 +0000
-+++ spool.c 2013-08-22 11:07:47.000000000 +0000
-@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
- return (0);
-
- /* Did the flush file get touched within the last period seconds? */
-- if (st.st_mtim.tv_sec + period >= now.tv_sec)
-+ if (st.st_mtim.tv_sec + (int)period >= now.tv_sec)
- return (1);
- else
- return (0);
Index: mail/mailagent/Makefile
===================================================================
--- mail/mailagent/Makefile
+++ mail/mailagent/Makefile
@@ -32,12 +32,6 @@
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 @@
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>
Index: mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH
===================================================================
--- /dev/null
+++ mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_Makefile.SH
@@ -1,20 +0,0 @@
---- ./agent/pl/utmp/Makefile.SH.orig 2006-08-24 22:24:12.000000000 +0900
-+++ ./agent/pl/utmp/Makefile.SH 2014-08-14 01:59:33.508704927 +0900
-@@ -107,7 +107,6 @@
- cp Makefile.new Makefile
- $(RM) Makefile.new
-
--all:: utmp_ph
-
- local_realclean::
- $(RM) utmp_ph
-@@ -122,8 +121,7 @@
- local_realclean::
- $(RM) utmp.pl
-
--utmp.pl: utmp_pl.sh utmp_ph
-- /bin/sh utmp_pl.sh
-+utmp.pl:
-
- ########################################################################
- # Common rules for all Makefiles -- do not edit
Index: mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl
===================================================================
--- /dev/null
+++ mail/mailagent/files/extra-patch-utmpx-agent_pl_utmp_utmp.pl
@@ -1,25 +0,0 @@
---- ./agent/pl/utmp/utmp.pl.orig 2014-08-14 01:59:33.506704776 +0900
-+++ ./agent/pl/utmp/utmp.pl 2014-08-14 01:59:33.506704776 +0900
-@@ -0,0 +1,22 @@
-+#
-+# utmp file primitives
-+#
-+
-+package utmp;
-+
-+# Return the ttys on which a given user is logged
-+sub ttys {
-+ local($user) = @_; # User's login name
-+ local(@u);
-+ open(WHO, '/usr/bin/who |') || warn "Can't invoke /usr/bin/who: $!\n";
-+ while (<WHO>) {
-+ next unless /^$user\s/;
-+ my ($name, $line, $dummy) = split;
-+ push(@u, $line);
-+ }
-+ close WHO;
-+ return @u; # Returns array of ttys
-+}
-+
-+package main;
-+
Index: mail/notmuch/Makefile
===================================================================
--- mail/notmuch/Makefile
+++ mail/notmuch/Makefile
@@ -49,10 +49,4 @@
${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>
Index: mail/qmail/Makefile
===================================================================
--- mail/qmail/Makefile
+++ mail/qmail/Makefile
@@ -396,15 +396,10 @@
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 @@
# 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
Index: mail/qmail/files/pkg-message-ldap.in
===================================================================
--- mail/qmail/files/pkg-message-ldap.in
+++ 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.
Index: mail/qmail/files/pkg-message-mysql.in
===================================================================
--- mail/qmail/files/pkg-message-mysql.in
+++ 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.
Index: mail/qmail/files/pkg-message-tls.in
===================================================================
--- mail/qmail/files/pkg-message-tls.in
+++ 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.
Index: mail/qmail/files/pkg-message.in
===================================================================
--- mail/qmail/files/pkg-message.in
+++ 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
Index: math/blacs/Makefile
===================================================================
--- math/blacs/Makefile
+++ math/blacs/Makefile
@@ -21,10 +21,6 @@
.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
Index: misc/compat9x/Makefile
===================================================================
--- misc/compat9x/Makefile
+++ misc/compat9x/Makefile
@@ -22,10 +22,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 900000
-IGNORE= is for FreeBSD 9.x and newer
-.endif
-
.if ${ARCH} == amd64
PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32"
USE_LDCONFIG32= ${TARGET32_DIR}
Index: misc/orville-write/Makefile
===================================================================
--- misc/orville-write/Makefile
+++ misc/orville-write/Makefile
@@ -20,22 +20,6 @@
MAKE_JOBS_UNSAFE=yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900006
-EXTRA_PATCHES= ${PATCHDIR}/utmpx-wrttmp.h \
- ${PATCHDIR}/utmpx-wrt_him.c \
- ${PATCHDIR}/utmpx-wrt_me.c \
- ${PATCHDIR}/utmpx-lib_common.c \
- ${PATCHDIR}/utmpx-lib_common.h \
- ${PATCHDIR}/utmpx-getutent.h \
- ${PATCHDIR}/utmpx-getutent.c \
- ${PATCHDIR}/utmpx-mesg.c \
- ${PATCHDIR}/utmpx-amin.c \
- ${PATCHDIR}/utmpx-huh.c \
- ${PATCHDIR}/utmpx-helpers.c
-.endif
-
do-install:
.for i in amin helpers huh mesg
${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
@@ -56,4 +40,4 @@
${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${MANPREFIX}/man/man1
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: misc/orville-write/files/utmpx-amin.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-amin.c
@@ -1,40 +0,0 @@
---- amin.c.orig 2010-02-02 23:04:35.773467035 -0800
-+++ amin.c 2010-02-02 23:06:45.674814831 -0800
-@@ -194,16 +194,16 @@
-
- void locate_wrttmp(char *tty, struct wrttmp *wbuf, long *pos)
- {
--struct utmp *ut;
-+struct utmpx *ut;
-
- /* Find utmp entry */
-- if ((ut= find_utmp(tty)) == NULL || ut->ut_name[0] == '\0')
-+ if ((ut= find_utmp(tty)) == NULL || ut->ut_user[0] == '\0')
- {
- printf("%s: Can't find your tty (%s) in utmp\n",progname,tty);
- exit(1);
- }
-
-- find_wrttmp(tty, ut->ut_time, wbuf, pos);
-+ find_wrttmp(tty, ut->ut_tv.tv_sec, wbuf, pos);
- }
-
-
-@@ -230,7 +230,7 @@
- }
-
- /* Close utmp file */
-- endutent();
-+ endutxent();
-
- /* Figure out name of program being exec'ed */
- if ((shortcmd= strrchr(fullcmd,'/')) == NULL)
-@@ -241,7 +241,7 @@
- /* Fix my entry in wrttmp */
- newwrt= mywrt;
- newwrt.wrt_what[0]= '!';
-- strncpy(newwrt.wrt_what+1, shortcmd, UT_NAMESIZE-1);
-+ strncpy(newwrt.wrt_what+1, shortcmd, sizeof(((struct utmpx *)0)->ut_user)-2);
- #ifndef TTYPERMS
- if (tmp_mesg != 's') newwrt.wrt_mesg= tmp_mesg;
- #endif
Index: misc/orville-write/files/utmpx-getutent.h
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-getutent.h
@@ -1,13 +0,0 @@
---- getutent.h.orig 2000-01-31 22:01:13.000000000 -0800
-+++ getutent.h 2010-02-02 22:49:58.043092643 -0800
-@@ -14,8 +14,8 @@
- int utmpname(const char *file);
- void endutent(void);
- void setutent(void);
--struct utmp *getutent(void);
--struct utmp *getutline(const struct utmp *ut);
-+struct utmpx *getutent(void);
-+struct utmpx *getutline(const struct utmpx *ut);
- #endif /*HAVE_GETUTENT*/
-
- #endif /* GETUTENT_H */
Index: misc/orville-write/files/utmpx-getutent.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-getutent.c
@@ -1,106 +0,0 @@
---- getutent.c.orig 2000-01-31 22:02:45.000000000 -0800
-+++ getutent.c 2010-02-02 22:53:30.347068707 -0800
-@@ -20,18 +20,8 @@
- {
- if (utmp.state == 0)
- {
-- if ((utmp.fd= open(utmp.fname ? utmp.fname : _PATH_UTMP,
-- O_RDONLY)) < 0)
-- {
-- utmp.state= -1;
-- return -1;
-- }
-- else
-- {
- utmp.state= 1;
-- fcntl(utmp.fd, F_SETFD, 1); /* Close over execs */
- return 0;
-- }
- }
- }
-
-@@ -42,8 +32,7 @@
- void endutent()
- {
- if (utmp.state == 1)
-- close(utmp.fd);
-- utmp.state= 0;
-+ utmp.state= 0;
- }
-
-
-@@ -52,8 +41,7 @@
-
- void setutent()
- {
-- if (utmp.state == 1)
-- lseek(utmp.fd, 0L, 0);
-+ ;
- }
-
-
-@@ -75,9 +63,9 @@
- /* GETUTENT - Read the next entry from the utmp file into static storage.
- */
-
--struct utmp *getutent()
-+struct utmpx *getutent()
- {
--static struct utmp ut;
-+static struct utmpx *ut;
-
- switch (utmp.state)
- {
-@@ -85,11 +73,11 @@
- openut();
- /* Drop through */
- case 1:
-- if (read(utmp.fd, &ut, sizeof(struct utmp)) == sizeof(struct utmp))
-- return &ut;
-+ if ((ut = getutxent()) != NULL)
-+ return ut;
- /* Drop through */
- default:
-- return (struct utmp *)NULL;
-+ return (struct utmpx *)NULL;
- }
- }
-
-@@ -100,9 +88,9 @@
- * we conform with Linux and Solaris.
- */
-
--struct utmp *getutline(const struct utmp *in)
-+struct utmpx *getutline(const struct utmpx *in)
- {
--static struct utmp ut;
-+static struct utmpx *ut;
-
- switch (utmp.state)
- {
-@@ -110,20 +98,20 @@
- openut();
- /* Drop through */
- case 1:
-- while (read(utmp.fd, &ut, sizeof(struct utmp)) == sizeof(struct utmp))
-+ while ((ut = getutxent()) != NULL)
- {
- if (
- #if defined(USER_PROCESS) && defined(LOGIN_PROCESS)
-- (ut.ut_type == USER_PROCESS || ut.ut_type == LOGIN_PROCESS) &&
-+ (ut->ut_type == USER_PROCESS || ut->ut_type == LOGIN_PROCESS) &&
- #endif
-- !strncmp(ut.ut_line, in->ut_line, UT_LINESIZE))
-+ !strncmp(ut->ut_line, in->ut_line, sizeof(ut->ut_line)))
- {
-- return &ut;
-+ return ut;
- }
- }
- /* Drop through */
- default:
-- return (struct utmp *)NULL;
-+ return (struct utmpx *)NULL;
- }
- }
-
Index: misc/orville-write/files/utmpx-helpers.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-helpers.c
@@ -1,84 +0,0 @@
---- helpers.c.orig 2000-02-20 09:28:08.000000000 -0800
-+++ helpers.c 2010-02-02 23:20:25.434811144 -0800
-@@ -11,7 +11,7 @@
-
- struct hlp {
- time_t time; /* login time from wrttmp file */
-- char line[UT_LINESIZE]; /* ttyline occupied by a helper */
-+ char line[sizeof(((struct utmpx *)0)->ut_line) -1]; /* ttyline occupied by a helper */
- int busy; /* is he busy? */
- struct hlp *next; /* next helper */
- } *list= NULL;
-@@ -27,7 +27,7 @@
-
- for (curr= list, prev= NULL; curr != NULL; prev= curr,curr= prev->next)
- {
-- if (!strncmp(tty, curr->line, UT_LINESIZE))
-+ if (!strncmp(tty, curr->line, ((struct utmpx *)0)->ut_line -1))
- {
- if (prev == NULL)
- list= curr->next;
-@@ -47,7 +47,7 @@
- int perms_on(struct wrttmp *w)
- {
- struct stat st;
--char devname[UT_LINESIZE+7];
-+char devname[sizeof(((struct utmpx *)0)->ut_line) +6];
-
- #ifdef TTYPERMS
- #define MASK 022
-@@ -59,7 +59,7 @@
-
- /* Is his tty physically writable? */
-
-- sprintf(devname,"/dev/%.*s",UT_LINESIZE,w->wrt_line);
-+ sprintf(devname,"/dev/%.*s",((struct utmpx *)0)->ut_line -1,w->wrt_line);
- if (stat(devname,&st))
- return(0);
-
-@@ -72,7 +72,7 @@
- FILE *fp;
- struct wrttmp w;
- struct wrthdr wt_head;
--struct utmp *u;
-+struct utmpx *u;
- struct hlp *tmp;
- int i, j;
- int slot= 0;
-@@ -146,7 +146,7 @@
- if (list != NULL)
- {
- /* Do the scan */
-- while ((u= getutent()) != NULL)
-+ while ((u= getutxent()) != NULL)
- {
- #ifdef USER_PROCESS
- if (u->ut_type != USER_PROCESS)
-@@ -155,15 +155,15 @@
- if ((tmp= findlist(u->ut_line)) != NULL)
- {
- /* If the time stamps don't match, this isn't a real helper */
-- if (u->ut_time == tmp->time)
-+ if (u->ut_tv.tv_sec == tmp->time)
- {
- /* Found a real helper -- count and print */
- count++;
-
- if (listthem)
- printf("%-*.*s %-*.*s%s\n",
-- UT_NAMESIZE, UT_NAMESIZE, u->ut_name,
-- UT_LINESIZE, UT_LINESIZE, u->ut_line,
-+ sizeof(u->ut_user)-1, sizeof(u->ut_user)-1, u->ut_user,
-+ sizeof(u->ut_line)-1, sizeof(u->ut_user)-1, u->ut_line,
- tmp->busy ? " [busy]" : "");
-
- }
-@@ -172,7 +172,7 @@
- }
- }
-
-- endutent();
-+ endutxent();
- }
-
- if (!listthem)
Index: misc/orville-write/files/utmpx-huh.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-huh.c
@@ -1,35 +0,0 @@
---- huh.c.orig 2010-02-02 23:11:01.823876514 -0800
-+++ huh.c 2010-02-02 23:11:54.475034412 -0800
-@@ -34,13 +34,13 @@
-
- int record_on()
- {
--struct utmp *ut;
-+struct utmpx *ut;
- struct wrttmp wt;
- char *tty;
- long pos;
-
- /* Open the utmp file */
-- setutent();
-+ setutxent();
-
- /* Open the wrttmp file */
- if (init_wstream(O_RDONLY)) return 1;
-@@ -50,13 +50,13 @@
- tty= mydevname+5;
-
- /* Find our entry in the utmp file */
-- if ((ut= find_utmp(tty)) == NULL || ut->ut_name[0] == '\0') return 1;
-+ if ((ut= find_utmp(tty)) == NULL || ut->ut_user[0] == '\0') return 1;
-
- /* Find the entry in the wrttmp file */
-- find_wrttmp(tty, ut->ut_time, &wt, &pos);
-+ find_wrttmp(tty, ut->ut_tv.tv_sec, &wt, &pos);
-
- /* Close utmp file */
-- endutent();
-+ endutxent();
-
- return (wt.wrt_record != 'n');
- }
Index: misc/orville-write/files/utmpx-lib_common.h
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-lib_common.h
@@ -1,11 +0,0 @@
---- lib_common.h.orig 2010-02-02 22:40:13.646402561 -0800
-+++ lib_common.h 2010-02-02 22:40:30.475105092 -0800
-@@ -6,7 +6,7 @@
- #include "getutent.h"
-
- int init_wstream(int mode);
--struct utmp *find_utmp(char *tty);
-+struct utmpx *find_utmp(char *tty);
- void find_wrttmp(char *tty, time_t time,struct wrttmp *wbuf, long *pos);
- void dflt_wrttmp(struct wrttmp *wbuf, char *tty, time_t time);
- char *leafname(char *fullpath);
Index: misc/orville-write/files/utmpx-lib_common.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-lib_common.c
@@ -1,19 +0,0 @@
---- lib_common.c.orig 2010-02-02 22:34:36.829638978 -0800
-+++ lib_common.c 2010-02-02 22:36:28.170798539 -0800
-@@ -141,13 +141,13 @@
- * fail. The tty name need not be null terminated.
- */
-
--struct utmp *find_utmp(char *tty)
-+struct utmpx *find_utmp(char *tty)
- {
--struct utmp tmputmp;
-+struct utmpx tmputmp;
-
- strncpy(tmputmp.ut_line, tty, UT_LINESIZE);
- setutent(); /* open and/or rewind */
-- return getutline(&tmputmp);
-+ return getutxline(&tmputmp);
- }
-
-
Index: misc/orville-write/files/utmpx-mesg.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-mesg.c
@@ -1,159 +0,0 @@
---- mesg.c.orig 2010-02-02 22:54:21.613120678 -0800
-+++ mesg.c 2010-02-02 23:01:31.739763589 -0800
-@@ -19,7 +19,7 @@
- char *mytty; /* my tty name in tty?? format */
- long mypos; /* offset of my entry in wrttmp file */
- struct wrttmp mywrt; /* my wrttmp entry */
--struct utmp myutmp; /* A tmp buffer for reading utmp entries */
-+struct utmpx myutmp; /* A tmp buffer for reading utmp entries */
-
- char silent= FALSE; /* generates no output if true */
- int verbose= FALSE; /* generate whole table of output if true */
-@@ -335,7 +335,7 @@
- }
-
- /* Close the utmp file */
-- endutent();
-+ endutxent();
-
- if (f_wrthist != NULL &&
- !wassilent && (new[SMESG] == 'n' || new[SEXCP] == 'y'))
-@@ -549,12 +549,12 @@
-
- void do_disconnect()
- {
--struct utmp *ut; /* A tmp buffer for reading utmp entries */
-+struct utmpx *ut; /* A tmp buffer for reading utmp entries */
- struct wrttmp hiswrt; /* Someone's wrttmp entry */
- int slot= 0;
-
- /* Rewind utmp file */
-- setutent();
-+ setutxent();
-
- /* For each user who is writing me */
- for (;;)
-@@ -564,16 +564,16 @@
- sizeof(struct wrttmp))
- break;
-
-- if (!strncmp(hiswrt.wrt_what, myutmp.ut_name, UT_NAMESIZE))
-+ if (!strncmp(hiswrt.wrt_what, myutmp.ut_user, sizeof(myutmp.ut_user)))
- {
- setutent();
- /* Check apparant writer against utmp file */
-- while ((ut= getutent()) != NULL)
-+ while ((ut= getutxent()) != NULL)
- if (
- #ifdef USER_PROCESS
- ut->ut_type == USER_PROCESS &&
- #endif
-- !strncmp(hiswrt.wrt_line, ut->ut_line, UT_LINESIZE))
-+ !strncmp(hiswrt.wrt_line, ut->ut_line, sizeof(ut->ut_line)))
- {
- /* Writer is for real: bonk him one */
- kill(hiswrt.wrt_pid, SIGTERM);
-@@ -590,10 +590,10 @@
-
- int find_me()
- {
--struct utmp *ut;
-+struct utmpx *ut;
-
- /* Find our entry in the Utmp file */
-- if ((ut= find_utmp(mytty)) == NULL || ut->ut_name[0] == '\0')
-+ if ((ut= find_utmp(mytty)) == NULL || ut->ut_user[0] == '\0')
- {
- printf("%s: Unable to find your tty (%s) in utmp file\n",
- progname,mytty);
-@@ -602,7 +602,7 @@
- myutmp= *ut;
-
- /* Find the entry in the wrttmp file */
-- find_wrttmp(mytty,myutmp.ut_time,&mywrt,&mypos);
-+ find_wrttmp(mytty,myutmp.ut_tv.tv_sec,&mywrt,&mypos);
- }
-
-
-@@ -616,13 +616,13 @@
- #define BUFSZ 80
- FILE *hfp;
- char buf[BUFSZ+1];
--char myname[UT_NAMESIZE+2];
-+char myname[sizeof(myutmp.ut_user)+1];
-
- if (f_helperlist == NULL || (hfp= fopen(f_helperlist,"r")) == NULL)
- return TRUE;
-
-- strncpy(myname,myutmp.ut_name,UT_NAMESIZE);
-- myname[UT_NAMESIZE]= '\0';
-+ strncpy(myname,myutmp.ut_user,sizeof(myutmp.ut_user) -1);
-+ myname[sizeof(myutmp.ut_user)]= '\0';
- strcat(myname,"\n");
-
- while (fgets(buf,BUFSZ,hfp) != NULL)
-@@ -645,7 +645,7 @@
- {
- struct wrthist *hist;
- struct wrttmp w;
--struct utmp *u;
-+struct utmpx *u;
- long writer, writee;
- time_t now;
- int n, foundsome= 0;
-@@ -669,7 +669,7 @@
-
- for (writee= 0; writee < n; writee++)
- {
-- if (hist[writee].tm > myutmp.ut_time &&
-+ if (hist[writee].tm > myutmp.ut_tv.tv_sec &&
- now - hist[writee].tm <= f_answertel)
- {
- /* Fetch "his" wrttmp entry - it may actually belong to a previous
-@@ -688,12 +688,12 @@
- /* Fetch his utmp entry, and confirm that the current user was
- * already logged in there when we sent our last telegram there.
- */
-- if ((u= find_utmp(w.wrt_line)) == NULL || u->ut_name[0] == '\0' ||
-- hist[writee].tm < u->ut_time)
-+ if ((u= find_utmp(w.wrt_line)) == NULL || u->ut_user[0] == '\0' ||
-+ hist[writee].tm < u->ut_tv.tv_sec)
- continue;
-
- /* Check if due to exceptions he may write us anyway */
-- if (f_exceptions && newmode > 1 && maywriteme(u->ut_name, newmode))
-+ if (f_exceptions && newmode > 1 && maywriteme(u->ut_user, newmode))
- continue;
-
- if (!foundsome)
-@@ -703,8 +703,8 @@
- foundsome= 1;
- }
- printf(" %-*.*s %-*.*s %4.1f more minutes\n",
-- UT_NAMESIZE, UT_NAMESIZE, u->ut_name,
-- UT_LINESIZE, UT_LINESIZE, u->ut_line,
-+ sizeof(u->ut_user) -1, sizeof(u->ut_user) -1, u->ut_user,
-+ sizeof(u->ut_line) -1, sizeof(u->ut_line) -1, u->ut_line,
- (float)(f_answertel - now + hist[writee].tm)/60.0);
- }
- }
-@@ -717,7 +717,7 @@
-
- char *myhomedir()
- {
--char myname[UT_NAMESIZE+2];
-+char myname[sizeof(myutmp.ut_user)+1];
- struct passwd *pw;
- char *dir, *getenv();
-
-@@ -726,8 +726,8 @@
- return dir;
-
- /* If that don't work, try passwd file */
-- strncpy(myname,myutmp.ut_name,UT_NAMESIZE);
-- myname[UT_NAMESIZE]= '\0';
-+ strncpy(myname,myutmp.ut_user,sizeof(myutmp.ut_user) -1);
-+ myname[sizeof(myutmp.ut_user)]= '\0';
- if ((pw= getpwnam(myname)) != NULL)
- return pw->pw_dir;
-
Index: misc/orville-write/files/utmpx-wrt_him.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-wrt_him.c
@@ -1,150 +0,0 @@
---- wrt_him.c.orig 2004-09-28 20:32:13.000000000 -0700
-+++ wrt_him.c 2010-02-02 22:31:08.634155195 -0800
-@@ -116,7 +116,7 @@
- extern struct wrttmp mywrt;
-
- /* Open utmp file */
-- setutent();
-+ setutxent();
-
- /* Look me up */
- find_me();
-@@ -204,7 +204,7 @@
- int perm, hisperm= 0;
- time_t hisatime= 0;
- time_t atime;
--struct utmp *ut;
-+struct utmpx *ut;
- struct wrttmp tmpwrt;
- long tmppos;
-
-@@ -213,16 +213,14 @@
- {
- /* Check if this is the target user, ignoring X-window lines */
- if (ut->ut_line[0] != ':' &&
--#ifdef USER_PROCESS
- ut->ut_type == USER_PROCESS &&
--#endif
-- !strncmp(hisname, ut->ut_name, UT_NAMESIZE))
-+ !strncmp(hisname, ut->ut_user, UT_NAMESIZE))
- {
- /* Count matches */
- cnt++;
-
- /* Find wrttmp entry */
-- find_wrttmp(ut->ut_line, ut->ut_time, &tmpwrt, &tmppos);
-+ find_wrttmp(ut->ut_line, ut->ut_tv.tv_sec, &tmpwrt, &tmppos);
-
- /* Is this guy writing me? */
- write_me= !strncmp(tmpwrt.wrt_what,myname,UT_NAMESIZE);
-@@ -283,7 +281,7 @@
-
- int find_tty()
- {
--struct utmp *ut;
-+struct utmpx *ut;
-
- if ((ut= find_utmp(histty)) == NULL)
- return(1);
-@@ -291,23 +289,23 @@
- if (*hisname != '\0')
- {
- /* Does the name not match? */
-- if (strncmp(hisname, ut->ut_name, UT_NAMESIZE))
-+ if (strncmp(hisname, ut->ut_user, UT_NAMESIZE))
- return(2);
- }
- else
- {
- /* Is anyone on that line? */
-- if (*ut->ut_name == '\0')
-+ if (*ut->ut_user == '\0')
- {
- printf("No one logged onto %s\n",histty);
- wrtlog("FAIL: empty tty");
- done(1);
- }
-- strncpy(hisname, ut->ut_name, UT_NAMESIZE);
-+ strncpy(hisname, ut->ut_user, UT_NAMESIZE);
- }
- printf("%s to %s on %s...",what[telegram],hisname,histty);
- if (!telegram) putchar('\n');
-- find_wrttmp(histty,ut->ut_time,&hiswrt,&hispos);
-+ find_wrttmp(histty,ut->ut_tv.tv_sec,&hiswrt,&hispos);
- return(0);
- }
-
-@@ -321,7 +319,7 @@
-
- void find_answer()
- {
--struct utmp *ut;
-+struct utmpx *ut;
- int slot;
-
- lseek(wstream,hispos= wrttmp_offset(slot= 0),0);
-@@ -332,9 +330,9 @@
- {
- /* Found someone writing me - get his name from utmp */
- strncpy(histty,hiswrt.wrt_line,UT_LINESIZE);
-- if ((ut= find_utmp(histty)) != NULL && ut->ut_name[0] != '\0')
-+ if ((ut= find_utmp(histty)) != NULL && ut->ut_user[0] != '\0')
- {
-- strncpy(hisname,ut->ut_name,UT_NAMESIZE);
-+ strncpy(hisname,ut->ut_user,UT_NAMESIZE);
- printf("Replying to %s on %s...",hisname,histty);
- if (!telegram) putchar('\n');
- return;
-@@ -363,7 +361,7 @@
- int ahelpers= 0; /* Number of helpers available */
- int previous;
- int slot= 0;
--struct utmp *ut;
-+struct utmpx *ut;
- struct wrttmp tmpwrt;
- long tmppos;
-
-@@ -387,7 +385,7 @@
-
- /* Find the helper candidate in utmp - if he's not there skip out */
- if ((ut= find_utmp(tmpwrt.wrt_line)) == NULL ||
-- ut->ut_name[0] == '\0' || ut->ut_time != tmpwrt.wrt_time)
-+ ut->ut_user[0] == '\0' || ut->ut_tv.tv_sec != tmpwrt.wrt_time)
- continue;
-
- /* Reject helpers with their message permissions off */
-@@ -397,14 +395,14 @@
- {
- /* Perms off - but am I in .yeswrite file? */
- if (!f_exceptions || tmpwrt.wrt_except != 'y' ||
-- !isuexception(ut->ut_name, 1, myname))
-+ !isuexception(ut->ut_user, 1, myname))
- continue;
- }
- else
- {
- /* Perms on - but am I in .nowrite file? */
- if (f_exceptions && tmpwrt.wrt_except == 'y' &&
-- isuexception(ut->ut_name, 0, myname))
-+ isuexception(ut->ut_user, 0, myname))
- continue;
- }
- }
-@@ -422,7 +420,7 @@
- ahelpers++;
-
- /* Has he helped us before? */
-- previous= !strncmp(ut->ut_name, mywrt.wrt_last, UT_NAMESIZE);
-+ previous= !strncmp(ut->ut_user, mywrt.wrt_last, UT_NAMESIZE);
-
- /* So roll the dice to see if we will choose him */
- if (!previous && (unsigned)RAND() > (unsigned)RAND_MAX / ahelpers)
-@@ -430,7 +428,7 @@
-
- /* We chose him, so make him our helper candidate so far */
- strncpy(histty, tmpwrt.wrt_line, UT_LINESIZE);
-- strncpy(hisname, ut->ut_name, UT_NAMESIZE);
-+ strncpy(hisname, ut->ut_user, UT_NAMESIZE);
- hiswrt= tmpwrt;
- hispos= tmppos;
-
Index: misc/orville-write/files/utmpx-wrt_me.c
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-wrt_me.c
@@ -1,34 +0,0 @@
---- wrt_me.c.orig 2010-02-02 22:31:42.972816673 -0800
-+++ wrt_me.c 2010-02-02 22:33:09.915329757 -0800
-@@ -14,19 +14,19 @@
-
- void find_me()
- {
--struct utmp *ut;
-+struct utmpx *ut;
- struct passwd *pw;
- int myuid;
-
- /* Search utmp for myself */
-
-- if ((ut= find_utmp(mytty)) == NULL || ut->ut_name[0] == '\0')
-+ if ((ut= find_utmp(mytty)) == NULL || ut->ut_user[0] == '\0')
- {
- printf("%s: Panic - Unable to find your tty (%s) in "_PATH_UTMP"\n",
- progname, mytty);
- done(1);
- }
-- strncpy(myname, ut->ut_name, UT_NAMESIZE);
-+ strncpy(myname, ut->ut_user, UT_NAMESIZE);
-
- /* Check if this is our real identity */
- #ifndef SLOWPASSWD
-@@ -48,7 +48,7 @@
-
- /* Find my wrt_tmp entry */
-
-- find_wrttmp(mytty, ut->ut_time, &mywrt, &mypos);
-+ find_wrttmp(mytty, ut->ut_tv.tv_sec, &mywrt, &mypos);
- }
-
-
Index: misc/orville-write/files/utmpx-wrttmp.h
===================================================================
--- /dev/null
+++ misc/orville-write/files/utmpx-wrttmp.h
@@ -1,37 +0,0 @@
---- wrttmp.h.orig 2010-02-02 22:10:42.237520427 -0800
-+++ wrttmp.h 2010-02-02 22:18:11.802300308 -0800
-@@ -30,7 +30,7 @@
- #define WRTTMP_H
-
- #include <sys/types.h>
--#include <utmp.h>
-+#include <utmpx.h>
-
- /* BSDI is only Unix I know of that threatens to change namesize from 8 to
- * anything else. Most don't even have a define for it. Here we default
-@@ -38,10 +38,10 @@
- * for us.
- */
- #ifndef UT_NAMESIZE
--#define UT_NAMESIZE 8
-+#define UT_NAMESIZE (sizeof(((struct utmpx *)0)->ut_user) -1)
- #endif
- #ifndef UT_LINESIZE
--#define UT_LINESIZE 8
-+#define UT_LINESIZE (sizeof(((struct utmpx *)0)->ut_line) -1)
- #endif
-
- #if defined(TTY_GROUP) || defined(TTY_OTHERS)
-@@ -65,9 +65,9 @@
- };
-
- struct wrttmp {
-- char wrt_line[UT_LINESIZE]; /* a tty line */
-- char wrt_what[UT_NAMESIZE]; /* what this user is doing? */
-- char wrt_last[UT_NAMESIZE]; /* Who did he last write to? */
-+ char wrt_line[sizeof(((struct utmpx *)0)->ut_line) -1]; /* a tty line */
-+ char wrt_what[sizeof(((struct utmpx *)0)->ut_user) -1]; /* what this user is doing? */
-+ char wrt_last[sizeof(((struct utmpx *)0)->ut_user) -1]; /* Who did he last write to? */
- #ifndef TTYPERMS
- char wrt_mesg; /* user's write perms (y or n) */
- #endif /*TTYPERMS*/
Index: multimedia/gstreamer-ffmpeg/Makefile
===================================================================
--- multimedia/gstreamer-ffmpeg/Makefile
+++ multimedia/gstreamer-ffmpeg/Makefile
@@ -71,7 +71,7 @@
.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
Index: multimedia/gstreamer1-libav/Makefile
===================================================================
--- multimedia/gstreamer1-libav/Makefile
+++ multimedia/gstreamer1-libav/Makefile
@@ -36,7 +36,7 @@
CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
.endif
-.if ${OSVERSION} < 900033 || ${ARCH} == ia64
+.if ${ARCH} == ia64
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin
.endif
Index: multimedia/kodi/Makefile
===================================================================
--- multimedia/kodi/Makefile
+++ multimedia/kodi/Makefile
@@ -144,12 +144,6 @@
PLIST_SUB+= ARCH="x86_64"
.endif
-.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:MNONFREE}
NO_CDROM= Restricted binary distribution
NO_PACKAGE= ${NO_CDROM}
Index: multimedia/mythtv-frontend/Makefile
===================================================================
--- multimedia/mythtv-frontend/Makefile
+++ multimedia/mythtv-frontend/Makefile
@@ -71,15 +71,6 @@
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 @@
${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \
${WRKSRC}/programs/mythcommflag/mythcommflag-analyze
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: multimedia/mythtv/Makefile
===================================================================
--- multimedia/mythtv/Makefile
+++ multimedia/mythtv/Makefile
@@ -77,13 +77,6 @@
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
Index: multimedia/plexhometheater/Makefile
===================================================================
--- multimedia/plexhometheater/Makefile
+++ multimedia/plexhometheater/Makefile
@@ -117,11 +117,6 @@
PLIST_SUB+= ARCH="x86_64"
.endif
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 900033
-USE_BINUTILS= yes
-MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin
-.endif
-
post-patch:
@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/FFMPEG_ARCH/' \
${WRKSRC}/lib/ffmpeg/Makefile \
Index: multimedia/plexmediaserver/Makefile
===================================================================
--- multimedia/plexmediaserver/Makefile
+++ multimedia/plexmediaserver/Makefile
@@ -32,15 +32,9 @@
.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
Index: multimedia/vlc/Makefile
===================================================================
--- multimedia/vlc/Makefile
+++ multimedia/vlc/Makefile
@@ -316,11 +316,10 @@
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 @@
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||' \
Index: multimedia/zoneminder/Makefile
===================================================================
--- multimedia/zoneminder/Makefile
+++ multimedia/zoneminder/Makefile
@@ -103,10 +103,6 @@
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:
Index: net-mgmt/argus3/Makefile
===================================================================
--- net-mgmt/argus3/Makefile
+++ net-mgmt/argus3/Makefile
@@ -30,11 +30,6 @@
PKGNAMESUFFIX+= -sasl
.endif
-.if ${OSVERSION} < 900000
-BUILD_DEPENDS+= ${LOCALBASE}/include/pcap.h:${PORTSDIR}/net/libpcap
-CONFIGURE_ARGS+= --with-libpcap=${LOCALBASE}
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's#/usr/lib/sasl2#${LOCALBASE}/lib/sasl2#' ${WRKSRC}/argus/ArgusOutput.c
Index: net-mgmt/collectd5/Makefile
===================================================================
--- net-mgmt/collectd5/Makefile
+++ net-mgmt/collectd5/Makefile
@@ -154,6 +154,7 @@
--enable-threshold \
--enable-unixsock \
--enable-uptime \
+ --enable-users \
--enable-uuid \
--enable-write_graphite \
--enable-write_log \
@@ -473,16 +474,6 @@
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
Index: net-mgmt/collectd5/pkg-plist
===================================================================
--- net-mgmt/collectd5/pkg-plist
+++ net-mgmt/collectd5/pkg-plist
@@ -90,7 +90,7 @@
%%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
Index: net-mgmt/net-snmp/Makefile
===================================================================
--- net-mgmt/net-snmp/Makefile
+++ net-mgmt/net-snmp/Makefile
@@ -236,10 +236,8 @@
.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
Index: net/boinc-client/Makefile
===================================================================
--- net/boinc-client/Makefile
+++ net/boinc-client/Makefile
@@ -75,9 +75,6 @@
.if ${PORT_OPTIONS:MMANAGER}
WX_CONF_ARGS= absolute
WX_UNICODE= yes
-. if ${OSVERSION} < 900506 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000002)
-CPPFLAGS+= -DNO_PER_THREAD_LOCALE
-. endif
SUB_LIST+= OPTION_MANAGER="true"
.else
SUB_LIST+= OPTION_MANAGER=""
Index: net/gnu-radius/Makefile
===================================================================
--- net/gnu-radius/Makefile
+++ net/gnu-radius/Makefile
@@ -44,10 +44,6 @@
.include <bsd.port.options.mk>
-.if ${OSVERSION} >= 900007
-EXTRA_PATCHES= ${FILESDIR}/extra-utmpx
-.endif
-
.if ${PORT_OPTIONS:MSNMP}
CONFIGURE_ARGS+=--enable-snmp
.endif
Index: net/gnu-radius/files/extra-utmpx
===================================================================
--- /dev/null
+++ net/gnu-radius/files/extra-utmpx
@@ -1,43 +0,0 @@
---- radwho/radwho.c.orig 2010-01-21 22:29:51.000000000 +0100
-+++ radwho/radwho.c 2010-01-21 22:37:37.000000000 +0100
-@@ -41,7 +41,8 @@
- int want_rad_record(struct radutmp *rt);
-
- /* UTMP stuff. Uses utmpx on svr4 */
--#if defined(__svr4__) || defined(__sgi)
-+#include <sys/param.h>
-+#if defined(__svr4__) || defined(__sgi) || (defined(__FreeBSD__) && __FreeBSD_version >= 900007)
- # include <utmpx.h>
- # include <sys/fcntl.h>
- # define utmp utmpx
-@@ -49,7 +50,9 @@
- # define UT_LINESIZE 32
- # define UT_HOSTSIZE 257
- # undef UTMP_FILE
-+/*
- # define UTMP_FILE UTMPX_FILE
-+*/
- # undef WTMP_FILE
- # define WTMP_FILE WTMPX_FILE
- #else
-@@ -60,13 +63,19 @@
- # define UT_LINESIZE 32
- # define UT_HOSTSIZE 64
- #endif
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi)
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 900007) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi)
- # ifndef UTMP_FILE
- # define UTMP_FILE "/var/run/utmp"
- # endif
- # define ut_user ut_name
- #endif
-
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 900007
-+# define UTMP_FILE "/var/run/utmp"
-+# define ut_name ut_user
-+# define ut_time ut_tv.tv_sec
-+#endif
-+
- #define P_CONSOLE -1 /* Special radutmp type value for local users */
-
- int fingerd; /* Are we run as fingerd */
Index: net/kamailio/Makefile
===================================================================
--- net/kamailio/Makefile
+++ net/kamailio/Makefile
@@ -60,10 +60,6 @@
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 @@
${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
Index: net/ntop/Makefile
===================================================================
--- net/ntop/Makefile
+++ net/ntop/Makefile
@@ -77,18 +77,6 @@
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako
.endif
-.include <bsd.port.pre.mk>
-
-# Quick and dirty hackaround - older binutils barf when asked to strip
-# an .a file, newer complain about missing sections and succeed.
-# The real fix would be for ntop to not try stripping .a files,
-# but upstream seems to have gone ahead with ntopng so this may not
-# ever be fixed.
-.if ${OSVERSION} < 900033
-USE_BINUTILS= yes
-CONFIGURE_ARGS+= STRIP=${LOCALBASE}/bin/strip
-.endif
-
pre-configure:
@(cd ${WRKSRC} && ./autogen.sh --noconfig)
@@ -98,4 +86,4 @@
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ntop/plugins/*.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net/ntopng/Makefile
===================================================================
--- net/ntopng/Makefile
+++ net/ntopng/Makefile
@@ -36,12 +36,6 @@
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
Index: ports-mgmt/dialog4ports/Makefile
===================================================================
--- ports-mgmt/dialog4ports/Makefile
+++ ports-mgmt/dialog4ports/Makefile
@@ -41,7 +41,7 @@
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
Index: security/gcr/Makefile
===================================================================
--- security/gcr/Makefile
+++ security/gcr/Makefile
@@ -29,10 +29,4 @@
GLIB_SCHEMAS= org.gnome.crypto.pgp.gschema.xml
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 900000
-EXTRA_PATCHES= ${FILESDIR}/extra-gck_gck.h
-.endif
-
.include <bsd.port.mk>
Index: security/gcr/files/extra-gck_gck.h
===================================================================
--- security/gcr/files/extra-gck_gck.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gck/gck.h.orig 2015-04-17 11:20:36.392953000 +0200
-+++ gck/gck.h 2015-04-17 11:21:07.941440000 +0200
-@@ -388,7 +388,6 @@
- */
- typedef struct _GckSlot GckSlot;
- typedef struct _GckModule GckModule;
--typedef struct _GckSession GckSession;
- typedef struct _GckObject GckObject;
- typedef struct _GckObjectCache GckObjectCache;
- typedef struct _GckEnumerator GckEnumerator;
Index: security/ipsec-tools/Makefile
===================================================================
--- security/ipsec-tools/Makefile
+++ security/ipsec-tools/Makefile
@@ -57,10 +57,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 900007
-EXTRA_PATCHES= ${FILESDIR}/patch8-utmp.diff
-.endif
-
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-debug
.else
Index: security/ipsec-tools/files/patch8-utmp.diff
===================================================================
--- security/ipsec-tools/files/patch8-utmp.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- src/racoon/isakmp_cfg.c 21 Sep 2010 13:14:17 -0000 1.24
-+++ src/racoon/isakmp_cfg.c 4 Aug 2010 09:16:58 -0000 1.23
-@@ -38,7 +38,7 @@
- #include <sys/socket.h>
- #include <sys/queue.h>
-
--#include <utmpx.h>
-+#include <utmp.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <util.h>
- #endif
-@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr
- int inout;
- {
- int error = 0;
-- struct utmpx ut;
-+ struct utmp ut;
-+ char term[UT_LINESIZE];
- char addr[NI_MAXHOST];
-
- if (usr == NULL || usr[0]=='\0') {
-@@ -1670,33 +1671,36 @@ isakmp_cfg_accounting_system(port, raddr
- return -1;
- }
-
-- memset(&ut, 0, sizeof ut);
-- gettimeofday((struct timeval *)&ut.ut_tv, NULL);
-- snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port);
-+ sprintf(term, TERMSPEC, port);
-
- switch (inout) {
- case ISAKMP_CFG_LOGIN:
-- ut.ut_type = USER_PROCESS;
-- strncpy(ut.ut_user, usr, sizeof ut.ut_user);
-+ strncpy(ut.ut_name, usr, UT_NAMESIZE);
-+ ut.ut_name[UT_NAMESIZE - 1] = '\0';
-+
-+ strncpy(ut.ut_line, term, UT_LINESIZE);
-+ ut.ut_line[UT_LINESIZE - 1] = '\0';
-
- GETNAMEINFO_NULL(raddr, addr);
-- strncpy(ut.ut_host, addr, sizeof ut.ut_host);
-+ strncpy(ut.ut_host, addr, UT_HOSTSIZE);
-+ ut.ut_host[UT_HOSTSIZE - 1] = '\0';
-
-+ ut.ut_time = time(NULL);
-+
- plog(LLV_INFO, LOCATION, NULL,
- "Accounting : '%s' logging on '%s' from %s.\n",
-- ut.ut_user, ut.ut_id, addr);
-+ ut.ut_name, ut.ut_line, ut.ut_host);
-
-- pututxline(&ut);
-+ login(&ut);
-
- break;
- case ISAKMP_CFG_LOGOUT:
-- ut.ut_type = DEAD_PROCESS;
-
- plog(LLV_INFO, LOCATION, NULL,
- "Accounting : '%s' unlogging from '%s'.\n",
-- usr, ut.ut_id);
-+ usr, term);
-
-- pututxline(&ut);
-+ logout(term);
-
- break;
- default:
Index: security/libgcrypt/Makefile
===================================================================
--- security/libgcrypt/Makefile
+++ security/libgcrypt/Makefile
@@ -34,24 +34,12 @@
.if ${ARCH} == "powerpc"
CONFIGURE_ARGS+= --disable-asm
-
-.elif ${ARCH} == "i386"
-.if (${OSVERSION} < 900033)
-CONFIGURE_ARGS+= --disable-aesni-support
-.endif
-
.endif
post-patch:
${RM} -f ${WRKSRC}/doc/gcrypt.info*
${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
-# Fix build without ASM on 8.x/amd64
-.if ${OPSYS} == FreeBSD && ${ARCH} == "amd64" && ${OSVERSION} < 900000
-USE_GCC= any
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
-.endif
-
# Fix crash at cipher/salsa20.c module on amd64
.if ${ARCH} == "amd64" && exists(/usr/bin/clang)
CFLAGS:= ${CFLAGS:N-O*} -O2
Index: security/libgcrypt/files/extra-patch-configure
===================================================================
--- security/libgcrypt/files/extra-patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2014-08-10 19:51:24.000000000 +0200
-+++ configure 2014-08-10 19:52:26.000000000 +0200
-@@ -16493,7 +16493,7 @@
- $as_echo "$gcry_cv_gcc_amd64_platform_as_ok" >&6; }
- if test "$gcry_cv_gcc_amd64_platform_as_ok" = "yes" ; then
-
--$as_echo "#define HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS 1" >>confdefs.h
-+$as_echo "#undef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS" >>confdefs.h
-
- fi
- fi
Index: security/lsh/Makefile
===================================================================
--- security/lsh/Makefile
+++ security/lsh/Makefile
@@ -36,12 +36,4 @@
(cd ${WRKSRC}/src/testsuite && ${SETENV} ${MAKE_ENV} \
${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900000
-PLIST_SUB+= KRB=""
-.else
-PLIST_SUB+= KRB="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: security/lsh/pkg-plist
===================================================================
--- security/lsh/pkg-plist
+++ security/lsh/pkg-plist
@@ -33,7 +33,7 @@
man/man8/lshd.8.gz
man/man8/sftp-server.8.gz
sbin/lsh-execuv
-%%KRB%%sbin/lsh-krb-checkpw
+sbin/lsh-krb-checkpw
sbin/lsh-pam-checkpw
sbin/lshd
sbin/sftp-server
Index: security/openssh-portable-devel/Makefile
===================================================================
--- security/openssh-portable-devel/Makefile
+++ security/openssh-portable-devel/Makefile
@@ -113,16 +113,9 @@
.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
Index: security/openssh-portable-devel/files/extra-patch-sshd-utmp-size
===================================================================
--- 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;
Index: security/openssh-portable/Makefile
===================================================================
--- security/openssh-portable/Makefile
+++ security/openssh-portable/Makefile
@@ -109,17 +109,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
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hostkeyalg_plus:-p1
Index: security/openssh-portable/files/extra-patch-sshd-utmp-size
===================================================================
--- 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;
Index: security/putty/Makefile
===================================================================
--- security/putty/Makefile
+++ security/putty/Makefile
@@ -45,9 +45,7 @@
.if ${PORT_OPTIONS:MGSSAPI}
_COMPAT= -DSTATIC_GSSAPI
-.if ${OSVERSION} >= 900000
LIB_DEPENDS+= libkrb5support.so:${PORTSDIR}/security/krb5
-.endif
.else
_COMPAT= -DNO_GSSAPI
.endif
Index: security/pwauth/Makefile
===================================================================
--- security/pwauth/Makefile
+++ security/pwauth/Makefile
@@ -17,12 +17,6 @@
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 @@
@${INSTALL_PROGRAM} ${WRKSRC}/checkfaillog ${STAGEDIR}${PREFIX}/bin
@${CHMOD} u=rxs ${STAGEDIR}${PREFIX}/bin/pwauth
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: security/pwauth/files/extra-patch-utmpx
===================================================================
--- /dev/null
+++ security/pwauth/files/extra-patch-utmpx
@@ -1,33 +0,0 @@
---- checkfaillog.c.orig 2012-02-11 13:18:31.000000000 +0200
-+++ checkfaillog.c 2012-02-11 13:18:50.000000000 +0200
-@@ -33,7 +33,7 @@
-
- #include <stdio.h>
- #include <sys/types.h>
--#include <utmp.h>
-+#include <utmpx.h>
- #include <pwd.h>
-
- #include "config.h"
---- fail_check.c.orig 2012-02-11 13:18:36.000000000 +0200
-+++ fail_check.c 2012-02-11 13:18:59.000000000 +0200
-@@ -35,7 +35,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <utmp.h>
-+#include <utmpx.h>
-
- #include "config.h"
- #include "fail_log.h"
---- pwauth.h.orig 2012-02-11 13:18:41.000000000 +0200
-+++ pwauth.h 2012-02-11 13:19:08.000000000 +0200
-@@ -71,7 +71,7 @@
-
- #ifdef UNIX_LASTLOG
- # define NEED_UID
--# include <utmp.h>
-+# include <utmpx.h>
- # ifdef HAVE_LASTLOG_H
- # include <lastlog.h>
- # endif
Index: security/tor-devel/Makefile
===================================================================
--- security/tor-devel/Makefile
+++ security/tor-devel/Makefile
@@ -47,8 +47,7 @@
.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
Index: security/tor/Makefile
===================================================================
--- security/tor/Makefile
+++ security/tor/Makefile
@@ -44,8 +44,7 @@
.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
Index: sysutils/arcconf/Makefile
===================================================================
--- sysutils/arcconf/Makefile
+++ sysutils/arcconf/Makefile
@@ -22,18 +22,14 @@
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
Index: sysutils/boxbackup/Makefile
===================================================================
--- sysutils/boxbackup/Makefile
+++ sysutils/boxbackup/Makefile
@@ -44,7 +44,7 @@
LDFLAGS+= -lexecinfo
.endif
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 && ${OSVERSION} > 900000
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
USE_GCC= yes
.endif
Index: sysutils/consul/Makefile
===================================================================
--- sysutils/consul/Makefile
+++ sysutils/consul/Makefile
@@ -150,10 +150,6 @@
.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
Index: sysutils/fusefs-kmod/Makefile
===================================================================
--- sysutils/fusefs-kmod/Makefile
+++ sysutils/fusefs-kmod/Makefile
@@ -27,11 +27,7 @@
.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
Index: sysutils/fusefs-kmod/files/extra-patch-8-fuse_vfsops.c
===================================================================
--- 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();
Index: sysutils/fusefs-kmod/files/extra-patch-8-fuse_vnops.c
===================================================================
--- 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];
Index: sysutils/libutempter/Makefile
===================================================================
--- sysutils/libutempter/Makefile
+++ sysutils/libutempter/Makefile
@@ -13,10 +13,6 @@
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>
Index: sysutils/msyslog/Makefile
===================================================================
--- sysutils/msyslog/Makefile
+++ sysutils/msyslog/Makefile
@@ -32,12 +32,6 @@
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"
Index: sysutils/msyslog/files/utmpx-src-modules-om_classic.c
===================================================================
--- /dev/null
+++ sysutils/msyslog/files/utmpx-src-modules-om_classic.c
@@ -1,70 +0,0 @@
---- src/modules/om_classic.c.orig 2010-01-25 16:36:53.000000000 -0800
-+++ src/modules/om_classic.c
-@@ -66,7 +66,7 @@
- #include <string.h>
- #include <syslog.h>
- #include <unistd.h>
--#include <utmp.h>
-+#include <utmpx.h>
- #include <netdb.h>
- /* if _PATH_UTMP isn't defined, define it here... */
- #ifndef _PATH_UTMP
-@@ -100,7 +100,7 @@
- struct om_classic_ctx {
- int fd;
- union {
-- char f_uname[MAXUNAMES][UT_NAMESIZE+1];
-+ char f_uname[MAXUNAMES][MAXLOGNAME+2];
- struct {
- char f_hname[MAXHOSTNAMELEN];
- struct sockaddr f_addr;
-@@ -396,9 +396,9 @@
- for (i = 0; i < MAXUNAMES && *p; i++) {
- for (q = p; *q && *q != ','; )
- q++;
-- (void)strncpy(c->f_un.f_uname[i], p, UT_NAMESIZE);
-- if ((q - p) > UT_NAMESIZE)
-- c->f_un.f_uname[i][UT_NAMESIZE] = '\0';
-+ (void)strncpy(c->f_un.f_uname[i], p, MAXLOGNAME+1);
-+ if ((q - p) > MAXLOGNAME+1)
-+ c->f_un.f_uname[i][MAXLOGNAME+1] = '\0';
- else
- c->f_un.f_uname[i][q - p] = '\0';
- while (*q == ',' || *q == ' ')
-@@ -456,24 +456,19 @@
- {
- static int reenter; /* avoid calling ourselves */
- FILE *uf;
-- struct utmp ut;
-+ struct utmpx ut;
- int i;
- char *p;
- char line[sizeof(ut.ut_line) + 1];
-
- if (reenter++)
- return;
-- if ( (uf = fopen(_PATH_UTMP, "r")) == NULL) {
-- dprintf(MSYSLOG_SERIOUS, "om_classic: error opening "
-- "%s\n", _PATH_UTMP);
-- reenter = 0;
-- return;
-- }
-+
- /* NOSTRICT */
- while (fread(&ut, sizeof(ut), 1, uf) == 1) {
-
- #ifndef __linux__
-- if (ut.ut_name[0] == '\0')
-+ if (ut.ut_user[0] == '\0')
- #else
- if ((ut.ut_type != USER_PROCESS && ut.ut_type != LOGIN_PROCESS) ||
- ut.ut_line[0] == ':' /* linux logs users that are not logged in (?!) */)
-@@ -494,7 +489,7 @@
- for (i = 0; i < MAXUNAMES; i++) {
- if (!c->f_un.f_uname[i][0])
- break;
-- if (!strncmp(c->f_un.f_uname[i], ut.ut_name,
-+ if (!strncmp(c->f_un.f_uname[i], ut.ut_user,
- UT_NAMESIZE)) {
- if ((p = ttymsg(iov, 6, line, TTYMSGTIME))
- != NULL) {
Index: sysutils/pftop/Makefile
===================================================================
--- sysutils/pftop/Makefile
+++ sysutils/pftop/Makefile
@@ -17,10 +17,6 @@
${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 @@
.if ${OSVERSION} > 1000017
CFLAGS+= -DHAVE_FINE_GRAINED_LOCKING=1
.endif
-.endif
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-engine.c
Index: sysutils/rmonitor/files/patch-src__rmonitor.c
===================================================================
--- sysutils/rmonitor/files/patch-src__rmonitor.c
+++ 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,
Index: sysutils/rmonitor/files/patch-utmpx
===================================================================
--- 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,
Index: sysutils/spiped/Makefile
===================================================================
--- sysutils/spiped/Makefile
+++ sysutils/spiped/Makefile
@@ -32,11 +32,6 @@
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-.if ${OSVERSION} < 900503
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-proto_proto__conn.c
-.endif
-
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
Index: sysutils/spiped/files/extra-patch-proto_proto__conn.c
===================================================================
--- /dev/null
+++ sysutils/spiped/files/extra-patch-proto_proto__conn.c
@@ -1,7 +0,0 @@
---- proto/proto_conn.c.orig 2015-02-28 21:19:18 UTC
-+++ proto/proto_conn.c
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <sys/socket.h>
-
- #include <netinet/in.h>
Index: sysutils/syslog-ng-devel/Makefile
===================================================================
--- sysutils/syslog-ng-devel/Makefile
+++ sysutils/syslog-ng-devel/Makefile
@@ -48,8 +48,8 @@
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --enable-manpages \
- --datadir=${PREFIX}/share/syslog-ng/
-
+ --datadir=${PREFIX}/share/syslog-ng/ \
+ --disable-linux-caps
BROKEN_sparc64= Does not compile on sparc64: gcc core dump
@@ -149,16 +149,6 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
${STAGEDIR}${PREFIX}/include/syslog-ng/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: sysutils/syslog-ng/Makefile
===================================================================
--- sysutils/syslog-ng/Makefile
+++ sysutils/syslog-ng/Makefile
@@ -41,7 +41,7 @@
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 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
${STAGEDIR}${PREFIX}/include/syslog-ng/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: sysutils/syslog-ng34/Makefile
===================================================================
--- sysutils/syslog-ng34/Makefile
+++ sysutils/syslog-ng34/Makefile
@@ -40,7 +40,7 @@
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 @@
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 @@
${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>
Index: sysutils/syslog-ng35/Makefile
===================================================================
--- sysutils/syslog-ng35/Makefile
+++ sysutils/syslog-ng35/Makefile
@@ -43,7 +43,7 @@
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 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
${STAGEDIR}${PREFIX}/include/syslog-ng/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: sysutils/tmux/Makefile
===================================================================
--- sysutils/tmux/Makefile
+++ sysutils/tmux/Makefile
@@ -38,12 +38,6 @@
.include <bsd.port.options.mk>
-.if ${OSVERSION} < 900004
-LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES
Index: sysutils/whowatch/Makefile
===================================================================
--- sysutils/whowatch/Makefile
+++ sysutils/whowatch/Makefile
@@ -15,15 +15,8 @@
PLIST_FILES= bin/whowatch man/man1/${PORTNAME}.1.gz
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900006
-EXTRA_PATCHES= ${PATCHDIR}/utmpx-whowatch.h \
- ${PATCHDIR}/utmpx-whowatch.c
-.endif
-
pre-patch:
@${FIND} ${WRKSRC} -name 'proc????.c' | ${XARGS} ${REINPLACE_CMD} -E \
-e 's/kp_.?proc\.._/ki_/ ; s/pcred\.p_//'
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: sysutils/whowatch/files/utmpx-whowatch.h
===================================================================
--- /dev/null
+++ sysutils/whowatch/files/utmpx-whowatch.h
@@ -1,27 +0,0 @@
---- whowatch.h.orig 2010-02-02 19:18:34.763514932 -0800
-+++ whowatch.h 2010-02-02 19:20:44.905393020 -0800
-@@ -2,7 +2,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <utmp.h>
-+#include <utmpx.h>
- #include <string.h>
- #include <signal.h>
- #include <sys/stat.h>
-@@ -75,12 +75,12 @@
- {
- struct user_t *next;
- struct user_t *prev;
-- char name[UT_NAMESIZE + 1]; /* login name */
-- char tty[UT_LINESIZE + 1]; /* tty */
-+ char name[sizeof(((struct utmpx *)0)->ut_user)]; /* login name */
-+ char tty[sizeof(((struct utmpx *)0)->ut_line)]; /* tty */
- int prot;
- int pid; /* pid of login shell */
- char parent[16];
-- char host[UT_HOSTSIZE + 1];
-+ char host[sizeof(((struct utmpx *)0)->ut_host)];
- int line;
- };
-
Index: sysutils/whowatch/files/utmpx-whowatch.c
===================================================================
--- /dev/null
+++ sysutils/whowatch/files/utmpx-whowatch.c
@@ -1,105 +0,0 @@
---- whowatch.c.orig 2000-06-06 03:21:44.000000000 -0700
-+++ whowatch.c 2010-02-02 19:56:37.081269004 -0800
-@@ -119,21 +119,17 @@
- /*
- * Create new user structure and fill it
- */
--struct user_t *allocate_user(struct utmp *entry)
-+struct user_t *allocate_user(struct utmpx *entry)
- {
- struct user_t *u;
- int ppid;
- u = calloc(1, sizeof *u);
- if(!u) errx(1, "Cannot allocate memory.");
-- strncpy(u->name, entry->ut_user, UT_NAMESIZE);
-- strncpy(u->tty, entry->ut_line, UT_LINESIZE);
-- strncpy(u->host, entry->ut_host, UT_HOSTSIZE);
-+ strncpy(u->name, entry->ut_user, sizeof(entry->ut_user));
-+ strncpy(u->tty, entry->ut_line, sizeof(entry->ut_line));
-+ strncpy(u->host, entry->ut_host, sizeof(entry->ut_host));
-
--#ifdef HAVE_UTPID
- u->pid = entry->ut_pid;
--#else
-- u->pid = get_login_pid(u->tty);
--#endif
-
- if((ppid = get_ppid(u->pid)) == -1)
- strncpy(u->parent, "can't access", sizeof u->parent);
-@@ -192,34 +188,24 @@
- */
- void read_utmp()
- {
-- int fd, i;
-- static struct utmp entry;
-+ static struct utmpx *entry;
- struct user_t *u;
-+
-+ while ((entry = getutxent()) != NULL) {
-
-- if ((fd = open(UTMP_FILE ,O_RDONLY)) == -1){
-- curses_end();
-- errx(1, "Cannot open " UTMP_FILE);
-- }
-- while((i = read(fd, &entry,sizeof entry)) > 0) {
-- if(i != sizeof entry) errx(1, "Error reading " UTMP_FILE );
--#ifdef HAVE_USER_PROCESS
-- if(entry.ut_type != USER_PROCESS) continue;
--#else
-- if(!entry.ut_name[0]) continue;
--#endif
-- u = allocate_user(&entry);
-+ if(entry->ut_type != USER_PROCESS) continue;
-+ u = allocate_user(entry);
- print_user(u);
- update_nr_users(u->parent, &u->prot, LOGIN);
- how_many ++;
- users_list.d_lines = how_many;
- addto_list(u, users);
- }
-- close(fd);
- wnoutrefresh(users_list.wd);
- return;
- }
-
--struct user_t* new_user(struct utmp *newone)
-+struct user_t* new_user(struct utmpx *newone)
- {
- struct user_t *u;
- u = allocate_user(newone);
-@@ -246,7 +232,7 @@
- void check_wtmp()
- {
- struct user_t *u;
-- struct utmp entry;
-+ struct utmpx entry;
- int i;
-
- while((i = read(wtmp_fd, &entry, sizeof entry)) > 0){
-@@ -256,25 +242,17 @@
- errx(1, "Error reading " WTMP_FILE );
- }
- /* user just logged in */
--#ifdef HAVE_USER_PROCESS
- if(entry.ut_type == USER_PROCESS) {
--#else
-- if(entry.ut_user[0]) {
--#endif
- u = new_user(&entry);
- print_user(u);
- wrefresh(users_list.wd);
- print_info();
- continue;
- }
--#ifdef HAVE_DEAD_PROCESS
- if(entry.ut_type != DEAD_PROCESS) continue;
--#else
--// if(entry.ut_line[0]) continue;
--#endif
- /* user just logged out */
- for_each(u, users) {
-- if(strncmp(u->tty, entry.ut_line, UT_LINESIZE))
-+ if(strncmp(u->tty, entry.ut_line, sizeof(entry.ut_line)))
- continue;
- if (state == USERS_LIST)
- delete_line(&users_list, u->line);
Index: sysutils/wuzzah/Makefile
===================================================================
--- sysutils/wuzzah/Makefile
+++ sysutils/wuzzah/Makefile
@@ -16,19 +16,13 @@
PLIST_FILES= bin/wuzzah man/man1/wuzzah.1.gz
-.include <bsd.port.pre.mk>
-
post-patch:
-.if ${OSVERSION} >= 900007
@${REINPLACE_CMD} -e '/^CFLAGS/d' -e 's|^\(SUBDIRS.*\)utmpx|\1|p' \
${WRKSRC}/Makefile.in
-.else
- @${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/Makefile.in
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \
${STAGEDIR}${MANPREFIX}/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: textproc/elasticsearch/Makefile
===================================================================
--- textproc/elasticsearch/Makefile
+++ textproc/elasticsearch/Makefile
@@ -68,10 +68,8 @@
.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
Index: textproc/libcroco/Makefile
===================================================================
--- textproc/libcroco/Makefile
+++ textproc/libcroco/Makefile
@@ -18,10 +18,4 @@
PLIST_SUB= VERSION="0.6"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900035
-CONFIGURE_ARGS+=--disable-Bsymbolic
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/iojs/Makefile
===================================================================
--- www/iojs/Makefile
+++ www/iojs/Makefile
@@ -30,7 +30,7 @@
.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
Index: www/mod_spdy/Makefile
===================================================================
--- www/mod_spdy/Makefile
+++ www/mod_spdy/Makefile
@@ -50,7 +50,7 @@
.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 @@
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 @@
.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/ && \
Index: www/node-devel/Makefile
===================================================================
--- www/node-devel/Makefile
+++ www/node-devel/Makefile
@@ -26,7 +26,7 @@
.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
Index: www/tengine/Makefile
===================================================================
--- www/tengine/Makefile
+++ www/tengine/Makefile
@@ -164,11 +164,6 @@
.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
Index: www/trafficserver/Makefile
===================================================================
--- www/trafficserver/Makefile
+++ www/trafficserver/Makefile
@@ -77,7 +77,7 @@
IGNORE= no allocation strategy selected
.endif
-.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang)
+.if exists(/usr/bin/clang)
CC= clang
CXX= clang++
.endif
Index: x11-toolkits/vte/Makefile
===================================================================
--- x11-toolkits/vte/Makefile
+++ x11-toolkits/vte/Makefile
@@ -36,12 +36,6 @@
CPE_VENDOR= nalin_dahyabhai
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 900007
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c
-.endif
-
.include <bsd.port.mk>
.endif
Index: x11-toolkits/vte/files/extra-patch-gnome-pty-helper_gnome-utmp.c
===================================================================
--- 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);
Index: x11-toolkits/vte290/Makefile
===================================================================
--- x11-toolkits/vte290/Makefile
+++ x11-toolkits/vte290/Makefile
@@ -48,10 +48,6 @@
.include <bsd.port.options.mk>
-.if ${OSVERSION} < 900007
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c
-.endif
-
.if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR)
CONFIGURE_ARGS+= --with-glX
USE_GL= yes
Index: x11-toolkits/vte290/files/extra-patch-gnome-pty-helper_gnome-utmp.c
===================================================================
--- 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);
Index: x11/cool-retro-term/Makefile
===================================================================
--- x11/cool-retro-term/Makefile
+++ x11/cool-retro-term/Makefile
@@ -24,7 +24,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 900014 || ${ARCH} == powerpc
+.if ${ARCH} == powerpc
USE_GCC= yes
.else
CC= clang
@@ -39,15 +39,8 @@
post-patch:
@${REINPLACE_CMD} -e '/DEFINES +=/s,^macx:,,' \
${WRKSRC}/qmltermwidget/qmltermwidget.pro
-.if ${OSVERSION} < 900007
- @${REINPLACE_CMD} -e 's,HAVE_UTMPX,HAVE_UTMP,' \
- ${WRKSRC}/qmltermwidget/qmltermwidget.pro
- @${REINPLACE_CMD} -e 's,ut_user,ut_name,g' \
- ${WRKSRC}/qmltermwidget/lib/kpty.cpp
-.else
@${REINPLACE_CMD} -e '/define HAVE_LOGIN/d' \
${WRKSRC}/qmltermwidget/lib/kpty.cpp
-.endif
@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
${WRKSRC}/app/app.pro ${WRKSRC}/cool-retro-term.pro
@${REINPLACE_CMD} -e 's,\.\./icons,/icons,' \
Index: x11/gdm/Makefile
===================================================================
--- x11/gdm/Makefile
+++ x11/gdm/Makefile
@@ -156,9 +156,4 @@
@${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>
Index: x11/mlterm/Makefile
===================================================================
--- x11/mlterm/Makefile
+++ x11/mlterm/Makefile
@@ -109,17 +109,11 @@
CONFIGURE_ARGS+=--with-tools="${EXTERNAL_TOOLS}"
-.if ${OSVERSION} < 900004
-LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
-.endif
-
post-configure:
@${REINPLACE_CMD} -e "s,@CGI_BIN@,${PREFIX}/libexec/w3mmlconfig," \
${WRKSRC}/tool/w3mmlconfig/mlconfig.cgi
-.if ${OSVERSION} >= 900004
@${REINPLACE_CMD} -e 's|kik_utmp_bsd|kik_utmp_utmper|' \
${WRKSRC}/kiklib/src/Makefile
-.endif
post-install:
(cd ${WRKSRC}/tool/w3mmlconfig && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
Index: x11/mrxvt-devel/Makefile
===================================================================
--- x11/mrxvt-devel/Makefile
+++ x11/mrxvt-devel/Makefile
@@ -43,11 +43,7 @@
.include <bsd.port.options.mk>
CONFIGURE_ARGS+= --enable-utempter
-.if ${OSVERSION} >= 900004
CONFIGURE_ARGS+= --disable-lastlog
-.else
-LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
-.endif
.if ${PORT_OPTIONS:MJAPANESE}
CONFIGURE_ARGS+= --enable-xim --enable-cjk --with-encoding=eucj
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -136,7 +136,7 @@
# 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 @@
# 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
Index: x11/xterm/Makefile
===================================================================
--- x11/xterm/Makefile
+++ x11/xterm/Makefile
@@ -68,10 +68,6 @@
USE_XORG+= xaw
.endif
-.if ${OSVERSION} < 900004
-LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
-.endif
-
post-extract:
@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
${WRKDIR}/bsd-xterm-icons-1/*.xpm \
Index: x11/xvt/Makefile
===================================================================
--- x11/xvt/Makefile
+++ x11/xvt/Makefile
@@ -47,19 +47,11 @@
CONFIGURE_ARGS= --enable-utmp --enable-lastlog \
--with-xpm --enable-xpm-background --enable-shared \
- --enable-mousewheel --disable-languages
+ --enable-mousewheel --disable-languages --disable-wtmp
LIBS+= -lutil
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 900007
-CONFIGURE_ARGS+= --disable-wtmp
-EXTRA_PATCHES+= ${FILESDIR}/extra-utmpx_patch-src__logging.c
-.else
-CONFIGURE_ARGS+= --enable-wtmp
-EXTRA_PATCHES+= ${FILESDIR}/extra-utmp_patch-src__logging.c
-.endif
-
# enable 256 color
.if ${PORT_OPTIONS:M256_COLOR}
CONFIGURE_ARGS+= --enable-256-color
Index: x11/xvt/files/extra-utmp_patch-src__logging.c
===================================================================
--- x11/xvt/files/extra-utmp_patch-src__logging.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/logging.c.orig 2014-12-09 13:29:03.000000000 -0800
-+++ src/logging.c 2014-12-09 13:29:08.000000000 -0800
-@@ -82,7 +82,8 @@
- else if (sscanf(pty, "pts/%d", &i) == 1)
- sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
- #endif
-- else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
-+ else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
-+ STRNCMP(pty, "pts/", 4)) {
- xvt_print_error("can't parse tty name \"%s\"", pty);
- return;
- }
Index: x11/xvt/files/extra-utmpx_patch-src__logging.c
===================================================================
--- /dev/null
+++ x11/xvt/files/extra-utmpx_patch-src__logging.c
@@ -1,50 +0,0 @@
---- src/logging.c.orig 2014-12-09 13:47:18.000000000 -0800
-+++ src/logging.c 2014-12-09 13:47:35.000000000 -0800
-@@ -82,7 +82,8 @@
- else if (sscanf(pty, "pts/%d", &i) == 1)
- sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
- #endif
-- else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
-+ else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
-+ STRNCMP(pty, "pts/", 4)) {
- xvt_print_error("can't parse tty name \"%s\"", pty);
- return;
- }
-@@ -137,7 +138,9 @@
- STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
- sizeof(utx->ut_user));
- STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
-+#if 0
- utx->ut_session = getsid(0);
-+#endif
- utx->ut_tv.tv_sec = time(NULL);
- utx->ut_tv.tv_usec = 0;
- utx->ut_pid = r->h->cmd_pid;
-@@ -202,7 +205,7 @@
- xvt_update_wtmp(XVT_WTMP_FILE, ut);
- # endif
- # endif
--# ifdef HAVE_STRUCT_UTMPX
-+# if 0
- updwtmpx(XVT_WTMPX_FILE, utx);
- # endif
- }
-@@ -254,7 +257,9 @@
- if ((tmputx = getutxid(utx))) /* position to entry in utmp file */
- utx = tmputx;
- utx->ut_type = DEAD_PROCESS;
-+#if 0
- utx->ut_session = getsid(0);
-+#endif
- utx->ut_tv.tv_sec = time(NULL);
- utx->ut_tv.tv_usec = 0;
- #endif
-@@ -274,7 +279,7 @@
- xvt_update_wtmp(XVT_WTMP_FILE, ut);
- # endif
- # endif
--# ifdef HAVE_STRUCT_UTMPX
-+# if 0
- updwtmpx(XVT_WTMPX_FILE, utx);
- # endif
- }

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 3:56 AM (13 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31818834
Default Alt Text
D3694.id8835.diff (138 KB)

Event Timeline