Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jan 2017 11:00:50 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r430631 - in head: archivers/libarchive archivers/rar devel/avro-c devel/babeltrace devel/creduce devel/cvs2svn devel/datadraw devel/dbus-sharp devel/doxygen devel/gputils devel/kf5-kse...
Message-ID:  <201701051100.v05B0oY4037219@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Jan  5 11:00:49 2017
New Revision: 430631
URL: https://svnweb.freebsd.org/changeset/ports/430631

Log:
  Remove always-true/false conditions after 9.x, 10.[12] EOL
  While here, couple minor fixes
  
  portmgr blanket

Deleted:
  head/devel/pecl-qb/files/extra-patch-libmissing
  head/www/xpi-u2f4moz/files/extra-patch-freebsd9
Modified:
  head/archivers/libarchive/Makefile
  head/archivers/rar/Makefile
  head/devel/avro-c/Makefile
  head/devel/babeltrace/Makefile
  head/devel/creduce/Makefile
  head/devel/cvs2svn/Makefile
  head/devel/datadraw/Makefile
  head/devel/dbus-sharp/Makefile
  head/devel/doxygen/Makefile
  head/devel/gputils/Makefile
  head/devel/kf5-kservice/Makefile
  head/devel/p4web/Makefile
  head/devel/pecl-qb/Makefile
  head/dns/getdns/Makefile
  head/dns/powerdns-recursor/Makefile
  head/dns/zkt/Makefile
  head/games/opencity/Makefile
  head/math/stp/Makefile
  head/net-im/jabberd/Makefile
  head/net-im/telegram/Makefile
  head/security/john/Makefile
  head/security/softether/Makefile
  head/sysutils/acpica-tools/Makefile
  head/textproc/miller/Makefile
  head/www/vimb-gtk2/Makefile
  head/www/xpi-u2f4moz/Makefile
  head/x11-toolkits/hs-wxc/Makefile

Modified: head/archivers/libarchive/Makefile
==============================================================================
--- head/archivers/libarchive/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/archivers/libarchive/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -102,10 +102,6 @@ NETTLE_CONFIGURE_OFF=	--with-openssl
 BROKEN=		Does not build with openssl-devel
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002504
-CONFIGURE_ENV+=	ac_cv_lzma_has_mt=no
-.endif
-
 .if empty(ICONV_LIB)
 CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
 		ac_cv_func_locale_charset=no \

Modified: head/archivers/rar/Makefile
==============================================================================
--- head/archivers/rar/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/archivers/rar/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -40,7 +40,7 @@ IGNORE=	requires a kernel with compiled-
 .endif
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054 && ${PORT_OPTIONS:MSFX}
+.if ${OPSYS} == FreeBSD && ${PORT_OPTIONS:MSFX}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 .endif
 

Modified: head/devel/avro-c/Makefile
==============================================================================
--- head/devel/avro-c/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/avro-c/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -26,16 +26,10 @@ USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lang/c
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003000
-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${FILESDIR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} '/add_subdirectory(docs)/d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \
 		${WRKSRC}/version.sh
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/babeltrace/Makefile
==============================================================================
--- head/devel/babeltrace/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/babeltrace/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -31,33 +31,16 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	ChangeLog std-ext-lib.txt API.txt lttng-live.txt
 
-.include <bsd.port.pre.mk>
-
-# FreeBSD 9.x and earlier do not have an updated flex
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.35:textproc/flex
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|LICENSE mit-license.txt gpl-2.0.txt||' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|machine\/endian|sys\/endian|' \
 		${WRKSRC}/include/babeltrace/endian.h
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-	@${REINPLACE_CMD} -e 's|\[FLEX\],\[flex\]|\[FLEX\],\[flex\],\[\/usr\/bin\/flex\],${LOCALBASE}/bin:${PATH}|' \
-		${WRKSRC}/configure.ac
-.endif
 
 pre-configure:
 	(cd ${WRKSRC}; ./bootstrap )
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-pre-build:
-	@${REINPLACE_CMD} -e 's|(LEX)|(FLEX)|' \
-		${WRKSRC}/formats/ctf/metadata/Makefile
-.endif
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbabeltrace*so.1.0.0
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/creduce/Makefile
==============================================================================
--- head/devel/creduce/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/creduce/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -28,11 +28,4 @@ CONFIGURE_ENV=	LLVM_CONFIG=${LOCALBASE}/
 
 USES=		autoreconf gmake libtool perl5
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-CONFIGURE_ENV+=	CPPFLAGS="-stdlib=libstdc++ -I${LOCALBASE}/lib/gcc48/include/c++/ -I${LOCALBASE}/lib/gcc48/include/ -I${LOCALBASE}/lib/gcc48/include/c++/${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}/ -L${LOCALBASE}/lib -L${LOCALBASE}/lib/gcc48" \
-		LDFLAGS="-L/usr/local/lib/gcc48 -lstdc++"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/cvs2svn/Makefile
==============================================================================
--- head/devel/cvs2svn/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/cvs2svn/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -15,13 +15,15 @@ MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
+		cvs:devel/cvs
 
 # 2.4.0 -> svn r5392
 PATCHREV=	5433
 
 USES=			shebangfix python:2.7
 USE_PYTHON=		distutils autoplist
