Date: Mon, 9 Jan 2017 13:16: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: r430947 - in head: archivers/unarchiver audio/csound audio/csound6 audio/optimfrog audio/praat audio/shoutcast audio/sndio benchmarks/fio biology/seqan-apps biology/ugene cad/iverilog c... Message-ID: <201701091316.v09DGo7R086627@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Jan 9 13:16:49 2017 New Revision: 430947 URL: https://svnweb.freebsd.org/changeset/ports/430947 Log: - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL Approved by: portmgr blanket Added: head/devel/cvsd/files/patch-cvsd-buildroot.in - copied unchanged from r430946, head/devel/cvsd/files/extra-cvsd-buildroot.in Deleted: head/databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc head/deskutils/gnote/files/extra-src_base_macros.hpp head/devel/cvsd/files/extra-cvsd-buildroot.in head/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp head/graphics/xfractint/files/pre-1000034-libm-patch head/net/remmina/files/ head/print/lyx/files/extrapatch-src_frontends_qt4_GuiWorkArea.cpp head/x11-toolkits/qt5-gui/files/extrapatch-src_gui_painting_qcolor.cpp head/x11/gnome-terminal/files/extra-src_terminal-screen.c Modified: head/archivers/unarchiver/Makefile head/audio/csound/Makefile head/audio/csound6/Makefile head/audio/optimfrog/Makefile head/audio/praat/Makefile head/audio/shoutcast/Makefile head/audio/sndio/Makefile head/benchmarks/fio/Makefile head/biology/seqan-apps/Makefile head/biology/ugene/Makefile head/cad/iverilog/Makefile head/cad/kicad-devel/Makefile head/comms/gnuradio/Makefile head/comms/gqrx/Makefile head/comms/libsdr-gui/Makefile head/databases/mariadb100-server/Makefile head/databases/mariadb101-server/Makefile head/databases/mariadb55-server/Makefile head/databases/mongodb32-tools/Makefile head/databases/mysql57-server/Makefile head/databases/percona56-server/Makefile head/databases/pg_citus/Makefile head/databases/pgbouncer/Makefile head/databases/pgmodeler/Makefile head/databases/sqlite3/Makefile head/deskutils/gnote/Makefile head/deskutils/owncloudclient/Makefile head/devel/appstream-glib/Makefile head/devel/binutils/Makefile head/devel/caf/Makefile head/devel/cvsd/Makefile head/devel/gdb/Makefile head/devel/libdispatch/Makefile head/devel/libsigrok/Makefile head/devel/libsigrokdecode/Makefile head/devel/qt5-qdoc/Makefile head/ftp/lftp/Makefile head/ftp/vsftpd-ext/Makefile head/games/bunnysay/Makefile head/games/darkplaces/Makefile head/games/pioneer/Makefile head/games/stonesoup/Makefile head/games/ufoai/Makefile head/graphics/hdr_tools/Makefile head/graphics/libGL/Makefile.common head/graphics/libgphoto2/Makefile head/graphics/mitsuba/Makefile head/graphics/ocrad/Makefile head/graphics/pixie/Makefile head/graphics/seexpr/Makefile head/graphics/xfractint/Makefile head/java/openjdk8/Makefile head/mail/alpine/Makefile head/mail/dma/Makefile head/mail/dovecot2/Makefile head/mail/exim/Makefile head/math/hfst/Makefile head/multimedia/ffmpeg0/Makefile head/multimedia/gstreamer-plugins/Makefile head/multimedia/gstreamer/Makefile head/multimedia/gstreamer1-plugins/Makefile head/multimedia/gstreamer1/Makefile head/multimedia/libdvbcsa/Makefile head/multimedia/mkvtoolnix/Makefile head/net-mgmt/ccnet-client/Makefile head/net-mgmt/ccnet-server/Makefile head/net-p2p/twister/Makefile head/net/freeradius3/Makefile head/net/freeradius3/pkg-plist head/net/haproxy-devel/Makefile head/net/ladvd/Makefile head/net/librdkafka/Makefile head/net/pen/Makefile head/net/remmina/Makefile head/news/nzbget/Makefile head/ports-mgmt/synth/Makefile head/print/lyx/Makefile head/security/acme-client/Makefile head/security/fastd/Makefile head/security/hpenc/Makefile head/security/pidgin-otr/Makefile head/security/s2n/Makefile head/security/tor-devel/Makefile head/security/tor/Makefile head/sysutils/e2fsprogs/Makefile head/sysutils/x86info/Makefile head/www/libmicrohttpd/Makefile head/www/mod_auth_gssapi/Makefile head/www/ufdbguard/Makefile head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-intel/Makefile head/x11-toolkits/py-fltk/Makefile head/x11-toolkits/qt5-gui/Makefile head/x11/gnome-terminal/Makefile Modified: head/archivers/unarchiver/Makefile ============================================================================== --- head/archivers/unarchiver/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/archivers/unarchiver/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -31,13 +31,6 @@ PORTEXAMPLES= lsar.bash_completion unar. OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 -CC= clang -CXX= clang++ -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/XADMaster/??ar ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${MANPREFIX}/man/man1 @@ -51,4 +44,4 @@ do-install-EXAMPLES-on: ${INSTALL_DATA} ${WRKSRC}/Extra/??ar.bash_completion \ ${STAGEDIR}${EXAMPLESDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/csound/Makefile ============================================================================== --- head/audio/csound/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/audio/csound/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -105,16 +105,7 @@ DOCS_DISTFILES= Csound${PORTVERSION:R}_ MAKE_ARGS+= Word64=1 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>0:textproc/flex -MAKE_ENV+= PATH=${LOCALBASE}/bin:$$PATH -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054 CXXLIB= c++ -.else -CXXLIB= # empty -.endif BROKEN_powerpc64= Does not build Modified: head/audio/csound6/Makefile ============================================================================== --- head/audio/csound6/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/audio/csound6/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -100,13 +100,6 @@ PULSEAUDIO_DESC= Build PulseAudio I/O mo PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -DUSE_PULSEAUDIO:BOOL=OFF -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e \ '/-O3/s|^|#| ; \ Modified: head/audio/optimfrog/Makefile ============================================================================== --- head/audio/optimfrog/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/audio/optimfrog/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -14,6 +14,8 @@ LICENSE_NAME= OptimFROG - License LICENSE_FILE= ${WRKSRC}/license.html #only available as html LICENSE_PERMS= dist-mirror pkg-mirror auto-accept +RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x + CONFLICTS_INSTALL?= optimfrog-sse2-[0-9]* ONLY_FOR_ARCHS?= amd64 i386 @@ -40,10 +42,6 @@ DISTNAME= OptimFROG_FreeBSD_x86_${DISTVE . endif .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x -.endif - do-install: @(cd ${WRKSRC} && ./install.sh -d ${STAGEDIR}) Modified: head/audio/praat/Makefile ============================================================================== --- head/audio/praat/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/audio/praat/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -19,13 +19,6 @@ USE_GNOME= gtk20 MAKEFILE= makefile PLIST_FILES= bin/praat man/man1/praat.1.gz -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000000 -# Requires std=g++11 -USE_GCC= yes -.endif - post-patch: @${FIND} ${WRKSRC} -name Makefile -exec \ ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' {} \; @@ -46,4 +39,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/shoutcast/Makefile ============================================================================== --- head/audio/shoutcast/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/audio/shoutcast/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -57,13 +57,11 @@ PLIST_FILES+= "@postunexec if [ ! -s ${S .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010 .if ${ARCH} == "i386" RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x .else RUN_DEPENDS+= ${LOCALBASE}/lib32/compat/libstdc++.so.6:misc/compat9x .endif -.endif post-patch: @${REINPLACE_CMD} -e '/sc_serv2 directory/d' \ Modified: head/audio/sndio/Makefile ============================================================================== --- head/audio/sndio/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/audio/sndio/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -17,15 +17,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --man USE_LDCONFIG= yes USE_RC_SUBR= sndiod -.include <bsd.port.pre.mk> - -# FreeBSD 9.x does not have SOCK_CLOEXEC -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -CFLAGS+= -DSOCK_CLOEXEC=0 -.endif - -USERS= _sndio -GROUPS= _sndio +USERS= _sndio +GROUPS= _sndio # Parallel build leads to problems, but sndio is very quick to compile # as is so not worth fixing @@ -38,4 +31,4 @@ post-install: ${STAGEDIR}${PREFIX}/bin/aucat \ ${STAGEDIR}${PREFIX}/bin/midicat -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/benchmarks/fio/Makefile ============================================================================== --- head/benchmarks/fio/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/benchmarks/fio/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -18,16 +18,6 @@ GNUPLOT_DESC= Support for plotting graph GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:math/gnuplot -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000013 -BUILD_DEPENDS+= byacc>0:devel/byacc -MAKE_ARGS+= YACC=${LOCALBASE}/bin/yacc - -BUILD_DEPENDS+= flex>0:textproc/flex -MAKE_ARGS+= LEX=${LOCALBASE}/bin/flex -.endif - BROKEN_powerpc64= Does not build on powerpc64 do-install: Modified: head/biology/seqan-apps/Makefile ============================================================================== --- head/biology/seqan-apps/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/biology/seqan-apps/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -28,16 +28,6 @@ USE_GCC= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 -post-patch: - # missing C99 functions in FreeBSD's math.h, use C++ instead - @${REINPLACE_CMD} -e 's|expl(|std::exp(|g' ${WRKSRC}/apps/snp_store/snp_store.h - @${REINPLACE_CMD} -e 's|logl(|std::log(|g' ${WRKSRC}/apps/snp_store/snp_store.h - # the other way around (use math.h instead of cmath) - @${REINPLACE_CMD} -e 's|std::round|round|g' ${WRKSRC}/apps/yara/mapper_writer.h - @${REINPLACE_CMD} -e 's|std::erfc|erfc|g' ${WRKSRC}/apps/yara/bits_matches.h -.endif - .if ${ARCH} == "i386" PLIST_SUB+= RM_I386="@comment " .else Modified: head/biology/ugene/Makefile ============================================================================== --- head/biology/ugene/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/biology/ugene/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -31,6 +31,9 @@ QMAKE_ARGS= INSTALL_PREFIX="${PREFIX}" U LUPDATE="${LUPDATE}" ALL_TARGET= release +# Required for Google Test code +CXXFLAGS+= -std=c++11 + DOCSDIR= ${DATADIR}/manuals OPTIONS_DEFINE= DOCS @@ -38,11 +41,6 @@ DOCS_DESC= Install official UGENE docume .include <bsd.port.pre.mk> -# Required for Google Test code -.if ${OSVERSION} > 1000054 -CXXFLAGS+= -std=c++11 -.endif - .if ${ARCH} == amd64 # XXX: need to manually tell the build we are on x64 QMAKE_ARGS+= CONFIG+=x64 Modified: head/cad/iverilog/Makefile ============================================================================== --- head/cad/iverilog/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/cad/iverilog/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -13,17 +13,9 @@ COMMENT= Verilog simulation and synthesi LICENSE= GPLv2 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-suffix USES= bison gmake MAKE_JOBS_UNSAFE= yes -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=0:textproc/flex -CONFIGURE_ENV+= ac_cv_prog_LEX="${LOCALBASE}/bin/flex" -.endif - -CONFIGURE_ARGS= --disable-suffix - .include <bsd.port.mk> Modified: head/cad/kicad-devel/Makefile ============================================================================== --- head/cad/kicad-devel/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/cad/kicad-devel/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -184,10 +184,8 @@ PLIST_SHAREDDIR_LIST= share/mimelnk/appl .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 1000000 || ${CHOSEN_COMPILER_TYPE} == gcc - IGNORE= builds only on greater than 10 and with clang -.endif +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc +IGNORE= builds only with clang .endif .include <bsd.port.post.mk> Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/comms/gnuradio/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -102,9 +102,6 @@ TESTING_BUILD_DEPENDS= cppunit-config:de LIBSTRIP_FILES+= uhd LIB_DEPENDS+= libuhd.so:comms/uhd .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif PATCH_FILES= docs/doxygen/Doxyfile.in \ gr-fec/lib/CMakeLists.txt Modified: head/comms/gqrx/Makefile ============================================================================== --- head/comms/gqrx/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/comms/gqrx/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -43,11 +43,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gqrx.desktop \ ${STAGEDIR}${PREFIX}/share/applications -.include <bsd.port.pre.mk> - -# Chase comms/gnuradio compiler choice -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/comms/libsdr-gui/Makefile ============================================================================== --- head/comms/libsdr-gui/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/comms/libsdr-gui/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -23,10 +23,4 @@ USE_QT5= core buildtools_build qmake wid USES= cmake pkgconfig USE_LDCONFIG= yes -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/mariadb100-server/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -139,7 +139,7 @@ post-install: .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 +.if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" @@ -151,7 +151,7 @@ NOT_FOR_ARCHS_REASON= TokuDB not suppo https://github.com/percona/PerconaFT/blob/master/README.md .endif -.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 +.if ${ARCH} == 'i386' # Server segfaults on i386 when built with clang >= 3.4 USE_GCC= yes .endif Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/mariadb101-server/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -154,14 +154,7 @@ IGNORE= BASE_GSSAPI is not compatible w .endif .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" -. else -CMAKE_ARGS+= -DWITH_JEMALLOC="no" -. if ${PORT_OPTIONS:MGSSAPI_BASE} -IGNORE= requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option -. endif -. endif .endif post-patch: Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/mariadb55-server/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -108,14 +108,14 @@ MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra- .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 +.if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif # Server segfaults on i386 when built with clang >= 3.4 -.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 +.if ${ARCH} == 'i386' USE_GCC= yes .endif Modified: head/databases/mongodb32-tools/Makefile ============================================================================== --- head/databases/mongodb32-tools/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/mongodb32-tools/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -39,13 +39,6 @@ MAKE_ENV= GOPATH="${WRKSRC}/.gopath:${WR USES= localbase MY_TAGS= -tags "${USE_MY_TAGS}" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000000 -# Cannot be built -IGNORE= unsupported on FreeBSD 9 or older -.endif - post-patch: @cd ${WRKSRC} ; ${MKDIR} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT} ; \ ${LN} -sf ${WRKSRC} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} @@ -68,4 +61,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/mysql57-server/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -129,15 +129,6 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif -.include <bsd.port.options.mk> - -### Just for the sake of FreeBSD 9.X ### -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -. if !defined(CLIENT_ONLY) -EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc -. endif -.endif - .include <bsd.port.pre.mk> .if ${SSL_DEFAULT} == base Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/percona56-server/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -105,11 +105,6 @@ BROKEN= Does not compile on arm NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md - -.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 -IGNORE= unsupported on FreeBSD 9 or older -.endif - .endif .include <bsd.port.post.mk> Modified: head/databases/pg_citus/Makefile ============================================================================== --- head/databases/pg_citus/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/pg_citus/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -22,11 +22,4 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip MAKE_ARGS= INSTALL="${INSTALL} -c" -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -MAKE_ARGS+= FLEX=${LOCALBASE}/bin/flex -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/pgbouncer/Makefile ============================================================================== --- head/databases/pgbouncer/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/pgbouncer/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -41,12 +41,6 @@ PLIST_SUB+= PGBOUNCER_USER="${USERS}" \ PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - post-patch: @${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \ -e "s|= pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \ Modified: head/databases/pgmodeler/Makefile ============================================================================== --- head/databases/pgmodeler/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/pgmodeler/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -33,10 +33,4 @@ pre-install: post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/tests -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000 -USE_GCC= yes -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/sqlite3/Makefile ============================================================================== --- head/databases/sqlite3/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/databases/sqlite3/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -197,10 +197,7 @@ UNKNOWN_SQL_CPPFLAGS= -DSQLITE_ENABLE_UN .if !defined(WITH_DEBUG) CFLAGS+= -Os .endif -CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000029) -CPPFLAGS+= -DHAVE_STRCHRNUL=1 -.endif +CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -DHAVE_STRCHRNUL=1 post-configure: @${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}" Modified: head/deskutils/gnote/Makefile ============================================================================== --- head/deskutils/gnote/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/deskutils/gnote/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -39,12 +39,6 @@ DOCS= AUTHORS ChangeLog NEWS README TOD PLIST_SUB+= VERSION=${PORTVERSION} -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES= ${FILESDIR}/extra-src_base_macros.hpp -.endif - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} Modified: head/deskutils/owncloudclient/Makefile ============================================================================== --- head/deskutils/owncloudclient/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/deskutils/owncloudclient/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -40,7 +40,7 @@ PLIST_SUB= VERSION=${PORTVERSION} .include <bsd.port.options.mk> -.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015 +.if ${OPSYS} != FreeBSD WITH_OPENSSL_PORT= yes # CMake 3.3.x will use $PATH when looking for headers and libraries by default, Modified: head/devel/appstream-glib/Makefile ============================================================================== --- head/devel/appstream-glib/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/appstream-glib/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -44,12 +44,4 @@ MANPAGE_BUILD_DEPENDS= docbook-xml>=0:te docbook-xsl>=0:textproc/docbook-xsl MANPAGES_USE= GNOME=libxslt:build -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000000 && ${OPSYS} == FreeBSD -post-patch: - ${REINPLACE_CMD} -e 's|-Wtype-limits||g' \ - ${WRKSRC}/configure -.endif - .include <bsd.port.mk> Modified: head/devel/binutils/Makefile ============================================================================== --- head/devel/binutils/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/binutils/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -82,10 +82,6 @@ PLIST_SUB+= GOLD="" PLIST_SUB+= GOLD="@comment " .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -CONFIGURE_ARGS+= --disable-initfini-array -.endif - .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else Modified: head/devel/caf/Makefile ============================================================================== --- head/devel/caf/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/caf/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -51,15 +51,4 @@ LOG_LEVEL_INFO_CMAKE_ON= -DCAF_LOG_LEVEL LOG_LEVEL_DEBUG_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=3 LOG_LEVEL_TRACE_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=4 -.include <bsd.port.options.mk> - -regression-test: test - -.if ${OSVERSION} < 1001000 -# require clang & libc++ -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34 \ - ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib -.endif - .include <bsd.port.mk> Modified: head/devel/cvsd/Makefile ============================================================================== --- head/devel/cvsd/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/cvsd/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -12,7 +12,8 @@ COMMENT= CVS pserver daemon LICENSE= GPLv2 -EXTRA_PATCHES= ${FILESDIR}/extra-cvsd-buildroot.in +BUILD_DEPENDS= cvs:devel/cvs +RUN_DEPENDS= cvs:devel/cvs USE_RC_SUBR= cvsd USES= perl5 @@ -25,13 +26,6 @@ OPTIONS_DEFINE= DOCS PORTDOCS= FAQ NEWS README -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -BUILD_DEPENDS+= cvs:devel/cvs -RUN_DEPENDS+= cvs:devel/cvs -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${STAGEDIR}${PREFIX}/sbin/cvsd .for f in cvsd-buginfo cvsd-buildroot cvsd-passwd @@ -46,4 +40,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Copied: head/devel/cvsd/files/patch-cvsd-buildroot.in (from r430946, head/devel/cvsd/files/extra-cvsd-buildroot.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cvsd/files/patch-cvsd-buildroot.in Mon Jan 9 13:16:49 2017 (r430947, copy of r430946, head/devel/cvsd/files/extra-cvsd-buildroot.in) @@ -0,0 +1,42 @@ +--- cvsd-buildroot.in.orig Thu Jun 1 23:57:20 2006 ++++ cvsd-buildroot.in Tue Jun 6 11:38:57 2006 +@@ -212,39 +212,6 @@ + fi + done + +-# populate /dev (need root privileges for this) +-echo $ECHO_N "creating $ROOT/dev devices... $ECHO_C" +-DEVICES="null zero" +-MISSINGDEVS="" +-for d in $DEVICES +-do +- if [ -r "$ROOT/dev/$d" ] +- then +- : +- else +- MISSINGDEVS="$MISSINGDEVS $d" +- fi +-done +-if [ -n "`echo $MISSINGDEVS`" ] +-then +- if (cd /dev ; tar chpf - $MISSINGDEVS) | \ +- ( cd "$ROOT/dev" ; tar xpf - > /dev/null 2>&1 ) +- then +- # check if we can use the devices +- if ( echo TEST > "$ROOT/dev/null" && \ +- echo TEST > "$ROOT/dev/zero" ) 2> /dev/null +- then +- echo "done." +- else +- echo "FAILED (unable to use devices)" +- fi +- else +- echo "FAILED." +- fi +-else +- echo "already there." +-fi +- + # update /etc/passwd + echo $ECHO_N "adding users to $ROOT/etc/passwd...$ECHO_C" + for i in $USERS Modified: head/devel/gdb/Makefile ============================================================================== --- head/devel/gdb/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/gdb/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -69,15 +69,8 @@ TUI_CONFIGURE_ENABLE= tui .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000010 -# FreeBSD 9.x and earlier do not define SIGLIBRT in <sys/signal.h> -CFLAGS+= -DSIGLIBRT=33 -.endif - -.if ${OSVERSION} > 1000010 # The option -Wno-extended-offsetof is supported by clang only CFLAGS+= -Wno-extended-offsetof -.endif .if ! ${PORT_OPTIONS:MBUNDLED_READLINE} EXCLUDE+= readline Modified: head/devel/libdispatch/Makefile ============================================================================== --- head/devel/libdispatch/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/libdispatch/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -76,19 +76,6 @@ _MAN3= dispatch.3 \ dispatch_walltime.3 PLIST_FILES+= ${_MAN3:S|^|man/man3/|:S|$|.gz|} -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 1000024) -OPTIONS_DEFINE= CLANG -OPTIONS_DEFAULT= CLANG -CLANG_DESC= Build with LLVM/Clang (required for blocks support) -.endif - -.if ${PORT_OPTIONS:MCLANG} -CONFIGURE_ARGS+= --with-blocks-runtime=/usr/lib -CONFIGURE_ENV+= CC="/usr/bin/clang" -.endif - # # Get rid of .la and static library files # @@ -97,4 +84,4 @@ post-configure: '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/libsigrok/Makefile ============================================================================== --- head/devel/libsigrok/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/libsigrok/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -28,11 +28,4 @@ post-patch: -e '/\*freebsd\*/,/;;/d' \ ${WRKSRC}/configure -.include <bsd.port.pre.mk> - -# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION -.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) -CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/libsigrokdecode/Makefile ============================================================================== --- head/devel/libsigrokdecode/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/libsigrokdecode/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -19,11 +19,4 @@ MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION -.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) -CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/qt5-qdoc/Makefile ============================================================================== --- head/devel/qt5-qdoc/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/devel/qt5-qdoc/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -17,10 +17,4 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_qdoc_qdocindexfiles.cpp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/ftp/lftp/Makefile ============================================================================== --- head/ftp/lftp/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/ftp/lftp/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -47,15 +47,6 @@ GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENSSL} -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} -. endif -.endif - post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/lftp.conf \ ${STAGEDIR}${PREFIX}/etc/lftp.conf.sample Modified: head/ftp/vsftpd-ext/Makefile ============================================================================== --- head/ftp/vsftpd-ext/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/ftp/vsftpd-ext/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -38,15 +38,6 @@ CONFLICTS= vsftpd-3* vsftpd${SSL_SUFFIX} .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -.if exists(/usr/bin/clang) -CC= clang -.else -BUILD_DEPENDS+= clang33:lang/clang33 -CC= clang33 -.endif -.endif - .if ${PORT_OPTIONS:MRC_SCRIPT} USE_RC_SUBR= vsftpd .endif Modified: head/games/bunnysay/Makefile ============================================================================== --- head/games/bunnysay/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/games/bunnysay/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -20,16 +20,7 @@ GH_ACCOUNT= co60ca PLIST_FILES= bin/bunnysay -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -LIB_DEPENDS+= libc++.so.1:devel/libc++ -CFLAGS+= -isystem${LOCALBASE}/include/c++/v1 -CXXFLAGS+= -isystem${LOCALBASE}/include/c++/v1 -LDFLAGS+= -L${LOCALBASE}/lib/c++ -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/darkplaces/Makefile ============================================================================== --- head/games/darkplaces/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/games/darkplaces/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -41,10 +41,6 @@ SERVER_DESC= Build dedicated server .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -USE_GCC= yes # internal compiler error on base gcc -.endif - .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDL} USE_GL= glu PLIST_SUB+= CLIENT="" Modified: head/games/pioneer/Makefile ============================================================================== --- head/games/pioneer/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/games/pioneer/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -80,10 +80,6 @@ CXXFLAGS+= -D_GLIBCXX_USE_C99 post-patch: .SILENT ${REINPLACE_CMD} -e '/^OPTIMISE=/d' \ ${WRKSRC}/configure.ac -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 - ${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \ - ${WRKSRC}/src/Orbit.cpp -.endif post-patch-MODELCOMPILER-off: .SILENT ${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \ Modified: head/games/stonesoup/Makefile ============================================================================== --- head/games/stonesoup/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/games/stonesoup/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -74,12 +74,6 @@ LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes CFLAGS+= -D_GLIBCXX_USE_C99 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -MAKE_ARGS+= NO_YACC=YesPlease -CFLAGS+= -std=c++11 -LDFLAGS:= -Wl,-rpath=${_GCC_RUNTIME} ${LDFLAGS} -.endif - post-patch-SOUND-on: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h @${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h Modified: head/games/ufoai/Makefile ============================================================================== --- head/games/ufoai/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/games/ufoai/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -79,10 +79,6 @@ CONFIGURE_ARGS+=--disable-uforadiant PLIST_SUB+= UFORADIANT="@comment " .endif -.if ${OSVERSION} < 1000024 -FAVORITE_COMPILER= gcc -.endif - .include <bsd.port.pre.mk> post-extract: Modified: head/graphics/hdr_tools/Makefile ============================================================================== --- head/graphics/hdr_tools/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/hdr_tools/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -36,11 +36,6 @@ CXXFLAGS+= -msse2 -mfpmath=sse CXXFLAGS+= -fopenmp .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034 -LIB_DEPENDS+= libml.so:math/ldouble -LDFLAGS+= -lml -.endif - post-patch: @${REINPLACE_CMD} -e 's,RGBColorspace,s&,' ${WRKSRC}/image.cc Modified: head/graphics/libGL/Makefile.common ============================================================================== --- head/graphics/libGL/Makefile.common Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/libGL/Makefile.common Mon Jan 9 13:16:49 2017 (r430947) @@ -46,11 +46,6 @@ PKGDEINSTALL= ${.CURDIR}/pkg-deinstall PORTSCOUT= ignore:1 .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex -.endif - python_OLD_CMD= "/usr/bin/env[[:space:]]python" python_CMD= ${LOCALBASE}/bin/python2 SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ Modified: head/graphics/libgphoto2/Makefile ============================================================================== --- head/graphics/libgphoto2/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/libgphoto2/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -45,8 +45,6 @@ NLS_CONFIGURE_ENABLE= nls XML_USE= GNOME=libxml2 XML_CONFIGURE_OFF= --with-libxml-2.0=no -.include <bsd.port.options.mk> - post-patch: .for i in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ Modified: head/graphics/mitsuba/Makefile ============================================================================== --- head/graphics/mitsuba/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/mitsuba/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -39,16 +39,6 @@ MAKE_JOBS_UNSAFE= yes HG_REVISION= 11ee1d7236f3 FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} -.include <bsd.port.pre.mk> - -# Unfortunately, the code is not GCC 4.2.1 compatible (due to bugs in GCC -# itself). Use system compiler if it is Clang. -.if ${OSVERSION} < 1000024 -CC= clang -CXX= clang++ -CPP= clang-cpp -.endif - post-patch: @${REINPLACE_CMD} -e '/CMAKE_SYSTEM_NAME/s,Linux,${OPSYS},' \ ${WRKSRC}/data/cmake/MitsubaExternal.cmake \ @@ -61,4 +51,4 @@ post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles/ior_database.dir @${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/ocrad/Makefile ============================================================================== --- head/graphics/ocrad/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/ocrad/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -22,15 +22,6 @@ PLIST_FILES= bin/${PORTNAME} man/man1/oc OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000024 -EXTRACT_DEPENDS= lzip:archivers/lzip -EXTRACT_CMD= ${LOCALBASE}/bin/lzip -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 Modified: head/graphics/pixie/Makefile ============================================================================== --- head/graphics/pixie/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/pixie/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -46,13 +46,6 @@ BROKEN_sparc64= Does not compile on spa OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g ; \ s|-lpthread|-pthread|g' ${WRKSRC}/configure @@ -63,7 +56,7 @@ post-patch: ${WRKSRC}/src/ri/Makefile.in \ ${WRKSRC}/src/sdr/Makefile.in -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog DEVNOTES NEWS \ README ${STAGEDIR}${DOCSDIR}) Modified: head/graphics/seexpr/Makefile ============================================================================== --- head/graphics/seexpr/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/seexpr/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -27,19 +27,8 @@ CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DUSE_SSE41:BOOL=ON .endif -.include <bsd.port.pre.mk> - -# base flex(1) v2.5.4 is not sufficient -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -.endif - post-patch: @${REINPLACE_CMD} -e '/<alloca\.h>/d' ${WRKSRC}/src/SeExpr/SePlatform.h @${REINPLACE_CMD} -e 's, "dl",,' ${WRKSRC}/src/SeExpr/CMakeLists.txt -.if ${OSVERSION} < 1000033 - @${REINPLACE_CMD} -e '/COMMAND/s,flex,${LOCALBASE}/bin/&,' \ - ${WRKSRC}/src/build/macros.cmake -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/xfractint/Makefile ============================================================================== --- head/graphics/xfractint/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/graphics/xfractint/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -17,12 +17,6 @@ ALL_TARGET= ${PORTNAME} DESKTOP_ENTRIES= "Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000034 -EXTRA_PATCHES= ${FILESDIR}/pre-1000034-libm-patch -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man \ @@ -34,4 +28,4 @@ do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/java/openjdk8/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -351,11 +351,6 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/ . endif .endif -# PR193009: work around the rtld bug -.if ${OSVERSION} < 1001511 -CONFIGURE_ARGS+= --enable-static-libjli -.endif - .if ${COMPILER_TYPE} == clang .if ${COMPILER_VERSION} >= 35 MAKE_ENV+= COMPILER_WARNINGS_FATAL=false Modified: head/mail/alpine/Makefile ============================================================================== --- head/mail/alpine/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/mail/alpine/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -61,10 +61,6 @@ MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCC .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes -.if ${OSVERSION} < 1000000 -# OpenSSL is pre v1.0 in FBSD9.x so the ports version needs to be used -WITH_OPENSSL_PORT= yes -.endif CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \ --with-ssl-include-dir=${OPENSSLINC} \ Modified: head/mail/dma/Makefile ============================================================================== --- head/mail/dma/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/mail/dma/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -53,9 +53,6 @@ post-patch: ${WRKSRC}/dma.conf @${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN/NO_MAN/' \ ${WRKSRC}/bsd/dma-mbox-create/Makefile -.if ${OSVERSION} < 1000013 - @${REINPLACE_CMD} -e 's,^YFLAGS.*,,' ${WRKSRC}/bsd/dma/Makefile -.endif post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Mon Jan 9 13:16:26 2017 (r430946) +++ head/mail/dovecot2/Makefile Mon Jan 9 13:16:49 2017 (r430947) @@ -132,18 +132,9 @@ LDAP_VARS= _REQUIRE+=slapd MYSQL_VARS= _REQUIRE+=mysql PGSQL_VARS= _REQUIRE+=postgresql -.include <bsd.port.options.mk> - SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701091316.v09DGo7R086627>