Date: Mon, 13 Jan 2014 07:23:43 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339572 - in head: archivers/deco archivers/libarchive archivers/p5-Compress-Raw-Lzma archivers/pixz archivers/py-liblzma archivers/tardy devel/libgta devel/mingw32-bin-msvcrt games/ope... Message-ID: <201401130723.s0D7Nhe2050967@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jan 13 07:23:43 2014 New Revision: 339572 URL: http://svnweb.freebsd.org/changeset/ports/339572 Log: archivers/xz is in base for all versions and has been removed from the ports tree Modified: head/archivers/deco/Makefile head/archivers/libarchive/Makefile head/archivers/p5-Compress-Raw-Lzma/Makefile head/archivers/pixz/Makefile head/archivers/py-liblzma/Makefile head/archivers/tardy/Makefile head/devel/libgta/Makefile head/devel/mingw32-bin-msvcrt/Makefile head/games/openttd/Makefile head/security/openvpn-auth-ldap/Makefile head/sysutils/squashfs-tools/Makefile head/textproc/bsdgrep/Makefile head/textproc/the_silver_searcher/Makefile head/www/links/Makefile head/x11/kde4-runtime/Makefile head/x11/kdelibs4/Makefile Modified: head/archivers/deco/Makefile ============================================================================== --- head/archivers/deco/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/archivers/deco/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -48,10 +48,4 @@ do-install: .endfor @cd ${WRKDIR}/${PORTNAME}-archive-1.6/x/ && ${CP} -PR * ${DATADIR} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -RUN_DEPENDS+= lzma:${PORTSDIR}/archivers/xz -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/archivers/libarchive/Makefile ============================================================================== --- head/archivers/libarchive/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/archivers/libarchive/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -103,13 +103,7 @@ USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl --without-nettle .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz -.endif - check: (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check) -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/archivers/p5-Compress-Raw-Lzma/Makefile ============================================================================== --- head/archivers/p5-Compress-Raw-Lzma/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/archivers/p5-Compress-Raw-Lzma/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -21,23 +21,13 @@ USES= perl5 LZMA_DEPEND?= sys -.include <bsd.port.pre.mk> - -.if (${ARCH} == "sparc64") -LZMA_DEPEND= xz -.endif - .if ${LZMA_DEPEND} == "lzmalib" LIB_DEPENDS+= liblzma.so.1:${PORTSDIR}/archivers/lzmalib .endif -.if ${LZMA_DEPEND} == "xz" -LIB_DEPENDS+= liblzma.so.5:${PORTSDIR}/archivers/xz -.endif - pre-build: .if ${LZMA_DEPEND} == "sys" @${REINPLACE_CMD} -e "/^LDDLFLAGS/ s|${LOCALBASE}/lib|${LIBDIR}|" ${WRKSRC}/Makefile .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/archivers/pixz/Makefile ============================================================================== --- head/archivers/pixz/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/archivers/pixz/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -16,16 +16,8 @@ SUB_FILES= Makefile PLIST_FILES= bin/${PORTNAME} man/man1/pixz.1.gz MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - post-extract: apply-slist ${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC} ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.1 ${WRKSRC} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/archivers/py-liblzma/Makefile ============================================================================== --- head/archivers/py-liblzma/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/archivers/py-liblzma/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -21,17 +21,11 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -.else post-patch: @${REINPLACE_CMD} -e 's/pc_cflags = .*/pc_cflags = ""/' \ -e 's/pc_libs = .*/pc_libs = "-llzma"/' ${WRKSRC}/setup.py -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lzma.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/archivers/tardy/Makefile ============================================================================== --- head/archivers/tardy/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/archivers/tardy/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -29,12 +29,6 @@ PLIST_FILES= bin/tardy man/man1/tardy.1. WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -BUILD_DEPENDS+= lzma:${PORTSDIR}/archivers/xz -.endif - post-patch: .for var in CFLAGS LDFLAGS @${REINPLACE_CMD} -e 's|^\(${var}\)\ =\ \(.*\)|\1 ?= \2|' \ @@ -47,4 +41,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/libgta/Makefile ============================================================================== --- head/devel/libgta/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/devel/libgta/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -28,10 +28,4 @@ post-patch: regression-test test: build cd ${WRKSR}/ && ${SETENV} ${MAKE_ENV} ${MAKE} check -.include <bsd.port.pre.mk> - -.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 -LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/mingw32-bin-msvcrt/Makefile ============================================================================== --- head/devel/mingw32-bin-msvcrt/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/devel/mingw32-bin-msvcrt/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -28,19 +28,8 @@ MAKE_ARGS+= INSTALL_AS_USER=yes .endif NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 ) -EXTRACT_DEPENDS=${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz -EXTRACT_ONLY= mingwrt-${RUNTIMEVERSION}-mingw32-dev${EXTRACT_SUFX} \ - mingwrt-${RUNTIMEVERSION}-mingw32-dll${EXTRACT_SUFX} -.endif post-extract: @${CP} ${FILESDIR}/Makefile ${WRKDIR} -.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 ) - @cd ${WRKDIR} && xzcat \ - ${_DISTDIR}/w32api-${APIVERSION}-mingw32-dev.tar.lzma | ${TAR} -xf - -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/openttd/Makefile ============================================================================== --- head/games/openttd/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/games/openttd/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -88,13 +88,9 @@ post-patch: @${REINPLACE_CMD} -e '/-O2 -fomit-frame-pointer/d ; \ s,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib # Use custom liblzma.pc for when we use liblzma from base -.if ${OSVERSION} >= 900012 || (${OSVERSION} >= 800505 && ${OSVERSION} < 900000) @${REINPLACE_CMD} -e \ 's,pkg-config liblzma,pkg-config ${FILESDIR}/liblzma.pc,' \ ${WRKSRC}/config.lib -.else -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/security/openvpn-auth-ldap/Makefile ============================================================================== --- head/security/openvpn-auth-ldap/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/security/openvpn-auth-ldap/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -28,10 +28,6 @@ PLIST_FILES= lib/openvpn-auth-ldap.so OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> -.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 -BUILD_DEPENDS+= ${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz -.endif - .if ${OSVERSION} >= 900000 # Use gcc from ports because Objective C support no longer included in base # and the GNU Objective-C runtime is required, lang/libobjc2 + clang Modified: head/sysutils/squashfs-tools/Makefile ============================================================================== --- head/sysutils/squashfs-tools/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/sysutils/squashfs-tools/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -37,9 +37,6 @@ PORTDOCS= ACKNOWLEDGEMENTS CHANGES COPYI .if ${PORT_OPTIONS:MXZ} MAKE_ARGS+= XZ_SUPPORT=1 -.if ${OSVERSION} < 900012 && ${OSVERSION} < 800505 -LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz -.endif .endif .if ${PORT_OPTIONS:MLZO} Modified: head/textproc/bsdgrep/Makefile ============================================================================== --- head/textproc/bsdgrep/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/textproc/bsdgrep/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -43,13 +43,6 @@ CONFLICTS= gnugrep-* NO_STAGE= yes .include <bsd.port.pre.mk> -.if !(${OSVERSION} >= 900012 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800505)) -LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz -CFLAGS+= -I${PREFIX}/include -LDFLAGS+= -L${PREFIX}/lib -BROKEN= overwrites files installed by dependency -.endif - .if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" .else Modified: head/textproc/the_silver_searcher/Makefile ============================================================================== --- head/textproc/the_silver_searcher/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/textproc/the_silver_searcher/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -20,12 +20,7 @@ ACLOCAL_ARGS+= -I ${ACLOCAL_DIR} AUTOMAKE_ARGS+= --add-missing GNU_CONFIGURE= yes CONFIGURE_ARGS= LZMA_LIBS=-llzma -.if exists(/usr/include/lzma.h) CONFIGURE_ARGS+= LZMA_CFLAGS=-I/usr/include -.else -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -CONFIGURE_ARGS+= LZMA_CFLAGS=-I${LOCALBASE}/include -.endif USE_AUTOTOOLS= aclocal autoconf autoheader automake USES= pkgconfig Modified: head/www/links/Makefile ============================================================================== --- head/www/links/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/www/links/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -43,10 +43,6 @@ NO_STAGE= yes #CIPHERSTRING must be a valid OpenSSL cipher string(see ciphers(1)): CIPHERSTRING?= HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz -.endif - .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ Modified: head/x11/kde4-runtime/Makefile ============================================================================== --- head/x11/kde4-runtime/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/x11/kde4-runtime/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -71,10 +71,6 @@ RUN_DEPENDS+= zeitgeist-daemon:${PORTSDI .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz -.endif - .if ${KDE4_PREFIX} != ${LOCALBASE} PLIST_SUB+= HACK="" .else Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Mon Jan 13 07:07:18 2014 (r339571) +++ head/x11/kdelibs4/Makefile Mon Jan 13 07:23:43 2014 (r339572) @@ -84,10 +84,6 @@ AVAHI_DESC= Use Avahi's mDNSResponder (o NO_STAGE= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) -LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz -.endif - .if ${OSVERSION} < 900004 LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401130723.s0D7Nhe2050967>