+NO_ARCH=		yes
 
 SHEBANG_FILES=		cvs2svn cvs2git cvs2bzr *.py \
 			contrib/* cvs2svn_lib/*.py \
@@ -39,12 +41,6 @@ SUBVERSION_RUN_DEPENDS=	${PYTHON_PKGNAME
 GIT_RUN_DEPENDS=	${LOCALBASE}/bin/git:devel/git
 BAZAAR_RUN_DEPENDS=	${LOCALBASE}/bin/bzr:devel/bzr
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
-RUN_DEPENDS+=	cvs:devel/cvs
-.endif
-
 # documents from ${WRKSRC}/doc
 DOCS1=		design-notes.txt making-releases.txt \
 		revision-reader.txt symbol-notes.txt

Modified: head/devel/datadraw/Makefile
==============================================================================
--- head/devel/datadraw/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/datadraw/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -21,14 +21,8 @@ CONFIGURE_ARGS=	--prefix=\$${DESTDIR}${P
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 1000013
-USES+=		bison
-.else
 post-patch:
 	@${REINPLACE_CMD} -e "s/bison/byacc/g" ${WRKSRC}/configure
-.endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

Modified: head/devel/dbus-sharp/Makefile
==============================================================================
--- head/devel/dbus-sharp/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/dbus-sharp/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -19,18 +19,10 @@ USES=		gmake mono pathfix pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
 
-.include <bsd.port.options.mk>
-
 post-patch:
-.if ${OSVERSION} < 1000044
-# libc.so is a symlink to the right libc.so.X
-	${REINPLACE_CMD} -e 's|libc.so.6|libc.so|' \
-		${WRKSRC}/src/dbus-sharp.dll.config
-.else
 # libc.so is an LD script not usable by dllmap, so we have to set a proper
 # version number.
-	${REINPLACE_CMD} -e 's|libc.so.6|libc.so.7|' \
+	@${REINPLACE_CMD} -e 's|libc.so.6|libc.so.7|' \
 		${WRKSRC}/src/dbus-sharp.dll.config
-.endif
 
 .include <bsd.port.mk>

Modified: head/devel/doxygen/Makefile
==============================================================================
--- head/devel/doxygen/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/doxygen/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -53,15 +53,8 @@ DOCS_PLIST_FILES=	man/man1/doxygen.1.gz 
 DOCS_IMPLIES=		LATEX
 PORTDOCS=		*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
-CMAKE_ARGS+=	-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/PERL_PATH/ s|/usr/bin/perl|${perl_CMD}|' \
 		${WRKSRC}/src/config.xml
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/gputils/Makefile
==============================================================================
--- head/devel/gputils/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/gputils/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -18,11 +18,4 @@ CONFIGURE_ARGS= --disable-dependency-tra
 USES=		bison gmake tar:bz2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*//}
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.35:textproc/flex
-CONFIGURE_ARGS+=LEX=${LOCALBASE}/bin/flex
-.endif
-
 .include <bsd.port.mk>

Modified: head/devel/kf5-kservice/Makefile
==============================================================================
--- head/devel/kf5-kservice/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/kf5-kservice/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -16,10 +16,4 @@ USE_QT5=	buildtools_build core dbus gui 
 # Make the applications.menu file not conflict with KDE4.
 CMAKE_ARGS=	-DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu"
 
-.include <bsd.port.pre.mk>
-# Flex on FreeBSD 9 and older 10 is too old
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/p4web/Makefile
==============================================================================
--- head/devel/p4web/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/p4web/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -13,6 +13,9 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
+# 10.x (and higher) needs compat libs
+LIB_DEPENDS=	libstdc++.so.6:misc/compat9x
+
 ONLY_FOR_ARCHS=	amd64 i386
 
 P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
