From 9c8a649e64872ba3ce9c147de9c6563e7ea759de Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 5 Jan 2017 11:00:49 +0000 Subject: [PATCH] Remove always-true/false conditions after 9.x, 10.[12] EOL While here, couple minor fixes portmgr blanket --- archivers/libarchive/Makefile | 4 ---- archivers/rar/Makefile | 2 +- devel/avro-c/Makefile | 8 +------- devel/babeltrace/Makefile | 19 +------------------ devel/creduce/Makefile | 9 +-------- devel/cvs2svn/Makefile | 10 +++------- devel/datadraw/Makefile | 6 ------ devel/dbus-sharp/Makefile | 10 +--------- devel/doxygen/Makefile | 9 +-------- devel/gputils/Makefile | 7 ------- devel/kf5-kservice/Makefile | 8 +------- devel/p4web/Makefile | 8 +++----- devel/pecl-qb/Makefile | 10 +--------- devel/pecl-qb/files/extra-patch-libmissing | 11 ----------- dns/getdns/Makefile | 16 ++++------------ dns/powerdns-recursor/Makefile | 9 +-------- dns/zkt/Makefile | 9 +++------ games/opencity/Makefile | 8 +------- math/stp/Makefile | 11 +---------- net-im/jabberd/Makefile | 2 +- net-im/telegram/Makefile | 8 +------- security/john/Makefile | 4 ---- security/softether/Makefile | 10 +--------- sysutils/acpica-tools/Makefile | 9 +-------- textproc/miller/Makefile | 12 +----------- www/vimb-gtk2/Makefile | 9 +-------- www/xpi-u2f4moz/Makefile | 4 ---- www/xpi-u2f4moz/files/extra-patch-freebsd9 | 14 -------------- x11-toolkits/hs-wxc/Makefile | 4 ---- 29 files changed, 30 insertions(+), 220 deletions(-) delete mode 100644 devel/pecl-qb/files/extra-patch-libmissing delete mode 100644 www/xpi-u2f4moz/files/extra-patch-freebsd9 diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index d9d0c3cdf8f4..80eb8cbd9377 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -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 \ diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile index 50ee150dea49..ff97dc9a92c8 100644 --- a/archivers/rar/Makefile +++ b/archivers/rar/Makefile @@ -40,7 +40,7 @@ IGNORE= requires a kernel with compiled-in IA32 compatibility .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 diff --git a/devel/avro-c/Makefile b/devel/avro-c/Makefile index c65c0442a179..913ef99b3539 100644 --- a/devel/avro-c/Makefile +++ b/devel/avro-c/Makefile @@ -26,16 +26,10 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME}/lang/c -.include - -.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 +.include diff --git a/devel/babeltrace/Makefile b/devel/babeltrace/Makefile index d92eaadb9bcf..15bbdad9121a 100644 --- a/devel/babeltrace/Makefile +++ b/devel/babeltrace/Makefile @@ -31,33 +31,16 @@ USE_LDCONFIG= yes PORTDOCS= ChangeLog std-ext-lib.txt API.txt lttng-live.txt -.include - -# 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 +.include diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile index 586f7570a99f..adcaa747adb0 100644 --- a/devel/creduce/Makefile +++ b/devel/creduce/Makefile @@ -28,11 +28,4 @@ CONFIGURE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config38 \ USES= autoreconf gmake libtool perl5 -.include - -.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 +.include diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index c26e52d8bec1..07db9ef7838b 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -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_PKGNAMEPREFIX}subversion>=0:devel/py-subversion GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:devel/git BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:devel/bzr -.include - -.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 diff --git a/devel/datadraw/Makefile b/devel/datadraw/Makefile index 29e21632e0d5..2948cae7a95e 100644 --- a/devel/datadraw/Makefile +++ b/devel/datadraw/Makefile @@ -21,14 +21,8 @@ CONFIGURE_ARGS= --prefix=\$${DESTDIR}${PREFIX} OPTIONS_DEFINE= DOCS -.include - -.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} diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile index dd92c89d84de..62ff44dcd767 100644 --- a/devel/dbus-sharp/Makefile +++ b/devel/dbus-sharp/Makefile @@ -19,18 +19,10 @@ USES= gmake mono pathfix pkgconfig USE_GITHUB= yes GH_ACCOUNT= mono -.include - 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 diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 318245561c9b..b94784fbdeb3 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -53,15 +53,8 @@ DOCS_PLIST_FILES= man/man1/doxygen.1.gz \ DOCS_IMPLIES= LATEX PORTDOCS= * -.include - -.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 +.include diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile index 1ba31dec7297..f2f67b4329d0 100644 --- a/devel/gputils/Makefile +++ b/devel/gputils/Makefile @@ -18,11 +18,4 @@ CONFIGURE_ARGS= --disable-dependency-tracking --disable-html-doc USES= bison gmake tar:bz2 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*//} -.include - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=2.5.35:textproc/flex -CONFIGURE_ARGS+=LEX=${LOCALBASE}/bin/flex -.endif - .include diff --git a/devel/kf5-kservice/Makefile b/devel/kf5-kservice/Makefile index c80369484ae4..4f2629b4b462 100644 --- a/devel/kf5-kservice/Makefile +++ b/devel/kf5-kservice/Makefile @@ -16,10 +16,4 @@ USE_QT5= buildtools_build core dbus gui qmake_build xml # Make the applications.menu file not conflict with KDE4. CMAKE_ARGS= -DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu" -.include -# Flex on FreeBSD 9 and older 10 is too old -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -.endif - -.include +.include diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile index ac92708f4ab8..a99f287add26 100644 --- a/devel/p4web/Makefile +++ b/devel/p4web/Makefile @@ -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 -# 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 diff --git a/devel/pecl-qb/Makefile b/devel/pecl-qb/Makefile index cfd73826ec83..4e2af8406c0f 100644 --- a/devel/pecl-qb/Makefile +++ b/devel/pecl-qb/Makefile @@ -18,12 +18,4 @@ USES= php:ext tar:tgz USE_GCC= any IGNORE_WITH_PHP= 70 -.include - -.if ${OSVERSION} < 1000034 -LIB_DEPENDS+= libmissing.so:math/libmissing -CONFIGURE_ARGS= --with-libmissing=${LOCALBASE} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libmissing -.endif - -.include +.include diff --git a/devel/pecl-qb/files/extra-patch-libmissing b/devel/pecl-qb/files/extra-patch-libmissing deleted file mode 100644 index 54ec190c3499..000000000000 --- a/devel/pecl-qb/files/extra-patch-libmissing +++ /dev/null @@ -1,11 +0,0 @@ ---- qb_interpreter_functions.h.orig 2014-12-10 10:54:35.485422703 +0000 -+++ qb_interpreter_functions.h 2014-12-10 10:54:54.694421330 +0000 -@@ -22,6 +22,8 @@ - #ifndef QB_INTERPRETER_FUNCTIONS_H_ - #define QB_INTERPRETER_FUNCTIONS_H_ - -+#include -+ - int qb_compare_ascending_F32(const void *p1, const void *p2); - int qb_compare_ascending_F32_array(const void *p1, const void *p2, const void *p3); - int qb_compare_ascending_F64(const void *p1, const void *p2); diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile index 4219764bb667..4ae98b6d9bf8 100644 --- a/dns/getdns/Makefile +++ b/dns/getdns/Makefile @@ -44,22 +44,14 @@ LIBUV_CONFIGURE_WITH= libuv LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent2 LIBEVENT_CONFIGURE_WITH=libevent -.include - -.include - -.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 +post-install-EXAMPLES-on: + (cd ${WRKSRC}/spec/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) + +.include diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index 9a453858cdd5..d2f21ff737ca 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -54,11 +54,4 @@ USERS= pdns_recursor GROUPS= pdns .endif -.include - -.if ${OSVERSION} < 1000000 && ${ARCH} == i386 -#BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops -LDFLAGS+= -latomic -.endif - -.include +.include diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile index 7784b0275a93..df2e552d5b9f 100644 --- a/dns/zkt/Makefile +++ b/dns/zkt/Makefile @@ -13,11 +13,8 @@ COMMENT= Tool to manage keys and signatures for DNSSEC-zones LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -.include -.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 +.include diff --git a/games/opencity/Makefile b/games/opencity/Makefile index 68c202658469..75bcb752b696 100644 --- a/games/opencity/Makefile +++ b/games/opencity/Makefile @@ -27,10 +27,4 @@ PORTDATA= * OPTIONS_DEFINE= DOCS -.include - -.if ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - -.include +.include diff --git a/math/stp/Makefile b/math/stp/Makefile index ec68840c1f2a..d4503931bf53 100644 --- a/math/stp/Makefile +++ b/math/stp/Makefile @@ -19,13 +19,4 @@ USES= bison:build cmake perl5 tar:xz USE_PERL5= build CMAKE_ARGS= -DFL_LIBRARY=/usr/lib/libfl.a -.include - -.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 +.include diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index f1631a22eb79..b370f667ad8d 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -102,7 +102,7 @@ EXPERIMENTAL_DESC= Enable experimental features (TLS-Everywhere) .include -.if (${OPSYS} != FreeBSD || ${OSVERSION} < 1000000) +.if ${OPSYS} != FreeBSD WITH_OPENSSL_PORT= yes .endif diff --git a/net-im/telegram/Makefile b/net-im/telegram/Makefile index 7f29bd4c5bc9..c738d70f8d3b 100644 --- a/net-im/telegram/Makefile +++ b/net-im/telegram/Makefile @@ -32,12 +32,6 @@ PLIST_FILES= bin/telegram-cli \ etc/telegram-cli/server.pub PORTDOCS= * -.include - -.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 +.include diff --git a/security/john/Makefile b/security/john/Makefile index cc334f2a0c67..7574662b28be 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -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 diff --git a/security/softether/Makefile b/security/softether/Makefile index 97be83a81ea6..c0a2e24ed7b5 100644 --- a/security/softether/Makefile +++ b/security/softether/Makefile @@ -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 -# 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" diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile index 4229b7a6b85b..ce4f70a8704c 100644 --- a/sysutils/acpica-tools/Makefile +++ b/sysutils/acpica-tools/Makefile @@ -29,15 +29,8 @@ MAKE_ARGS+= CC="${CC}" LEX="${FLEX}" YACC="${YACC}" BROKEN_aarch64= Fails to compile: error: comparison of constant -1 with expression of type char is always true BROKEN_powerpc64= Does not build -.include - -.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 +.include diff --git a/textproc/miller/Makefile b/textproc/miller/Makefile index a0c142da8ccb..17aa7445533b 100644 --- a/textproc/miller/Makefile +++ b/textproc/miller/Makefile @@ -20,18 +20,8 @@ PLIST_FILES= bin/mlr man/man1/mlr.1.gz BROKEN_aarch64= Fails to compile: undefined reference to .mcount -.include - -.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 +.include diff --git a/www/vimb-gtk2/Makefile b/www/vimb-gtk2/Makefile index 2d508c6f7578..f194f87ad4a7 100644 --- a/www/vimb-gtk2/Makefile +++ b/www/vimb-gtk2/Makefile @@ -22,18 +22,11 @@ USES= gmake pkgconfig CONFLICTS?= vimb-gtk3-* -.include - 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 +.include diff --git a/www/xpi-u2f4moz/Makefile b/www/xpi-u2f4moz/Makefile index 794a114ed469..78872323f2d3 100644 --- a/www/xpi-u2f4moz/Makefile +++ b/www/xpi-u2f4moz/Makefile @@ -44,8 +44,4 @@ post-install: SYSTEM_PROCESSOR= x86_64 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-freebsd9 -.endif - .include diff --git a/www/xpi-u2f4moz/files/extra-patch-freebsd9 b/www/xpi-u2f4moz/files/extra-patch-freebsd9 deleted file mode 100644 index 943fc47e9397..000000000000 --- a/www/xpi-u2f4moz/files/extra-patch-freebsd9 +++ /dev/null @@ -1,14 +0,0 @@ ---- c_src/CMakeLists.txt.orig 2016-10-27 08:19:19 UTC -+++ c_src/CMakeLists.txt -@@ -57,10 +57,7 @@ ELSEIF(UNIX) - ENDIF(USE_LIBUSB) - SET(TARGET_LOCATION linux_${SYSTEM_PROCESSOR}-gcc3) - ELSE() -- FIND_PACKAGE(PkgConfig) -- PKG_CHECK_MODULES(libusb REQUIRED libusb-1.0) -- LIST(APPEND extra_LIBS ${libusb_LIBRARIES}) -- LIST(APPEND extra_INCLUDES ${libusb_INCLUDE_DIRS}) -+ LIST(APPEND extra_LIBS -lusb) - SET(hidapi_SRC hidapi/hid-linux-libusb.c) - SET(TARGET_LOCATION freebsd_${SYSTEM_PROCESSOR}-gcc3) - ENDIF() diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile index 6758400d47da..47b8550ab27a 100644 --- a/x11-toolkits/hs-wxc/Makefile +++ b/x11-toolkits/hs-wxc/Makefile @@ -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