Date: Fri, 30 Aug 2013 01:02:57 +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: r325646 - in head/archivers: advancecomp aolserver-nszlib arj dact fastjar file-roller ha libunrar lrzip lzlib lzma lzmalib ocaml-bz2 pbzip2 pigz plzip ppmd-7z rpm rpm4 rpm5 rvm squeeze... Message-ID: <201308300102.r7U12vxH029823@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Aug 30 01:02:57 2013 New Revision: 325646 URL: http://svnweb.freebsd.org/changeset/ports/325646 Log: Convert archivers from USE_GMAKE to USES=gmake While here: - Trim headers - Convert some port to the new perl world - Convert some port from USE_GNOME=pkgconfig to USES=pkgconfig Modified: head/archivers/advancecomp/Makefile head/archivers/aolserver-nszlib/Makefile head/archivers/arj/Makefile head/archivers/dact/Makefile head/archivers/fastjar/Makefile head/archivers/file-roller/Makefile head/archivers/ha/Makefile head/archivers/libunrar/Makefile head/archivers/lrzip/Makefile head/archivers/lzlib/Makefile head/archivers/lzma/Makefile head/archivers/lzmalib/Makefile head/archivers/ocaml-bz2/Makefile head/archivers/pbzip2/Makefile head/archivers/pigz/Makefile head/archivers/plzip/Makefile head/archivers/ppmd-7z/Makefile head/archivers/rpm/Makefile head/archivers/rpm4/Makefile head/archivers/rpm5/Makefile head/archivers/rvm/Makefile head/archivers/squeeze/Makefile head/archivers/szip/Makefile head/archivers/thunar-archive-plugin/Makefile head/archivers/unace/Makefile head/archivers/upx/Makefile head/archivers/xar/Makefile head/archivers/xarchiver/Makefile Modified: head/archivers/advancecomp/Makefile ============================================================================== --- head/archivers/advancecomp/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/advancecomp/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -9,7 +9,7 @@ MASTER_SITES= SF/advancemame/${PORTNAME} MAINTAINER= danilogondolfo@gmail.com COMMENT= Recompression utilities for .ZIP, .PNG, .MNG, and .GZ files -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes MAN1= advdef.1 advmng.1 advpng.1 advzip.1 Modified: head/archivers/aolserver-nszlib/Makefile ============================================================================== --- head/archivers/aolserver-nszlib/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/aolserver-nszlib/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -22,7 +22,7 @@ AOLSERVERBASE?= aolserver BUILD_DEPENDS+= ${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver RUN_DEPENDS+= ${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver -USE_GMAKE= yes +USES= gmake MAKE_ARGS= AOLSERVER="${LOCALBASE}/${AOLSERVERBASE}" \ DLLLIBS="-lz" MODLIBS="-lz" Modified: head/archivers/arj/Makefile ============================================================================== --- head/archivers/arj/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/arj/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -12,8 +12,8 @@ COMMENT= Open-source ARJ OPTIONS_DEFINE= DOCS +USES= gmake USE_AUTOTOOLS= autoconf -USE_GMAKE= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_WRKSRC= ${WRKSRC}/gnu CFLAGS+= -fPIC Modified: head/archivers/dact/Makefile ============================================================================== --- head/archivers/dact/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/dact/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: dact -# Date created: May 2, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= dact PORTVERSION= 0.8.42 @@ -17,7 +12,7 @@ COMMENT= Dynamic Adaptive Compression To LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \ lzo2.2:${PORTSDIR}/archivers/lzo2 -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/lib CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include Modified: head/archivers/fastjar/Makefile ============================================================================== --- head/archivers/fastjar/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/fastjar/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -12,10 +12,10 @@ COMMENT= Version of JDK's `jar' command LICENSE= GPLv2 +USES= gmake perl5 +USES_PERL5= build USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_PERL5_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= CHANGES ChangeLog NEWS README Modified: head/archivers/file-roller/Makefile ============================================================================== --- head/archivers/file-roller/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/file-roller/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -18,10 +18,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${POR USE_LDCONFIG= yes USE_BZIP2= yes -USES= gettext +USES= gettext gmake INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \ gtk20 gconf2 GNOME_DESKTOP_VERSION=2 Modified: head/archivers/ha/Makefile ============================================================================== --- head/archivers/ha/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/ha/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ha -# Date created: 24 Jan 1995 -# Whom: ache -# +# Created by: ache # $FreeBSD$ -# PORTNAME= ha PORTVERSION= 0.999b @@ -22,7 +18,7 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/ha MAKEFILE= makefile.nix ALL_TARGET= ha -USE_GMAKE= yes +USES= gmake post-patch: @${REINPLACE_CMD} 's,<malloc.h>,<stdlib.h>,' \ Modified: head/archivers/libunrar/Makefile ============================================================================== --- head/archivers/libunrar/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/libunrar/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: unrar -# Date created: 23 Sep 2005 -# Whom: samm@os2.kiev.ua -# +# Created by: samm@os2.kiev.ua # $FreeBSD$ -# PORTNAME= libunrar PORTVERSION= 3.9.10 @@ -17,7 +13,7 @@ COMMENT= Library to work with RAR archiv WRKSRC= ${WRKDIR}/unrar -USE_GMAKE= yes +USES= gmake MAKEFILE= makefile.unix ALL_TARGET= lib USE_LDCONFIG= yes Modified: head/archivers/lrzip/Makefile ============================================================================== --- head/archivers/lrzip/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/lrzip/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lrzip -# Date created: 2011-04-08 -# Whom: Gea-Suan Lin <gslin@gslin.org> -# +# Created by: Gea-Suan Lin <gslin@gslin.org> # $FreeBSD$ -# PORTNAME= lrzip PORTVERSION= 0.614 @@ -24,9 +20,8 @@ CONFIGURE_ARGS+= --enable-asm GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib USE_BZIP2= yes -USE_GMAKE= yes -USES= pathfix -USE_PERL5_BUILD= yes +USES= gmake pathfix perl5 +USE_PERL5= build USE_LDCONFIG= yes MAN1= lrunzip.1 \ Modified: head/archivers/lzlib/Makefile ============================================================================== --- head/archivers/lzlib/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/lzlib/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -12,8 +12,8 @@ COMMENT= In-memory LZMA compression and PLIST_FILES= include/lzlib.h \ lib/liblz.a +USES= gmake GNU_CONFIGURE= yes -USE_GMAKE= yes MAKE_ARGS= ${MAKE_ENV} INFO= lzlib Modified: head/archivers/lzma/Makefile ============================================================================== --- head/archivers/lzma/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/lzma/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lzma -# Date created: 25 Apr 2005 -# Whom: Radim Kolar <hsn@netmag.cz> -# +# Created by: Radim Kolar <hsn@netmag.cz> # $FreeBSD$ -# PORTNAME= lzma PORTVERSION= 9.22 @@ -16,8 +12,8 @@ COMMENT= High-ratio LZMA compressor CONFLICTS= lzmautils-[0-9]* xz-[0-9]* +USES= gmake USE_BZIP2= yes -USE_GMAKE= yes NO_WRKSUBDIR= yes USE_DOS2UNIX= yes BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Bundles/LzmaCon Modified: head/archivers/lzmalib/Makefile ============================================================================== --- head/archivers/lzmalib/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/lzmalib/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lzmalib -# Date created: 2008-09-22 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= lzmalib PORTVERSION= 0.0.1 @@ -13,8 +9,8 @@ MASTER_SITES= http://tokyocabinet.source MAINTAINER= miwi@FreeBSD.org COMMENT= Thin wrapper library of LZMA +USES= gmake GNU_CONFIGURE= yes -USE_GMAKE= yes USE_LDCONFIG= yes .include <bsd.port.mk> Modified: head/archivers/ocaml-bz2/Makefile ============================================================================== --- head/archivers/ocaml-bz2/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/ocaml-bz2/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ocaml-bz2 -# Date created: 2009-02-24 -# Whom: Jaap Boender <jaapb@kerguelen.org> -# +# Created by: Jaap Boender <jaapb@kerguelen.org> # $FreeBSD$ -# PORTNAME= bz2 PORTVERSION= 0.6.0 @@ -17,7 +13,7 @@ MAINTAINER= jaapb@kerguelen.org COMMENT= OCaml library to manipulate bz2 files GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake USE_OCAML= yes USE_OCAML_LDCONFIG= yes Modified: head/archivers/pbzip2/Makefile ============================================================================== --- head/archivers/pbzip2/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/pbzip2/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: pbzip2 -# Date created: Dec 7, 2004 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= pbzip2 PORTVERSION= 1.1.6 @@ -21,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAN1= pbzip2.1 MLINKS= pbzip2.1 pbunzip2.1 -USE_GMAKE= YES +USES= gmake PLIST_FILES= bin/pbzip2 bin/pbunzip2 Modified: head/archivers/pigz/Makefile ============================================================================== --- head/archivers/pigz/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/pigz/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.zlib.net/pigz/ MAINTAINER= gslin@gslin.org COMMENT= Parallel GZIP -USE_GMAKE= yes +USES= gmake .if !defined(NO_INSTALL_MANPAGES) MAN1= pigz.1 Modified: head/archivers/plzip/Makefile ============================================================================== --- head/archivers/plzip/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/plzip/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -13,8 +13,8 @@ BUILD_DEPENDS= lzlib>=1.1:${PORTSDIR}/ar PLIST_FILES= bin/plzip +USES= gmake GNU_CONFIGURE= yes -USE_GMAKE= yes CONFIGURE_ARGS= CXXFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= plzip.1 Modified: head/archivers/ppmd-7z/Makefile ============================================================================== --- head/archivers/ppmd-7z/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/ppmd-7z/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ppmd-7z -# Date created: 1 September 2007 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME= ppmd PORTVERSION= 9.04 @@ -16,7 +12,7 @@ MAINTAINER= bf@FreeBSD.org COMMENT= High-ratio PPMD compressor USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake WRKSRC= ${WRKDIR}/p7zip_${DISTVERSION} BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/PPMD_Alone MAKEFILE= makefile Modified: head/archivers/rpm/Makefile ============================================================================== --- head/archivers/rpm/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/rpm/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -16,7 +16,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/po CONFLICTS= rpm-[45].* -USE_GMAKE= yes +USES= gmake USE_AUTOTOOLS= automake14 autoconf213 libtool CONFIGURE_ARGS= --with-glob USE_LDCONFIG= yes Modified: head/archivers/rpm4/Makefile ============================================================================== --- head/archivers/rpm4/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/rpm4/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -17,9 +17,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${P OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT=PYTHON +USES= gmake USE_AUTOTOOLS= libtool USE_BZIP2= yes -USE_GMAKE= yes USE_LUA= 5.1+ USE_BDB= 46+ INVALID_BDB_VER=51 Modified: head/archivers/rpm5/Makefile ============================================================================== --- head/archivers/rpm5/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/rpm5/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -32,9 +32,9 @@ USE_AUTOTOOLS= libtool LIBTOOLFILES= configure db3/configure db/dist/configure \ file/configure xar/configure CONFIGURE_ARGS= --without-js -USE_GMAKE= yes +USES= gmake perl5 +USE_PERL5= build USE_LDCONFIG= yes -USE_PERL5_BUILD=yes LATEST_LINK= rpm5 CONFLICTS= rpm-3.* rpm-4.* Modified: head/archivers/rvm/Makefile ============================================================================== --- head/archivers/rvm/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/rvm/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -16,7 +16,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_LATEST_LINK= yes -USE_GMAKE= yes +USES= gmake USE_GCC= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-default-config-file=${PREFIX}/etc/rvm.conf \ Modified: head/archivers/squeeze/Makefile ============================================================================== --- head/archivers/squeeze/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/squeeze/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -19,12 +19,11 @@ LIB_DEPENDS= thunar-vfs-1:${PORTSDIR}/x1 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= pkgconfig gettext pathfix desktop-file-utils +USES= 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_GMAKE= yes USE_LDCONFIG= yes MAKE_JOB_SAFE= yes Modified: head/archivers/szip/Makefile ============================================================================== --- head/archivers/szip/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/szip/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -12,7 +12,7 @@ DISTNAME= sz${PORTVERSION:S/.//}_src MAINTAINER= ports@FreeBSD.org COMMENT= Fast compression utility -USE_GMAKE= yes +USES= gmake WRKSRC= ${WRKDIR} Modified: head/archivers/thunar-archive-plugin/Makefile ============================================================================== --- head/archivers/thunar-archive-plugin/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/thunar-archive-plugin/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -15,9 +15,8 @@ COMMENT= Archive plugin for the Thunar F USE_BZIP2= yes GNU_CONFIGURE= yes USE_XFCE= configenv libexo thunar -USES= gettext pkgconfig +USES= gettext gmake pkgconfig INSTALLS_ICONS= yes USE_GNOME= intltool -USE_GMAKE= yes .include <bsd.port.mk> Modified: head/archivers/unace/Makefile ============================================================================== --- head/archivers/unace/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/unace/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,10 +1,5 @@ -# New ports collection makefile for: unace -# URL: http://members.aol.com/mlemke6413/ace.html -# Date created: 23 February 1999 -# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br> -# +# Created by: Joao Carlos Mendes Luis <jonny@jonny.eng.br> # $FreeBSD$ -# PORTNAME= unace PORTVERSION= 1.2b @@ -18,7 +13,7 @@ COMMENT= Extract, view & test ACE archiv MAKE_JOBS_UNSAFE= yes -USE_GMAKE= yes +USES= gmake ALL_TARGET= clean unace PLIST_FILES= bin/unace Modified: head/archivers/upx/Makefile ============================================================================== --- head/archivers/upx/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/upx/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: upx -# Date created: 17 Feb 2004 -# Whom: Max Khon <fjoe@FreeBSD.org> -# +# Created by: Max Khon <fjoe@FreeBSD.org> # $FreeBSD$ -# PORTNAME= upx PORTVERSION= 3.09 @@ -21,8 +17,8 @@ LIB_DEPENDS= ucl.1:${PORTSDIR}/archivers LZMA_VER= 4.65 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src USE_BZIP2= yes -USE_GMAKE= yes -USE_PERL5_BUILD=yes +USES= gmake perl5 +USE_PERL5= build MAKE_ENV= UPX_UCLDIR=${LOCALBASE}\ UPX_LZMADIR=${WRKDIR}\ target=freebsd Modified: head/archivers/xar/Makefile ============================================================================== --- head/archivers/xar/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/xar/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xar -# Date created: 24 January 2005 -# Whom: Jeffrey H. Johnson <CPE1704TKS@bellsouth.net> -# +# Created by: Jeffrey H. Johnson <CPE1704TKS@bellsouth.net> # $FreeBSD$ -# PORTNAME= xar PORTVERSION= 1.5.2 @@ -19,8 +15,8 @@ LICENSE= BSD USE_LDCONFIG= yes +USES= gmake USE_GNOME= libxml2 -USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes Modified: head/archivers/xarchiver/Makefile ============================================================================== --- head/archivers/xarchiver/Makefile Fri Aug 30 00:59:01 2013 (r325645) +++ head/archivers/xarchiver/Makefile Fri Aug 30 01:02:57 2013 (r325646) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xarchiver -# Date created: 27 Mart 2008 -# Whom: Andreev Maxim -# +# Created by: Andreev Maxim # $FreeBSD$ -# PORTNAME= xarchiver PORTVERSION= 0.5.2 @@ -16,9 +12,9 @@ COMMENT= Desktop-agnostic GTK+2 frontend RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils +USES= gmake pkgconfig desktop-file-utils USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= glib20 gtk20 intltool pkgconfig desktopfileutils +USE_GNOME= glib20 gtk20 intltool GNU_CONFIGURE= yes INSTALLS_ICONS= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308300102.r7U12vxH029823>