@@ -32,11 +35,6 @@ USE_RC_SUBR=	p4web
 
 .include <bsd.port.pre.mk>
 
-# 10.x (and higher) needs compat libs
-.if ${OSVERSION} >= 1000054
-LIB_DEPENDS+=	libstdc++.so.6:misc/compat9x
-.endif
-
 # Figure out what to install
 .if ${ARCH} == amd64
 PLATFORM=	freebsd70x86_64

Modified: head/devel/pecl-qb/Makefile
==============================================================================
--- head/devel/pecl-qb/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/devel/pecl-qb/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -18,12 +18,4 @@ USES=		php:ext tar:tgz
 USE_GCC=	any
 IGNORE_WITH_PHP=	70
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libmissing.so:math/libmissing
-CONFIGURE_ARGS=	--with-libmissing=${LOCALBASE}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libmissing
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/dns/getdns/Makefile
==============================================================================
--- head/dns/getdns/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/dns/getdns/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -44,22 +44,14 @@ LIBUV_CONFIGURE_WITH=	libuv
 LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent2
 LIBEVENT_CONFIGURE_WITH=libevent
 
-.include <bsd.port.options.mk>
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 1000000
-CONFIGURE_ARGS+=	--disable-gost
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -Ee 's,^(sharedoc = ).*,\1${WRKDIR}/doc,' \
 		-e '/echo .\*\*\*/d' ${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	(cd ${WRKSRC}/spec/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
-.endif
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgetdns.so.*
 
-.include <bsd.port.post.mk>
+post-install-EXAMPLES-on:
+	(cd ${WRKSRC}/spec/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
+
+.include <bsd.port.mk>

Modified: head/dns/powerdns-recursor/Makefile
==============================================================================
--- head/dns/powerdns-recursor/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/dns/powerdns-recursor/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -54,11 +54,4 @@ USERS=		pdns_recursor
 GROUPS=		pdns
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000 && ${ARCH} == i386
-#BUILD_DEPENDS=		${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
-LDFLAGS+=		-latomic
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/dns/zkt/Makefile
==============================================================================
--- head/dns/zkt/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/dns/zkt/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -13,11 +13,8 @@ COMMENT=		Tool to manage keys and signat
 LICENSE=		BSD3CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 1000055
-BUILD_DEPENDS=	dnssec-signzone:dns/bind99
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-.endif
+BUILD_DEPENDS=		dnssec-signzone:dns/bind99
+RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 DIR_NAMED_CONF?=	/etc/namedb
 GNU_CONFIGURE=		yes
@@ -38,4 +35,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/zkt-ls.8 ${STAGEDIR}${PREFIX}/man/man8/
 	${INSTALL_MAN} ${WRKSRC}/man/zkt-signer.8 ${STAGEDIR}${PREFIX}/man/man8/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/games/opencity/Makefile
==============================================================================
--- head/games/opencity/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/games/opencity/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -27,10 +27,4 @@ PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-USE_GCC=	yes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/math/stp/Makefile
==============================================================================
--- head/math/stp/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/math/stp/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -19,13 +19,4 @@ USES=		bison:build cmake perl5 tar:xz
 USE_PERL5=	build
 CMAKE_ARGS=	-DFL_LIBRARY=/usr/lib/libfl.a
 
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} < 1000000)
-BUILD_DEPENDS+=flex>=2.5.38:textproc/flex
-CMAKE_ARGS+=	-DFL_LIBRARY=${LOCALBASE}/lib/libfl.a \
-		-DFLEX_INCLUDE_DIR=${LOCALBASE}/include/flex \
-		-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-im/jabberd/Makefile
==============================================================================
--- head/net-im/jabberd/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/net-im/jabberd/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -102,7 +102,7 @@ EXPERIMENTAL_DESC=	Enable experimental f
 
 .include <bsd.port.options.mk>
 
-.if (${OPSYS} != FreeBSD || ${OSVERSION} < 1000000)
+.if ${OPSYS} != FreeBSD
 WITH_OPENSSL_PORT=	yes
 .endif
 

Modified: head/net-im/telegram/Makefile
==============================================================================
--- head/net-im/telegram/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/net-im/telegram/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -32,12 +32,6 @@ PLIST_FILES=	bin/telegram-cli \
 		etc/telegram-cli/server.pub
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000024
-USE_GCC=	yes
-.endif
-
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/telegram-cli
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/telegram-cli ${STAGEDIR}${PREFIX}/bin
@@ -46,4 +40,4 @@ do-install:
 	(cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGELOG README-LUA README.es README.md \
 		${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/john/Makefile
==============================================================================
--- head/security/john/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/security/john/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -75,10 +75,6 @@ post-patch:
 BROKEN=		Does not build with openssl-devel
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
-CFLAGS+=	-flax-vector-conversions
-.endif
-
 do-install:
 .for b in ${BINARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/../run/${b} ${STAGEDIR}${PREFIX}/bin

Modified: head/security/softether/Makefile
==============================================================================
--- head/security/softether/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/security/softether/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -12,9 +12,6 @@ COMMENT=	Softether VPN solution
 
 LICENSE=	GPLv2
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 PORTDOCS=	AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT
 DOS2UNIX_FILES=	AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT \
 		WARNING.TXT \
@@ -35,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_OPENSSL=	yes
-USES=		dos2unix gmake iconv:wchar_t ncurses readline
+USES=		dos2unix gmake iconv:wchar_t localbase:ldflags ncurses readline
 USE_RC_SUBR=	softether_bridge softether_client softether_server
 SUB_FILES=	vpncmd
 MAKE_JOBS_UNSAFE=	yes
@@ -47,11 +44,6 @@ ALL_TARGET=	build
 
 .include <bsd.port.options.mk>
 
-# requires OpenSSL from ports
-.if ${OSVERSION} < 1000000
-WITH_OPENSSL_PORT=	yes
-.endif
-
 # skip configure at all and copy the corresponding Makefile in place
 post-extract:
 .if ${ARCH} != "amd64"

Modified: head/sysutils/acpica-tools/Makefile
==============================================================================
--- head/sysutils/acpica-tools/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/sysutils/acpica-tools/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -29,15 +29,8 @@ MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YAC
 BROKEN_aarch64=		Fails to compile: error: comparison of constant -1 with expression of type char is always true
 BROKEN_powerpc64=	Does not build
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1001506
-BUILD_DEPENDS+=	byacc>=20160324_1:devel/byacc
-YACC=		${LOCALBASE}/bin/yacc
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
 	    ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/miller/Makefile
==============================================================================
--- head/textproc/miller/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/textproc/miller/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -20,18 +20,8 @@ PLIST_FILES=	bin/mlr man/man1/mlr.1.gz
 
 BROKEN_aarch64=		Fails to compile: undefined reference to .mcount
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
-.endif
-
 post-configure:
 	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
 	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-	${REINPLACE_CMD} -e 's|flex|${LOCALBASE}/bin/flex|' \
-		${WRKSRC}/c/dsls/Makefile
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/vimb-gtk2/Makefile
==============================================================================
--- head/www/vimb-gtk2/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/www/vimb-gtk2/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -22,18 +22,11 @@ USES=		gmake pkgconfig
 
 CONFLICTS?=	vimb-gtk3-*
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	${MV} ${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-# cc on FreeBSD-9 does not know -Wno-typedef-redefinition
-	${REINPLACE_CMD} -e 's|-Wno-typedef-redefinition|-Wall|' \
-		${WRKSRC}/config.mk
-.endif
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/vimb ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/xpi-u2f4moz/Makefile
==============================================================================
--- head/www/xpi-u2f4moz/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/www/xpi-u2f4moz/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -44,8 +44,4 @@ post-install:
 SYSTEM_PROCESSOR=	x86_64
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-freebsd9
-.endif
-
 .include <bsd.port.post.mk>

Modified: head/x11-toolkits/hs-wxc/Makefile
==============================================================================
--- head/x11-toolkits/hs-wxc/Makefile	Thu Jan  5 10:58:16 2017	(r430630)
+++ head/x11-toolkits/hs-wxc/Makefile	Thu Jan  5 11:00:49 2017	(r430631)
@@ -26,10 +26,6 @@ post-patch::
 
 .if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
 LIB_DEPENDS+=	libc++.so.1:devel/libc++
-
-.if ${OSVERSION} < 1000000
-CONFIGURE_ARGS+=	--extra-include-dirs=${LOCALBASE}/include/c++/v1
-.endif
 .endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701051100.v05B0oY4037219>