Date: Thu, 12 Jan 2017 11:30: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: r431251 - in head: emulators/dynamips-community graphics/libGL mail/archiveopteryx mail/archiveopteryx-devel misc/dnetc multimedia/libtuner multimedia/mplayer multimedia/mplayer/files n... Message-ID: <201701121130.v0CBUo1f025606@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Jan 12 11:30:50 2017 New Revision: 431251 URL: https://svnweb.freebsd.org/changeset/ports/431251 Log: - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL Approved by: portmgr blanket Added: head/multimedia/mplayer/files/patch-aligned_alloc - copied unchanged from r431250, head/multimedia/mplayer/files/extra-patch-aligned_alloc Deleted: head/multimedia/mplayer/files/extra-patch-aligned_alloc Modified: head/emulators/dynamips-community/Makefile head/graphics/libGL/Makefile.common head/mail/archiveopteryx-devel/Makefile head/mail/archiveopteryx/Makefile head/misc/dnetc/Makefile head/misc/dnetc/distinfo.amd64 head/misc/dnetc/distinfo.i386 head/multimedia/libtuner/Makefile head/multimedia/mplayer/Makefile.options head/net-mgmt/nagios-plugins/Makefile head/net-mgmt/rancid3/Makefile head/www/opera/Makefile head/www/opera/pkg-plist Modified: head/emulators/dynamips-community/Makefile ============================================================================== --- head/emulators/dynamips-community/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/emulators/dynamips-community/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -39,7 +39,7 @@ PORTDOCS= * DYNAMIPS_CODE= stable -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +.if ${OPSYS} == FreeBSD DYNAMIPS_ARCH= nojit .endif Modified: head/graphics/libGL/Makefile.common ============================================================================== --- head/graphics/libGL/Makefile.common Thu Jan 12 11:29:47 2017 (r431250) +++ head/graphics/libGL/Makefile.common Thu Jan 12 11:30:50 2017 (r431251) @@ -91,8 +91,8 @@ CONFIGURE_ARGS+= --enable-gles2 # Clover (OpenCL). .if ${OPSYS} == DragonFly || \ (${OPSYS} == FreeBSD && \ - (${OSVERSION} >= 1001000 && ${ARCH} == amd64 || \ - ${OSVERSION} >= 1001000 && ${ARCH} == i386)) + (${ARCH} == amd64 || \ + ${ARCH} == i386)) BUILD_DEPENDS+= libclc>=0.0.r222830:devel/libclc Modified: head/mail/archiveopteryx-devel/Makefile ============================================================================== --- head/mail/archiveopteryx-devel/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/mail/archiveopteryx-devel/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -42,8 +42,8 @@ JAM?= ${LOCALBASE}/bin/jam .include <bsd.port.pre.mk> -# force Clang when on FreeBSD 10+ -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +# force Clang when on FreeBSD +.if ${OPSYS} == FreeBSD JAMARG= "-sCLANG=1" .endif Modified: head/mail/archiveopteryx/Makefile ============================================================================== --- head/mail/archiveopteryx/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/mail/archiveopteryx/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -35,8 +35,8 @@ JAM?= ${LOCALBASE}/bin/jam .include <bsd.port.pre.mk> -# force Clang when on FreeBSD 10+ -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +# force Clang when on FreeBSD +.if ${OPSYS} == FreeBSD JAMARG= "-sCLANG=1" .endif Modified: head/misc/dnetc/Makefile ============================================================================== --- head/misc/dnetc/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/misc/dnetc/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -36,32 +36,14 @@ SUB_LIST= BINDIR="${BINDIR}" .include <bsd.port.pre.mk> .if ${ARCH} == i386 -.if ${OSVERSION} >= 900044 VERSION= 2.9112.521 DISTNAME= dnetc${PORTVERSION:E}-freebsd9-${ARCH:S/i386/x86/} WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd9-${ARCH:S/i386/x86/} -.else -VERSION= 2.9110.519 -REVISION= 1 -DISTNAME= dnetc${PORTVERSION:E}-freebsd8-${ARCH:S/i386/x86/} -WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH:S/i386/x86/} -.endif .elif ${ARCH} == amd64 -.if ${OSVERSION} >= 1000100 VERSION= 2.9112.521 DISTNAME= dnetc${PORTVERSION:E}-freebsd10-${ARCH} WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd10-${ARCH} -.elif ${OSVERSION} >= 900044 -VERSION= 2.9112.521 -DISTNAME= dnetc${PORTVERSION:E}-freebsd9-${ARCH} -WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd9-${ARCH} -.else -VERSION= 2.9110.519 -REVISION= 1 -DISTNAME= dnetc${PORTVERSION:E}-freebsd8-${ARCH} -WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH} -.endif .elif ${ARCH} == sparc64 VERSION= 2.9109.518 @@ -77,9 +59,9 @@ WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E} .endif do-install: - ${MKDIR} ${STAGEDIR}${BINDIR} + @${MKDIR} ${STAGEDIR}${BINDIR} ${INSTALL_PROGRAM} ${WRKSRC}/dnetc ${STAGEDIR}${BINDIR} ${INSTALL_MAN} ${WRKSRC}/dnetc.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL} -c -m 644 ${FILESDIR}/dnetc.ini ${STAGEDIR}${BINDIR}/dnetc.ini.sample + ${INSTALL_DATA} ${FILESDIR}/dnetc.ini ${STAGEDIR}${BINDIR}/dnetc.ini.sample .include <bsd.port.post.mk> Modified: head/misc/dnetc/distinfo.amd64 ============================================================================== --- head/misc/dnetc/distinfo.amd64 Thu Jan 12 11:29:47 2017 (r431250) +++ head/misc/dnetc/distinfo.amd64 Thu Jan 12 11:30:50 2017 (r431251) @@ -1,7 +1,3 @@ TIMESTAMP = 1466708223 -SHA256 (dnetc519-freebsd8-amd64.tar.gz) = bb30f76586be582637554467bc62c9f7f8cfe0fe781ab5ddcccbafc5b0998ca3 -SIZE (dnetc519-freebsd8-amd64.tar.gz) = 902150 -SHA256 (dnetc521-freebsd9-amd64.tar.gz) = 8a64046f1f153cd33a7ee6594a17409e654ca3e2b6375ae363b95f58597fccf3 -SIZE (dnetc521-freebsd9-amd64.tar.gz) = 989120 SHA256 (dnetc521-freebsd10-amd64.tar.gz) = 05ac1de9a1660f9f241fb616d35f0c294b26d1485152033bcc1adf9e545b71de SIZE (dnetc521-freebsd10-amd64.tar.gz) = 1063731 Modified: head/misc/dnetc/distinfo.i386 ============================================================================== --- head/misc/dnetc/distinfo.i386 Thu Jan 12 11:29:47 2017 (r431250) +++ head/misc/dnetc/distinfo.i386 Thu Jan 12 11:30:50 2017 (r431251) @@ -1,5 +1,3 @@ TIMESTAMP = 1466708294 SHA256 (dnetc521-freebsd9-x86.tar.gz) = 45f210311bdff7a898b14404fe9683dfe5e4246d97ae3cb68b9e62bd4f45593c SIZE (dnetc521-freebsd9-x86.tar.gz) = 909376 -SHA256 (dnetc519-freebsd8-x86.tar.gz) = 7f79fa206e43fbf17637124802993909d198c1150c9bfaf3f4c82eefd408fffb -SIZE (dnetc519-freebsd8-x86.tar.gz) = 897231 Modified: head/multimedia/libtuner/Makefile ============================================================================== --- head/multimedia/libtuner/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/multimedia/libtuner/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libtuner -PORTVERSION= 1.1.3 +PORTVERSION= 1.1.3 CATEGORIES= multimedia MASTER_SITES= ftp://corona.homeunix.net/ports/libtuner/ @@ -13,12 +13,7 @@ LICENSE= BSD2CLAUSE MIT LICENSE_COMB= multi MAKE_ARGS+= INSTALLDIR=${STAGEDIR}${PREFIX} +MAKE_ARGS+= -D LIBTUNER_ENABLE_IIC USE_LDCONFIG= ${PREFIX}/lib/libtuner -.include <bsd.port.options.mk> - -.if (${OSVERSION} >= 1002502) -MAKE_ARGS+= -D LIBTUNER_ENABLE_IIC -.endif - .include <bsd.port.mk> Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Thu Jan 12 11:29:47 2017 (r431250) +++ head/multimedia/mplayer/Makefile.options Thu Jan 12 11:30:50 2017 (r431251) @@ -41,11 +41,6 @@ DEFAULT_KERN_HZ=1024 # Build system handling (including OPTIONS) # ========================================= -# Support for aligned_alloc -.if ${OSVERSION} >= 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aligned_alloc -.endif - .if ${CHOSEN_COMPILER_TYPE} == clang EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version # Require 16 byte stack realignment on i386 to interface Copied: head/multimedia/mplayer/files/patch-aligned_alloc (from r431250, head/multimedia/mplayer/files/extra-patch-aligned_alloc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-aligned_alloc Thu Jan 12 11:30:50 2017 (r431251, copy of r431250, head/multimedia/mplayer/files/extra-patch-aligned_alloc) @@ -0,0 +1,27 @@ +--- configure.orig 2014-12-17 22:02:44.000000000 +0100 ++++ configure 2015-03-28 13:56:41.340987552 +0100 +@@ -3798,17 +3808,17 @@ + echores "$aligned_malloc" + + +-echocheck "memalign()" ++echocheck "aligned_alloc()" + # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? +-def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' ++def_memalign='#define HAVE_MEMALIGN 0' + _memalign=no +-statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes ++statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes + if test "$_memalign" = yes ; then +- def_memalign='#define HAVE_MEMALIGN 1' ++ def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)' ++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' + else +- def_memalign='#define HAVE_MEMALIGN 0' + def_map_memalign='#define memalign(a, b) malloc(b)' +- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' ++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' + fi + echores "$_memalign" + + Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/net-mgmt/nagios-plugins/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -138,7 +138,7 @@ SSH_PORTABLE_CONFIGURE_ON= --with-ssh-co .include <bsd.port.options.mk> -.if ${OSVERSION} > 1000055 && ${PORT_OPTIONS:MDNS_BASE} +.if ${PORT_OPTIONS:MDNS_BASE} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \ ac_cv_path_PATH_TO_NSLOOKUP= Modified: head/net-mgmt/rancid3/Makefile ============================================================================== --- head/net-mgmt/rancid3/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/net-mgmt/rancid3/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -53,9 +53,7 @@ CONFIGURE_ARGS+= --with-svn BUILD_DEPENDS+= svn:devel/subversion .else CONFIGURE_ARGS+= --without-svn -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -RUN_DEPENDS+= cvs>0:devel/cvs -.endif +RUN_DEPENDS+= cvs:devel/cvs .endif pre-everything:: Modified: head/www/opera/Makefile ============================================================================== --- head/www/opera/Makefile Thu Jan 12 11:29:47 2017 (r431250) +++ head/www/opera/Makefile Thu Jan 12 11:30:50 2017 (r431251) @@ -18,7 +18,8 @@ COMMENT= Blazingly fast, full-featured, LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -BUILD_DEPENDS= ${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info +BUILD_DEPENDS= ${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info \ + ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:misc/shared-mime-info BUNDLE_LIBS= yes @@ -68,20 +69,11 @@ INSTALLS_ICONS= yes OPERA_ARCH= ${ARCH:S,i386,intel,} -.if ${OSVERSION} >= 1000054 -BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x -PLIST_SUB+= LIBSTDC="" -.else -PLIST_SUB+= LIBSTDC="@comment " -.endif - post-extract: ${GUNZIP_CMD} ${WRKSRC}/share/man/man1/opera.1.gz do-build: -.if ${OSVERSION} >= 1000054 ${CP} ${LOCALBASE}/lib/compat/libstdc++.so.6 ${WRKSRC} -.endif do-configure: @${MV} ${WRKSRC}/share/man ${WRKSRC}/man @@ -100,9 +92,7 @@ do-configure: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/opera ${STAGEDIR}${PREFIX}/bin/ ${TAR} -C ${WRKSRC} -cf - lib man share | ${TAR} -C ${STAGEDIR}${PREFIX} -xf - -.if ${OSVERSION} >= 1000054 ${INSTALL_LIB} ${WRKSRC}/libstdc++.so.6 ${STAGEDIR}${PREFIX}/lib/opera -.endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d ${INSTALL_DATA} ${FILESDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/opera.conf Modified: head/www/opera/pkg-plist ============================================================================== --- head/www/opera/pkg-plist Thu Jan 12 11:29:47 2017 (r431250) +++ head/www/opera/pkg-plist Thu Jan 12 11:30:50 2017 (r431251) @@ -4,7 +4,7 @@ lib/opera/gstreamer/plugins/libgstoperam lib/opera/gstreamer/plugins/libgstoperavp8.so lib/opera/liboperagtk2.so lib/opera/liboperakde4.so -%%LIBSTDC%%lib/opera/libstdc++.so.6 +lib/opera/libstdc++.so.6 lib/opera/opera lib/opera/plugins/README lib/opera/pluginwrapper/operapluginwrapper
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701121130.v0CBUo1f025606>