From be41425d62fadcf027f2786f380ffa32662102d1 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 2 Sep 2013 21:16:30 +0000 Subject: [PATCH] Add an explicit dependency on pkgconf --- audio/asunder/Makefile | 2 +- audio/jamin/Makefile | 2 +- audio/mixmos/Makefile | 7 ++----- audio/xoscope/Makefile | 2 +- audio/xsynth-dssi/Makefile | 2 +- chinese/oxim/Makefile | 2 +- comms/gpredict/Makefile | 3 +-- deskutils/clipit/Makefile | 2 +- devel/gpsim/Makefile | 7 ++----- editors/gmanedit/Makefile | 3 +-- games/eboard/Makefile | 2 +- games/euchre/Makefile | 1 + games/glightoff/Makefile | 4 ++-- graphics/epdfview/Makefile | 3 +-- graphics/giram/Makefile | 9 ++------- graphics/gliv/Makefile | 9 ++------- graphics/gqview-devel/Makefile | 7 ++----- graphics/mtpaint/Makefile | 8 ++------ korean/gtkcomm/Makefile | 2 +- math/ggobi/Makefile | 1 + net-mgmt/mbrowse/Makefile | 7 ++----- print/gtklp/Makefile | 1 + security/gtkpasman/Makefile | 2 +- sysutils/gkrellmwho2/Makefile | 7 ++----- sysutils/gpkgdep/Makefile | 7 ++----- sysutils/xcdroast/Makefile | 3 +-- textproc/aiksaurus/Makefile | 3 +-- x11-toolkits/gtkmm20-reference/Makefile | 8 ++------ x11-toolkits/gtksourceviewmm3/Makefile | 3 +-- x11-wm/wmakerconf/Makefile | 4 +--- 30 files changed, 41 insertions(+), 82 deletions(-) diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile index e57fc27fb13f..917215373ec0 100644 --- a/audio/asunder/Makefile +++ b/audio/asunder/Makefile @@ -23,7 +23,7 @@ WINDOWS_CHARS_DESC= Allow Windows special chars in filenames USE_BZIP2= yes GNU_CONFIGURE= yes -USES= gettext gmake +USES= gettext gmake pkgconfig USE_GNOME= gtk20 PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README TODO diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile index 84c478383da5..1bc37b5b0d6f 100644 --- a/audio/jamin/Makefile +++ b/audio/jamin/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 GNU_CONFIGURE= yes -USES= gmake +USES= gmake pkgconfig USE_GNOME= gtk20 libxml2 MAN1= jamin.1 diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile index 10cba643c43e..b88778b3cdc2 100644 --- a/audio/mixmos/Makefile +++ b/audio/mixmos/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mixmos -# Date created: 24 Jul 2004 -# Whom: Herbert J. Skuhra -# +# Created by: Herbert J. Skuhra # $FreeBSD$ -# PORTNAME= mixmos PORTVERSION= 0.2.0 @@ -14,6 +10,7 @@ MASTER_SITES= ${MASTER_SITE_TUCOWS} MAINTAINER= h.skuhra@gmail.com COMMENT= A GTK2 audio mixer +USES= pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/xoscope/Makefile b/audio/xoscope/Makefile index 72dc2a36e406..4a30044a7eea 100644 --- a/audio/xoscope/Makefile +++ b/audio/xoscope/Makefile @@ -11,7 +11,7 @@ COMMENT= Sound card oscilloscope GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} -USES= gmake +USES= gmake pkgconfig USE_GNOME= gtk20 USE_XORG= x11 diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile index 88113fb986e0..aeed0d8524cf 100644 --- a/audio/xsynth-dssi/Makefile +++ b/audio/xsynth-dssi/Makefile @@ -20,7 +20,7 @@ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi USE_GNOME= gtk20 -USES= gmake +USES= gmake pkgconfig USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile index 9f1e644a6f7b..89926944fce4 100644 --- a/chinese/oxim/Makefile +++ b/chinese/oxim/Makefile @@ -19,7 +19,7 @@ GTK2_DESC= GTK2 input method module CHEWING_DESC= Chewing input module UNICODE_DESC= Unicode input module -USES= iconv +USES= iconv pkgconfig USE_XORG= x11 xft xpm xtst WANT_GNOME= yes diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile index 2269ae366f13..f1b9fddd8098 100644 --- a/comms/gpredict/Makefile +++ b/comms/gpredict/Makefile @@ -15,9 +15,8 @@ LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib \ curl:${PORTSDIR}/ftp/curl \ goocanvas:${PORTSDIR}/graphics/goocanvas -USES= gettext pathfix +USES= gettext pathfix gmake pkgconfig USE_GNOME= gtk20 -USE_GMAKE= yes GNU_CONFIGURE= yes MAN1= gpredict.1 diff --git a/deskutils/clipit/Makefile b/deskutils/clipit/Makefile index de100fb2be33..3938905ab0aa 100644 --- a/deskutils/clipit/Makefile +++ b/deskutils/clipit/Makefile @@ -10,7 +10,7 @@ COMMENT= Lightweight GTK+ clipboard manager forked from parcellite GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GMAKE= yes +USES= gmake pkgconfig USE_GNOME= gtk20 OPTIONS_DEFINE= NLS XDOTOOL diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile index 31465ad986a6..571f31df7674 100644 --- a/devel/gpsim/Makefile +++ b/devel/gpsim/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: gpsim -# Date created: 2006-03-13 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= gpsim PORTVERSION= 0.22.0 @@ -20,6 +16,7 @@ RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes +USES= pkgconfig USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile index 427a8454b121..3f28edc78ba8 100644 --- a/editors/gmanedit/Makefile +++ b/editors/gmanedit/Makefile @@ -10,9 +10,8 @@ MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A GNOME manpages editor -USES= pathfix gettext +USES= pathfix gettext gmake pkgconfig USE_GNOME= gtk20 -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/games/eboard/Makefile b/games/eboard/Makefile index 493eb660caf0..60d2d08f9639 100644 --- a/games/eboard/Makefile +++ b/games/eboard/Makefile @@ -19,7 +19,7 @@ COMMENT= GTK+ chess board interface (mainly for FICS and chessd) LIB_DEPENDS= png15:${PORTSDIR}/graphics/png EXTRAS= 1pl2 2 -USES= shebangfix +USES= shebangfix pkgconfig USE_BZIP2= yes HAS_CONFIGURE= yes USE_PERL5_BUILD=yes diff --git a/games/euchre/Makefile b/games/euchre/Makefile index d007b28f8898..277c316bc7e3 100644 --- a/games/euchre/Makefile +++ b/games/euchre/Makefile @@ -11,6 +11,7 @@ COMMENT= Very popular card game with variable skill levels LICENSE= GPLv2 # (or later) +USES= pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules diff --git a/games/glightoff/Makefile b/games/glightoff/Makefile index 68f6e64e6234..85204ffa7f9e 100644 --- a/games/glightoff/Makefile +++ b/games/glightoff/Makefile @@ -1,4 +1,4 @@ -# Created by: nemysis@gmx.ch +# Created by: nemysis@gmx.ch # $FreeBSD$ PORTNAME= glightoff @@ -13,7 +13,7 @@ COMMENT= Simple (but not so easy to solve!) puzzle game LICENSE= GPLv2 GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake pkgconfig USE_GNOME= glib20 gtk20 USE_XORG= x11 diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index dfa03c8a7bba..ed0ad5ad2b93 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -19,8 +19,7 @@ LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib USE_BZIP2= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= iconv -USE_GMAKE= yes +USES= iconv gmake pkgconfig USE_GNOME= gtk20 intlhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 72e9052a01fc..62e65bc517ec 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: giram -# Date created: 17 June 1999 -# Whom: Brandon Fosdick -# +# Created by: Brandon Fosdick # $FreeBSD$ -# PORTNAME= giram PORTVERSION= 0.3.5 @@ -18,10 +14,9 @@ LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= gettext perl5 +USES= gettext perl5 pkgconfig gmake USE_PERL5= build USE_GNOME= gtk20 -USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ENV= INTLTOOL_PERL="${PERL}" LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile index 158b1b710d70..5d5e5a77f2a1 100644 --- a/graphics/gliv/Makefile +++ b/graphics/gliv/Makefile @@ -1,9 +1,5 @@ -# ports collection makefile for: gliv -# Date created: 16 March 2001 -# Whom: Jeremy Norris -# +# Created by: Jeremy Norris # $FreeBSD$ -# PORTNAME= gliv PORTVERSION= 1.9.7 @@ -21,8 +17,7 @@ LICENSE= GPLv2 USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk20 USE_GL= yes -USES= gettext -USE_GMAKE= yes +USES= gettext gmake pkgconfig GNU_CONFIGURE= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile index c2280ee5c3ba..82866c1db1ef 100644 --- a/graphics/gqview-devel/Makefile +++ b/graphics/gqview-devel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: gqview -# Date Created: 27 Oct 1998 -# Whom: Vanilla Pooh Shu -# +# Created by: Vanilla Pooh Shu # $FreeBSD$ -# PORTNAME= gqview PORTVERSION= 2.1.5 @@ -16,6 +12,7 @@ COMMENT= Another gtk2-based graphic file viewer LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +USES= pkgconfig USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile index eec23afa7105..d04779f9b01f 100644 --- a/graphics/mtpaint/Makefile +++ b/graphics/mtpaint/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mtpaint -# Date created: 3 April 2007 -# Whom: Andrew Pantyukhin -# +# Created by: Andrew Pantyukhin # $FreeBSD$ -# PORTNAME= mtpaint PORTVERSION= 3.40 @@ -29,7 +25,7 @@ OPENJPEG_DESC= Enable OpenJPEG support USE_BZIP2= yes USE_GNOME= gtk20 -USE_GMAKE= yes +USES= gmake pkgconfig HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \ --localedir=${PREFIX}/share/locale \ diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile index d10a4d13ecd2..dac30f53f9da 100644 --- a/korean/gtkcomm/Makefile +++ b/korean/gtkcomm/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf -USES= perl5 +USES= perl5 pkgconfig USE_PERL5= build USE_GNOME= glib20 gtk20 GNU_CONFIGURE= yes diff --git a/math/ggobi/Makefile b/math/ggobi/Makefile index 06d90d4e285a..ce1d3f1a3a46 100644 --- a/math/ggobi/Makefile +++ b/math/ggobi/Makefile @@ -10,6 +10,7 @@ MASTER_SITES= http://www.ggobi.org/downloads/ MAINTAINER= rhurlin@gwdg.de COMMENT= Data visualization system +USES= pkgconfig USE_BZIP2= yes USE_GNOME= gtk20 libxml2 gnomehack USE_LDCONFIG= yes diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile index bbc7a3bd2409..432ac25d8d2f 100644 --- a/net-mgmt/mbrowse/Makefile +++ b/net-mgmt/mbrowse/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mbrowse -# Date created: Apr 4, 2002 -# Whom: Mark Pulford -# +# Created by: Mark Pulford # $FreeBSD$ -# PORTNAME= mbrowse PORTVERSION= 0.4.0 @@ -18,6 +14,7 @@ LIB_DEPENDS= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp GNU_CONFIGURE= yes PLIST_FILES= bin/mbrowse +USES= pkgconfig USE_GNOME= gtk20 CONFIGURE_ARGS= --with-snmp-prefix=${PREFIX} --with-snmp-type=net CPPFLAGS+= `net-snmp-config --cflags` diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile index 26eda1d756c0..95eeec75fd30 100644 --- a/print/gtklp/Makefile +++ b/print/gtklp/Makefile @@ -15,6 +15,7 @@ LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= pkgconfig USE_GNOME= gtk20 USE_OPENSSL= yes USE_AUTOTOOLS= automake:env diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile index a981f7af1e1d..a275cec4db50 100644 --- a/security/gtkpasman/Makefile +++ b/security/gtkpasman/Makefile @@ -11,7 +11,7 @@ COMMENT= GTK+ passwords manager for system and network administrators RUN_DEPENDS+= gpgv2:${PORTSDIR}/security/gnupg -USES= desktop-file-utils gmake +USES= desktop-file-utils gmake pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gtk2 diff --git a/sysutils/gkrellmwho2/Makefile b/sysutils/gkrellmwho2/Makefile index d91fe34ac554..dfd2cd573d11 100644 --- a/sysutils/gkrellmwho2/Makefile +++ b/sysutils/gkrellmwho2/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: gkrellmwho2 -# Date created: 12 Nov 2003 -# Whom: Alexey Zaytsev -# +# Created by: Alexey Zaytsev # $FreeBSD$ -# PORTNAME= gkrellmwho2 PORTVERSION= 0.2.8 @@ -21,6 +17,7 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 HAS_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig +USES= pkgconfig ALL_TARGET= PLIST_FILES= libexec/gkrellm2/plugins/gkrellmwho2.so diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile index 1d823ea6fc4e..4097ccec817e 100644 --- a/sysutils/gpkgdep/Makefile +++ b/sysutils/gpkgdep/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: gpkgdep -# Date created: 2002/11/28 -# Whom: Heiner -# +# Created by: Heiner # $FreeBSD$ PORTNAME= gpkgdep @@ -19,7 +16,7 @@ USE_BZIP2= yes USE_GNOME= gtk20 USE_AUTOTOOLS= automake14 autoconf AUTOMAKE_ARGS= --add-missing -USE_GMAKE= yes +USES= gmake pkgconfig PLIST_FILES= bin/gpkgdep .include diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index c593b57a9140..ffc23df04f5b 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -20,10 +20,9 @@ NONROOT_DESC= Use xcdroast w/o being root RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools -USES= gettext +USES= gettext gmake pkgconfig GNU_CONFIGURE= yes WANT_GNOME= yes -USE_GMAKE= yes CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile index 2105d0f9d4bd..0289866115ab 100644 --- a/textproc/aiksaurus/Makefile +++ b/textproc/aiksaurus/Makefile @@ -11,9 +11,8 @@ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A set of libraries and applications which provide a thesaurus USE_AUTOTOOLS= libtool -USE_GMAKE= yes USE_CSTD= gnu89 -USES= pathfix +USES= pathfix gmake pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?=--without-gtk diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile index ba8df81f3ea8..8923550b4d72 100644 --- a/x11-toolkits/gtkmm20-reference/Makefile +++ b/x11-toolkits/gtkmm20-reference/Makefile @@ -1,15 +1,11 @@ -# New ports collection makefile for: gtkmm20-reference -# Date created: 09 May 2006 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# PORTREVISION= 7 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20 -USE_GMAKE= yes +USES= gmake pkgconfig GNU_CONFIGURE= yes DOCSDIR= ${PREFIX}/share/doc/gtkmm-2.0 diff --git a/x11-toolkits/gtksourceviewmm3/Makefile b/x11-toolkits/gtksourceviewmm3/Makefile index 34431c185eb5..92f69e9c97d3 100644 --- a/x11-toolkits/gtksourceviewmm3/Makefile +++ b/x11-toolkits/gtksourceviewmm3/Makefile @@ -13,9 +13,8 @@ COMMENT= C++ binding of GtkSourceView3 USE_LDCONFIG= yes USE_XZ= yes -USES= pathfix +USES= pathfix gmake pkgconfig USE_GNOME= gtksourceview3 gnomeprefix gtkmm30 -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBAS}/lib diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index 44545fdbb710..425eeeaa5f71 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -19,9 +19,7 @@ RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GNOME= gtk20 -USE_PERL5= yes -USES= gettext -USE_GMAKE= yes +USES= gettext pkgconfig perl5 gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wmakerdataprefix="${LOCALBASE}/share" \ --with-wmakeretcprefix="${LOCALBASE}/share"