diff options
author | bapt <bapt@FreeBSD.org> | 2013-08-30 09:02:57 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2013-08-30 09:02:57 +0800 |
commit | aebf2d0daee118826e1f126e652665f089b6b569 (patch) | |
tree | ee68401b2ee3dafe958408cec9cdc338aab8b747 | |
parent | 56d11c945fd26b8d2b3c053683e03e16dbadd3d1 (diff) | |
download | freebsd-ports-gnome-aebf2d0daee118826e1f126e652665f089b6b569.tar.gz freebsd-ports-gnome-aebf2d0daee118826e1f126e652665f089b6b569.tar.zst freebsd-ports-gnome-aebf2d0daee118826e1f126e652665f089b6b569.zip |
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
28 files changed, 46 insertions, 105 deletions
diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile index 11198f7d5196..efb58bbd9367 100644 --- a/archivers/advancecomp/Makefile +++ b/archivers/advancecomp/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION} 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 diff --git a/archivers/aolserver-nszlib/Makefile b/archivers/aolserver-nszlib/Makefile index e7a293ee89ab..568c53e0bded 100644 --- a/archivers/aolserver-nszlib/Makefile +++ b/archivers/aolserver-nszlib/Makefile @@ -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" diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile index 36a541a73b5d..db9bef702389 100644 --- a/archivers/arj/Makefile +++ b/archivers/arj/Makefile @@ -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 diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index b16b698bbb26..492c76de08a9 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -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 Tool 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 diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile index 85ddd403d9e8..17c2c0501e40 100644 --- a/archivers/fastjar/Makefile +++ b/archivers/fastjar/Makefile @@ -12,10 +12,10 @@ COMMENT= Version of JDK's `jar' command written entirely in C 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 diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index e164ea3f5fd0..f38733911445 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -18,10 +18,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \ 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 diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile index ec171fab997b..1a3aaf3d8da2 100644 --- a/archivers/ha/Makefile +++ b/archivers/ha/Makefile @@ -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>,' \ diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile index b128838603e6..2e3392e70a2a 100644 --- a/archivers/libunrar/Makefile +++ b/archivers/libunrar/Makefile @@ -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 archives WRKSRC= ${WRKDIR}/unrar -USE_GMAKE= yes +USES= gmake MAKEFILE= makefile.unix ALL_TARGET= lib USE_LDCONFIG= yes diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile index 153ef14745e3..46a9a3a74fdb 100644 --- a/archivers/lrzip/Makefile +++ b/archivers/lrzip/Makefile @@ -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 \ diff --git a/archivers/lzlib/Makefile b/archivers/lzlib/Makefile index 0371513e167f..f39fc5e5c65d 100644 --- a/archivers/lzlib/Makefile +++ b/archivers/lzlib/Makefile @@ -12,8 +12,8 @@ COMMENT= In-memory LZMA compression and decompression library PLIST_FILES= include/lzlib.h \ lib/liblz.a +USES= gmake GNU_CONFIGURE= yes -USE_GMAKE= yes MAKE_ARGS= ${MAKE_ENV} INFO= lzlib diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile index 8db5e24d03b1..5647575fc05e 100644 --- a/archivers/lzma/Makefile +++ b/archivers/lzma/Makefile @@ -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 diff --git a/archivers/lzmalib/Makefile b/archivers/lzmalib/Makefile index 22d34f9fdb62..d02ab101f8d4 100644 --- a/archivers/lzmalib/Makefile +++ b/archivers/lzmalib/Makefile @@ -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.sourceforge.net/misc/ 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> diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile index 414ae090de12..54a1d7e98ac9 100644 --- a/archivers/ocaml-bz2/Makefile +++ b/archivers/ocaml-bz2/Makefile @@ -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 diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile index 02152e134125..290f83f5d96a 100644 --- a/archivers/pbzip2/Makefile +++ b/archivers/pbzip2/Makefile @@ -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 diff --git a/archivers/pigz/Makefile b/archivers/pigz/Makefile index 8219c2efd0ef..021fe9deb270 100644 --- a/archivers/pigz/Makefile +++ b/archivers/pigz/Makefile @@ -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 diff --git a/archivers/plzip/Makefile b/archivers/plzip/Makefile index b52170f7b9d8..499aff3f2c24 100644 --- a/archivers/plzip/Makefile +++ b/archivers/plzip/Makefile @@ -13,8 +13,8 @@ BUILD_DEPENDS= lzlib>=1.1:${PORTSDIR}/archivers/lzlib 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 diff --git a/archivers/ppmd-7z/Makefile b/archivers/ppmd-7z/Makefile index 7473d7d64386..9211a859ae36 100644 --- a/archivers/ppmd-7z/Makefile +++ b/archivers/ppmd-7z/Makefile @@ -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 diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index 3793894d1099..55ef92fa0348 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt CONFLICTS= rpm-[45].* -USE_GMAKE= yes +USES= gmake USE_AUTOTOOLS= automake14 autoconf213 libtool CONFIGURE_ARGS= --with-glob USE_LDCONFIG= yes diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 81fe5fe5de90..0139e86606ab 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -17,9 +17,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed 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 diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile index 0c368f2c8f4b..5b58d06808cd 100644 --- a/archivers/rpm5/Makefile +++ b/archivers/rpm5/Makefile @@ -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.* diff --git a/archivers/rvm/Makefile b/archivers/rvm/Makefile index 480348962889..b150f018ba25 100644 --- a/archivers/rvm/Makefile +++ b/archivers/rvm/Makefile @@ -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 \ diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile index b6d0ee770439..dd8a856e0ae5 100644 --- a/archivers/squeeze/Makefile +++ b/archivers/squeeze/Makefile @@ -19,12 +19,11 @@ LIB_DEPENDS= thunar-vfs-1:${PORTSDIR}/x11-fm/thunar-vfs 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 diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile index c35406b97e5f..926f43390924 100644 --- a/archivers/szip/Makefile +++ b/archivers/szip/Makefile @@ -12,7 +12,7 @@ DISTNAME= sz${PORTVERSION:S/.//}_src MAINTAINER= ports@FreeBSD.org COMMENT= Fast compression utility -USE_GMAKE= yes +USES= gmake WRKSRC= ${WRKDIR} diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile index da2eb0a95a5e..b38da59de4a0 100644 --- a/archivers/thunar-archive-plugin/Makefile +++ b/archivers/thunar-archive-plugin/Makefile @@ -15,9 +15,8 @@ COMMENT= Archive plugin for the Thunar File Manager 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> diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile index fd4c08b935f8..b6605c51d8f3 100644 --- a/archivers/unace/Makefile +++ b/archivers/unace/Makefile @@ -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 archives MAKE_JOBS_UNSAFE= yes -USE_GMAKE= yes +USES= gmake ALL_TARGET= clean unace PLIST_FILES= bin/unace diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile index a05d076520a4..92c75971fa80 100644 --- a/archivers/upx/Makefile +++ b/archivers/upx/Makefile @@ -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/ucl 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 diff --git a/archivers/xar/Makefile b/archivers/xar/Makefile index e4797a0d3983..5723220111e9 100644 --- a/archivers/xar/Makefile +++ b/archivers/xar/Makefile @@ -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 diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile index ff70f4ef728d..c4caada78f8b 100644 --- a/archivers/xarchiver/Makefile +++ b/archivers/xarchiver/Makefile @@ -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 to various archiving tools 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 |