From owner-svn-ports-head@FreeBSD.ORG Sun Jun 1 07:59:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 956C0570; Sun, 1 Jun 2014 07:59:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6610321C2; Sun, 1 Jun 2014 07:59:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s517xKSs013103; Sun, 1 Jun 2014 07:59:20 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s517xF37013074; Sun, 1 Jun 2014 07:59:15 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201406010759.s517xF37013074@svn.freebsd.org> From: Olli Hauer Date: Sun, 1 Jun 2014 07:59:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356058 - in head/archivers: fastjar grzip hs-tar hs-zip-archive hs-zlib hs-zlib-bindings hs-zlib-conduit lrzip lzma mscompress p7zip pixz ppmd-7z rox-archive squeeze thunar-archive-plu... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2014 07:59:20 -0000 Author: ohauer Date: Sun Jun 1 07:59:15 2014 New Revision: 356058 URL: http://svnweb.freebsd.org/changeset/ports/356058 QAT: https://qat.redports.org/buildarchive/r356058/ Log: - fix sanity in CAT archivers - USE_BZIP2 -> USES=tar:bzip2 - LICENSE=BSD -> BSD[n]CLAUSE Modified: head/archivers/fastjar/Makefile head/archivers/grzip/Makefile head/archivers/hs-tar/Makefile head/archivers/hs-zip-archive/Makefile head/archivers/hs-zlib-bindings/Makefile head/archivers/hs-zlib-conduit/Makefile head/archivers/hs-zlib/Makefile head/archivers/lrzip/Makefile head/archivers/lzma/Makefile head/archivers/mscompress/Makefile head/archivers/p7zip/Makefile head/archivers/pixz/Makefile head/archivers/ppmd-7z/Makefile head/archivers/rox-archive/Makefile head/archivers/squeeze/Makefile head/archivers/thunar-archive-plugin/Makefile head/archivers/unadf/Makefile head/archivers/unfoo/Makefile head/archivers/upx/Makefile head/archivers/xarchiver/Makefile head/archivers/xdms/Makefile head/archivers/zip/Makefile Modified: head/archivers/fastjar/Makefile ============================================================================== --- head/archivers/fastjar/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/fastjar/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -12,9 +12,8 @@ COMMENT= Version of JDK's `jar' command LICENSE= GPLv2 -USES= gmake perl5 +USES= tar:bzip2 gmake perl5 USES_PERL5= build -USE_BZIP2= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -29,6 +28,6 @@ OPTIONS_DEFINE= DOCS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Modified: head/archivers/grzip/Makefile ============================================================================== --- head/archivers/grzip/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/grzip/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -12,8 +12,7 @@ COMMENT= Efficient file compressor LICENSE= LGPL21 -USE_BZIP2= yes -USES= gettext +USES= tar:bzip2 gettext USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -L${LOCALBASE}/lib -lintl @@ -28,13 +27,13 @@ post-patch: -e '/^PREFIX=/d;/^LDFLAGS/s|=|+=|' ${WRKSRC}/Makefile ${WRKSRC}/po/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/grunzip ${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/grzcat - ${INSTALL_SCRIPT} ${WRAPPERS:S|^|${WRKSRC}/scripts/|} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_SCRIPT} ${WRAPPERS:S|^|${WRKSRC}/scripts/|} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib ${LN} -sf lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0 - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.h ${STAGEDIR}${PREFIX}/include/ - cd ${WRKSRC}/po; ${SETENV} ${MAKE_ENV} ${MAKE} PREFIX="${STAGEDIR}${PREFIX}" install + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.h ${STAGEDIR}${PREFIX}/include + (cd ${WRKSRC}/po; ${SETENV} ${MAKE_ENV} ${MAKE} PREFIX="${STAGEDIR}${PREFIX}" install) .include Modified: head/archivers/hs-tar/Makefile ============================================================================== --- head/archivers/hs-tar/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/hs-tar/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -8,8 +8,7 @@ CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Reading, writing, and manipulating ".tar" archive files -LICENSE= BSD - +LICENSE= BSD3CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Modified: head/archivers/hs-zip-archive/Makefile ============================================================================== --- head/archivers/hs-zip-archive/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/hs-zip-archive/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -8,7 +8,7 @@ CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Library for creating and modifying zip archives -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_CABAL= digest>=0.0.0.1 mtl utf8-string>=0.3.1 zlib Modified: head/archivers/hs-zlib-bindings/Makefile ============================================================================== --- head/archivers/hs-zlib-bindings/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/hs-zlib-bindings/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -8,7 +8,7 @@ CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Low-level bindings to the zlib package -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_CABAL= zlib>=0.5.2.0 Modified: head/archivers/hs-zlib-conduit/Makefile ============================================================================== --- head/archivers/hs-zlib-conduit/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/hs-zlib-conduit/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -8,7 +8,7 @@ CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Streaming compression/decompression via conduits -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_CABAL= conduit>=1.0 transformers>=0.2.2 void zlib-bindings>=0.1 Modified: head/archivers/hs-zlib/Makefile ============================================================================== --- head/archivers/hs-zlib/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/hs-zlib/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -9,7 +9,7 @@ CATEGORIES= archivers haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Compression and decompression in the gzip and zlib formats -LICENSE= BSD +LICENSE= BSD2CLAUSE .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Modified: head/archivers/lrzip/Makefile ============================================================================== --- head/archivers/lrzip/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/lrzip/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -19,8 +19,7 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-asm GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -USE_BZIP2= yes -USES= gmake pathfix perl5 +USES= tar:bzip2 gmake pathfix perl5 USE_PERL5= build USE_LDCONFIG= yes Modified: head/archivers/lzma/Makefile ============================================================================== --- head/archivers/lzma/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/lzma/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -12,8 +12,7 @@ COMMENT= High-ratio LZMA compressor CONFLICTS= lzmautils-[0-9]* xz-[0-9]* -USES= gmake dos2unix -USE_BZIP2= yes +USES= tar:bzip2 gmake dos2unix NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Bundles/LzmaCon MAKEFILE= makefile.gcc @@ -40,9 +39,9 @@ post-patch: ${BUILD_WRKSRC}/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) regression-test: build ${BUILD_WRKSRC}/${PORTNAME} b Modified: head/archivers/mscompress/Makefile ============================================================================== --- head/archivers/mscompress/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/mscompress/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= utils/compress MAINTAINER= tj@FreeBSD.org COMMENT= Microsoft "compress.exe/expand.exe" compatible (de)compressor -USE_BZIP2= yes +USES= tar:bzip2 HAS_CONFIGURE= yes PLIST_FILES= bin/mscompress bin/msexpand \ Modified: head/archivers/p7zip/Makefile ============================================================================== --- head/archivers/p7zip/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/p7zip/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -14,7 +14,7 @@ COMMENT?= File archiver with high compre LICENSE?= LGPL21 ALL_TARGET?= all3 -USE_BZIP2= yes +USES= tar:bzip2 MAKEFILE= makefile MAKE_ARGS= OPTFLAGS="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} @@ -44,14 +44,14 @@ do-install: .endfor ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${STAGEDIR}${PREFIX}/libexec/p7zip - ${INSTALL_SCRIPT} ${FILESDIR}/7z ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${FILESDIR}/7z ${STAGEDIR}${PREFIX}/bin ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr - cd ${WRKSRC}/DOCS && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/man1 && \ - ${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + (cd ${WRKSRC}/DOCS && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/man1 && \ + ${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1) .endif .include Modified: head/archivers/pixz/Makefile ============================================================================== --- head/archivers/pixz/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/pixz/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= hrs@FreeBSD.org COMMENT= Parallel, indexing version of XZ -LICENSE= BSD +LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE SUB_FILES= Makefile Modified: head/archivers/ppmd-7z/Makefile ============================================================================== --- head/archivers/ppmd-7z/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/ppmd-7z/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -11,8 +11,7 @@ DISTNAME= p7zip_${DISTVERSION}_src_all MAINTAINER= bf@FreeBSD.org COMMENT= High-ratio PPMD compressor -USE_BZIP2= yes -USES= gmake +USES= tar:bzip2 gmake WRKSRC= ${WRKDIR}/p7zip_${DISTVERSION} BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/PPMD_Alone MAKEFILE= makefile Modified: head/archivers/rox-archive/Makefile ============================================================================== --- head/archivers/rox-archive/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/rox-archive/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -12,7 +12,7 @@ COMMENT= Archive management tool for the RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \ ${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib -USE_BZIP2= yes +USES= tar:bzip2 USE_PYTHON= yes do-build: Modified: head/archivers/squeeze/Makefile ============================================================================== --- head/archivers/squeeze/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/squeeze/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -18,11 +18,10 @@ LIB_DEPENDS= libthunar-vfs-1.so:${PORTSD GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= pkgconfig gmake gettext pathfix desktop-file-utils +USES= tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils USE_XFCE= configenv libutil thunar USE_XORG= x11 USE_GNOME= gtk20 glib20 intltool intlhack -USE_BZIP2= yes USE_LDCONFIG= yes MAKE_JOB_SAFE= yes Modified: head/archivers/thunar-archive-plugin/Makefile ============================================================================== --- head/archivers/thunar-archive-plugin/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/thunar-archive-plugin/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -11,10 +11,9 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Archive plugin for the Thunar File Manager -USE_BZIP2= yes GNU_CONFIGURE= yes USE_XFCE= configenv libexo thunar -USES= gettext gmake pkgconfig +USES= tar:bzip2 gettext gmake pkgconfig INSTALLS_ICONS= yes USE_GNOME= intltool Modified: head/archivers/unadf/Makefile ============================================================================== --- head/archivers/unadf/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/unadf/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -12,7 +12,7 @@ COMMENT= Extracts files from .adf-files LICENSE= GPLv2 -USE_BZIP2= yes +USES= tar:bzip2 MAKE_JOBS_UNSAFE= yes Modified: head/archivers/unfoo/Makefile ============================================================================== --- head/archivers/unfoo/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/unfoo/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -16,7 +16,7 @@ RUN_DEPENDS= unace:${PORTSDIR}/archivers 7z:${PORTSDIR}/archivers/p7zip NO_BUILD= yes -USE_BZIP2= yes +USES= tar:bzip2 PLIST_FILES= bin/${PORTNAME} post-patch: Modified: head/archivers/upx/Makefile ============================================================================== --- head/archivers/upx/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/upx/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -16,8 +16,7 @@ LIB_DEPENDS= libucl.so:${PORTSDIR}/archi LZMA_VER= 4.65 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src -USE_BZIP2= yes -USES= gmake perl5 +USES= tar:bzip2 gmake perl5 USE_PERL5= build MAKE_ENV= UPX_UCLDIR=${LOCALBASE}\ UPX_LZMADIR=${WRKDIR}\ Modified: head/archivers/xarchiver/Makefile ============================================================================== --- head/archivers/xarchiver/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/xarchiver/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -16,8 +16,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ 7zr:${PORTSDIR}/archivers/p7zip \ zip:${PORTSDIR}/archivers/zip -USES= gmake pkgconfig desktop-file-utils -USE_BZIP2= yes +USES= tar:bzip2 gmake pkgconfig desktop-file-utils USE_GNOME= glib20 gtk20 intltool GNU_CONFIGURE= yes INSTALLS_ICONS= yes Modified: head/archivers/xdms/Makefile ============================================================================== --- head/archivers/xdms/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/xdms/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -11,7 +11,7 @@ COMMENT= Tool for decompressing Amiga DM OPTIONS_DEFINE= DOCS -USE_BZIP2= yes +USES= tar:bzip2 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} ALL_TARGET= xdms Modified: head/archivers/zip/Makefile ============================================================================== --- head/archivers/zip/Makefile Sun Jun 1 07:56:42 2014 (r356057) +++ head/archivers/zip/Makefile Sun Jun 1 07:59:15 2014 (r356058) @@ -12,7 +12,7 @@ MAINTAINER= freebsd@skysmurf.nl COMMENT= Create/update ZIP files compatible with PKZIP # License is BSD-based, but not identical, so intall with documentation -LICENSE= BSD +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= DOCS