Index: Mk/bsd.xorg.mk =================================================================== --- Mk/bsd.xorg.mk (revision 305013) +++ Mk/bsd.xorg.mk (working copy) @@ -39,7 +39,7 @@ MASTER_SITE_SUBDIR?= individual/${XORG_CAT} . if ${XORG_CAT} == "app" -USE_GNOME+= pkgconfig +USE_PKGCONFIG= build . endif . if ${XORG_CAT} == "data" @@ -47,7 +47,7 @@ . endif . if ${XORG_CAT} == "driver" -USE_GNOME+= pkgconfig +USE_PKGCONFIG= build USE_XORG+= xorg-server xproto randrproto xi CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' . if ${PORTNAME:M*input*}x != x @@ -82,7 +82,7 @@ USE_GNOME+= gnomehack NEED_MKFONTFOO= no . elif ${INSTALLS_TTF} == "yes" -USE_GNOME+= pkgconfig +USE_PKGCONFIG= build BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig . else @@ -118,7 +118,8 @@ . endif . if ${XORG_CAT} == "lib" -USE_GNOME+= gnomehack pkgconfig +USE_GNOME+= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif Index: accessibility/atk/Makefile =================================================================== --- accessibility/atk/Makefile (revision 305013) +++ accessibility/atk/Makefile (working copy) @@ -27,6 +27,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack glib20 ltverhack referencehack +USE_PKGCONFIG= build CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc Index: accessibility/speech-dispatcher/Makefile =================================================================== --- accessibility/speech-dispatcher/Makefile (revision 305013) +++ accessibility/speech-dispatcher/Makefile (working copy) @@ -20,8 +20,9 @@ sndfile.1:${PORTSDIR}/audio/libsndfile # gnomehier is required because of share/sounds directory. -USE_GNOME= glib20 gnomehier pkgconfig +USE_GNOME= glib20 gnomehier GNU_CONFIGURE= yes +USE_PKGCONFIG= build CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes Index: archivers/libzip/Makefile =================================================================== --- archivers/libzip/Makefile (revision 305013) +++ archivers/libzip/Makefile (working copy) @@ -15,9 +15,10 @@ USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build MAKE_ENV= LC_ALL="C" USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes MAN1= zipcmp.1 \ Index: archivers/squeeze/Makefile =================================================================== --- archivers/squeeze/Makefile (revision 305013) +++ archivers/squeeze/Makefile (working copy) @@ -17,11 +17,12 @@ LIB_DEPENDS= thunar-vfs-1.5:${PORTSDIR}/x11-fm/thunar-vfs GNU_CONFIGURE= yes +USE_PKGCONFIG= build INSTALLS_ICONS= yes USE_XFCE= configenv libutil thunar USE_XORG= x11 -USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes Index: archivers/xarchiver/Makefile =================================================================== --- archivers/xarchiver/Makefile (revision 305013) +++ archivers/xarchiver/Makefile (working copy) @@ -18,8 +18,9 @@ USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gtk20 intltool pkgconfig desktopfileutils +USE_GNOME= glib20 gtk20 intltool desktopfileutils GNU_CONFIGURE= yes +USE_PKGCONFIG= build INSTALLS_ICONS= yes .include Index: astro/foxtrotgps/Makefile =================================================================== --- astro/foxtrotgps/Makefile (revision 305013) +++ astro/foxtrotgps/Makefile (working copy) @@ -19,10 +19,11 @@ gps:${PORTSDIR}/astro/gpsd GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gtk20 gconf2 libxml2 intltool pkgconfig libglade2 +USE_GNOME= gtk20 gconf2 libxml2 intltool libglade2 USE_SQLITE= 3 INSTALLS_ICONS= yes Index: astro/gpsd/Makefile =================================================================== --- astro/gpsd/Makefile (revision 305013) +++ astro/gpsd/Makefile (working copy) @@ -17,7 +17,7 @@ BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_SCONS= yes USE_RC_SUBR= gpsd USE_PYTHON= yes Index: audio/alsa-plugins/Makefile =================================================================== --- audio/alsa-plugins/Makefile (revision 305013) +++ audio/alsa-plugins/Makefile (working copy) @@ -20,7 +20,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/alsa-lib Index: audio/aqualung/Makefile =================================================================== --- audio/aqualung/Makefile (revision 305013) +++ audio/aqualung/Makefile (working copy) @@ -37,9 +37,10 @@ strfunc.9:${PORTSDIR}/devel/libstrfunc USE_GETTEXT= yes -USE_GNOME= pkgconfig gtk20 libxml2 +USE_GNOME= gtk20 libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ARGS= --program-transform-name="" --with-alsa=no --with-ifp=no \ --with-cdda=no CPPFLAGS+= -I${LOCALBASE}/include Index: audio/bmp-htmlplaylist/Makefile =================================================================== --- audio/bmp-htmlplaylist/Makefile (revision 305013) +++ audio/bmp-htmlplaylist/Makefile (working copy) @@ -20,7 +20,7 @@ RUN_DEPENDS= beep-media-player:${PORTSDIR}/multimedia/beep-media-player MAKE_ARGS= CC=${CC} LD=${CC} -USE_GNOME= pkgconfig +USE_PKGCONFIG= build WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes Index: audio/esound/Makefile =================================================================== --- audio/esound/Makefile (revision 305013) +++ audio/esound/Makefile (working copy) @@ -20,6 +20,7 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= JW=false Index: audio/fluidsynth/Makefile =================================================================== --- audio/fluidsynth/Makefile (revision 305013) +++ audio/fluidsynth/Makefile (working copy) @@ -20,7 +20,8 @@ OPTIONS_DEFAULT= JACK USE_BZIP2= yes -USE_GNOME= glib20 pkgconfig +USE_PKGCONFIG= build +USE_GNOME= glib20 USE_CMAKE= yes CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ -Denable-midishare:BOOL=FALSE Index: audio/freealut/Makefile =================================================================== --- audio/freealut/Makefile (revision 305013) +++ audio/freealut/Makefile (working copy) @@ -16,10 +16,11 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack USE_OPENAL= al USE_LDCONFIG= yes Index: audio/jack/Makefile =================================================================== --- audio/jack/Makefile (revision 305013) +++ audio/jack/Makefile (working copy) @@ -29,9 +29,10 @@ CONFIGURE_ARGS+=--enable-portaudio \ --with-default-tmpdir=/tmp GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack MAN1= jackd.1 jackstart.1 Index: audio/libaacplus/Makefile =================================================================== --- audio/libaacplus/Makefile (revision 305013) +++ audio/libaacplus/Makefile (working copy) @@ -25,7 +25,8 @@ CONFLICTS= aacplusenc-0* USE_CSTD= gnu89 -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool libtoolize aclocal autoheader automake GNOME_MAKEFILEIN= Makefile.am Index: audio/libao/Makefile =================================================================== --- audio/libao/Makefile (revision 305013) +++ audio/libao/Makefile (working copy) @@ -16,7 +16,8 @@ USE_AUTOTOOLS= libtool WANT_GNOME= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: audio/libaudiofile/Makefile =================================================================== --- audio/libaudiofile/Makefile (revision 305013) +++ audio/libaudiofile/Makefile (working copy) @@ -17,7 +17,8 @@ COMMENT= A sound library for SGI audio file USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: audio/libbpm/Makefile =================================================================== --- audio/libbpm/Makefile (revision 305013) +++ audio/libbpm/Makefile (working copy) @@ -16,7 +16,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build post-patch: ${SED} -i '' 's/\(-release .*\)/\1 -version-info 0/' ${WRKSRC}/Makefile.in ${WRKSRC}/*/Makefile.in Index: audio/libcdaudio/Makefile =================================================================== --- audio/libcdaudio/Makefile (revision 305013) +++ audio/libcdaudio/Makefile (working copy) @@ -15,8 +15,9 @@ COMMENT= A library for playing audio CDs USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: audio/libcddb/Makefile =================================================================== --- audio/libcddb/Makefile (revision 305013) +++ audio/libcddb/Makefile (working copy) @@ -17,7 +17,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --without-cdio Index: audio/libfishsound/Makefile =================================================================== --- audio/libfishsound/Makefile (revision 305013) +++ audio/libfishsound/Makefile (working copy) @@ -20,7 +20,8 @@ vorbis:${PORTSDIR}/audio/libvorbis GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes OPTIONS= DOXYGEN "Doxygen is required for generating documents" off Index: audio/libid3tag/Makefile =================================================================== --- audio/libid3tag/Makefile (revision 305013) +++ audio/libid3tag/Makefile (working copy) @@ -17,8 +17,8 @@ LICENSE= GPLv2 -USE_GNOME= pkgconfig GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes post-patch: Index: audio/libmad/Makefile =================================================================== --- audio/libmad/Makefile (revision 305013) +++ audio/libmad/Makefile (working copy) @@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-debugging \ --enable-sso Index: audio/libmodplug/Makefile =================================================================== --- audio/libmodplug/Makefile (revision 305013) +++ audio/libmodplug/Makefile (working copy) @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes Index: audio/libmpd/Makefile =================================================================== --- audio/libmpd/Makefile (revision 305013) +++ audio/libmpd/Makefile (working copy) @@ -15,7 +15,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_GNOME= pkgconfig glib20 gnomehack +USE_PKGCONFIG= build +USE_GNOME= glib20 gnomehack USE_LDCONFIG= yes post-patch: Index: audio/libmpdclient/Makefile =================================================================== --- audio/libmpdclient/Makefile (revision 305013) +++ audio/libmpdclient/Makefile (working copy) @@ -15,8 +15,9 @@ USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack USE_LDCONFIG= yes .include Index: audio/liboggz/Makefile =================================================================== --- audio/liboggz/Makefile (revision 305013) +++ audio/liboggz/Makefile (working copy) @@ -18,7 +18,7 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ogg=${LOCALBASE} --program-transform-name="" Index: audio/libsamplerate/Makefile =================================================================== --- audio/libsamplerate/Makefile (revision 305013) +++ audio/libsamplerate/Makefile (working copy) @@ -17,7 +17,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: audio/libshout2/Makefile =================================================================== --- audio/libshout2/Makefile (revision 305013) +++ audio/libshout2/Makefile (working copy) @@ -25,10 +25,11 @@ CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include GNU_CONFIGURE= yes +USE_PKGCONFIG= build LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/libshout Index: audio/libsndfile/Makefile =================================================================== --- audio/libsndfile/Makefile (revision 305013) +++ audio/libsndfile/Makefile (working copy) @@ -17,8 +17,9 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes CONFIGURE_ARGS= --disable-gcc-pipe \ --disable-sqlite \ Index: audio/mp3unicode/Makefile =================================================================== --- audio/mp3unicode/Makefile (revision 305013) +++ audio/mp3unicode/Makefile (working copy) @@ -18,8 +18,8 @@ USE_BZIP2= yes USE_ICONV= yes -USE_GNOME= pkgconfig GNU_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ENV= ICONV_CFLAGS="-I${LOCALBASE}/include" \ ICONV_LIBS="-L${LOCALBASE}/lib -liconv" Index: audio/mpdas/Makefile =================================================================== --- audio/mpdas/Makefile (revision 305013) +++ audio/mpdas/Makefile (working copy) @@ -13,7 +13,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ mpd.4:${PORTSDIR}/audio/libmpd -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_BZIP2= yes USE_RC_SUBR= mpdas Index: audio/mpdscribble/Makefile =================================================================== --- audio/mpdscribble/Makefile (revision 305013) +++ audio/mpdscribble/Makefile (working copy) @@ -18,8 +18,9 @@ LIB_DEPENDS+= mpdclient.2:${PORTSDIR}/audio/libmpdclient USE_BZIP2= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_RC_SUBR= mpdscribble MAN1= mpdscribble.1 Index: audio/openal/Makefile =================================================================== --- audio/openal/Makefile (revision 305013) +++ audio/openal/Makefile (working copy) @@ -19,11 +19,12 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-capture USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack WANT_SDL= yes USE_LDCONFIG= yes Index: audio/p5-MusicBrainz-DiscID/Makefile =================================================================== --- audio/p5-MusicBrainz-DiscID/Makefile (revision 305013) +++ audio/p5-MusicBrainz-DiscID/Makefile (working copy) @@ -19,7 +19,7 @@ LIB_DEPENDS= discid.0:${PORTSDIR}/audio/libdiscid RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PERL_MODBUILD= yes MAN3= MusicBrainz::DiscID.3 Index: audio/p5-Net-LibLO/Makefile =================================================================== --- audio/p5-Net-LibLO/Makefile (revision 305013) +++ audio/p5-Net-LibLO/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS= lo:${PORTSDIR}/audio/liblo PERL_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAN3= \ Net::LibLO.3 \ Index: audio/rubberband/Makefile =================================================================== --- audio/rubberband/Makefile (revision 305013) +++ audio/rubberband/Makefile (working copy) @@ -25,6 +25,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes @@ -32,6 +33,4 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= pkgconfig - .include Index: audio/sdl_mixer/Makefile =================================================================== --- audio/sdl_mixer/Makefile (revision 305013) +++ audio/sdl_mixer/Makefile (working copy) @@ -17,9 +17,10 @@ USE_AUTOTOOLS= libtool USE_SDL= sdl -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/etc/timidity.cfg\" Index: audio/shairport/Makefile =================================================================== --- audio/shairport/Makefile (revision 305013) +++ audio/shairport/Makefile (working copy) @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_PERL5_RUN= 5.10.0+ USE_OPENSSL= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_RC_SUBR= ${PORTNAME} SUB_LIST= PERL=${PERL} Index: audio/sooperlooper/Makefile =================================================================== --- audio/sooperlooper/Makefile (revision 305013) +++ audio/sooperlooper/Makefile (working copy) @@ -29,6 +29,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_WX= 2.6+ WX_UNICODE= yes @@ -39,6 +40,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 .include Index: audio/thunar-media-tags-plugin/Makefile =================================================================== --- audio/thunar-media-tags-plugin/Makefile (revision 305013) +++ audio/thunar-media-tags-plugin/Makefile (working copy) @@ -22,7 +22,8 @@ USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_PKGCONFIG= build +USE_GNOME= gnomehack gtk20 intltool intlhack USE_XFCE= configenv libexo thunar USE_AUTOTOOLS= libtool Index: audio/twolame/Makefile =================================================================== --- audio/twolame/Makefile (revision 305013) +++ audio/twolame/Makefile (working copy) @@ -17,9 +17,10 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build MAN1= twolame.1 Index: audio/vagalume/Makefile =================================================================== --- audio/vagalume/Makefile (revision 305013) +++ audio/vagalume/Makefile (working copy) @@ -20,8 +20,9 @@ curl.6:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 USE_GSTREAMER= good mad gconf INSTALLS_ICONS= yes Index: audio/vamp-plugin-sdk/Makefile =================================================================== --- audio/vamp-plugin-sdk/Makefile (revision 305013) +++ audio/vamp-plugin-sdk/Makefile (working copy) @@ -19,9 +19,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig - .include Index: audio/wavpack/Makefile =================================================================== --- audio/wavpack/Makefile (revision 305013) +++ audio/wavpack/Makefile (working copy) @@ -16,10 +16,11 @@ LICENSE= BSD USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: audio/xfce4-mixer/Makefile =================================================================== --- audio/xfce4-mixer/Makefile (revision 305013) +++ audio/xfce4-mixer/Makefile (working copy) @@ -20,11 +20,12 @@ RUN_DEPENDS+= gstreamer-plugins-good>=0.10.22:${PORTSDIR}/multimedia/gstreamer-plugins-good GNU_CONFIGURE= yes +USE_PKGCONFIG= build INSTALLS_ICONS= yes USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack libxml2 pkgconfig +USE_GNOME= gtk20 intltool intlhack libxml2 USE_XFCE= configenv libgui libutil panel xfconf USE_XORG= xproto x11 xrender xext xinerama xrandr xcursor xcomposite \ xdamage xfixes xi xau xdmcp Index: benchmarks/expedite/Makefile =================================================================== --- benchmarks/expedite/Makefile (revision 305013) +++ benchmarks/expedite/Makefile (working copy) @@ -19,9 +19,10 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_EFL= evas USE_EFL_EVAS_ENGINES= buffer -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes OPTIONS= OPENGL "Enable OpenGL engine" on \ Index: cad/freehdl/Makefile =================================================================== --- cad/freehdl/Makefile (revision 305013) +++ cad/freehdl/Makefile (working copy) @@ -16,10 +16,10 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_PERL5= yes -USE_GNOME= gnomehack \ - pkgconfig +USE_GNOME= gnomehack USE_AUTOTOOLS= libtool HAS_CONFIGURE= yes +USE_PKGCONFIG= build MAN1= freehdl-config.1 \ freehdl-gennodes.1 \ Index: chinese/libchewing/Makefile =================================================================== --- chinese/libchewing/Makefile (revision 305013) +++ chinese/libchewing/Makefile (working copy) @@ -13,8 +13,9 @@ MAINTAINER= clsung@FreeBSD.org COMMENT= The Chewing intelligent phonetic input method library -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_BZIP2= yes Index: chinese/libpinyin/Makefile =================================================================== --- chinese/libpinyin/Makefile (revision 305013) +++ chinese/libpinyin/Makefile (working copy) @@ -17,9 +17,10 @@ import_interpolation.1 USE_BDB= yes -USE_GNOME= glib20 gnomehack pkgconfig +USE_GNOME= glib20 gnomehack USE_GETTEXT= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes Index: chinese/scim-array/Makefile =================================================================== --- chinese/scim-array/Makefile (revision 305013) +++ chinese/scim-array/Makefile (working copy) @@ -18,8 +18,8 @@ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes -USE_GNOME= pkgconfig USE_GETTEXT= yes USE_ICONV= yes Index: comms/hamlib/Makefile =================================================================== --- comms/hamlib/Makefile (revision 305013) +++ comms/hamlib/Makefile (working copy) @@ -15,7 +15,8 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 -USE_GNOME= pkgconfig gnomehack libxml2 +USE_GNOME= gnomehack libxml2 +USE_PKGCONFIG= build USE_PERL5= yes USE_TCL= yes USE_PYTHON= yes Index: comms/libticables/Makefile =================================================================== --- comms/libticables/Makefile (revision 305013) +++ comms/libticables/Makefile (working copy) @@ -17,7 +17,8 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GETTEXT= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes Index: comms/libticables2/Makefile =================================================================== --- comms/libticables2/Makefile (revision 305013) +++ comms/libticables2/Makefile (working copy) @@ -18,7 +18,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack pkgconfig +USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .if !defined(WITHOUT_NLS) Index: comms/libticalcs2/Makefile =================================================================== --- comms/libticalcs2/Makefile (revision 305013) +++ comms/libticalcs2/Makefile (working copy) @@ -22,7 +22,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack pkgconfig +USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .if !defined(WITHOUT_NLS) Index: comms/morse/Makefile =================================================================== --- comms/morse/Makefile (revision 305013) +++ comms/morse/Makefile (working copy) @@ -43,7 +43,7 @@ .elif defined(WITH_PA) MAKE_FLAGS+= DEVICE=PA LIB_DEPENDS+= pulse-simple:${PORTSDIR}/audio/pulseaudio -USE_GNOME= pkgconfig +USE_PKGCONFIG= build .if defined(WITH_OSS) || defined(WITH_X11) BROKEN= Only one sound output method must be chosen. Index: converters/enca/Makefile =================================================================== --- converters/enca/Makefile (revision 305013) +++ converters/enca/Makefile (working copy) @@ -20,7 +20,7 @@ LICENSE= GPLv2 USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_ICONV= yes USE_BZIP2= yes USE_GMAKE= yes Index: converters/fribidi/Makefile =================================================================== --- converters/fribidi/Makefile (revision 305013) +++ converters/fribidi/Makefile (working copy) @@ -16,9 +16,10 @@ COMMENT= A Free Implementation of the Unicode Bidirectional Algorithm USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ARGS= --without-glib MAN3= fribidi_charset_to_unicode.3 fribidi_debug_status.3 \ Index: converters/libticonv/Makefile =================================================================== --- converters/libticonv/Makefile (revision 305013) +++ converters/libticonv/Makefile (working copy) @@ -18,7 +18,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack pkgconfig +USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_ICONV= yes Index: converters/lua-iconv/Makefile =================================================================== --- converters/lua-iconv/Makefile (revision 305013) +++ converters/lua-iconv/Makefile (working copy) @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/lua-${PORTNAME}-${PORTVERSION} USE_LUA?= 5.1 -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_ICONV= yes PLIST_FILES= %%LUA_MODLIBDIR%%/iconv.so Index: databases/dbh/Makefile =================================================================== --- databases/dbh/Makefile (revision 305013) +++ databases/dbh/Makefile (working copy) @@ -17,8 +17,9 @@ CONFLICTS= dbh-[0-3]* -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes MAN1= dbh.1 dbh.h.1 Index: databases/libiodbc/Makefile =================================================================== --- databases/libiodbc/Makefile (revision 305013) +++ databases/libiodbc/Makefile (working copy) @@ -20,7 +20,8 @@ CONFLICTS= unixODBC-[0-9]* -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR} USE_LDCONFIG= yes Index: databases/libmemcached/Makefile =================================================================== --- databases/libmemcached/Makefile (revision 305013) +++ databases/libmemcached/Makefile (working copy) @@ -21,7 +21,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_PKGCONFIG= build +USE_GNOME= gnomehack CONFIGURE_ARGS= --without-memcached CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" Index: databases/libodbc++/Makefile =================================================================== --- databases/libodbc++/Makefile (revision 305013) +++ databases/libodbc++/Makefile (working copy) @@ -16,7 +16,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --with-isqlxx CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" Index: databases/mysql-proxy/Makefile =================================================================== --- databases/mysql-proxy/Makefile (revision 305013) +++ databases/mysql-proxy/Makefile (working copy) @@ -22,7 +22,7 @@ CONFIGURE_ENV+= PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc" LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_ICONV= yes USE_LDCONFIG= yes USE_LUA= 5.1+ Index: databases/spatialite_gui/Makefile =================================================================== --- databases/spatialite_gui/Makefile (revision 305013) +++ databases/spatialite_gui/Makefile (working copy) @@ -21,9 +21,9 @@ USE_WX= 2.8 WANT_UNICODE= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes USE_ICONV= yes -USE_GNOME= pkgconfig CPPFLAGS+= -I${LOCALBASE}/include `${WX_CONFIG} --cppflags` LDFLAGS+= -L${LOCALBASE}/lib -liconv `${WX_CONFIG} --libs` CONFIGURE_ARGS+=CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" Index: databases/sqlite3/Makefile =================================================================== --- databases/sqlite3/Makefile (revision 305013) +++ databases/sqlite3/Makefile (working copy) @@ -21,7 +21,7 @@ CONFLICTS= sqlite34-[0-9]* -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= YES GNU_CONFIGURE= YES Index: databases/tdb/Makefile =================================================================== --- databases/tdb/Makefile (revision 305013) +++ databases/tdb/Makefile (working copy) @@ -25,9 +25,9 @@ USE_PYTHON_BUILD= -2.7 USE_LDCONFIG= yes HAS_CONFIGURE= yes +USE_PKGCONFIG= build WAF_TOOL= buildtools/bin/waf CONFIGURE_SCRIPT= ${WAF_TOOL} configure -USE_GNOME= pkgconfig MAKE_JOBS_SAFE= yes Index: deskutils/cairo-dock/Makefile =================================================================== --- deskutils/cairo-dock/Makefile (revision 305013) +++ deskutils/cairo-dock/Makefile (working copy) @@ -21,8 +21,9 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GETTEXT= yes -USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2 +USE_GNOME= gnomehack glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_XORG= xrender xtst USE_CMAKE= yes Index: deskutils/cairo-dock-plugins/Makefile =================================================================== --- deskutils/cairo-dock-plugins/Makefile (revision 305013) +++ deskutils/cairo-dock-plugins/Makefile (working copy) @@ -24,9 +24,10 @@ ICONS_PACKAGE= cairo-dock-plugins-png-icons GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2 +USE_GNOME= gnomehack glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_PYTHON= yes USE_XORG= xrender Index: deskutils/libopensync-plugin-python-devel/Makefile =================================================================== --- deskutils/libopensync-plugin-python-devel/Makefile (revision 305013) +++ deskutils/libopensync-plugin-python-devel/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_CMAKE= yes USE_PYTHON= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CMAKE_ARGS+= -Wno-dev \ -DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR} \ -DPYTHON_LIBRARY:PATH=${PYTHON_LIBDIR}/config/lib${PYTHON_VERSION}.so Index: deskutils/notecase/Makefile =================================================================== --- deskutils/notecase/Makefile (revision 305013) +++ deskutils/notecase/Makefile (working copy) @@ -18,7 +18,8 @@ LICENSE= BSD USE_GMAKE= yes -USE_GNOME= gtk20 gtksourceview2 gnomevfs2 desktopfileutils pkgconfig +USE_GNOME= gtk20 gtksourceview2 gnomevfs2 desktopfileutils +USE_PKGCONFIG= build USE_GETTEXT= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: deskutils/orage/Makefile =================================================================== --- deskutils/orage/Makefile (revision 305013) +++ deskutils/orage/Makefile (working copy) @@ -19,11 +19,12 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes +USE_PKGCONFIG= build INSTALLS_ICONS= yes USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gnomehack gtk20 intltool intlhack desktopfileutils USE_XFCE= configenv libmenu panel USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \ xfixes Index: deskutils/strigi/Makefile =================================================================== --- deskutils/strigi/Makefile (revision 305013) +++ deskutils/strigi/Makefile (working copy) @@ -23,7 +23,8 @@ USE_QT4= corelib gui dbus moc_build uic_build qmake_build rcc_build USE_BZIP2= yes -USE_GNOME= libxml2 pkgconfig +USE_GNOME= libxml2 +USE_PKGCONFIG= build USE_FAM= yes USE_LDCONFIG= yes USE_CMAKE= yes Index: deskutils/tagutils/Makefile =================================================================== --- deskutils/tagutils/Makefile (revision 305013) +++ deskutils/tagutils/Makefile (working copy) @@ -18,7 +18,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack glib20 pkgconfig +USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: deskutils/wammu/Makefile =================================================================== --- deskutils/wammu/Makefile (revision 305013) +++ deskutils/wammu/Makefile (working copy) @@ -26,7 +26,7 @@ USE_WX= 2.6+ WX_COMPS= python:lib WX_UNICODE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MANLANG= "" cs de it nl pt_BR MAN1= wammu.1 wammu-configure.1 Index: deskutils/xfce4-notes-plugin/Makefile =================================================================== --- deskutils/xfce4-notes-plugin/Makefile (revision 305013) +++ deskutils/xfce4-notes-plugin/Makefile (working copy) @@ -23,7 +23,8 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack glib20 gtk20 intltool intlhack desktopfileutils pkgconfig +USE_GNOME= gnomehack glib20 gtk20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel xfconf INSTALLS_ICONS= yes Index: deskutils/xfce4-xkb-plugin/Makefile =================================================================== --- deskutils/xfce4-xkb-plugin/Makefile (revision 305013) +++ deskutils/xfce4-xkb-plugin/Makefile (working copy) @@ -13,10 +13,11 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig librsvg2 +USE_GNOME= gtk20 intltool intlhack librsvg2 USE_XFCE= configenv panel .include Index: deskutils/xneur/Makefile =================================================================== --- deskutils/xneur/Makefile (revision 305013) +++ deskutils/xneur/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig gnomehack +USE_PKGCONFIG= build +USE_GNOME= gnomehack USE_ICONV= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} Index: deskutils/xpad/Makefile =================================================================== --- deskutils/xpad/Makefile (revision 305013) +++ deskutils/xpad/Makefile (working copy) @@ -22,8 +22,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XORG= x11 sm -USE_GNOME= pkgconfig gtk20 gnomehier intltool +USE_GNOME= gtk20 gnomehier intltool GNU_CONFIGURE= yes +USE_PKGCONFIG= build CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: deskutils/xpad-current/Makefile =================================================================== --- deskutils/xpad-current/Makefile (revision 305013) +++ deskutils/xpad-current/Makefile (working copy) @@ -21,11 +21,12 @@ FETCH_ARGS= -p USE_BZIP2= yes USE_XORG= x11 sm -USE_GNOME= pkgconfig gtk20 gnomehier intltool +USE_GNOME= gtk20 gnomehier intltool INSTALLS_ICONS= yes CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes #code currently doesn't properly handle --disable-nls (in next upstream milestone) Index: devel/ORBit2/Makefile =================================================================== --- devel/ORBit2/Makefile (revision 305013) +++ devel/ORBit2/Makefile (working copy) @@ -25,6 +25,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack libidl ltverhack referencehack +USE_PKGCONFIG= build CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include Index: devel/anjuta/Makefile =================================================================== --- devel/anjuta/Makefile (revision 305013) +++ devel/anjuta/Makefile (working copy) @@ -40,6 +40,7 @@ USE_PERL5= yes USE_PYTHON= yes USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4 +USE_PKGCONFIG= both GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: devel/ccrtp/Makefile =================================================================== --- devel/ccrtp/Makefile (revision 305013) +++ devel/ccrtp/Makefile (working copy) @@ -16,8 +16,8 @@ LIB_DEPENDS= ccgnu2-1.7.0:${PORTSDIR}/devel/commoncpp GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes -USE_GNOME= pkgconfig USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" Index: devel/codeblocks/Makefile =================================================================== --- devel/codeblocks/Makefile (revision 305013) +++ devel/codeblocks/Makefile (working copy) @@ -24,8 +24,8 @@ USE_BZIP2= yes USE_WX= 2.8 WANT_UNICODE= yes -USE_GNOME= pkgconfig GNU_CONFIGURE= yes +USE_PKGCONFIG= build INSTALLS_ICONS= yes USE_LDCONFIG= yes Index: devel/cvstrac/Makefile =================================================================== --- devel/cvstrac/Makefile (revision 305013) +++ devel/cvstrac/Makefile (working copy) @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/cvstrac-${PORTVERSION} USE_SQLITE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GMAKE= yes MAKE_ARGS+= SRCDIR=${WRKSRC} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} Index: devel/dbus-glib/Makefile =================================================================== --- devel/dbus-glib/Makefile (revision 305013) +++ devel/dbus-glib/Makefile (working copy) @@ -17,6 +17,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool Index: devel/desktop-file-utils/Makefile =================================================================== --- devel/desktop-file-utils/Makefile (revision 305013) +++ devel/desktop-file-utils/Makefile (working copy) @@ -15,6 +15,7 @@ COMMENT= A couple of command line utilities for working with desktop entries USE_GNOME= glib20 +USE_PKGCONFIG= build USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes Index: devel/ding-libs/Makefile =================================================================== --- devel/ding-libs/Makefile (revision 305013) +++ devel/ding-libs/Makefile (working copy) @@ -19,7 +19,7 @@ CPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib USE_GETTEXT= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ENV+= DOXYGEN="" Index: devel/e_dbus/Makefile =================================================================== --- devel/e_dbus/Makefile (revision 305013) +++ devel/e_dbus/Makefile (working copy) @@ -22,9 +22,10 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_EFL= eina evas ecore libtool_hack librt_hack USE_EFL_ECORE= evas -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-ehal \ Index: devel/ecore-file/Makefile =================================================================== --- devel/ecore-file/Makefile (revision 305013) +++ devel/ecore-file/Makefile (working copy) @@ -21,8 +21,9 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_EFL= ecore libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_file INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: devel/ecore-main/Makefile =================================================================== --- devel/ecore-main/Makefile (revision 305013) +++ devel/ecore-main/Makefile (working copy) @@ -21,8 +21,9 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_EFL= eina libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_ICONV= yes USE_LDCONFIG= yes Index: devel/eet/Makefile =================================================================== --- devel/eet/Makefile (revision 305013) +++ devel/eet/Makefile (working copy) @@ -22,8 +22,9 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_EFL= eina librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes USE_OPENSSL= yes Index: devel/eggdbus/Makefile =================================================================== --- devel/eggdbus/Makefile (revision 305013) +++ devel/eggdbus/Makefile (working copy) @@ -17,11 +17,12 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_GNOME= pkgconfig glib20 gnomehack +USE_GNOME= glib20 gnomehack USE_GETTEXT= yes USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --localstatedir=/var CPPFLAGS+= -I${LOCALBASE}/include Index: devel/eina/Makefile =================================================================== --- devel/eina/Makefile (revision 305013) +++ devel/eina/Makefile (working copy) @@ -19,7 +19,8 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_PKGCONFIG= build +USE_GNOME= gnomehack USE_EFL= librt_hack libtool_hack USE_ICONV= yes USE_LDCONFIG= yes Index: devel/eio/Makefile =================================================================== --- devel/eio/Makefile (revision 305013) +++ devel/eio/Makefile (working copy) @@ -19,8 +19,9 @@ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_EFL= eina ecore libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_LDCONFIG= yes .include Index: devel/etl/Makefile =================================================================== --- devel/etl/Makefile (revision 305013) +++ devel/etl/Makefile (working copy) @@ -14,9 +14,10 @@ MAINTAINER= dhn@FreeBSD.org COMMENT= Voria Extended Class and Template Library -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build post-install: .if !defined(NOPORTDOCS) Index: devel/flatzebra/Makefile =================================================================== --- devel/flatzebra/Makefile (revision 305013) +++ devel/flatzebra/Makefile (working copy) @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool USE_SDL= sdl mixer image -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes Index: devel/gamin/Makefile =================================================================== --- devel/gamin/Makefile (revision 305013) +++ devel/gamin/Makefile (working copy) @@ -19,6 +19,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME?= gnomehack _glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python Index: devel/gio-fam-backend/Makefile =================================================================== --- devel/gio-fam-backend/Makefile (revision 305013) +++ devel/gio-fam-backend/Makefile (working copy) @@ -27,7 +27,8 @@ BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig _glib20 +USE_PKGCONFIG= build +USE_GNOME= gnomehack _glib20 USE_FAM= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes Index: devel/glib12/Makefile =================================================================== --- devel/glib12/Makefile (revision 305013) +++ devel/glib12/Makefile (working copy) @@ -16,7 +16,7 @@ USE_CSTD= gnu89 USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 Index: devel/glib20/Makefile =================================================================== --- devel/glib20/Makefile (revision 305013) +++ devel/glib20/Makefile (working copy) @@ -36,7 +36,8 @@ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig ltverhack +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_PYTHON= yes Index: devel/glibmm/Makefile =================================================================== --- devel/glibmm/Makefile (revision 305013) +++ devel/glibmm/Makefile (working copy) @@ -29,6 +29,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_PERL5= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: devel/gnome-common/Makefile =================================================================== --- devel/gnome-common/Makefile (revision 305013) +++ devel/gnome-common/Makefile (working copy) @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes .include Index: devel/gobject-introspection/Makefile =================================================================== --- devel/gobject-introspection/Makefile (revision 305013) +++ devel/gobject-introspection/Makefile (working copy) @@ -22,6 +22,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_PYTHON= -2.7 USE_BISON= build USE_GETTEXT= yes Index: devel/gsettings-desktop-schemas/Makefile =================================================================== --- devel/gsettings-desktop-schemas/Makefile (revision 305013) +++ devel/gsettings-desktop-schemas/Makefile (working copy) @@ -24,6 +24,7 @@ USE_GMAKE= yes USE_PERL5_BUILD= yes USE_GNOME= gnomehack intltool glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ Index: devel/hwloc/Makefile =================================================================== --- devel/hwloc/Makefile (revision 305013) +++ devel/hwloc/Makefile (working copy) @@ -22,7 +22,8 @@ --enable-libxml2 USE_BZIP2= yes USE_LDCONFIG= yes -USE_GNOME= libxml2 pkgconfig +USE_GNOME= libxml2 +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes ONLY_FOR_ARCHS= i386 amd64 Index: devel/jansson/Makefile =================================================================== --- devel/jansson/Makefile (revision 305013) +++ devel/jansson/Makefile (working copy) @@ -16,6 +16,7 @@ USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_PKGCONFIG= build +USE_GNOME= gnomehack .include Index: devel/json-c/Makefile =================================================================== --- devel/json-c/Makefile (revision 305013) +++ devel/json-c/Makefile (working copy) @@ -15,7 +15,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack .include Index: devel/json-glib/Makefile =================================================================== --- devel/json-glib/Makefile (revision 305013) +++ devel/json-glib/Makefile (working copy) @@ -20,6 +20,7 @@ USE_GMAKE= yes USE_XZ= yes USE_GNOME= glib20 gnomehack gnomeprefix ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Index: devel/lasi/Makefile =================================================================== --- devel/lasi/Makefile (revision 305013) +++ devel/lasi/Makefile (working copy) @@ -15,7 +15,8 @@ MAINTAINER= lme@FreeBSD.org COMMENT= C++ stream output interface for creating Postscript documents -USE_GNOME= pango pkgconfig +USE_GNOME= pango +USE_PKGCONFIG= build USE_AUTOTOOLS= libltdl PKG_CONFIG_PATH= ${PREFIX}/libdata/pkgconfig CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKG_CONFIG_PATH} Index: devel/libIDL/Makefile =================================================================== --- devel/libIDL/Makefile (revision 305013) +++ devel/libIDL/Makefile (working copy) @@ -21,6 +21,7 @@ USE_GETTEXT= yes USE_BISON= build USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc Index: devel/libassetml/Makefile =================================================================== --- devel/libassetml/Makefile (revision 305013) +++ devel/libassetml/Makefile (working copy) @@ -19,7 +19,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2 pkgconfig +USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2 +USE_PKGCONFIG= build USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: devel/libconfig/Makefile =================================================================== --- devel/libconfig/Makefile (revision 305013) +++ devel/libconfig/Makefile (working copy) @@ -15,8 +15,9 @@ CONFLICTS= wand-libconfig-[0-9]* -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack HAS_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_GMAKE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} Index: devel/libconfuse/Makefile =================================================================== --- devel/libconfuse/Makefile (revision 305013) +++ devel/libconfuse/Makefile (working copy) @@ -22,7 +22,8 @@ USE_ICONV= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build CONFIGURE_ARGS+= --disable-nls CFLAGS+= -I${WRKSRC}/src .if defined(WITH_CHECK) Index: devel/libdlna/Makefile =================================================================== --- devel/libdlna/Makefile (revision 305013) +++ devel/libdlna/Makefile (working copy) @@ -19,9 +19,9 @@ LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg HAS_CONFIGURE= yes +USE_PKGCONFIG= build USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes Index: devel/libev/Makefile =================================================================== --- devel/libev/Makefile (revision 305013) +++ devel/libev/Makefile (working copy) @@ -16,8 +16,8 @@ COMMENT= A full-featured and high-performance event loop library GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes -USE_GNOME= pkgconfig MAN3= ev.3 Index: devel/libffi/Makefile =================================================================== --- devel/libffi/Makefile (revision 305013) +++ devel/libffi/Makefile (working copy) @@ -14,8 +14,9 @@ COMMENT= Foreign Function Interface GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack PLIST_SUB= PORTVERSION=${PORTVERSION} INFO= libffi Index: devel/libfirm/Makefile =================================================================== --- devel/libfirm/Makefile (revision 305013) +++ devel/libfirm/Makefile (working copy) @@ -19,7 +19,8 @@ USE_AUTOTOOLS= autoconf USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes OPTIONS= DEBUG "Build a debug version of libFIRM" OFF Index: devel/libftdi/Makefile =================================================================== --- devel/libftdi/Makefile (revision 305013) +++ devel/libftdi/Makefile (working copy) @@ -17,9 +17,10 @@ USE_AUTOTOOLS= autoconf libtool automake GNU_CONFIGURE= yes +USE_PKGCONFIG= build CFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack PORTDOCS= COPYING.LIB ChangeLog README Index: devel/libgalago/Makefile =================================================================== --- devel/libgalago/Makefile (revision 305013) +++ devel/libgalago/Makefile (working copy) @@ -19,10 +19,11 @@ BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ARGS= --disable-tests CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: devel/libgee/Makefile =================================================================== --- devel/libgee/Makefile (revision 305013) +++ devel/libgee/Makefile (working copy) @@ -20,6 +20,7 @@ USE_GMAKE= yes USE_XZ= yes USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: devel/libgtop/Makefile =================================================================== --- devel/libgtop/Makefile (revision 305013) +++ devel/libgtop/Makefile (working copy) @@ -24,6 +24,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 ltverhack intlhack +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-gtk-doc \ Index: devel/libhtp/Makefile =================================================================== --- devel/libhtp/Makefile (revision 305013) +++ devel/libhtp/Makefile (working copy) @@ -21,7 +21,8 @@ USE_AUTOTOOLS= libtool autoheader aclocal ACLOCAL_ARGS= -Im4 USE_LDCONFIG= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} Index: devel/libleaftag/Makefile =================================================================== --- devel/libleaftag/Makefile (revision 305013) +++ devel/libleaftag/Makefile (working copy) @@ -17,7 +17,8 @@ USE_SQLITE= 2 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack glib20 pkgconfig +USE_PKGCONFIG= build +USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include Index: devel/libmcs/Makefile =================================================================== --- devel/libmcs/Makefile (revision 305013) +++ devel/libmcs/Makefile (working copy) @@ -20,9 +20,9 @@ OPTIONS= GCONF "Enable gconf support" on GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= pkgconfig .include Index: devel/liboil/Makefile =================================================================== --- devel/liboil/Makefile (revision 305013) +++ devel/liboil/Makefile (working copy) @@ -17,7 +17,8 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= pkgconfig gnomehack ltverhack +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ Index: devel/libopendaap/Makefile =================================================================== --- devel/libopendaap/Makefile (revision 305013) +++ devel/libopendaap/Makefile (working copy) @@ -16,8 +16,9 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes MAN3= libopendaap.3 Index: devel/libopkele/Makefile =================================================================== --- devel/libopkele/Makefile (revision 305013) +++ devel/libopkele/Makefile (working copy) @@ -22,8 +22,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig GNU_CONFIGURE= yes +USE_PKGCONFIG= build CONFIGURE_ENV= "OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \ OPENSSL_LIBS=-L${OPENSSLLIB} CPPFLAGS+= -I${LOCALBASE}/include Index: devel/libpthread-stubs/Makefile =================================================================== --- devel/libpthread-stubs/Makefile (revision 305013) +++ devel/libpthread-stubs/Makefile (working copy) @@ -16,7 +16,8 @@ USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: devel/librelp/Makefile =================================================================== --- devel/librelp/Makefile (revision 305013) +++ devel/librelp/Makefile (working copy) @@ -9,7 +9,8 @@ MAINTAINER= brd@FreeBSD.org COMMENT= Reliable event logging protocol library -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: devel/libsigc++12/Makefile =================================================================== --- devel/libsigc++12/Makefile (revision 305013) +++ devel/libsigc++12/Makefile (working copy) @@ -22,7 +22,8 @@ USE_GMAKE= yes LATEST_LINK= libsigc++12 USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build .include Index: devel/libsigc++20/Makefile =================================================================== --- devel/libsigc++20/Makefile (revision 305013) +++ devel/libsigc++20/Makefile (working copy) @@ -22,8 +22,9 @@ USE_PERL5_BUILD=yes LATEST_LINK= libsigc++20 USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build PLIST_SUB= VERSION="2.0" API_VERSION="2.0" Index: devel/libstatgrab/Makefile =================================================================== --- devel/libstatgrab/Makefile (revision 305013) +++ devel/libstatgrab/Makefile (working copy) @@ -21,7 +21,8 @@ DIST_SUBDIR= i-scream USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_PKGCONFIG= build +USE_GNOME= gnomehack MAN3= sg_get_cpu_percents.3 sg_get_cpu_stats.3 \ sg_get_cpu_stats_diff.3 sg_get_disk_io_stats.3 \ Index: devel/libticalcs/Makefile =================================================================== --- devel/libticalcs/Makefile (revision 305013) +++ devel/libticalcs/Makefile (working copy) @@ -18,7 +18,8 @@ tifiles.6:${PORTSDIR}/devel/libtifiles USE_GETTEXT= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes Index: devel/libtifiles/Makefile =================================================================== --- devel/libtifiles/Makefile (revision 305013) +++ devel/libtifiles/Makefile (working copy) @@ -15,7 +15,8 @@ COMMENT= TI calculator file types library USE_GETTEXT= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes Index: devel/libtifiles2/Makefile =================================================================== --- devel/libtifiles2/Makefile (revision 305013) +++ devel/libtifiles2/Makefile (working copy) @@ -20,7 +20,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack pkgconfig +USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .if !defined(WITHOUT_NLS) Index: devel/libukcprog/Makefile =================================================================== --- devel/libukcprog/Makefile (revision 305013) +++ devel/libukcprog/Makefile (working copy) @@ -25,7 +25,8 @@ MAN3= ukcprog.3 DIST_SUBDIR= i-scream GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig lthack +USE_GNOME= gnomehack lthack .include Index: devel/libvolume_id/Makefile =================================================================== --- devel/libvolume_id/Makefile (revision 305013) +++ devel/libvolume_id/Makefile (working copy) @@ -14,7 +14,7 @@ USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKE_ENV= E=${ECHO_MSG} RANLIB=${RANLIB} AR=${AR} Q=@ \ prefix=${PREFIX} Index: devel/libzvbi/Makefile =================================================================== --- devel/libzvbi/Makefile (revision 305013) +++ devel/libzvbi/Makefile (working copy) @@ -20,8 +20,9 @@ USE_GETTEXT= yes USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes MAN1= zvbi-ntsc-cc.1 Index: devel/log4shib/Makefile =================================================================== --- devel/log4shib/Makefile (revision 305013) +++ devel/log4shib/Makefile (working copy) @@ -17,7 +17,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig gnomehack +USE_PKGCONFIG= build +USE_GNOME= gnomehack CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-pthreads --disable-html-docs --disable-doxygen Index: devel/m17n-db/Makefile =================================================================== --- devel/m17n-db/Makefile (revision 305013) +++ devel/m17n-db/Makefile (working copy) @@ -19,7 +19,7 @@ MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= Data files for the m17n library -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-charmaps=${CHARMAPSDIR} Index: devel/m17n-lib/Makefile =================================================================== --- devel/m17n-lib/Makefile (revision 305013) +++ devel/m17n-lib/Makefile (working copy) @@ -27,7 +27,8 @@ MAKE_JOBS_UNSAFE= yes USE_XORG= ice sm x11 xaw xft xt -USE_GNOME= libxml2 pkgconfig +USE_GNOME= libxml2 +USE_PKGCONFIG= build USE_AUTOTOOLS= autoconf libtool USE_LDCONFIG= yes Index: devel/makedepend/Makefile =================================================================== --- devel/makedepend/Makefile (revision 305013) +++ devel/makedepend/Makefile (working copy) @@ -14,7 +14,7 @@ COMMENT= A dependency generator for makefiles XORG_CAT= util -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= xproto PLIST_FILES= bin/makedepend Index: devel/mercator/Makefile =================================================================== --- devel/mercator/Makefile (revision 305013) +++ devel/mercator/Makefile (working copy) @@ -15,7 +15,8 @@ LIB_DEPENDS= wfmath-0.3.5:${PORTSDIR}/math/wfmath -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: devel/mono-addins/Makefile =================================================================== --- devel/mono-addins/Makefile (revision 305013) +++ devel/mono-addins/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build MAKE_JOBS_UNSAFE= yes OPTIONS= GTK2 "Enable GTK support" on Index: devel/mq4cpp/Makefile =================================================================== --- devel/mq4cpp/Makefile (revision 305013) +++ devel/mq4cpp/Makefile (working copy) @@ -15,7 +15,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig ltverhack +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_BZIP2= yes GNU_CONFIGURE= yes Index: devel/omniORB/Makefile =================================================================== --- devel/omniORB/Makefile (revision 305013) +++ devel/omniORB/Makefile (working copy) @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_PYTHON= yes USE_OPENSSL= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_BZIP2= yes USE_LDCONFIG= yes MAKEFILE= GNUmakefile Index: devel/orc/Makefile =================================================================== --- devel/orc/Makefile (revision 305013) +++ devel/orc/Makefile (working copy) @@ -15,7 +15,7 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GMAKE= yes Index: devel/p5-Net-DBus/Makefile =================================================================== --- devel/p5-Net-DBus/Makefile (revision 305013) +++ devel/p5-Net-DBus/Makefile (working copy) @@ -19,7 +19,7 @@ p5-XML-Grove>=0:${PORTSDIR}/textproc/p5-XML-Grove \ p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PERL_CONFIGURE= yes MAN3= Net::DBus::ASyncReply.3 Net::DBus::Annotation.3 Net::DBus::Tutorial.3 \ Index: devel/p5-Unix-Statgrab/Makefile =================================================================== --- devel/p5-Unix-Statgrab/Makefile (revision 305013) +++ devel/p5-Unix-Statgrab/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PERL_CONFIGURE= yes CONFIGURE_ARGS+= INC="`pkg-config libstatgrab --cflags`" \ Index: devel/pcsc-lite/Makefile =================================================================== --- devel/pcsc-lite/Makefile (revision 305013) +++ devel/pcsc-lite/Makefile (working copy) @@ -22,7 +22,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5_BUILD=yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_RC_SUBR= pcscd USE_LDCONFIG= yes Index: devel/protobuf/Makefile =================================================================== --- devel/protobuf/Makefile (revision 305013) +++ devel/protobuf/Makefile (working copy) @@ -18,7 +18,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build tests: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) Index: devel/protobuf-c/Makefile =================================================================== --- devel/protobuf-c/Makefile (revision 305013) +++ devel/protobuf-c/Makefile (working copy) @@ -18,7 +18,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: devel/ptlib/Makefile =================================================================== --- devel/ptlib/Makefile (revision 305013) +++ devel/ptlib/Makefile (working copy) @@ -23,7 +23,7 @@ USE_BISON= build USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build WANT_GNOME= yes WANT_SDL= yes USE_OPENSSL= yes Index: devel/ptlib26/Makefile =================================================================== --- devel/ptlib26/Makefile (revision 305013) +++ devel/ptlib26/Makefile (working copy) @@ -25,7 +25,7 @@ USE_BISON= build USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build WANT_GNOME= yes USE_OPENSSL= yes USE_LDCONFIG= yes Index: devel/py-dbus/Makefile =================================================================== --- devel/py-dbus/Makefile (revision 305013) +++ devel/py-dbus/Makefile (working copy) @@ -20,6 +20,7 @@ USE_GETTEXT= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool Index: devel/ruby-statgrab/Makefile =================================================================== --- devel/ruby-statgrab/Makefile (revision 305013) +++ devel/ruby-statgrab/Makefile (working copy) @@ -19,7 +19,7 @@ USE_RUBY= yes USE_RUBY_EXTCONF= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build INSTALL_TARGET= site-install Index: devel/sdl12/Makefile =================================================================== --- devel/sdl12/Makefile (revision 305013) +++ devel/sdl12/Makefile (working copy) @@ -23,7 +23,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes WANT_GNOME= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ Index: devel/talloc/Makefile =================================================================== --- devel/talloc/Makefile (revision 305013) +++ devel/talloc/Makefile (working copy) @@ -28,7 +28,7 @@ WAF_TOOL= buildtools/bin/waf CONFIGURE_SCRIPT= ${WAF_TOOL} configure CONFIGURE_LOG= bin/config.log -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes Index: devel/tevent/Makefile =================================================================== --- devel/tevent/Makefile (revision 305013) +++ devel/tevent/Makefile (working copy) @@ -28,7 +28,7 @@ WAF_TOOL= buildtools/bin/waf CONFIGURE_SCRIPT= ${WAF_TOOL} configure CONFIGURE_LOG= bin/config.log -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes Index: devel/thrift/Makefile =================================================================== --- devel/thrift/Makefile (revision 305013) +++ devel/thrift/Makefile (working copy) @@ -24,7 +24,7 @@ ACLOCAL_ARGS= -I${WRKSRC}/aclocal AUTOMAKE_ARGS= --foreign --add-missing --copy -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes Index: devel/thunar-vcs-plugin/Makefile =================================================================== --- devel/thunar-vcs-plugin/Makefile (revision 305013) +++ devel/thunar-vcs-plugin/Makefile (working copy) @@ -20,8 +20,8 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= desktopfileutils gnomehack gtk20 glib20 intltool intlhack \ - pkgconfig +USE_GNOME= desktopfileutils gnomehack gtk20 glib20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libexo libutil thunar INSTALLS_ICONS= yes Index: devel/ucommon/Makefile =================================================================== --- devel/ucommon/Makefile (revision 305013) +++ devel/ucommon/Makefile (working copy) @@ -16,7 +16,8 @@ LICENSE= LGPL3 -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CFLAGS+= -D__BSD_VISIBLE Index: dns/libidn/Makefile =================================================================== --- dns/libidn/Makefile (revision 305013) +++ dns/libidn/Makefile (working copy) @@ -14,7 +14,8 @@ MAINTAINER= gaod@hychen.org COMMENT= Internationalized Domain Names command line tool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: editors/fxite/Makefile =================================================================== --- editors/fxite/Makefile (revision 305013) +++ editors/fxite/Makefile (working copy) @@ -18,7 +18,7 @@ USE_GETTEXT= yes USE_LUA= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes CXXFLAGS+= -g -O0 -fPIC LDFLAGS+= -L${LOCALBASE}/lib -lintl Index: editors/mousepad/Makefile =================================================================== --- editors/mousepad/Makefile (revision 305013) +++ editors/mousepad/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gtk20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv libgui post-install: Index: editors/poedit/Makefile =================================================================== --- editors/poedit/Makefile (revision 305013) +++ editors/poedit/Makefile (working copy) @@ -19,7 +19,7 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_WX= 2.8+ WX_CONF_ARGS= absolute WX_UNICODE= yes Index: emulators/dolphin-emu-devel/Makefile =================================================================== --- emulators/dolphin-emu-devel/Makefile (revision 305013) +++ emulators/dolphin-emu-devel/Makefile (working copy) @@ -27,7 +27,7 @@ REVDATE= 20120912 USE_ICONV= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_SDL= sdl USE_OPENAL= yes USE_XORG= ice xext x11 xrandr Index: emulators/mupen64-base/Makefile.common =================================================================== --- emulators/mupen64-base/Makefile.common (revision 305013) +++ emulators/mupen64-base/Makefile.common (working copy) @@ -9,7 +9,8 @@ .if defined(HAVE_GTK2) .include <${PORTSDIR}/Mk/bsd.gnome.mk> -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 +USE_PKGCONFIG= build .else .include <${PORTSDIR}/Mk/bsd.gnome.mk> USE_GNOME= gtk12 Index: emulators/snes9x-gtk/Makefile =================================================================== --- emulators/snes9x-gtk/Makefile (revision 305013) +++ emulators/snes9x-gtk/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_XORG= x11 sm ice xext USE_GMAKE= yes -USE_GNOME= gtk20 desktopfileutils pkgconfig intltool libglade2 libxml2 +USE_GNOME= gtk20 desktopfileutils intltool libglade2 libxml2 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_GETTEXT= yes USE_SDL= sdl Index: games/instead/Makefile =================================================================== --- games/instead/Makefile (revision 305013) +++ games/instead/Makefile (working copy) @@ -16,7 +16,8 @@ HAS_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_LUA= 5.1 USE_SDL= sdl image ttf mixer USE_ICONV= yes Index: games/openalchemist/Makefile =================================================================== --- games/openalchemist/Makefile (revision 305013) +++ games/openalchemist/Makefile (working copy) @@ -32,7 +32,8 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} GNU_CONFIGURE= yes -USE_GNOME= pkgconfig pygtk2 +USE_GNOME= pygtk2 +USE_PKGCONFIG= build USE_XORG= xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice USE_GL= gl glu USE_SDL= sdl gfx Index: games/openttd/Makefile =================================================================== --- games/openttd/Makefile (revision 305013) +++ games/openttd/Makefile (working copy) @@ -54,7 +54,7 @@ .endif .if defined(WITH_DEDICATED_SERVER_ONLY) -USE_GNOME= pkgconfig # Needed for liblzma support +USE_PKGCONFIG= build # Needed for liblzma support CONFIGURE_ARGS+= --enable-dedicated # Aid it to find lzo2 headers; client build gets it via sdl-config CFLAGS+= -I${LOCALBASE}/include Index: games/py-fife/Makefile =================================================================== --- games/py-fife/Makefile (revision 305013) +++ games/py-fife/Makefile (working copy) @@ -40,7 +40,7 @@ USE_XORG= xcursor USE_GL= gl -USE_GNOME= pkgconfig +USE_PKGCONFIG= build post-patch: ${REINPLACE_CMD} -e 's/X11R6/local/g' ${WRKSRC}/build/openbsd4-config.py && \ Index: games/ufoai/Makefile =================================================================== --- games/ufoai/Makefile (revision 305013) +++ games/ufoai/Makefile (working copy) @@ -31,7 +31,7 @@ USE_SDL= sdl image mixer ttf USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_OPENAL= soft GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-release=yes Index: games/xmoto/Makefile =================================================================== --- games/xmoto/Makefile (revision 305013) +++ games/xmoto/Makefile (working copy) @@ -24,7 +24,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 +USE_PKGCONFIG= build USE_LUA= 5.1 USE_SQLITE= 3 USE_SDL= sdl mixer ttf net Index: graphics/OpenEXR/Makefile =================================================================== --- graphics/OpenEXR/Makefile (revision 305013) +++ graphics/OpenEXR/Makefile (working copy) @@ -18,7 +18,7 @@ LIB_DEPENDS= Half.6:${PORTSDIR}/graphics/ilmbase USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= YES Index: graphics/ampasCTL/Makefile =================================================================== --- graphics/ampasCTL/Makefile (revision 305013) +++ graphics/ampasCTL/Makefile (working copy) @@ -16,7 +16,7 @@ LIB_DEPENDS= Half.6:${PORTSDIR}/graphics/ilmbase -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool Index: graphics/animorph/Makefile =================================================================== --- graphics/animorph/Makefile (revision 305013) +++ graphics/animorph/Makefile (working copy) @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Index: graphics/cal3d/Makefile =================================================================== --- graphics/cal3d/Makefile (revision 305013) +++ graphics/cal3d/Makefile (working copy) @@ -17,7 +17,7 @@ CONFLICTS= cal3d-devel-[0-9]* -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_AUTOTOOLS= automake autoheader libtool USE_LDCONFIG= yes Index: graphics/cal3d-devel/Makefile =================================================================== --- graphics/cal3d-devel/Makefile (revision 305013) +++ graphics/cal3d-devel/Makefile (working copy) @@ -20,7 +20,7 @@ CONFLICTS= cal3d-[0-9]* USE_BZIP2= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= automake autoheader libtool AUTOMAKE_ARGS= --add-missing Index: graphics/clutter/Makefile =================================================================== --- graphics/clutter/Makefile (revision 305013) +++ graphics/clutter/Makefile (working copy) @@ -24,7 +24,8 @@ USE_GETTEXT= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango +USE_GNOME= gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango +USE_PKGCONFIG= build USE_GL= gl USE_XORG= glproto x11 xfixes xdamage xcomposite xi USE_LDCONFIG= yes Index: graphics/devil/Makefile =================================================================== --- graphics/devil/Makefile (revision 305013) +++ graphics/devil/Makefile (working copy) @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:L} -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing --copy --force-missing Index: graphics/ecore-evas/Makefile =================================================================== --- graphics/ecore-evas/Makefile (revision 305013) +++ graphics/ecore-evas/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_EFL= evas ecore libtool_hack USE_EFL_ECORE= input input_evas -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_evas INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: graphics/ecore-sdl/Makefile =================================================================== --- graphics/ecore-sdl/Makefile (revision 305013) +++ graphics/ecore-sdl/Makefile (working copy) @@ -24,7 +24,8 @@ USE_SDL= sdl USE_EFL= ecore libtool_hack USE_EFL_ECORE= input -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_sdl INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: graphics/edje/Makefile =================================================================== --- graphics/edje/Makefile (revision 305013) +++ graphics/edje/Makefile (working copy) @@ -26,7 +26,8 @@ USE_EFL= eet evas ecore embryo libtool_hack librt_hack USE_EFL_EVAS_LOADERS= eet jpeg png USE_EFL_ECORE= evas file imf imf_evas -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS+= --without-vim Index: graphics/edje_viewer/Makefile =================================================================== --- graphics/edje_viewer/Makefile (revision 305013) +++ graphics/edje_viewer/Makefile (working copy) @@ -19,7 +19,8 @@ GNU_CONFIGURE= yes USE_EFL= evas ecore edje elementary USE_EFL_ECORE= file -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes Index: graphics/electrix/Makefile =================================================================== --- graphics/electrix/Makefile (revision 305013) +++ graphics/electrix/Makefile (working copy) @@ -21,7 +21,8 @@ poppler-glib.8:${PORTSDIR}/graphics/poppler-glib USE_BZIP2= yes -USE_GNOME= gtk20 desktopfileutils intltool intlhack pkgconfig +USE_GNOME= gtk20 desktopfileutils intltool intlhack +USE_PKGCONFIG= build USE_PYTHON= yes USE_GETTEXT= yes Index: graphics/ethumb/Makefile =================================================================== --- graphics/ethumb/Makefile (revision 305013) +++ graphics/ethumb/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_EFL= eina evas ecore edje libtool_hack USE_EFL_ECORE= evas file x11 input_evas -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-epdf Index: graphics/evas-core/Makefile =================================================================== --- graphics/evas-core/Makefile (revision 305013) +++ graphics/evas-core/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= librt_hack libtool_hack DATADIR= ${PREFIX}/share/evas Index: graphics/evas-engine-buffer/Makefile =================================================================== --- graphics/evas-engine-buffer/Makefile (revision 305013) +++ graphics/evas-engine-buffer/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/buffer INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: graphics/evas-engine-opengl/Makefile =================================================================== --- graphics/evas-engine-opengl/Makefile (revision 305013) +++ graphics/evas-engine-opengl/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack USE_XORG= x11 xext xrender USE_GL= gl glu Index: graphics/evas-engine-sdl/Makefile =================================================================== --- graphics/evas-engine-sdl/Makefile (revision 305013) +++ graphics/evas-engine-sdl/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack USE_SDL= sdl BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/software_sdl Index: graphics/evas-engine-x11/Makefile =================================================================== --- graphics/evas-engine-x11/Makefile (revision 305013) +++ graphics/evas-engine-x11/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack USE_XORG= x11 xext BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/software_x11 Index: graphics/evas-loader-bmp/Makefile =================================================================== --- graphics/evas-loader-bmp/Makefile (revision 305013) +++ graphics/evas-loader-bmp/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= evas librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKEDIRS= ${WRKSRC}/src/modules/loaders/bmp Index: graphics/evas-loader-eet/Makefile =================================================================== --- graphics/evas-loader-eet/Makefile (revision 305013) +++ graphics/evas-loader-eet/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas eet librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/eet \ Index: graphics/evas-loader-generic/Makefile =================================================================== --- graphics/evas-loader-generic/Makefile (revision 305013) +++ graphics/evas-loader-generic/Makefile (working copy) @@ -28,7 +28,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/generic Index: graphics/evas-loader-gif/Makefile =================================================================== --- graphics/evas-loader-gif/Makefile (revision 305013) +++ graphics/evas-loader-gif/Makefile (working copy) @@ -25,7 +25,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/gif Index: graphics/evas-loader-ico/Makefile =================================================================== --- graphics/evas-loader-ico/Makefile (revision 305013) +++ graphics/evas-loader-ico/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= evas librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKEDIRS= ${WRKSRC}/src/modules/loaders/ico Index: graphics/evas-loader-jpeg/Makefile =================================================================== --- graphics/evas-loader-jpeg/Makefile (revision 305013) +++ graphics/evas-loader-jpeg/Makefile (working copy) @@ -25,7 +25,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/jpeg \ Index: graphics/evas-loader-pmaps/Makefile =================================================================== --- graphics/evas-loader-pmaps/Makefile (revision 305013) +++ graphics/evas-loader-pmaps/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= evas librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKEDIRS= ${WRKSRC}/src/modules/loaders/pmaps Index: graphics/evas-loader-png/Makefile =================================================================== --- graphics/evas-loader-png/Makefile (revision 305013) +++ graphics/evas-loader-png/Makefile (working copy) @@ -25,7 +25,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/png \ Index: graphics/evas-loader-psd/Makefile =================================================================== --- graphics/evas-loader-psd/Makefile (revision 305013) +++ graphics/evas-loader-psd/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= evas librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKEDIRS= ${WRKSRC}/src/modules/loaders/psd Index: graphics/evas-loader-svg/Makefile =================================================================== --- graphics/evas-loader-svg/Makefile (revision 305013) +++ graphics/evas-loader-svg/Makefile (working copy) @@ -25,7 +25,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig librsvg2 +USE_GNOME= gnomehack librsvg2 +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/svg Index: graphics/evas-loader-tga/Makefile =================================================================== --- graphics/evas-loader-tga/Makefile (revision 305013) +++ graphics/evas-loader-tga/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= evas librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKEDIRS= ${WRKSRC}/src/modules/loaders/tga Index: graphics/evas-loader-tiff/Makefile =================================================================== --- graphics/evas-loader-tiff/Makefile (revision 305013) +++ graphics/evas-loader-tiff/Makefile (working copy) @@ -25,7 +25,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= evas librt_hack libtool_hack MAKEDIRS= ${WRKSRC}/src/modules/loaders/tiff \ Index: graphics/evas-loader-wbmp/Makefile =================================================================== --- graphics/evas-loader-wbmp/Makefile (revision 305013) +++ graphics/evas-loader-wbmp/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= evas librt_hack libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKEDIRS= ${WRKSRC}/src/modules/loaders/wbmp Index: graphics/evas-loader-xpm/Makefile =================================================================== --- graphics/evas-loader-xpm/Makefile (revision 305013) +++ graphics/evas-loader-xpm/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_XORG= xpm USE_EFL= evas librt_hack libtool_hack Index: graphics/evas_generic_loaders-gst/Makefile =================================================================== --- graphics/evas_generic_loaders-gst/Makefile (revision 305013) +++ graphics/evas_generic_loaders-gst/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_EFL= eina -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GSTREAMER= good ffmpeg BINSRC= ${WRKSRC}/src/bin/${PORTNAME} Index: graphics/evas_generic_loaders-pdf/Makefile =================================================================== --- graphics/evas_generic_loaders-pdf/Makefile (revision 305013) +++ graphics/evas_generic_loaders-pdf/Makefile (working copy) @@ -25,7 +25,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_EFL= eina -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build BINSRC= ${WRKSRC}/src/bin/${PORTNAME} Index: graphics/evas_generic_loaders-ps/Makefile =================================================================== --- graphics/evas_generic_loaders-ps/Makefile (revision 305013) +++ graphics/evas_generic_loaders-ps/Makefile (working copy) @@ -25,7 +25,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_EFL= eina -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build BINSRC= ${WRKSRC}/src/bin/${PORTNAME} Index: graphics/evas_generic_loaders-raw/Makefile =================================================================== --- graphics/evas_generic_loaders-raw/Makefile (revision 305013) +++ graphics/evas_generic_loaders-raw/Makefile (working copy) @@ -25,7 +25,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_EFL= eina -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build BINSRC= ${WRKSRC}/src/bin/${PORTNAME} Index: graphics/evas_generic_loaders-xcf/Makefile =================================================================== --- graphics/evas_generic_loaders-xcf/Makefile (revision 305013) +++ graphics/evas_generic_loaders-xcf/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_EFL= eina -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build BINSRC= ${WRKSRC}/src/bin/${PORTNAME} Index: graphics/flam3/Makefile =================================================================== --- graphics/flam3/Makefile (revision 305013) +++ graphics/flam3/Makefile (working copy) @@ -24,7 +24,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CFLAGS+= -I${LOCALBASE}/include/libpng15 Index: graphics/frei0r/Makefile =================================================================== --- graphics/frei0r/Makefile (revision 305013) +++ graphics/frei0r/Makefile (working copy) @@ -19,7 +19,8 @@ .if !defined(BUILDING_FREI0R_METAPORT) GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes LICENSE= GPLv2 Index: graphics/gegl/Makefile =================================================================== --- graphics/gegl/Makefile (revision 305013) +++ graphics/gegl/Makefile (working copy) @@ -39,7 +39,8 @@ # Disable docs until I fix the problem with graphviz's dot NOPORTDOCS= yes -USE_GNOME= glib20 pkgconfig gnomehack +USE_GNOME= glib20 gnomehack +USE_PKGCONFIG= build USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes Index: graphics/glitz/Makefile =================================================================== --- graphics/glitz/Makefile (revision 305013) +++ graphics/glitz/Makefile (working copy) @@ -17,7 +17,8 @@ USE_GL= yes USE_XORG= xt -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: graphics/gnash/Makefile =================================================================== --- graphics/gnash/Makefile (revision 305013) +++ graphics/gnash/Makefile (working copy) @@ -31,7 +31,8 @@ WANT_GNOME= yes USE_GCC= 4.2+ # triggers compiler error on gcc 3.4 WANT_GSTREAMER= yes -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 +USE_PKGCONFIG= build USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv USE_AUTOTOOLS= libltdl MAKE_JOBS_SAFE= yes Index: graphics/gts/Makefile =================================================================== --- graphics/gts/Makefile (revision 305013) +++ graphics/gts/Makefile (working copy) @@ -15,7 +15,8 @@ MAINTAINER= erik@bz.bzflag.bz COMMENT= GNU Triangulated Surface Library -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: graphics/ilmbase/Makefile =================================================================== --- graphics/ilmbase/Makefile (revision 305013) +++ graphics/ilmbase/Makefile (working copy) @@ -20,7 +20,7 @@ OPTIONS_DEFAULT= THREAD THREAD_DESC= Enable multithreaded file I/O support -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool Index: graphics/imlib2/Makefile =================================================================== --- graphics/imlib2/Makefile (revision 305013) +++ graphics/imlib2/Makefile (working copy) @@ -20,7 +20,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= libtool_hack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: graphics/ipe/Makefile =================================================================== --- graphics/ipe/Makefile (revision 305013) +++ graphics/ipe/Makefile (working copy) @@ -24,7 +24,7 @@ USE_LDCONFIG= yes USE_LUA= 5.1 USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_QT4= gui qt3support qmake_build moc_build uic_build rcc_build MAN1= ipe.1 ipe6upgrade.1 ipeextract.1 iperender.1 ipetoipe.1 ipescript.1 Index: graphics/libGL/bsd.mesalib.mk =================================================================== --- graphics/libGL/bsd.mesalib.mk (revision 305013) +++ graphics/libGL/bsd.mesalib.mk (working copy) @@ -44,6 +44,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: graphics/libart_lgpl/Makefile =================================================================== --- graphics/libart_lgpl/Makefile (revision 305013) +++ graphics/libart_lgpl/Makefile (working copy) @@ -19,7 +19,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes Index: graphics/libcaca/Makefile =================================================================== --- graphics/libcaca/Makefile (revision 305013) +++ graphics/libcaca/Makefile (working copy) @@ -14,7 +14,8 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Graphics library that outputs text instead of pixels -USE_GNOME= gnomehack ltverhack pkgconfig +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-doc \ Index: graphics/libchamplain/Makefile =================================================================== --- graphics/libchamplain/Makefile (revision 305013) +++ graphics/libchamplain/Makefile (working copy) @@ -22,7 +22,8 @@ RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection USE_BZIP2= yes -USE_GNOME= gnomeprefix pkgconfig gtk20 gnomehack ltverhack:1 +USE_GNOME= gnomeprefix gtk20 gnomehack ltverhack:1 +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes Index: graphics/libdrm/Makefile =================================================================== --- graphics/libdrm/Makefile (revision 305013) +++ graphics/libdrm/Makefile (working copy) @@ -21,6 +21,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-nouveau-experimental-api Index: graphics/libexif/Makefile =================================================================== --- graphics/libexif/Makefile (revision 305013) +++ graphics/libexif/Makefile (working copy) @@ -14,7 +14,8 @@ COMMENT= Library to read digital camera file meta-data USE_BZIP2= yes -USE_GNOME= gnomehack ltverhack pkgconfig +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include Index: graphics/libgphoto2/Makefile =================================================================== --- graphics/libgphoto2/Makefile (revision 305013) +++ graphics/libgphoto2/Makefile (working copy) @@ -17,7 +17,8 @@ jpeg.11:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes -USE_GNOME= pkgconfig ltverhack +USE_GNOME= ltverhack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool libltdl LIBTOOLFILES= configure libgphoto2_port/configure Index: graphics/libiptcdata/Makefile =================================================================== --- graphics/libiptcdata/Makefile (revision 305013) +++ graphics/libiptcdata/Makefile (working copy) @@ -14,7 +14,7 @@ COMMENT= Library for manipulating IPTC metadata stored in image files USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: graphics/libkdcraw/Makefile =================================================================== --- graphics/libkdcraw/Makefile (revision 305013) +++ graphics/libkdcraw/Makefile (working copy) @@ -18,7 +18,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_KDELIBS_VER=3 -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: graphics/libkexif/Makefile =================================================================== --- graphics/libkexif/Makefile (revision 305013) +++ graphics/libkexif/Makefile (working copy) @@ -17,7 +17,8 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: graphics/libkexiv2/Makefile =================================================================== --- graphics/libkexiv2/Makefile (revision 305013) +++ graphics/libkexiv2/Makefile (working copy) @@ -17,7 +17,8 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: graphics/libkipi/Makefile =================================================================== --- graphics/libkipi/Makefile (revision 305013) +++ graphics/libkipi/Makefile (working copy) @@ -15,7 +15,8 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: graphics/liblqr-1/Makefile =================================================================== --- graphics/liblqr-1/Makefile (revision 305013) +++ graphics/liblqr-1/Makefile (working copy) @@ -18,7 +18,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GETTEXT= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Index: graphics/libosmesa/Makefile =================================================================== --- graphics/libosmesa/Makefile (revision 305013) +++ graphics/libosmesa/Makefile (working copy) @@ -26,7 +26,8 @@ USE_GCC= 4.2+ USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-driver=osmesa --with-osmesa-bits=32 \ Index: graphics/libqrencode/Makefile =================================================================== --- graphics/libqrencode/Makefile (revision 305013) +++ graphics/libqrencode/Makefile (working copy) @@ -18,7 +18,8 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include Index: graphics/libsvg-cairo/Makefile =================================================================== --- graphics/libsvg-cairo/Makefile (revision 305013) +++ graphics/libsvg-cairo/Makefile (working copy) @@ -21,7 +21,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes PLIST_FILES= include/svg-cairo.h \ lib/libsvg-cairo.a \ Index: graphics/libvisual04/Makefile =================================================================== --- graphics/libvisual04/Makefile (revision 305013) +++ graphics/libvisual04/Makefile (working copy) @@ -16,7 +16,8 @@ COMMENT= Abstraction library that sits between apps and visual plugin USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GETTEXT= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} Index: graphics/libvisual04-plugins/Makefile =================================================================== --- graphics/libvisual04-plugins/Makefile (revision 305013) +++ graphics/libvisual04-plugins/Makefile (working copy) @@ -18,7 +18,7 @@ LIB_DEPENDS= visual-${MAJORMINOR}:${PORTSDIR}/graphics/libvisual04 -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GL= yes USE_XORG= x11 GNU_CONFIGURE= yes Index: graphics/makehuman/Makefile =================================================================== --- graphics/makehuman/Makefile (revision 305013) +++ graphics/makehuman/Makefile (working copy) @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GL= glut CPPFLAGS+= -I${LOCALBASE}/include Index: graphics/mapnik/Makefile =================================================================== --- graphics/mapnik/Makefile (revision 305013) +++ graphics/mapnik/Makefile (working copy) @@ -35,7 +35,8 @@ USE_LDCONFIG= yes USE_SCONS= yes USE_AUTOTOOLS= libltdl -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes INPUT_PLUGINS= raster shape Index: graphics/mhgui/Makefile =================================================================== --- graphics/mhgui/Makefile (revision 305013) +++ graphics/mhgui/Makefile (working copy) @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XORG= xi xmu ice sm USE_GL= glut Index: graphics/nathive/Makefile =================================================================== --- graphics/nathive/Makefile (revision 305013) +++ graphics/nathive/Makefile (working copy) @@ -16,7 +16,8 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image editor -USE_GNOME= pkgconfig glib20 gtk20 +USE_GNOME= glib20 gtk20 +USE_PKGCONFIG= build ALL_TARGET= default post-patch: Index: graphics/nip2/Makefile =================================================================== --- graphics/nip2/Makefile (revision 305013) +++ graphics/nip2/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BISON= build USE_GMAKE= yes -USE_GNOME= gnomemimedata glib20 pkgconfig gtk20 +USE_GNOME= gnomemimedata glib20 gtk20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --mandir=${PREFIX}/man MAKE_JOBS_SAFE= yes Index: graphics/opencv/Makefile =================================================================== --- graphics/opencv/Makefile (revision 305013) +++ graphics/opencv/Makefile (working copy) @@ -18,7 +18,7 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/doc/license.txt -USE_GNOME= pkgconfig +USE_PKGCONFIG= build WANT_GSTREAMER= yes MAKE_JOBS_UNSAFE= yes USE_BZIP2= yes Index: graphics/openexr_ctl/Makefile =================================================================== --- graphics/openexr_ctl/Makefile (revision 305013) +++ graphics/openexr_ctl/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS+= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ IlmCtl.2:${PORTSDIR}/graphics/ampasCTL -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool Index: graphics/osg/Makefile =================================================================== --- graphics/osg/Makefile (revision 305013) +++ graphics/osg/Makefile (working copy) @@ -25,7 +25,7 @@ USE_ZIP= yes USE_CMAKE= yes USE_GL= gl glu -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= x11 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: graphics/osg-devel/Makefile =================================================================== --- graphics/osg-devel/Makefile (revision 305013) +++ graphics/osg-devel/Makefile (working copy) @@ -26,7 +26,7 @@ USE_ZIP= yes USE_CMAKE= yes USE_GL= gl glu -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= x11 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: graphics/pfstools/Makefile =================================================================== --- graphics/pfstools/Makefile (revision 305013) +++ graphics/pfstools/Makefile (working copy) @@ -31,7 +31,7 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build OPTIONS= PPM "Compile programs that use PPM (NetPBM)" off \ EXR "Compile programs that use OpenEXR library" off \ Index: graphics/picpuz/Makefile =================================================================== --- graphics/picpuz/Makefile (revision 305013) +++ graphics/picpuz/Makefile (working copy) @@ -15,7 +15,8 @@ COMMENT= Jigsaw puzzle program USE_GMAKE= yes -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build ALL_TARGET= # #RUN_DEPENDS+= xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils Index: graphics/pngnq/Makefile =================================================================== --- graphics/pngnq/Makefile (revision 305013) +++ graphics/pngnq/Makefile (working copy) @@ -24,7 +24,7 @@ CONFIGURE_ENV+= LIBS=-lpng LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PORTDOCS= README COPYING PLIST_FILES= bin/pngcomp bin/pngnq Index: graphics/pqiv/Makefile =================================================================== --- graphics/pqiv/Makefile (revision 305013) +++ graphics/pqiv/Makefile (working copy) @@ -27,6 +27,7 @@ USE_BZIP2= yes USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_CSTD= gnu89 CFLAGS+= -DNO_INOTIFY -DBINARY_NAME=\"${PORTNAME}\" Index: graphics/py-poppler/Makefile =================================================================== --- graphics/py-poppler/Makefile (revision 305013) +++ graphics/py-poppler/Makefile (working copy) @@ -22,6 +22,7 @@ USE_PYTHON= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig atk pygtk2 +USE_GNOME= atk pygtk2 +USE_PKGCONFIG= build .include Index: graphics/ruby-cairo/Makefile =================================================================== --- graphics/ruby-cairo/Makefile (revision 305013) +++ graphics/ruby-cairo/Makefile (working copy) @@ -19,7 +19,7 @@ BUILD_DEPENDS= rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_RUBY= yes USE_RUBY_EXTCONF=yes CONFIGURE_ARGS+=--ruby=${RUBY} Index: graphics/sdl_image/Makefile =================================================================== --- graphics/sdl_image/Makefile (revision 305013) +++ graphics/sdl_image/Makefile (working copy) @@ -21,7 +21,8 @@ USE_AUTOTOOLS= libtool USE_SDL= sdl -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: graphics/sdl_ttf/Makefile =================================================================== --- graphics/sdl_ttf/Makefile (revision 305013) +++ graphics/sdl_ttf/Makefile (working copy) @@ -19,7 +19,8 @@ USE_AUTOTOOLS= libtool USE_SDL= sdl USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: graphics/silgraphite/Makefile =================================================================== --- graphics/silgraphite/Makefile (revision 305013) +++ graphics/silgraphite/Makefile (working copy) @@ -15,7 +15,7 @@ OPTIONS= FREETYPE "Build with Freetype support" on -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-xft --without-pangographite Index: graphics/swfmill/Makefile =================================================================== --- graphics/swfmill/Makefile (revision 305013) +++ graphics/swfmill/Makefile (working copy) @@ -18,7 +18,8 @@ freetype.9:${PORTSDIR}/print/freetype2 USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig libxml2 libxslt +USE_GNOME= libxml2 libxslt +USE_PKGCONFIG= build GNU_CONFIGURE= YES CONFIGURE_ENV+= PKG_CONFIG=${LOCALBASE}/bin/pkg-config Index: graphics/vips/Makefile =================================================================== --- graphics/vips/Makefile (revision 305013) +++ graphics/vips/Makefile (working copy) @@ -33,7 +33,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_PERL5_BUILD=yes -USE_GNOME= gnomehack glib20 pkgconfig pango libxml2 +USE_GNOME= gnomehack glib20 pango libxml2 +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: graphics/yagf/Makefile =================================================================== --- graphics/yagf/Makefile (revision 305013) +++ graphics/yagf/Makefile (working copy) @@ -20,7 +20,7 @@ USE_CMAKE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build INSTALLS_ICONS= yes USE_QT4= corelib gui imageformats linguist_build \ moc_build qmake_build rcc_build uic_build Index: irc/ratbox-services/Makefile =================================================================== --- irc/ratbox-services/Makefile (revision 305013) +++ irc/ratbox-services/Makefile (working copy) @@ -24,7 +24,7 @@ RUNDIR?= /var/run DBDIR?= /var/db/${PORTNAME} PERL?= ${LOCALBASE}/bin/perl -USE_GNOME= pkgconfig +USE_PKGCONFIG= build SUB_FILES= pkg-message pkg-install PLIST_SUB= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL} SUB_LIST= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL} Index: irc/znc/Makefile =================================================================== --- irc/znc/Makefile (revision 305013) +++ irc/znc/Makefile (working copy) @@ -18,7 +18,8 @@ FETCH_ARGS?= -Fpr GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build WANT_PERL= yes OPTIONS= DEBUG "Enable debugging" off \ Index: japanese/anthy/Makefile =================================================================== --- japanese/anthy/Makefile (revision 305013) +++ japanese/anthy/Makefile (working copy) @@ -19,7 +19,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= lthack pkgconfig +USE_GNOME= lthack +USE_PKGCONFIG= build DOCSDIR= share/doc/ja/anthy ELISPDIR= share/emacs/site-lisp/anthy Index: japanese/prime/Makefile =================================================================== --- japanese/prime/Makefile (revision 305013) +++ japanese/prime/Makefile (working copy) @@ -23,7 +23,7 @@ USE_RUBY_FEATURES= iconv RUBY_WITH_PTHREAD= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR} USE_AUTOTOOLS= automake autoconf Index: japanese/suikyo/Makefile =================================================================== --- japanese/suikyo/Makefile (revision 305013) +++ japanese/suikyo/Makefile (working copy) @@ -15,7 +15,7 @@ COMMENT= Romaji-Kana conversion Library for the prime USE_RUBY= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR} USE_AUTOTOOLS= automake autoconf Index: japanese/xdtp/Makefile =================================================================== --- japanese/xdtp/Makefile (revision 305013) +++ japanese/xdtp/Makefile (working copy) @@ -19,7 +19,8 @@ LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm USE_LDCONFIG= yes -USE_GNOME= libxml2 libxslt pkgconfig +USE_GNOME= libxml2 libxslt +USE_PKGCONFIG= build GNU_CONFIGURE= yes OPTIONS= GDK "Build with Gdk-Pixbuf" on \ Index: java/eclipse/Makefile =================================================================== --- java/eclipse/Makefile (revision 305013) +++ java/eclipse/Makefile (working copy) @@ -47,7 +47,8 @@ USE_GECKO= libxul19 USE_GL= glu USE_GMAKE= yes -USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui pkgconfig +USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui +USE_PKGCONFIG= build USE_JAVA= yes USE_XZ= yes BZIP2_SUFX= .tar.bz2 Index: java/eclipse-devel/Makefile =================================================================== --- java/eclipse-devel/Makefile (revision 305013) +++ java/eclipse-devel/Makefile (working copy) @@ -51,7 +51,8 @@ USE_GECKO= libxul19 USE_GL= glu USE_GMAKE= yes -USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui pkgconfig +USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui +USE_PKGCONFIG= build USE_JAVA= yes USE_XZ= yes BZIP2_SUFX= .tar.bz2 Index: java/sablevm/Makefile =================================================================== --- java/sablevm/Makefile (revision 305013) +++ java/sablevm/Makefile (working copy) @@ -24,7 +24,7 @@ USE_ICONV= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include `${PKG_CONFIG} libffi --cflags` Index: korean/ibus-hangul/Makefile =================================================================== --- korean/ibus-hangul/Makefile (revision 305013) +++ korean/ibus-hangul/Makefile (working copy) @@ -25,7 +25,8 @@ INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= gnomehack intltool pkgconfig +USE_GNOME= gnomehack intltool +USE_PKGCONFIG= build USE_PYTHON= yes .include Index: lang/embryo/Makefile =================================================================== --- lang/embryo/Makefile (revision 305013) +++ lang/embryo/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= eina libtool_hack librt_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: lang/lua/Makefile =================================================================== --- lang/lua/Makefile (revision 305013) +++ lang/lua/Makefile (working copy) @@ -22,7 +22,7 @@ USE_LUA= 5.1 LUA_COMPS= # only define variables ALL_TARGET= freebsd -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}" Index: lang/pure/Makefile =================================================================== --- lang/pure/Makefile (revision 305013) +++ lang/pure/Makefile (working copy) @@ -26,7 +26,8 @@ USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_PURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: lang/qore/Makefile =================================================================== --- lang/qore/Makefile (revision 305013) +++ lang/qore/Makefile (working copy) @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_OPENSSL= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ENV= "LEX=${LOCALBASE}/bin/flex" CONFIGURE_ARGS= --disable-debug --disable-static Index: lang/smalltalk/Makefile =================================================================== --- lang/smalltalk/Makefile (revision 305013) +++ lang/smalltalk/Makefile (working copy) @@ -25,7 +25,8 @@ OPTIONS_DEFAULT=TCL PGSQL SDL USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig pango +USE_GNOME= gnomehack pango +USE_PKGCONFIG= build USE_ICONV= yes USE_SQLITE= yes USE_GMAKE= yes Index: lang/vala/Makefile =================================================================== --- lang/vala/Makefile (revision 305013) +++ lang/vala/Makefile (working copy) @@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_XZ= yes USE_GNOME= gnomehack glib20 gnomeprefix libxslt +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_GETTEXT= yes CPPFLAGS+= -I${LOCALBASE} Index: mail/claws-mail/Makefile =================================================================== --- mail/claws-mail/Makefile (revision 305013) +++ mail/claws-mail/Makefile (working copy) @@ -34,7 +34,8 @@ USE_ICONV= yes USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xi xinerama xrandr \ xrender -USE_GNOME= gnomehack pkgconfig gtk20 glib20 atk libartlgpl2 pango libxml2 +USE_GNOME= gnomehack gtk20 glib20 atk libartlgpl2 pango libxml2 +USE_PKGCONFIG= build GNU_CONFIGURE= yes WANT_GNOME= yes INSTALLS_ICONS= yes Index: mail/dbmail22/Makefile =================================================================== --- mail/dbmail22/Makefile (revision 305013) +++ mail/dbmail22/Makefile (working copy) @@ -30,7 +30,8 @@ USE_GMAKE= yes USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_OPENSSL= yes CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS} Index: mail/exim/Makefile =================================================================== --- mail/exim/Makefile (revision 305013) +++ mail/exim/Makefile (working copy) @@ -410,7 +410,7 @@ .if defined(WITH_SQLITE) USE_SQLITE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,`pkg-config --static --libs sqlite3`,' \ -e 's,XX_SQLITE_FLAGS_XX,`pkg-config --cflags sqlite3`,' \ -e 's,^\# (LOOKUP_SQLITE=),\1,' Index: mail/libmapi/Makefile =================================================================== --- mail/libmapi/Makefile (revision 305013) +++ mail/libmapi/Makefile (working copy) @@ -28,7 +28,7 @@ CODENAME= COCHRANE USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_PYTHON= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: mail/msmtp/Makefile =================================================================== --- mail/msmtp/Makefile (revision 305013) +++ mail/msmtp/Makefile (working copy) @@ -17,7 +17,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAN1= msmtp.1 Index: mail/mu/Makefile =================================================================== --- mail/mu/Makefile (revision 305013) +++ mail/mu/Makefile (working copy) @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build MAN1= mu-cfind.1 mu-easy.1 mu-extract.1 mu-find.1 mu-index.1 \ mu-mkdir.1 mu-view.1 mu-add.1 mu-remove.1 mu-server.1 mu.1 \ Index: mail/xfce4-mailwatch-plugin/Makefile =================================================================== --- mail/xfce4-mailwatch-plugin/Makefile (revision 305013) +++ mail/xfce4-mailwatch-plugin/Makefile (working copy) @@ -24,7 +24,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel USE_XORG= x11 xt xaw Index: math/GiNaC/Makefile =================================================================== --- math/GiNaC/Makefile (revision 305013) +++ math/GiNaC/Makefile (working copy) @@ -19,7 +19,8 @@ LIB_DEPENDS= cln.6:${PORTSDIR}/math/cln USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: math/cln/Makefile =================================================================== --- math/cln/Makefile (revision 305013) +++ math/cln/Makefile (working copy) @@ -20,7 +20,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gmp Index: math/fftw3/Makefile =================================================================== --- math/fftw3/Makefile (revision 305013) +++ math/fftw3/Makefile (working copy) @@ -22,7 +22,8 @@ FFTW3_SUFX= GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_PERL5_BUILD=yes USE_LDCONFIG= yes Index: math/timbl/Makefile =================================================================== --- math/timbl/Makefile (revision 305013) +++ math/timbl/Makefile (working copy) @@ -21,7 +21,8 @@ USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes post-patch: Index: math/wfmath/Makefile =================================================================== --- math/wfmath/Makefile (revision 305013) +++ math/wfmath/Makefile (working copy) @@ -14,7 +14,8 @@ COMMENT= Worldforge math library USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: misc/amanda-server/Makefile =================================================================== --- misc/amanda-server/Makefile (revision 305013) +++ misc/amanda-server/Makefile (working copy) @@ -23,7 +23,8 @@ LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} GNU_CONFIGURE= yes -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes USE_OPENSSL= yes USE_LDCONFIG= yes Index: misc/amanda26-server/Makefile =================================================================== --- misc/amanda26-server/Makefile (revision 305013) +++ misc/amanda26-server/Makefile (working copy) @@ -21,7 +21,8 @@ NO_LATEST_LINK= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes USE_OPENSSL= yes PATCH_STRIP= Index: misc/amanda32-server/Makefile =================================================================== --- misc/amanda32-server/Makefile (revision 305013) +++ misc/amanda32-server/Makefile (working copy) @@ -23,7 +23,8 @@ NO_LATEST_LINK= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes USE_OPENSSL= yes USE_LDCONFIG= yes Index: misc/gnome-mime-data/Makefile =================================================================== --- misc/gnome-mime-data/Makefile (revision 305013) +++ misc/gnome-mime-data/Makefile (working copy) @@ -19,7 +19,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack pkgconfig +USE_GNOME= gnomeprefix gnomehack intlhack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" CPPFLAGS+= -I${LOCALBASE}/include Index: misc/gnome-user-docs/Makefile =================================================================== --- misc/gnome-user-docs/Makefile (revision 305013) +++ misc/gnome-user-docs/Makefile (working copy) @@ -23,5 +23,6 @@ GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomedocutils +USE_PKGCONFIG= build .include Index: misc/podsleuth/Makefile =================================================================== --- misc/podsleuth/Makefile (revision 305013) +++ misc/podsleuth/Makefile (working copy) @@ -25,7 +25,8 @@ LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build post-patch: @${REINPLACE_CMD} -e 's|^#!/bin/bash$$|#!/bin/sh|' \ Index: misc/shared-mime-info/Makefile =================================================================== --- misc/shared-mime-info/Makefile (revision 305013) +++ misc/shared-mime-info/Makefile (working copy) @@ -19,7 +19,8 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= glib20 libxml2 intltool gnomehack intlhack pkgconfig +USE_GNOME= glib20 libxml2 intltool gnomehack intlhack +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes Index: misc/sword/Makefile =================================================================== --- misc/sword/Makefile (revision 305013) +++ misc/sword/Makefile (working copy) @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= automake autoconf Index: misc/xfce4-appfinder/Makefile =================================================================== --- misc/xfce4-appfinder/Makefile (revision 305013) +++ misc/xfce4-appfinder/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 glib20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gtk20 glib20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv garcon libmenu libutil xfconf post-install: Index: multimedia/dirac/Makefile =================================================================== --- multimedia/dirac/Makefile (revision 305013) +++ multimedia/dirac/Makefile (working copy) @@ -18,7 +18,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ENV?= HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \ Index: multimedia/dv2sub/Makefile =================================================================== --- multimedia/dv2sub/Makefile (revision 305013) +++ multimedia/dv2sub/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PLIST_FILES= bin/dv2sub MAN1= dv2sub.1 Index: multimedia/emotion/Makefile =================================================================== --- multimedia/emotion/Makefile (revision 305013) +++ multimedia/emotion/Makefile (working copy) @@ -24,7 +24,8 @@ USE_GMAKE= yes USE_EFL= ecore edje eet eio embryo evas libtool_hack modarch_hack USE_EFL_EVAS_LOADERS= png jpeg -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes OPTIONS= GST "Build GStreamer module" on \ Index: multimedia/ffmpegthumbnailer/Makefile =================================================================== --- multimedia/ffmpegthumbnailer/Makefile (revision 305013) +++ multimedia/ffmpegthumbnailer/Makefile (working copy) @@ -24,7 +24,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig _glib20 +USE_GNOME= gnomehack _glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes MAN1= ffmpegthumbnailer.1 Index: multimedia/gavl/Makefile =================================================================== --- multimedia/gavl/Makefile (revision 305013) +++ multimedia/gavl/Makefile (working copy) @@ -16,7 +16,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes Index: multimedia/gstreamer-plugins/Makefile =================================================================== --- multimedia/gstreamer-plugins/Makefile (revision 305013) +++ multimedia/gstreamer-plugins/Makefile (working copy) @@ -50,7 +50,8 @@ WANT_GSTREAMER= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME+= gnomehack pkgconfig ltverhack ltasneededhack +USE_GNOME+= gnomehack ltverhack ltasneededhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool GST_PLUGIN?= base Index: multimedia/gstreamermm/Makefile =================================================================== --- multimedia/gstreamermm/Makefile (revision 305013) +++ multimedia/gstreamermm/Makefile (working copy) @@ -20,7 +20,8 @@ USE_XZ= yes USE_GMAKE= yes USE_GSTREAMER= theora vorbis cdparanoia gio pango -USE_GNOME= pkgconfig gnomeprefix gnomehack +USE_GNOME= gnomeprefix gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-documentation USE_LDCONFIG= yes Index: multimedia/libdca/Makefile =================================================================== --- multimedia/libdca/Makefile (revision 305013) +++ multimedia/libdca/Makefile (working copy) @@ -15,7 +15,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes MAN1= dcadec.1 extract_dca.1 Index: multimedia/libquicktime/Makefile =================================================================== --- multimedia/libquicktime/Makefile (revision 305013) +++ multimedia/libquicktime/Makefile (working copy) @@ -22,7 +22,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_GETTEXT= yes MAKE_JOBS_SAFE= yes Index: multimedia/libquvi/Makefile =================================================================== --- multimedia/libquvi/Makefile (revision 305013) +++ multimedia/libquvi/Makefile (working copy) @@ -20,7 +20,8 @@ CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes USE_LDCONFIG= yes USE_LUA= yes Index: multimedia/libquvi-scripts/Makefile =================================================================== --- multimedia/libquvi-scripts/Makefile (revision 305013) +++ multimedia/libquvi-scripts/Makefile (working copy) @@ -18,7 +18,8 @@ NSFW_DESC= Enable adult website support GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_XZ= yes MAN7= libquvi-scripts.7 Index: multimedia/libxspf/Makefile =================================================================== --- multimedia/libxspf/Makefile (revision 305013) +++ multimedia/libxspf/Makefile (working copy) @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--with-expat=${LOCALBASE} --disable-test USE_BZIP2= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: multimedia/mjpegtools/Makefile =================================================================== --- multimedia/mjpegtools/Makefile (revision 305013) +++ multimedia/mjpegtools/Makefile (working copy) @@ -22,7 +22,7 @@ CONFLICTS= mplex-[0-9]* -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf LIBTOOLIZE_ARGS=--force Index: multimedia/pitivi/Makefile =================================================================== --- multimedia/pitivi/Makefile (revision 305013) +++ multimedia/pitivi/Makefile (working copy) @@ -19,7 +19,8 @@ USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pygtk2 pkgconfig +USE_GNOME= pygtk2 +USE_PKGCONFIG= build USE_GSTREAMER= gnonlin python good USE_PYTHON= yes INSTALLS_ICONS= yes Index: multimedia/py-gstreamer/Makefile =================================================================== --- multimedia/py-gstreamer/Makefile (revision 305013) +++ multimedia/py-gstreamer/Makefile (working copy) @@ -26,7 +26,8 @@ USE_PYTHON= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pygobject gnomehack pkgconfig +USE_GNOME= pygobject gnomehack +USE_PKGCONFIG= build USE_GSTREAMER= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${GST_VERSION}" Index: multimedia/quvi/Makefile =================================================================== --- multimedia/quvi/Makefile (revision 305013) +++ multimedia/quvi/Makefile (working copy) @@ -21,7 +21,7 @@ RUN_DEPENDS= libquvi>=0.4.0:${PORTSDIR}/multimedia/libquvi GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XZ= yes MAN1= quvi.1 Index: multimedia/rtmpdump/Makefile =================================================================== --- multimedia/rtmpdump/Makefile (revision 305013) +++ multimedia/rtmpdump/Makefile (working copy) @@ -16,7 +16,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_OPENSSL= yes MAKE_ENV= THREADLIB="${PTHREAD_LIBS}" Index: multimedia/schroedinger/Makefile =================================================================== --- multimedia/schroedinger/Makefile (revision 305013) +++ multimedia/schroedinger/Makefile (working copy) @@ -25,6 +25,7 @@ BUILD_DEPENDS= orc>=0.4.16:${PORTSDIR}/devel/orc GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: multimedia/vcdimager/Makefile =================================================================== --- multimedia/vcdimager/Makefile (revision 305013) +++ multimedia/vcdimager/Makefile (working copy) @@ -24,7 +24,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig lthack +USE_GNOME= gnomehack lthack +USE_PKGCONFIG= build CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: multimedia/xfce4-media/Makefile =================================================================== --- multimedia/xfce4-media/Makefile (revision 305013) +++ multimedia/xfce4-media/Makefile (working copy) @@ -23,7 +23,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= glib20 gnomehack gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libexo libgui libutil panel USE_XORG= x11 sm Index: multimedia/xfce4-xmms-plugin/Makefile =================================================================== --- multimedia/xfce4-xmms-plugin/Makefile (revision 305013) +++ multimedia/xfce4-xmms-plugin/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pango pkgconfig +USE_GNOME= gtk20 intltool intlhack pango +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel OPTIONS= XMMS "Enable xmms support" on \ Index: net/avahi-app/Makefile =================================================================== --- net/avahi-app/Makefile (revision 305013) +++ net/avahi-app/Makefile (working copy) @@ -27,6 +27,7 @@ GROUPS?= ${USERS} USE_GNOME?= gnomehack ltverhack glib20 intltool +USE_PKGCONFIG= build USE_GETTEXT= yes USE_GNOME_SUBR= yes USE_GMAKE= yes Index: net-im/farsight2/Makefile =================================================================== --- net-im/farsight2/Makefile (revision 305013) +++ net-im/farsight2/Makefile (working copy) @@ -20,8 +20,8 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_PYTHON= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack \ - pygtk2 +USE_GNOME= gnomehack glib20 ltverhack pygtk2 +USE_PKGCONFIG= build USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include Index: net-im/freetalk/Makefile =================================================================== --- net-im/freetalk/Makefile (revision 305013) +++ net-im/freetalk/Makefile (working copy) @@ -22,7 +22,8 @@ BUILD_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile RUN_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} Index: net-im/jggtrans/Makefile =================================================================== --- net-im/jggtrans/Makefile (revision 305013) +++ net-im/jggtrans/Makefile (working copy) @@ -21,7 +21,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_GETTEXT= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include Index: net-im/libnice/Makefile =================================================================== --- net-im/libnice/Makefile (revision 305013) +++ net-im/libnice/Makefile (working copy) @@ -17,7 +17,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_GSTREAMER= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS Index: net-im/libtelepathy/Makefile =================================================================== --- net-im/libtelepathy/Makefile (revision 305013) +++ net-im/libtelepathy/Makefile (working copy) @@ -24,7 +24,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool .include Index: net-im/loudmouth/Makefile =================================================================== --- net-im/loudmouth/Makefile (revision 305013) +++ net-im/loudmouth/Makefile (working copy) @@ -22,6 +22,7 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build CONFIGURE_ARGS= --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib Index: net-im/mu-conference/Makefile =================================================================== --- net-im/mu-conference/Makefile (revision 305013) +++ net-im/mu-conference/Makefile (working copy) @@ -19,7 +19,8 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ idn:${PORTSDIR}/dns/libidn -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= MYSQL Index: net-im/pidgin-birthday-reminder/Makefile =================================================================== --- net-im/pidgin-birthday-reminder/Makefile (revision 305013) +++ net-im/pidgin-birthday-reminder/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= pkgconfig intltool +USE_GNOME= intltool +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: net-im/pidgin-hotkeys/Makefile =================================================================== --- net-im/pidgin-hotkeys/Makefile (revision 305013) +++ net-im/pidgin-hotkeys/Makefile (working copy) @@ -18,7 +18,8 @@ BUILD_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes Index: net-im/pidgin-libnotify/Makefile =================================================================== --- net-im/pidgin-libnotify/Makefile (revision 305013) +++ net-im/pidgin-libnotify/Makefile (working copy) @@ -24,7 +24,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 +USE_PKGCONFIG= build .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls Index: net-im/pidgin-osd/Makefile =================================================================== --- net-im/pidgin-osd/Makefile (revision 305013) +++ net-im/pidgin-osd/Makefile (working copy) @@ -18,7 +18,8 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin \ xosd>=2.2.12:${PORTSDIR}/misc/xosd -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes Index: net-im/pidgin-pidgimpd/Makefile =================================================================== --- net-im/pidgin-pidgimpd/Makefile (revision 305013) +++ net-im/pidgin-pidgimpd/Makefile (working copy) @@ -21,7 +21,8 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin USE_BZIP2= yes -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_ICONV= yes GNU_CONFIGURE= yes Index: net-im/pidgin-twitter/Makefile =================================================================== --- net-im/pidgin-twitter/Makefile (revision 305013) +++ net-im/pidgin-twitter/Makefile (working copy) @@ -17,7 +17,8 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes Index: net-im/telepathy-farsight/Makefile =================================================================== --- net-im/telepathy-farsight/Makefile (revision 305013) +++ net-im/telepathy-farsight/Makefile (working copy) @@ -29,7 +29,8 @@ USE_LDCONFIG= yes USE_PYTHON= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} Index: net-im/telepathy-gabble/Makefile =================================================================== --- net-im/telepathy-gabble/Makefile (revision 305013) +++ net-im/telepathy-gabble/Makefile (working copy) @@ -31,7 +31,8 @@ CONFIGURE_ARGS= --disable-Werror LDFLAGS+= ${PTHREAD_LIBS} USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 +USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_OPENSSL= yes USE_PYTHON_BUILD= yes Index: net-im/telepathy-glib/Makefile =================================================================== --- net-im/telepathy-glib/Makefile (revision 305013) +++ net-im/telepathy-glib/Makefile (working copy) @@ -28,7 +28,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_PYTHON_BUILD= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --enable-vala-bindings Index: net-im/telepathy-haze/Makefile =================================================================== --- net-im/telepathy-haze/Makefile (revision 305013) +++ net-im/telepathy-haze/Makefile (working copy) @@ -21,7 +21,7 @@ idn.17:${PORTSDIR}/dns/libidn \ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION} GNU_CONFIGURE= yes Index: net-im/telepathy-idle/Makefile =================================================================== --- net-im/telepathy-idle/Makefile (revision 305013) +++ net-im/telepathy-idle/Makefile (working copy) @@ -26,7 +26,8 @@ GNU_CONFIGURE= yes USE_OPENSSL= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 +USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build MAN8= telepathy-idle.8 Index: net-im/telepathy-logger/Makefile =================================================================== --- net-im/telepathy-logger/Makefile (revision 305013) +++ net-im/telepathy-logger/Makefile (working copy) @@ -23,7 +23,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack +USE_GNOME= gnomehack glib20 intltool gnomedocutils ltverhack +USE_PKGCONFIG= build USE_PYTHON_BUILD= yes #MAKE_JOBS_UNSAFE= yes GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml Index: net-im/telepathy-mission-control/Makefile =================================================================== --- net-im/telepathy-mission-control/Makefile (revision 305013) +++ net-im/telepathy-mission-control/Makefile (working copy) @@ -17,7 +17,8 @@ LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack +USE_GNOME= gnomeprefix gconf2 libxslt gnomehack ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: net-im/telepathy-qt4/Makefile =================================================================== --- net-im/telepathy-qt4/Makefile (revision 305013) +++ net-im/telepathy-qt4/Makefile (working copy) @@ -21,7 +21,7 @@ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_PYTHON_BUILD= 2.5+ USE_QT4= dbus gui network qtestlib_build xml \ moc_build qmake_build rcc_build uic_build Index: net-im/telepathy-salut/Makefile =================================================================== --- net-im/telepathy-salut/Makefile (revision 305013) +++ net-im/telepathy-salut/Makefile (working copy) @@ -26,7 +26,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_OPENSSL= yes USE_PYTHON_BUILD= yes CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" Index: net-im/xfce4-messenger-plugin/Makefile =================================================================== --- net-im/xfce4-messenger-plugin/Makefile (revision 305013) +++ net-im/xfce4-messenger-plugin/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel USE_XORG= x11 xt xaw Index: net-mgmt/libsmi/Makefile =================================================================== --- net-mgmt/libsmi/Makefile (revision 305013) +++ net-mgmt/libsmi/Makefile (working copy) @@ -16,7 +16,8 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes PIBDIR= ${PREFIX}/share/smi/pibs MIBDIR= ${PREFIX}/share/smi/mibs Index: net-mgmt/tork/Makefile =================================================================== --- net-mgmt/tork/Makefile (revision 305013) +++ net-mgmt/tork/Makefile (working copy) @@ -15,7 +15,7 @@ COMMENT= TorK is an Anonymity Manager for the KDE Desktop USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool aclocal:env USE_GETTEXT= yes USE_XORG= xext Index: net-mgmt/wifimgr/Makefile =================================================================== --- net-mgmt/wifimgr/Makefile (revision 305013) +++ net-mgmt/wifimgr/Makefile (working copy) @@ -17,7 +17,8 @@ USE_BZIP2= yes USE_XORG= x11 -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build INSTALLS_ICONS= yes .if !defined(WITHOUT_NLS) Index: net-p2p/amule/Makefile =================================================================== --- net-p2p/amule/Makefile (revision 305013) +++ net-p2p/amule/Makefile (working copy) @@ -27,7 +27,7 @@ USE_BZIP2= yes USE_BISON= build -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GMAKE= yes USE_WX= 2.8 WX_CONF_ARGS= absolute Index: net-p2p/amule-devel/Makefile =================================================================== --- net-p2p/amule-devel/Makefile (revision 305013) +++ net-p2p/amule-devel/Makefile (working copy) @@ -27,7 +27,7 @@ USE_BZIP2= yes USE_BISON= build -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GMAKE= yes USE_WX= 2.8 WX_CONF_ARGS= absolute Index: net-p2p/libtorrent/Makefile =================================================================== --- net-p2p/libtorrent/Makefile (revision 305013) +++ net-p2p/libtorrent/Makefile (working copy) @@ -22,7 +22,8 @@ rblibtorrent-devel-[0-9]* USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= buidl USE_OPENSSL= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: net-p2p/moodriver/Makefile =================================================================== --- net-p2p/moodriver/Makefile (revision 305013) +++ net-p2p/moodriver/Makefile (working copy) @@ -21,7 +21,8 @@ CXXFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig USE_GETTEXT= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: net-p2p/transmission-cli/Makefile =================================================================== --- net-p2p/transmission-cli/Makefile (revision 305013) +++ net-p2p/transmission-cli/Makefile (working copy) @@ -29,7 +29,7 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web USE_GMAKE= yes -USE_GNOME?= pkgconfig +USE_PKGCONFIG= build USE_OPENSSL= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: net-p2p/transmission25-cli/Makefile =================================================================== --- net-p2p/transmission25-cli/Makefile (revision 305013) +++ net-p2p/transmission25-cli/Makefile (working copy) @@ -29,7 +29,7 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission25-web USE_GMAKE= yes -USE_GNOME?= pkgconfig +USE_PKGCONFIG= build USE_OPENSSL= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: palm/barry/Makefile =================================================================== --- palm/barry/Makefile (revision 305013) +++ palm/barry/Makefile (working copy) @@ -14,7 +14,7 @@ USE_BZIP2= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ENV= OPENSSL_CFLAGS=-I/usr/include \ OPENSSL_LIBS="-L/lib -lssl -lcrypto" Index: palm/pilot-link/Makefile =================================================================== --- palm/pilot-link/Makefile (revision 305013) +++ palm/pilot-link/Makefile (working copy) @@ -19,7 +19,8 @@ USE_BZIP2= yes USE_ICONV= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits --enable-xsltproc Index: polish/ekg/Makefile =================================================================== --- polish/ekg/Makefile (revision 305013) +++ polish/ekg/Makefile (working copy) @@ -15,7 +15,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build CONFIGURE_ARGS+=--disable-shared \ --disable-static \ --enable-dynamic \ Index: polish/ekg2/Makefile =================================================================== --- polish/ekg2/Makefile (revision 305013) +++ polish/ekg2/Makefile (working copy) @@ -21,7 +21,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes MAKE_JOBS_SAFE= yes Index: polish/libgadu/Makefile =================================================================== --- polish/libgadu/Makefile (revision 305013) +++ polish/libgadu/Makefile (working copy) @@ -17,7 +17,8 @@ CONFLICTS= pl-ekg-1.[0-6]* -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --disable-static --with-pthread \ Index: ports-mgmt/kpackagekit/Makefile =================================================================== --- ports-mgmt/kpackagekit/Makefile (revision 305013) +++ ports-mgmt/kpackagekit/Makefile (working copy) @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_KDE4= automoc4 kdehier kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build MAKE_JOBS_SAFE= yes Index: print/freetype2/Makefile =================================================================== --- print/freetype2/Makefile (revision 305013) +++ print/freetype2/Makefile (working copy) @@ -28,7 +28,8 @@ MAKE_ENV= TOP="" USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig ltverhack:9 +USE_GNOME= ltverhack:9 +USE_PKGCONFIG= build LIBTOOLFILES= builds/unix/configure CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix Index: print/hplip/Makefile =================================================================== --- print/hplip/Makefile (revision 305013) +++ print/hplip/Makefile (working copy) @@ -28,7 +28,8 @@ USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= 2.5+ -USE_GNOME= pkgconfig pygobject +USE_GNOME= pygobject +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-foomatic-ppd-install \ Index: print/libgnomecups/Makefile =================================================================== --- print/libgnomecups/Makefile (revision 305013) +++ print/libgnomecups/Makefile (working copy) @@ -21,6 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack ltverhack glib20 +USE_PKGCONFIG= build USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool Index: print/libotf/Makefile =================================================================== --- print/libotf/Makefile (revision 305013) +++ print/libotf/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_XORG= x11 xt xaw xmu -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Index: print/pslib/Makefile =================================================================== --- print/pslib/Makefile (revision 305013) +++ print/pslib/Makefile (working copy) @@ -19,7 +19,8 @@ png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -USE_GNOME= gnomehack intlhack pkgconfig +USE_GNOME= gnomehack intlhack +USE_PKGCONFIG= build USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool Index: print/scribus/Makefile =================================================================== --- print/scribus/Makefile (revision 305013) +++ print/scribus/Makefile (working copy) @@ -36,7 +36,8 @@ NO_LATEST_LINK= yes USE_XZ= yes USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network -USE_GNOME= desktopfileutils libartlgpl2 libxml2 pkgconfig +USE_GNOME= desktopfileutils libartlgpl2 libxml2 +USE_PKGCONFIG= build USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_CMAKE= yes Index: print/scribus-devel/Makefile =================================================================== --- print/scribus-devel/Makefile (revision 305013) +++ print/scribus-devel/Makefile (working copy) @@ -37,7 +37,8 @@ USE_SVN= yes USE_BZIP2= yes USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network -USE_GNOME= desktopfileutils libartlgpl2 libxml2 pkgconfig +USE_GNOME= desktopfileutils libartlgpl2 libxml2 +USE_PKGCONFIG= build USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_CMAKE= yes Index: print/xfce4-print/Makefile =================================================================== --- print/xfce4-print/Makefile (revision 305013) +++ print/xfce4-print/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= glib20 gnomehack gtk20 intltool intlhack +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XFCE= configenv libgui libutil xfconf Index: science/ghemical/Makefile =================================================================== --- science/ghemical/Makefile (revision 305013) +++ science/ghemical/Makefile (working copy) @@ -27,7 +27,8 @@ USE_FORTRAN= yes USE_GMAKE= yes -USE_GNOME= glib20 gtk20 libglade2 pkgconfig +USE_GNOME= glib20 gtk20 libglade2 +USE_PKGCONFIG= build USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gamess --enable-mpqc --enable-openbabel --enable-gtk --enable-threads --enable-mopac7 Index: science/libghemical/Makefile =================================================================== --- science/libghemical/Makefile (revision 305013) +++ science/libghemical/Makefile (working copy) @@ -22,7 +22,8 @@ f2c:${PORTSDIR}/lang/f2c USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GL= gl GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: science/omnetpp/Makefile =================================================================== --- science/omnetpp/Makefile (revision 305013) +++ science/omnetpp/Makefile (working copy) @@ -20,7 +20,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= libxml libxslt pkgconfig +USE_GNOME= libxml libxslt +USE_PKGCONFIG= build USE_PERL5= yes USE_TCL= yes USE_TK= 84+ Index: security/engine_pkcs11/Makefile =================================================================== --- security/engine_pkcs11/Makefile (revision 305013) +++ security/engine_pkcs11/Makefile (working copy) @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" Index: security/fprint_demo/Makefile =================================================================== --- security/fprint_demo/Makefile (revision 305013) +++ security/fprint_demo/Makefile (working copy) @@ -21,7 +21,8 @@ USE_AUTOTOOLS= autoconf automake AUTOMAKE_ARGS= -a GNU_CONFIGURE= yes -USE_GNOME= atk glib20 gtk20 pango pkgconfig +USE_GNOME= atk glib20 gtk20 pango +USE_PKGCONFIG= build INSTALLS_ICONS= yes WRKSRC= ${WRKDIR} Index: security/gnutls-devel/Makefile =================================================================== --- security/gnutls-devel/Makefile (revision 305013) +++ security/gnutls-devel/Makefile (working copy) @@ -23,7 +23,8 @@ USE_XZ= yes USE_ICONV= yes -USE_GNOME= pkgconfig ltverhack +USE_GNOME= ltverhack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool Index: security/gsasl/Makefile =================================================================== --- security/gsasl/Makefile (revision 305013) +++ security/gsasl/Makefile (working copy) @@ -20,7 +20,8 @@ gnutls.47:${PORTSDIR}/security/gnutls \ ntlm.0:${PORTSDIR}/security/libntlm -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_PERL5_BUILD= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: security/gss/Makefile =================================================================== --- security/gss/Makefile (revision 305013) +++ security/gss/Makefile (working copy) @@ -19,7 +19,8 @@ CONFLICTS= heimdal-[0-9]* USE_PERL5_BUILD= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-kerberos5 USE_LDCONFIG= yes Index: security/heimdal/Makefile =================================================================== --- security/heimdal/Makefile (revision 305013) +++ security/heimdal/Makefile (working copy) @@ -31,7 +31,8 @@ X11 "Build X11 utilies" off USE_AUTOTOOLS= autoconf autoheader libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_OPENSSL= yes USE_GETTEXT= yes GNU_CONFIGURE= yes Index: security/hydra/Makefile =================================================================== --- security/hydra/Makefile (revision 305013) +++ security/hydra/Makefile (working copy) @@ -54,7 +54,8 @@ .endif .if ${PORT_OPTIONS:MX11} -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build PLIST_FILES+= bin/xhydra MAN1+= xhydra.1 .else Index: security/klamav/Makefile =================================================================== --- security/klamav/Makefile (revision 305013) +++ security/klamav/Makefile (working copy) @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_SQLITE= 3 -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GETTEXT= yes INSTALLS_ICONS= yes Index: security/libfprint/Makefile =================================================================== --- security/libfprint/Makefile (revision 305013) +++ security/libfprint/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes USE_LDCONFIG= yes USE_OPENSSL= yes -USE_GNOME= gnomehack glib20 pkgconfig +USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build CFLAGS+= -DHAVE_MEMMEM MAKE_JOBS_UNSAFE=yes Index: security/libntlm/Makefile =================================================================== --- security/libntlm/Makefile (revision 305013) +++ security/libntlm/Makefile (working copy) @@ -14,7 +14,8 @@ MAINTAINER= jochen@daten-chaos.de COMMENT= A library that implement Microsoft's NTLM authentication -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Index: security/libp11/Makefile =================================================================== --- security/libp11/Makefile (revision 305013) +++ security/libp11/Makefile (working copy) @@ -19,7 +19,8 @@ USE_AUTOTOOLS= libltdl libtool USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig ltverhack +USE_GNOME= ltverhack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBASE}/include" \ Index: security/libtasn1/Makefile =================================================================== --- security/libtasn1/Makefile (revision 305013) +++ security/libtasn1/Makefile (working copy) @@ -15,7 +15,7 @@ COMMENT= ASN.1 structure parser library USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes DOCS= AUTHORS NEWS README THANKS doc/TODO \ Index: security/obfsproxy/Makefile =================================================================== --- security/obfsproxy/Makefile (revision 305013) +++ security/obfsproxy/Makefile (working copy) @@ -32,7 +32,7 @@ MAN1= obfsproxy.1 SUB_FILES= pkg-message PLIST_FILES= bin/obfsproxy -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes Index: security/opencdk/Makefile =================================================================== --- security/opencdk/Makefile (revision 305013) +++ security/opencdk/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig ltverhack +USE_GNOME= ltverhack +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE} Index: security/openconnect/Makefile =================================================================== --- security/openconnect/Makefile (revision 305013) +++ security/openconnect/Makefile (working copy) @@ -24,7 +24,8 @@ CONFIGURE_ARGS= --disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig USE_AUTOTOOLS= aclocal autoconf libtool -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_OPENSSL= yes MAKE_JOBS_SAFE= yes Index: security/openct/Makefile =================================================================== --- security/openct/Makefile (revision 305013) +++ security/openct/Makefile (working copy) @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_RC_SUBR= openct SUB_FILES= etoken.conf Index: security/opensc/Makefile =================================================================== --- security/opensc/Makefile (revision 305013) +++ security/opensc/Makefile (working copy) @@ -27,7 +27,7 @@ USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ENV= \ Index: security/pam_fprint/Makefile =================================================================== --- security/pam_fprint/Makefile (revision 305013) +++ security/pam_fprint/Makefile (working copy) @@ -23,7 +23,7 @@ CONFIGURE_ENV+= FPRINT_CFLAGS=-I${LOCALBASE}/include GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build WRKSRC= ${WRKDIR} Index: security/pam_p11/Makefile =================================================================== --- security/pam_p11/Makefile (revision 305013) +++ security/pam_p11/Makefile (working copy) @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" Index: security/pkcs11-helper/Makefile =================================================================== --- security/pkcs11-helper/Makefile (revision 305013) +++ security/pkcs11-helper/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ Index: security/shishi/Makefile =================================================================== --- security/shishi/Makefile (revision 305013) +++ security/shishi/Makefile (working copy) @@ -16,7 +16,8 @@ USE_AUTOTOOLS= libtool USE_PERL5_BUILD= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" Index: security/snort/Makefile =================================================================== --- security/snort/Makefile (revision 305013) +++ security/snort/Makefile (working copy) @@ -137,7 +137,7 @@ .if ${PORT_OPTIONS:MSNORTSAM} BROKEN= current snortsam patch fails to apply USE_AUTOTOOLS+= automake -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PATCH_SITES+= http://www.snortsam.net/files/snort-plugin/:snortsam PATCHFILES+= snortsam-2.9.2.2.diff.gz:snortsam .endif Index: security/sssd/Makefile =================================================================== --- security/sssd/Makefile (revision 305013) +++ security/sssd/Makefile (working copy) @@ -52,7 +52,7 @@ USE_PYTHON= yes USE_OPENLDAP= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GETTEXT= yes USE_ICONV= yes USE_PYTHON= yes Index: security/yersinia/Makefile =================================================================== --- security/yersinia/Makefile (revision 305013) +++ security/yersinia/Makefile (working copy) @@ -21,7 +21,8 @@ .endif .endif .if defined(WITH_GTK) -USE_GNOME+= pkgconfig gtk20 +USE_GNOME+= gtk20 +USE_PKGCONFIG= build PKGNAMESUFFIX= -gtk CONFLICTS= yersinia-[0-9]* .else Index: sysutils/cdrdao/Makefile =================================================================== --- sysutils/cdrdao/Makefile (revision 305013) +++ sysutils/cdrdao/Makefile (working copy) @@ -25,7 +25,8 @@ vorbis.4:${PORTSDIR}/audio/libvorbis .if ${PORTNAME} == "gcdmaster" -USE_GNOME= gnomehier pkgconfig +USE_GNOME= gnomehier +USE_PKGCONFIG= build GCONF_SCHEMAS= gcdmaster.schemas LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \ gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 @@ -46,7 +47,7 @@ PLIST_SUB+= TOC2MP3="@comment " .endif .if !defined(WITHOUT_MP3OGG) -USE_GNOME= pkgconfig +USE_PKGCONFIG= build LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} CONFIGURE_ENV+= AO_CFLAGS=-I${LOCALBASE}/include \ AO_LIBS="-L${LOCALBASE}/lib -lao" \ Index: sysutils/conky/Makefile =================================================================== --- sysutils/conky/Makefile (revision 305013) +++ sysutils/conky/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_XORG?= x11 xext xdamage -USE_GNOME?= pkgconfig +USE_GNOME?= # empty +USE_PKGCONFIG= build USE_ICONV= yes USE_GMAKE= yes CONFIGURE_ARGS+= --disable-portmon \ Index: sysutils/djmount/Makefile =================================================================== --- sysutils/djmount/Makefile (revision 305013) +++ sysutils/djmount/Makefile (working copy) @@ -21,7 +21,7 @@ PLIST_FILES= bin/${PORTNAME} GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-fuse-prefix=${LOCALBASE} \ --with-external-libupnp --with-libupnp-prefix=${LOCALBASE} Index: sysutils/empower/Makefile =================================================================== --- sysutils/empower/Makefile (revision 305013) +++ sysutils/empower/Makefile (working copy) @@ -22,7 +22,8 @@ GNU_CONFIGURE= yes USE_EFL= evas ecore edje elementary USE_EFL_ECORE= file imf evas -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes Index: sysutils/eventlog/Makefile =================================================================== --- sysutils/eventlog/Makefile (revision 305013) +++ sysutils/eventlog/Makefile (working copy) @@ -15,7 +15,8 @@ COMMENT= Replacement of the simple syslog() API providing structure to messages GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: sysutils/fusefs-fur/Makefile =================================================================== --- sysutils/fusefs-fur/Makefile (revision 305013) +++ sysutils/fusefs-fur/Makefile (working copy) @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_ICONV= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DFUSE_USE_VERSION=26 Index: sysutils/fusefs-fusexmp_fh/Makefile =================================================================== --- sysutils/fusefs-fusexmp_fh/Makefile (revision 305013) +++ sysutils/fusefs-fusexmp_fh/Makefile (working copy) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_ICONV= yes GNU_CONFIGURE= yes Index: sysutils/fusefs-gstfs/Makefile =================================================================== --- sysutils/fusefs-gstfs/Makefile (revision 305013) +++ sysutils/fusefs-gstfs/Makefile (working copy) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_GSTREAMER= yes PLIST_FILES= bin/${PORTNAME} Index: sysutils/fusefs-ifuse/Makefile =================================================================== --- sysutils/fusefs-ifuse/Makefile (revision 305013) +++ sysutils/fusefs-ifuse/Makefile (working copy) @@ -27,7 +27,8 @@ SUB_FILES= pkg-message USE_BZIP2= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib Index: sysutils/gksu/Makefile =================================================================== --- sysutils/gksu/Makefile (revision 305013) +++ sysutils/gksu/Makefile (working copy) @@ -18,7 +18,8 @@ nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring -USE_GNOME= gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack +USE_GNOME= gtk20 gnomeprefix gnomehack gconf2 intlhack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: sysutils/isomaster/Makefile =================================================================== --- sysutils/isomaster/Makefile (revision 305013) +++ sysutils/isomaster/Makefile (working copy) @@ -15,7 +15,8 @@ COMMENT= GTK2 (bootable) CD ISO Image editor USE_BZIP2= yes -USE_GNOME= gtk20 pkgconfig intlhack gnomehier desktopfileutils +USE_GNOME= gtk20 intlhack gnomehier desktopfileutils +USE_PKGCONFIG= build USE_GMAKE= yes MAKE_ENV= DESKTOPPATH=${DESKTOPDIR} Index: sysutils/lcdproc/Makefile =================================================================== --- sysutils/lcdproc/Makefile (revision 305013) +++ sysutils/lcdproc/Makefile (working copy) @@ -20,7 +20,7 @@ USE_AUTOTOOLS= autoconf automake aclocal GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_RC_SUBR= LCDd lcdproc lcdexec CONFIGURE_ARGS= --enable-drivers="${LCDPROC_DRIVERS}" \ Index: sysutils/ldapvi/Makefile =================================================================== --- sysutils/ldapvi/Makefile (revision 305013) +++ sysutils/ldapvi/Makefile (working copy) @@ -21,7 +21,8 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt USE_OPENLDAP= yes -USE_GNOME= pkgconfig glib20 +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_ICONV= yes GNU_CONFIGURE= yes USE_GMAKE= yes Index: sysutils/libcdio/Makefile =================================================================== --- sysutils/libcdio/Makefile (revision 305013) +++ sysutils/libcdio/Makefile (working copy) @@ -22,7 +22,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_ICONV= yes USE_LDCONFIG= yes Index: sysutils/libgksu/Makefile =================================================================== --- sysutils/libgksu/Makefile (revision 305013) +++ sysutils/libgksu/Makefile (working copy) @@ -21,7 +21,8 @@ RUN_DEPENDS= xauth:${PORTSDIR}/x11/xauth \ sudo:${PORTSDIR}/security/sudo -USE_GNOME= pkgconfig glib20 gconf2 +USE_GNOME= glib20 gconf2 +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-gtk-doc=no GNU_CONFIGURE= yes Index: sysutils/ntfsprogs/Makefile =================================================================== --- sysutils/ntfsprogs/Makefile (revision 305013) +++ sysutils/ntfsprogs/Makefile (working copy) @@ -20,7 +20,7 @@ CONFLICTS_INSTALL= fusefs-ntfs-* -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: sysutils/nut/Makefile =================================================================== --- sysutils/nut/Makefile (revision 305013) +++ sysutils/nut/Makefile (working copy) @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build NUT_USER?= uucp NUT_GROUP?= uucp Index: sysutils/nvclock/Makefile =================================================================== --- sysutils/nvclock/Makefile (revision 305013) +++ sysutils/nvclock/Makefile (working copy) @@ -32,7 +32,7 @@ .if defined(WITH_NVCONTROL) USE_XORG= xext -USE_GNOME= pkgconfig +USE_PKGCONFIG= build .else CONFIGURE_ARGS+= --disable-nvcontrol .endif Index: sysutils/openipmi/Makefile =================================================================== --- sysutils/openipmi/Makefile (revision 305013) +++ sysutils/openipmi/Makefile (working copy) @@ -19,7 +19,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_AUTOTOOLS= autoconf autoheader automake aclocal libtool AUTOMAKE_ARGS+= --add-missing --copy --foreign Index: sysutils/p5-Fuse/Makefile =================================================================== --- sysutils/p5-Fuse/Makefile (revision 305013) +++ sysutils/p5-Fuse/Makefile (working copy) @@ -22,7 +22,7 @@ PERL_CONFIGURE= yes PORTSCOUT= skipv:0.09_4 -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAN3= Fuse.3 Index: sysutils/pam_mount/Makefile =================================================================== --- sysutils/pam_mount/Makefile (revision 305013) +++ sysutils/pam_mount/Makefile (working copy) @@ -16,7 +16,8 @@ LIB_DEPENDS= HX.27:${PORTSDIR}/lang/libhx -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 +USE_PKGCONFIG= build USE_PERL5= yes USE_XZ= yes Index: sysutils/policykit/Makefile =================================================================== --- sysutils/policykit/Makefile (revision 305013) +++ sysutils/policykit/Makefile (working copy) @@ -23,6 +23,7 @@ GROUPS= polkit USE_GNOME= gnomehack glib20 intlhack +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: sysutils/polkit/Makefile =================================================================== --- sysutils/polkit/Makefile (revision 305013) +++ sysutils/polkit/Makefile (working copy) @@ -20,6 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection USE_GNOME= gnomehack glib20 intlhack +USE_PKGCONFIG= build USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes Index: sysutils/usbutils/Makefile =================================================================== --- sysutils/usbutils/Makefile (revision 305013) +++ sysutils/usbutils/Makefile (working copy) @@ -19,7 +19,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} --enable-zlib USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAN1= usb-devices.1 MAN8= lsusb.8 Index: sysutils/xfce4-battery-plugin/Makefile =================================================================== --- sysutils/xfce4-battery-plugin/Makefile (revision 305013) +++ sysutils/xfce4-battery-plugin/Makefile (working copy) @@ -20,7 +20,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 glib20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libmenu libutil panel INSTALLS_ICONS= yes Index: sysutils/xfce4-cpugraph-plugin/Makefile =================================================================== --- sysutils/xfce4-cpugraph-plugin/Makefile (revision 305013) +++ sysutils/xfce4-cpugraph-plugin/Makefile (working copy) @@ -18,7 +18,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libmenu panel INSTALLS_ICONS= yes Index: sysutils/xfce4-genmon-plugin/Makefile =================================================================== --- sysutils/xfce4-genmon-plugin/Makefile (revision 305013) +++ sysutils/xfce4-genmon-plugin/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libmenu panel WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} Index: sysutils/xfce4-minicmd-plugin/Makefile =================================================================== --- sysutils/xfce4-minicmd-plugin/Makefile (revision 305013) +++ sysutils/xfce4-minicmd-plugin/Makefile (working copy) @@ -19,7 +19,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= libgui configenv panel .include Index: sysutils/xfce4-mount-plugin/Makefile =================================================================== --- sysutils/xfce4-mount-plugin/Makefile (revision 305013) +++ sysutils/xfce4-mount-plugin/Makefile (working copy) @@ -18,7 +18,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack intltool intlhack pkgconfig +USE_GNOME= gnomehack intltool intlhack +USE_PKGCONFIG= build USE_GETTEXT= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes Index: sysutils/xfce4-power-manager/Makefile =================================================================== --- sysutils/xfce4-power-manager/Makefile (revision 305013) +++ sysutils/xfce4-power-manager/Makefile (working copy) @@ -21,7 +21,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libutil libgui panel INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-network-manager \ Index: sysutils/xfce4-settings/Makefile =================================================================== --- sysutils/xfce4-settings/Makefile (revision 305013) +++ sysutils/xfce4-settings/Makefile (working copy) @@ -22,8 +22,8 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 gtk20 desktopfileutils intltool intlhack \ - pkgconfig +USE_GNOME= gnomehack glib20 gtk20 desktopfileutils intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv garcon libexo libmenu libutil xfconf USE_XORG= inputproto x11 xi Index: sysutils/xfce4-systemload-plugin/Makefile =================================================================== --- sysutils/xfce4-systemload-plugin/Makefile (revision 305013) +++ sysutils/xfce4-systemload-plugin/Makefile (working copy) @@ -20,7 +20,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libmenu libutil panel OPTIONS_DEFINE= NLS Index: sysutils/xfce4-wavelan-plugin/Makefile =================================================================== --- sysutils/xfce4-wavelan-plugin/Makefile (revision 305013) +++ sysutils/xfce4-wavelan-plugin/Makefile (working copy) @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libutil libgui panel post-patch: Index: sysutils/xorriso/Makefile =================================================================== --- sysutils/xorriso/Makefile (revision 305013) +++ sysutils/xorriso/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes USE_LDCONFIG= yes WANT_GNOME= yes Index: textproc/apertium/Makefile =================================================================== --- textproc/apertium/Makefile (revision 305013) +++ textproc/apertium/Makefile (working copy) @@ -29,7 +29,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes PLIST_SUB+= APVER="${APVER}" Index: textproc/artha/Makefile =================================================================== --- textproc/artha/Makefile (revision 305013) +++ textproc/artha/Makefile (working copy) @@ -24,7 +24,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool pkgconfig +USE_GNOME= gtk20 intltool +USE_PKGCONFIG= build CONFIGURE_ARGS= --enable-static=no --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib Index: textproc/augeas/Makefile =================================================================== --- textproc/augeas/Makefile (revision 305013) +++ textproc/augeas/Makefile (working copy) @@ -16,7 +16,8 @@ COMMENT= A configuration editing tool USE_GMAKE= yes -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 +USE_PKGCONFIG= build USE_AUTOTOOLS= autoconf aclocal autoheader automake libtool ACLOCAL_ARGS= -I . -I gnulib/m4 -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing Index: textproc/ebook-tools/Makefile =================================================================== --- textproc/ebook-tools/Makefile (revision 305013) +++ textproc/ebook-tools/Makefile (working copy) @@ -18,6 +18,7 @@ USE_CMAKE= yes USE_LDCONFIG= yes -USE_GNOME= libxml2 pkgconfig +USE_GNOME= libxml2 +USE_PKGCONFIG= build .include Index: textproc/enchant/Makefile =================================================================== --- textproc/enchant/Makefile (revision 305013) +++ textproc/enchant/Makefile (working copy) @@ -19,6 +19,7 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build CONFIGURE_ARGS= --disable-uspell \ --disable-voikko MAKE_JOBS_SAFE= yes Index: textproc/gnome-doc-utils/Makefile =================================================================== --- textproc/gnome-doc-utils/Makefile (revision 305013) +++ textproc/gnome-doc-utils/Makefile (working copy) @@ -27,6 +27,7 @@ MAKE_JOBS_UNSAFE=yes USE_GETTEXT= yes USE_GNOME= gnomehier gnomehack libxslt intlhack +USE_PKGCONFIG= build USE_PYTHON= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes Index: textproc/goldendict/Makefile =================================================================== --- textproc/goldendict/Makefile (revision 305013) +++ textproc/goldendict/Makefile (working copy) @@ -22,7 +22,7 @@ LICENSE= GPLv3 USE_BZIP2= yes HAS_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= xtst USE_QT4= corelib gui webkit phonon \ qmake_build linguist_build moc_build rcc_build script_build uic_build Index: textproc/google-ctemplate/Makefile =================================================================== --- textproc/google-ctemplate/Makefile (revision 305013) +++ textproc/google-ctemplate/Makefile (working copy) @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build .if !defined(NOPORTDOCS) PORTDOCS= * Index: textproc/groonga/Makefile =================================================================== --- textproc/groonga/Makefile (revision 305013) +++ textproc/groonga/Makefile (working copy) @@ -20,7 +20,7 @@ LICENSE= LGPL21 GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFIGURE_ARGS= --with-munin-plugins # We cannot enable this document option until textproc/py-sphinx be upgraded to 1.2. CONFIGURE_ARGS+= --disable-document Index: textproc/ibus-kmfl/Makefile =================================================================== --- textproc/ibus-kmfl/Makefile (revision 305013) +++ textproc/ibus-kmfl/Makefile (working copy) @@ -21,7 +21,8 @@ kmflcomp.0:${PORTSDIR}/textproc/kmflcomp RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes Index: textproc/ibus-table/Makefile =================================================================== --- textproc/ibus-table/Makefile (revision 305013) +++ textproc/ibus-table/Makefile (working copy) @@ -20,7 +20,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 USE_PYTHON= 2.5+ -USE_GNOME= pkgconfig pygtk2 +USE_GNOME= pygtk2 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_GMAKE= yes Index: textproc/libcroco/Makefile =================================================================== --- textproc/libcroco/Makefile (revision 305013) +++ textproc/libcroco/Makefile (working copy) @@ -20,6 +20,7 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 libxml2 ltverhack +USE_PKGCONFIG= build PLIST_SUB= VERSION="0.6" Index: textproc/libguess/Makefile =================================================================== --- textproc/libguess/Makefile (revision 305013) +++ textproc/libguess/Makefile (working copy) @@ -15,7 +15,8 @@ LIB_DEPENDS= mowgli.2:${PORTSDIR}/devel/libmowgli -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: textproc/libtre/Makefile =================================================================== --- textproc/libtre/Makefile (revision 305013) +++ textproc/libtre/Makefile (working copy) @@ -20,7 +20,8 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool CONFIGURE_ARGS+= --enable-static USE_LDCONFIG= yes Index: textproc/libxml/Makefile =================================================================== --- textproc/libxml/Makefile (revision 305013) +++ textproc/libxml/Makefile (working copy) @@ -16,7 +16,7 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes Index: textproc/libxml++/Makefile =================================================================== --- textproc/libxml++/Makefile (revision 305013) +++ textproc/libxml++/Makefile (working copy) @@ -16,7 +16,8 @@ COMMENT= XML API for C++ USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack libxml2 pkgconfig +USE_GNOME= gnomehack libxml2 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: textproc/libxml++26/Makefile =================================================================== --- textproc/libxml++26/Makefile (revision 305013) +++ textproc/libxml++26/Makefile (working copy) @@ -28,7 +28,8 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes -USE_GNOME= gnomehack libxml2 pkgconfig +USE_GNOME= gnomehack libxml2 +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static --disable-documentation Index: textproc/libxml2/Makefile =================================================================== --- textproc/libxml2/Makefile (revision 305013) +++ textproc/libxml2/Makefile (working copy) @@ -28,7 +28,8 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes -USE_GNOME?= gnomehack pkgconfig +USE_GNOME?= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ Index: textproc/link-grammar/Makefile =================================================================== --- textproc/link-grammar/Makefile (revision 305013) +++ textproc/link-grammar/Makefile (working copy) @@ -15,7 +15,8 @@ LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell -USE_GNOME= gnomehack ltverhack pkgconfig +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: textproc/lttoolbox/Makefile =================================================================== --- textproc/lttoolbox/Makefile (revision 305013) +++ textproc/lttoolbox/Makefile (working copy) @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build PLIST_SUB+= APVER="${APVER}" MAN1= lt-comp.1 lt-expand.1 lt-proc.1 lt-tmxcomp.1 lt-tmxproc.1 Index: textproc/m17n-im-config/Makefile =================================================================== --- textproc/m17n-im-config/Makefile (revision 305013) +++ textproc/m17n-im-config/Makefile (working copy) @@ -20,7 +20,8 @@ MAKE_JOBS_UNSAFE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gtk20 intltool intlhack pkgconfig glib20 +USE_GNOME= gtk20 intltool intlhack glib20 +USE_PKGCONFIG= build USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: textproc/rasqal/Makefile =================================================================== --- textproc/rasqal/Makefile (revision 305013) +++ textproc/rasqal/Makefile (working copy) @@ -18,7 +18,8 @@ LIB_DEPENDS= raptor2.0:${PORTSDIR}/textproc/raptor2 \ pcre.1:${PORTSDIR}/devel/pcre -USE_GNOME= gnomehack lthack pkgconfig +USE_GNOME= gnomehack lthack +USE_PKGCONFIG= build USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes Index: textproc/rubygem-augeas/Makefile =================================================================== --- textproc/rubygem-augeas/Makefile (revision 305013) +++ textproc/rubygem-augeas/Makefile (working copy) @@ -17,7 +17,8 @@ USE_RUBY= yes USE_RUBYGEMS= yes -USE_GNOME= pkgconfig libxml2 +USE_GNOME= libxml2 +USE_PKGCONFIG= build RUBYGEM_AUTOPLIST= yes CONFIGURE_ARGS+= --with-opt-include="${LOCALBASE}/include/libxml2" Index: textproc/soprano/Makefile =================================================================== --- textproc/soprano/Makefile (revision 305013) +++ textproc/soprano/Makefile (working copy) @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_QT4= corelib dbus qtestlib network \ qmake_build moc_build uic_build rcc_build -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_CMAKE= yes CMAKE_ARGS+= -DSOPRANO_DISABLE_CLUCENE_INDEX=yes \ Index: textproc/xfce4-dict-plugin/Makefile =================================================================== --- textproc/xfce4-dict-plugin/Makefile (revision 305013) +++ textproc/xfce4-dict-plugin/Makefile (working copy) @@ -22,7 +22,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gtk20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel USE_XORG= x11 Index: www/cherokee/Makefile =================================================================== --- www/cherokee/Makefile (revision 305013) +++ www/cherokee/Makefile (working copy) @@ -43,7 +43,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Extremely fast and flexible web server -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_OPENSSL= yes USE_LDCONFIG= yes USE_GETTEXT= yes Index: www/dansguardian/Makefile =================================================================== --- www/dansguardian/Makefile (revision 305013) +++ www/dansguardian/Makefile (working copy) @@ -18,7 +18,7 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre USE_RC_SUBR= dansguardian -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFLICTS= dansguardian-2.12.* LATEST_LINK= dansguardian Index: www/dansguardian-devel/Makefile =================================================================== --- www/dansguardian-devel/Makefile (revision 305013) +++ www/dansguardian-devel/Makefile (working copy) @@ -18,7 +18,7 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre USE_RC_SUBR= dansguardian -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFLICTS= dansguardian-2.10.* LATEST_LINK= dansguardian-devel Index: www/flickcurl/Makefile =================================================================== --- www/flickcurl/Makefile (revision 305013) +++ www/flickcurl/Makefile (working copy) @@ -16,7 +16,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack ltverhack libxml2 pkgconfig +USE_GNOME= gnomehack ltverhack libxml2 +USE_PKGCONFIG= build USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc Index: www/gecko-mediaplayer/Makefile =================================================================== --- www/gecko-mediaplayer/Makefile (revision 305013) +++ www/gecko-mediaplayer/Makefile (working copy) @@ -22,7 +22,8 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= glib20 +USE_PKGCONFIG= build USE_GECKO= libxul19 USE_WEBPLUGINS= native WEBPLUGINS_FILES= ${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \ Index: www/luakit/Makefile =================================================================== --- www/luakit/Makefile (revision 305013) +++ www/luakit/Makefile (working copy) @@ -27,7 +27,8 @@ WRKSRC= ${WRKDIR}/mason-larobina-${PORTNAME}-${GITVERSION} USE_GMAKE= yes -USE_GNOME= glib20 gtk20 pkgconfig +USE_GNOME= glib20 gtk20 +USE_PKGCONFIG= build USE_LUA= 5.1+ MAN1= luakit.1 Index: www/midori/Makefile =================================================================== --- www/midori/Makefile (revision 305013) +++ www/midori/Makefile (working copy) @@ -39,7 +39,8 @@ HAS_CONFIGURE= yes USE_PYTHON_BUILD= yes USE_BZIP2= yes -USE_GNOME= glib20 gtk20 intltool libxml2 pkgconfig desktopfileutils +USE_GNOME= glib20 gtk20 intltool libxml2 desktopfileutils +USE_PKGCONFIG= build USE_XORG= xscrnsaver INSTALLS_ICONS= yes USE_LDCONFIG= yes Index: www/node04/Makefile =================================================================== --- www/node04/Makefile (revision 305013) +++ www/node04/Makefile (working copy) @@ -22,7 +22,7 @@ HAS_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFLICTS= node-0.[0-35-9]* node-devel-0.[0-9]* Index: www/nspluginwrapper/Makefile =================================================================== --- www/nspluginwrapper/Makefile (revision 305013) +++ www/nspluginwrapper/Makefile (working copy) @@ -28,7 +28,8 @@ USE_LINUX= yes USE_LINUX_APPS= gtk2 USE_XORG= x11 xext xt -USE_GNOME= glib20 gtk20 pkgconfig +USE_GNOME= glib20 gtk20 +USE_PKGCONFIG= build CFLAGS+= -std=c99 Index: www/nspluginwrapper-devel/Makefile =================================================================== --- www/nspluginwrapper-devel/Makefile (revision 305013) +++ www/nspluginwrapper-devel/Makefile (working copy) @@ -31,7 +31,8 @@ USE_LINUX= yes USE_LINUX_APPS= gtk2 USE_XORG= x11 xext xt -USE_GNOME= glib20 gtk20 pkgconfig +USE_GNOME= glib20 gtk20 +USE_PKGCONFIG= build CFLAGS+= -std=c99 Index: www/py-webkitgtk/Makefile =================================================================== --- www/py-webkitgtk/Makefile (revision 305013) +++ www/py-webkitgtk/Makefile (working copy) @@ -25,7 +25,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes -USE_GNOME= glib20 libxslt pkgconfig pygtk2 +USE_GNOME= glib20 libxslt pygtk2 +USE_PKGCONFIG= build USE_GMAKE= yes USE_PYTHON= yes Index: www/surf/Makefile =================================================================== --- www/surf/Makefile (revision 305013) +++ www/surf/Makefile (working copy) @@ -17,7 +17,8 @@ LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build MAN1= surf.1 PLIST_FILES= bin/surf Index: www/varnish/Makefile =================================================================== --- www/varnish/Makefile (revision 305013) +++ www/varnish/Makefile (working copy) @@ -20,7 +20,7 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX} CONFIGURE_ENV= RST2MAN=true USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_AUTOTOOLS= aclocal libtool libtoolize automake autoconf ACLOCAL_ARGS= -I m4 LIBTOOLFLAGS= --copy --force Index: www/varnish-nagios/Makefile =================================================================== --- www/varnish-nagios/Makefile (revision 305013) +++ www/varnish-nagios/Makefile (working copy) @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build PLIST_DIRSTRY= libexec/nagios PLIST_FILES= libexec/nagios/check_varnish Index: www/varnish2/Makefile =================================================================== --- www/varnish2/Makefile (revision 305013) +++ www/varnish2/Makefile (working copy) @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX} CONFIGURE_ENV= RST2MAN=true USE_LDCONFIG= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAN1= varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \ varnishncsa.1 varnishreplay.1 varnishsizes.1 \ Index: www/xfce4-smartbookmark-plugin/Makefile =================================================================== --- www/xfce4-smartbookmark-plugin/Makefile (revision 305013) +++ www/xfce4-smartbookmark-plugin/Makefile (working copy) @@ -20,7 +20,8 @@ USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libgui panel USE_XORG= ice Index: x11/Terminal/Makefile =================================================================== --- x11/Terminal/Makefile (revision 305013) +++ x11/Terminal/Makefile (working copy) @@ -21,8 +21,8 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig vte \ - desktopfileutils +USE_GNOME= gnomehack gtk20 glib20 intltool intlhack vte desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv libexo USE_XORG= x11 Index: x11/babl/Makefile =================================================================== --- x11/babl/Makefile (revision 305013) +++ x11/babl/Makefile (working copy) @@ -25,7 +25,8 @@ USE_LDCONFIG= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig gnomehack ltverhack +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build USE_GMAKE= yes OPTIONS= SIMD "Use cpu-specific optimizations if available" off Index: x11/ecore-imf/Makefile =================================================================== --- x11/ecore-imf/Makefile (revision 305013) +++ x11/ecore-imf/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= ecore libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11/ecore-imf_evas/Makefile =================================================================== --- x11/ecore-imf_evas/Makefile (revision 305013) +++ x11/ecore-imf_evas/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_EFL= ecore evas libtool_hack USE_EFL_ECORE= imf -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf_evas INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11/ecore-input/Makefile =================================================================== --- x11/ecore-input/Makefile (revision 305013) +++ x11/ecore-input/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= ecore libtool_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11/ecore-input_evas/Makefile =================================================================== --- x11/ecore-input_evas/Makefile (revision 305013) +++ x11/ecore-input_evas/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_EFL= ecore evas libtool_hack USE_EFL_ECORE= input -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input_evas INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11/ecore-x11/Makefile =================================================================== --- x11/ecore-x11/Makefile (revision 305013) +++ x11/ecore-x11/Makefile (working copy) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USE_EFL= ecore libtool_hack USE_EFL_ECORE= input -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_x INSTALL_WRKSRC= ${BUILD_WRKSRC} Index: x11/efreet/Makefile =================================================================== --- x11/efreet/Makefile (revision 305013) +++ x11/efreet/Makefile (working copy) @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_EFL= eet eina ecore libtool_hack librt_hack USE_EFL_ECORE= file -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: x11/emprint/Makefile =================================================================== --- x11/emprint/Makefile (revision 305013) +++ x11/emprint/Makefile (working copy) @@ -19,7 +19,8 @@ GNU_CONFIGURE= yes USE_EFL= ecore evas edje imlib2 USE_EFL_ECORE= file x11 evas -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes .include Index: x11/gnome-menus/Makefile =================================================================== --- x11/gnome-menus/Makefile (revision 305013) +++ x11/gnome-menus/Makefile (working copy) @@ -22,6 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_PYTHON= yes USE_LDCONFIG= yes Index: x11/gsynaptics/Makefile =================================================================== --- x11/gsynaptics/Makefile (revision 305013) +++ x11/gsynaptics/Makefile (working copy) @@ -17,7 +17,8 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -USE_GNOME= lthack intlhack intltool pkgconfig gtk20 libgnome libglade2 libgnomeui +USE_GNOME= lthack intlhack intltool gtk20 libgnome libglade2 libgnomeui +USE_PKGCONFIG= build USE_ICONV= yes USE_GMAKE= yes USE_PERL5= yes Index: x11/keybinder/Makefile =================================================================== --- x11/keybinder/Makefile (revision 305013) +++ x11/keybinder/Makefile (working copy) @@ -18,7 +18,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 pkgconfig +USE_GNOME= gnomehack gtk20 +USE_PKGCONFIG= build USE_LDCONFIG= yes PORTEXAMPLES= * Index: x11/libfm/Makefile =================================================================== --- x11/libfm/Makefile (revision 305013) +++ x11/libfm/Makefile (working copy) @@ -16,7 +16,8 @@ LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \ menu-cache.1:${PORTSDIR}/x11/menu-cache -USE_GNOME= gnomehack gtk20 pkgconfig +USE_GNOME= gnomehack gtk20 +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_FAM= yes Index: x11/libxcb/Makefile =================================================================== --- x11/libxcb/Makefile (revision 305013) +++ x11/libxcb/Makefile (working copy) @@ -26,6 +26,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= xau xdmcp Index: x11/libxklavier/Makefile =================================================================== --- x11/libxklavier/Makefile (revision 305013) +++ x11/libxklavier/Makefile (working copy) @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack libxml2 glib20 ltverhack:12 +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include Index: x11/lxpanel/Makefile =================================================================== --- x11/lxpanel/Makefile (revision 305013) +++ x11/lxpanel/Makefile (working copy) @@ -20,7 +20,8 @@ NLS "NLS support" On USE_XORG= x11 xmu -USE_GNOME= gnomehack gtk20 pkgconfig libwnck +USE_GNOME= gnomehack gtk20 libwnck +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_AUTOTOOLS= automake:env CONFIGURE_ARGS= --prefix=${PREFIX} \ Index: x11/menu-cache/Makefile =================================================================== --- x11/menu-cache/Makefile (revision 305013) +++ x11/menu-cache/Makefile (working copy) @@ -13,7 +13,8 @@ MAINTAINER= kmoore@FreeBSD.org COMMENT= The menu-cache portion of LXDE -USE_GNOME= gnomehack gtk20 pkgconfig +USE_GNOME= gnomehack gtk20 +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GMAKE= yes Index: x11/rxvt-unicode/Makefile =================================================================== --- x11/rxvt-unicode/Makefile (revision 305013) +++ x11/rxvt-unicode/Makefile (working copy) @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \ ${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= xpm xft xrender GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: x11/startup-notification/Makefile =================================================================== --- x11/startup-notification/Makefile (revision 305013) +++ x11/startup-notification/Makefile (working copy) @@ -20,7 +20,8 @@ USE_XORG= x11 USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig ltasneededhack +USE_GNOME= gnomehack ltasneededhack +USE_PKGCONFIG= build GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Index: x11/thingylaunch/Makefile =================================================================== --- x11/thingylaunch/Makefile (revision 305013) +++ x11/thingylaunch/Makefile (working copy) @@ -18,7 +18,7 @@ LICENSE= MIT USE_XORG= x11 xproto -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes PLIST_FILES= bin/${PORTNAME} Index: x11/xcb-util/Makefile =================================================================== --- x11/xcb-util/Makefile (revision 305013) +++ x11/xcb-util/Makefile (working copy) @@ -21,6 +21,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= xau xdmcp +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes Index: x11/xcb-util-renderutil/Makefile =================================================================== --- x11/xcb-util-renderutil/Makefile (revision 305013) +++ x11/xcb-util-renderutil/Makefile (working copy) @@ -20,6 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= build #USE_XORG= xau xdmcp #USE_AUTOTOOLS= libtool Index: x11/xdotool/Makefile =================================================================== --- x11/xdotool/Makefile (revision 305013) +++ x11/xdotool/Makefile (working copy) @@ -17,7 +17,7 @@ USE_PERL5_BUILD= yes USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= x11 xtst xinerama MAN1= xdotool.1 Index: x11/xfce4-clipman-plugin/Makefile =================================================================== --- x11/xfce4-clipman-plugin/Makefile (revision 305013) +++ x11/xfce4-clipman-plugin/Makefile (working copy) @@ -25,7 +25,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig glib20 desktopfileutils +USE_GNOME= gnomehack gtk20 intltool intlhack glib20 desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv libexo libmenu libutil panel xfconf USE_XORG= xtst Index: x11/xfce4-quicklauncher-plugin/Makefile =================================================================== --- x11/xfce4-quicklauncher-plugin/Makefile (revision 305013) +++ x11/xfce4-quicklauncher-plugin/Makefile (working copy) @@ -20,7 +20,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libgui panel .include Index: x11/xfce4-screenshooter-plugin/Makefile =================================================================== --- x11/xfce4-screenshooter-plugin/Makefile (revision 305013) +++ x11/xfce4-screenshooter-plugin/Makefile (working copy) @@ -22,7 +22,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_ICONS= yes -USE_GNOME= glib20 gtk20 intltool intlhack pkgconfig +USE_GNOME= glib20 gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv panel libutil libgui MAN1= xfce4-screenshooter.1 Index: x11/xfce4-taskmanager/Makefile =================================================================== --- x11/xfce4-taskmanager/Makefile (revision 305013) +++ x11/xfce4-taskmanager/Makefile (working copy) @@ -23,7 +23,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 desktopfileutils intltool intlhack pkgconfig +USE_GNOME= gtk20 desktopfileutils intltool intlhack +USE_PKGCONFIG= build .include Index: x11/xfce4-verve-plugin/Makefile =================================================================== --- x11/xfce4-verve-plugin/Makefile (revision 305013) +++ x11/xfce4-verve-plugin/Makefile (working copy) @@ -24,7 +24,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 intltool intlhack pkgconfig +USE_GNOME= gnomehack glib20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv panel libexo libgui libutil CONFIGURE_ARGS= --disable-debug Index: x11/xfce4-wmdock-plugin/Makefile =================================================================== --- x11/xfce4-wmdock-plugin/Makefile (revision 305013) +++ x11/xfce4-wmdock-plugin/Makefile (working copy) @@ -19,7 +19,8 @@ USE_GETTEXT= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig libwnck +USE_GNOME= gtk20 intltool intlhack libwnck +USE_PKGCONFIG= build USE_XFCE= configenv libgui panel INSTALLS_ICONS= yes Index: x11/xfce4-xfapplet-plugin/Makefile =================================================================== --- x11/xfce4-xfapplet-plugin/Makefile (revision 305013) +++ x11/xfce4-xfapplet-plugin/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gtk20 intltool intlhack orbit2 pkgconfig +USE_GNOME= gtk20 intltool intlhack orbit2 +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel .include Index: x11/xkeyboard-config/Makefile =================================================================== --- x11/xkeyboard-config/Makefile (revision 305013) +++ x11/xkeyboard-config/Makefile (working copy) @@ -21,6 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= intlhack gnomehack +USE_PKGCONFIG= build USE_PERL5_BUILD=yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ Index: x11/xproto/Makefile =================================================================== --- x11/xproto/Makefile (revision 305013) +++ x11/xproto/Makefile (working copy) @@ -13,7 +13,7 @@ COMMENT= X11 protocol headers XORG_CAT= proto -USE_GNOME= pkgconfig +USE_PKGCONFIG= build CONFIGURE_ARGS+=--disable-specs Index: x11/xrestop/Makefile =================================================================== --- x11/xrestop/Makefile (revision 305013) +++ x11/xrestop/Makefile (working copy) @@ -16,7 +16,7 @@ USE_XORG= x11 xext xrender xt xres xproto USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_NCURSES= yes GNU_CONFIGURE= yes Index: x11-clocks/xfce4-datetime-plugin/Makefile =================================================================== --- x11-clocks/xfce4-datetime-plugin/Makefile (revision 305013) +++ x11-clocks/xfce4-datetime-plugin/Makefile (working copy) @@ -21,7 +21,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool intlhack pkgconfig +USE_GNOME= gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libgui libutil panel .include Index: x11-clocks/xfce4-timer-out-plugin/Makefile =================================================================== --- x11-clocks/xfce4-timer-out-plugin/Makefile (revision 305013) +++ x11-clocks/xfce4-timer-out-plugin/Makefile (working copy) @@ -21,7 +21,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libmenu libutil panel .include Index: x11-fm/thunar/Makefile =================================================================== --- x11-fm/thunar/Makefile (revision 305013) +++ x11-fm/thunar/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= desktopfileutils gnomehack gtk20 intltool intlhack pkgconfig gdkpixbuf2 +USE_GNOME= desktopfileutils gnomehack gtk20 intltool intlhack gdkpixbuf2 +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XFCE= configenv libexo libmenu libutil USE_XORG= sm x11 Index: x11-fm/thunar-vfs/Makefile =================================================================== --- x11-fm/thunar-vfs/Makefile (revision 305013) +++ x11-fm/thunar-vfs/Makefile (working copy) @@ -26,7 +26,8 @@ USE_PERL5= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack glib20 gtk20 intltool intlhack +USE_PKGCONFIG= build USE_XFCE= configenv libutil libexo USE_XORG= x11 Index: x11-fonts/cantarell-fonts/Makefile =================================================================== --- x11-fonts/cantarell-fonts/Makefile (revision 305013) +++ x11-fonts/cantarell-fonts/Makefile (working copy) @@ -11,7 +11,7 @@ LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XZ= yes USE_GMAKE= yes GNU_CONFIGURE= yes Index: x11-fonts/font-adobe-100dpi/Makefile =================================================================== --- x11-fonts/font-adobe-100dpi/Makefile (revision 305013) +++ x11-fonts/font-adobe-100dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-adobe-75dpi/Makefile =================================================================== --- x11-fonts/font-adobe-75dpi/Makefile (revision 305013) +++ x11-fonts/font-adobe-75dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-adobe-utopia-100dpi/Makefile =================================================================== --- x11-fonts/font-adobe-utopia-100dpi/Makefile (revision 305013) +++ x11-fonts/font-adobe-utopia-100dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-adobe-utopia-75dpi/Makefile =================================================================== --- x11-fonts/font-adobe-utopia-75dpi/Makefile (revision 305013) +++ x11-fonts/font-adobe-utopia-75dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-bh-100dpi/Makefile =================================================================== --- x11-fonts/font-bh-100dpi/Makefile (revision 305013) +++ x11-fonts/font-bh-100dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-bh-75dpi/Makefile =================================================================== --- x11-fonts/font-bh-75dpi/Makefile (revision 305013) +++ x11-fonts/font-bh-75dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile =================================================================== --- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile (revision 305013) +++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile =================================================================== --- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile (revision 305013) +++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile (working copy) @@ -14,5 +14,6 @@ XORG_CAT= font USE_XORG= fontutil +USE_PKGCONFIG= build .include Index: x11-fonts/fontconfig/Makefile =================================================================== --- x11-fonts/fontconfig/Makefile (revision 305013) +++ x11-fonts/fontconfig/Makefile (working copy) @@ -24,7 +24,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig ltverhack +USE_GNOME= gnomehack ltverhack +USE_PKGCONFIG= build CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ Index: x11-fonts/gbdfed/Makefile =================================================================== --- x11-fonts/gbdfed/Makefile (revision 305013) +++ x11-fonts/gbdfed/Makefile (working copy) @@ -17,7 +17,8 @@ USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: x11-themes/gtk-oxygen-engine/Makefile =================================================================== --- x11-themes/gtk-oxygen-engine/Makefile (revision 305013) +++ x11-themes/gtk-oxygen-engine/Makefile (working copy) @@ -21,7 +21,8 @@ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_CMAKE= yes MAKE_JOBS_SAFE= yes Index: x11-themes/gtk3-oxygen-engine/Makefile =================================================================== --- x11-themes/gtk3-oxygen-engine/Makefile (revision 305013) +++ x11-themes/gtk3-oxygen-engine/Makefile (working copy) @@ -22,7 +22,8 @@ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes -USE_GNOME= gtk30 pkgconfig +USE_GNOME= gtk30 +USE_PKGCONFIG= build USE_CMAKE= yes MAKE_JOBS_SAFE= yes Index: x11-themes/icon-naming-utils/Makefile =================================================================== --- x11-themes/icon-naming-utils/Makefile (revision 305013) +++ x11-themes/icon-naming-utils/Makefile (working copy) @@ -20,7 +20,8 @@ USE_PERL5= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build pre-configure: @ ${REINPLACE_CMD} -e "s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g" ${WRKSRC}/Makefile.in Index: x11-themes/xcursor-themes/Makefile =================================================================== --- x11-themes/xcursor-themes/Makefile (revision 305013) +++ x11-themes/xcursor-themes/Makefile (working copy) @@ -18,6 +18,7 @@ BUILD_DEPENDS= xcursorgen:${PORTSDIR}/x11/xcursorgen USE_XORG= xextproto +USE_PKGCONFIG= build XORG_CAT= data Index: x11-toolkits/attica/Makefile =================================================================== --- x11-toolkits/attica/Makefile (revision 305013) +++ x11-toolkits/attica/Makefile (working copy) @@ -16,7 +16,7 @@ USE_QT4= dbus network moc_build uic_build rcc_build qmake_build USE_BZIP2= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_CMAKE= yes MAKE_JOBS_SAFE= yes Index: x11-toolkits/elementary/Makefile =================================================================== --- x11-toolkits/elementary/Makefile (revision 305013) +++ x11-toolkits/elementary/Makefile (working copy) @@ -22,7 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_EFL= ecore embryo edje libtool_hack librt_hack modarch_hack -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_LDCONFIG= yes INSTALLS_ICONS= yes Index: x11-toolkits/gnocl/Makefile =================================================================== --- x11-toolkits/gnocl/Makefile (revision 305013) +++ x11-toolkits/gnocl/Makefile (working copy) @@ -20,7 +20,8 @@ USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gtk20 libglade2 pkgconfig +USE_GNOME= gtk20 libglade2 +USE_PKGCONFIG= build USE_TCL= 84+ USE_LDCONFIG= yes CFLAGS+= -I${TCL_INCLUDEDIR} -L${TCL_LIBDIR} `pkg-config --cflags libglade-2.0` Index: x11-toolkits/libxfce4gui/Makefile =================================================================== --- x11-toolkits/libxfce4gui/Makefile (revision 305013) +++ x11-toolkits/libxfce4gui/Makefile (working copy) @@ -22,7 +22,8 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack libglade2 pkgconfig +USE_GNOME= gnomehack gtk20 intltool intlhack libglade2 +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XFCE= configenv libutil USE_XORG= sm x11 Index: x11-toolkits/shared-desktop-ontologies/Makefile =================================================================== --- x11-toolkits/shared-desktop-ontologies/Makefile (revision 305013) +++ x11-toolkits/shared-desktop-ontologies/Makefile (working copy) @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_CMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build post-patch: @${REINPLACE_CMD} -e 's|share/cmake/SharedDesktopOntologies|lib/cmake/SharedDesktopOntologies|' \ Index: x11-toolkits/swt/Makefile =================================================================== --- x11-toolkits/swt/Makefile (revision 305013) +++ x11-toolkits/swt/Makefile (working copy) @@ -28,7 +28,8 @@ USE_ZIP= yes USE_GL= yes -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_JAVA= yes JAVA_VERSION= 1.5+ JAVA_OS= native Index: x11-toolkits/swt-devel/Makefile =================================================================== --- x11-toolkits/swt-devel/Makefile (revision 305013) +++ x11-toolkits/swt-devel/Makefile (working copy) @@ -27,7 +27,8 @@ USE_ZIP= yes USE_GL= yes -USE_GNOME= gtk20 pkgconfig +USE_GNOME= gtk20 +USE_PKGCONFIG= build USE_JAVA= yes JAVA_VERSION= 1.5+ JAVA_OS= native Index: x11-wm/bbpager/Makefile =================================================================== --- x11-wm/bbpager/Makefile (revision 305013) +++ x11-wm/bbpager/Makefile (working copy) @@ -16,7 +16,8 @@ BUILD_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_XORG= xext sm x11 xau xcursor xi GNU_CONFIGURE= yes CPPFLAGS+= `pkg-config --cflags xft` Index: x11-wm/blackbox/Makefile =================================================================== --- x11-wm/blackbox/Makefile (revision 305013) +++ x11-wm/blackbox/Makefile (working copy) @@ -18,7 +18,8 @@ GNU_CONFIGURE= yes USE_ICONV= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_XORG= x11 xft MAN1= bsetbg.1 bsetroot.1 Index: x11-wm/e17-module-alarm/Makefile =================================================================== --- x11-wm/e17-module-alarm/Makefile (revision 305013) +++ x11-wm/e17-module-alarm/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-calendar/Makefile =================================================================== --- x11-wm/e17-module-calendar/Makefile (revision 305013) +++ x11-wm/e17-module-calendar/Makefile (working copy) @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= ecore evas edje eet libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-comp-scale/Makefile =================================================================== --- x11-wm/e17-module-comp-scale/Makefile (revision 305013) +++ x11-wm/e17-module-comp-scale/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-cpu/Makefile =================================================================== --- x11-wm/e17-module-cpu/Makefile (revision 305013) +++ x11-wm/e17-module-cpu/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-deskshow/Makefile =================================================================== --- x11-wm/e17-module-deskshow/Makefile (revision 305013) +++ x11-wm/e17-module-deskshow/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .include Index: x11-wm/e17-module-diskio/Makefile =================================================================== --- x11-wm/e17-module-diskio/Makefile (revision 305013) +++ x11-wm/e17-module-diskio/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-drawer/Makefile =================================================================== --- x11-wm/e17-module-drawer/Makefile (revision 305013) +++ x11-wm/e17-module-drawer/Makefile (working copy) @@ -24,7 +24,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-e-tiling/Makefile =================================================================== --- x11-wm/e17-module-e-tiling/Makefile (revision 305013) +++ x11-wm/e17-module-e-tiling/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-elfe/Makefile =================================================================== --- x11-wm/e17-module-elfe/Makefile (revision 305013) +++ x11-wm/e17-module-elfe/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje elementary libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-empris/Makefile =================================================================== --- x11-wm/e17-module-empris/Makefile (revision 305013) +++ x11-wm/e17-module-empris/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-engage/Makefile =================================================================== --- x11-wm/e17-module-engage/Makefile (revision 305013) +++ x11-wm/e17-module-engage/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-eooorg/Makefile =================================================================== --- x11-wm/e17-module-eooorg/Makefile (revision 305013) +++ x11-wm/e17-module-eooorg/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-aspell/Makefile =================================================================== --- x11-wm/e17-module-everything-aspell/Makefile (revision 305013) +++ x11-wm/e17-module-everything-aspell/Makefile (working copy) @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-mpris/Makefile =================================================================== --- x11-wm/e17-module-everything-mpris/Makefile (revision 305013) +++ x11-wm/e17-module-everything-mpris/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-pidgin/Makefile =================================================================== --- x11-wm/e17-module-everything-pidgin/Makefile (revision 305013) +++ x11-wm/e17-module-everything-pidgin/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-places/Makefile =================================================================== --- x11-wm/e17-module-everything-places/Makefile (revision 305013) +++ x11-wm/e17-module-everything-places/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-shotgun/Makefile =================================================================== --- x11-wm/e17-module-everything-shotgun/Makefile (revision 305013) +++ x11-wm/e17-module-everything-shotgun/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-wallpaper/Makefile =================================================================== --- x11-wm/e17-module-everything-wallpaper/Makefile (revision 305013) +++ x11-wm/e17-module-everything-wallpaper/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-everything-websearch/Makefile =================================================================== --- x11-wm/e17-module-everything-websearch/Makefile (revision 305013) +++ x11-wm/e17-module-everything-websearch/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-exebuf/Makefile =================================================================== --- x11-wm/e17-module-exebuf/Makefile (revision 305013) +++ x11-wm/e17-module-exebuf/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack CONFIGURE_ARGS= --disable-nls # without this exebuf don't build Index: x11-wm/e17-module-execwatch/Makefile =================================================================== --- x11-wm/e17-module-execwatch/Makefile (revision 305013) +++ x11-wm/e17-module-execwatch/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-flame/Makefile =================================================================== --- x11-wm/e17-module-flame/Makefile (revision 305013) +++ x11-wm/e17-module-flame/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-forecasts/Makefile =================================================================== --- x11-wm/e17-module-forecasts/Makefile (revision 305013) +++ x11-wm/e17-module-forecasts/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-iiirk/Makefile =================================================================== --- x11-wm/e17-module-iiirk/Makefile (revision 305013) +++ x11-wm/e17-module-iiirk/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-itask/Makefile =================================================================== --- x11-wm/e17-module-itask/Makefile (revision 305013) +++ x11-wm/e17-module-itask/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-language/Makefile =================================================================== --- x11-wm/e17-module-language/Makefile (revision 305013) +++ x11-wm/e17-module-language/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= xkbfile USE_EFL= edje libtool_hack modarch_hack Index: x11-wm/e17-module-mail/Makefile =================================================================== --- x11-wm/e17-module-mail/Makefile (revision 305013) +++ x11-wm/e17-module-mail/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-mem/Makefile =================================================================== --- x11-wm/e17-module-mem/Makefile (revision 305013) +++ x11-wm/e17-module-mem/Makefile (working copy) @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-moon/Makefile =================================================================== --- x11-wm/e17-module-moon/Makefile (revision 305013) +++ x11-wm/e17-module-moon/Makefile (working copy) @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-mpdule/Makefile =================================================================== --- x11-wm/e17-module-mpdule/Makefile (revision 305013) +++ x11-wm/e17-module-mpdule/Makefile (working copy) @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-net/Makefile =================================================================== --- x11-wm/e17-module-net/Makefile (revision 305013) +++ x11-wm/e17-module-net/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-news/Makefile =================================================================== --- x11-wm/e17-module-news/Makefile (revision 305013) +++ x11-wm/e17-module-news/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-penguins/Makefile =================================================================== --- x11-wm/e17-module-penguins/Makefile (revision 305013) +++ x11-wm/e17-module-penguins/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-photo/Makefile =================================================================== --- x11-wm/e17-module-photo/Makefile (revision 305013) +++ x11-wm/e17-module-photo/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-places/Makefile =================================================================== --- x11-wm/e17-module-places/Makefile (revision 305013) +++ x11-wm/e17-module-places/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-quickaccess/Makefile =================================================================== --- x11-wm/e17-module-quickaccess/Makefile (revision 305013) +++ x11-wm/e17-module-quickaccess/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-rain/Makefile =================================================================== --- x11-wm/e17-module-rain/Makefile (revision 305013) +++ x11-wm/e17-module-rain/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-screenshot/Makefile =================================================================== --- x11-wm/e17-module-screenshot/Makefile (revision 305013) +++ x11-wm/e17-module-screenshot/Makefile (working copy) @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-slideshow/Makefile =================================================================== --- x11-wm/e17-module-slideshow/Makefile (revision 305013) +++ x11-wm/e17-module-slideshow/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-snow/Makefile =================================================================== --- x11-wm/e17-module-snow/Makefile (revision 305013) +++ x11-wm/e17-module-snow/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-taskbar/Makefile =================================================================== --- x11-wm/e17-module-taskbar/Makefile (revision 305013) +++ x11-wm/e17-module-taskbar/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-tclock/Makefile =================================================================== --- x11-wm/e17-module-tclock/Makefile (revision 305013) +++ x11-wm/e17-module-tclock/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-tiling/Makefile =================================================================== --- x11-wm/e17-module-tiling/Makefile (revision 305013) +++ x11-wm/e17-module-tiling/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-uptime/Makefile =================================================================== --- x11-wm/e17-module-uptime/Makefile (revision 305013) +++ x11-wm/e17-module-uptime/Makefile (working copy) @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .include Index: x11-wm/e17-module-weather/Makefile =================================================================== --- x11-wm/e17-module-weather/Makefile (revision 305013) +++ x11-wm/e17-module-weather/Makefile (working copy) @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-winlist-ng/Makefile =================================================================== --- x11-wm/e17-module-winlist-ng/Makefile (revision 305013) +++ x11-wm/e17-module-winlist-ng/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-winselector/Makefile =================================================================== --- x11-wm/e17-module-winselector/Makefile (revision 305013) +++ x11-wm/e17-module-winselector/Makefile (working copy) @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-wlan/Makefile =================================================================== --- x11-wm/e17-module-wlan/Makefile (revision 305013) +++ x11-wm/e17-module-wlan/Makefile (working copy) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/e17-module-xkbswitch/Makefile =================================================================== --- x11-wm/e17-module-xkbswitch/Makefile (revision 305013) +++ x11-wm/e17-module-xkbswitch/Makefile (working copy) @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_EFL= edje libtool_hack modarch_hack .if !defined(WITHOUT_NLS) Index: x11-wm/echinus/Makefile =================================================================== --- x11-wm/echinus/Makefile (revision 305013) +++ x11-wm/echinus/Makefile (working copy) @@ -17,7 +17,7 @@ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_XORG= x11 xft xrender xrandr -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAN1= echinus.1 MANCOMPRESSED= no Index: x11-wm/enlightenment/Makefile =================================================================== --- x11-wm/enlightenment/Makefile (revision 305013) +++ x11-wm/enlightenment/Makefile (working copy) @@ -26,7 +26,8 @@ USE_EFL_EVAS_LOADERS= eet jpeg png USE_EFL_EVAS_ENGINES= buffer USE_EFL_ECORE= ipc -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_ICONV= yes USE_GETTEXT= yes USE_GMAKE= yes Index: x11-wm/wmfs/Makefile =================================================================== --- x11-wm/wmfs/Makefile (revision 305013) +++ x11-wm/wmfs/Makefile (working copy) @@ -19,7 +19,7 @@ LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_XORG= x11 xft xpm HAS_CONFIGURE= yes Index: x11-wm/xfce4-desktop/Makefile =================================================================== --- x11-wm/xfce4-desktop/Makefile (revision 305013) +++ x11-wm/xfce4-desktop/Makefile (working copy) @@ -24,8 +24,8 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gnomehack gtk20 intltool intlhack pkgconfig \ - desktopfileutils +USE_GNOME= glib20 gnomehack gtk20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_XFCE= configenv garcon libmenu libutil libexo xfconf CONFIGURE_ARGS+=--enable-gio-unix \ Index: x11-wm/xfce4-session/Makefile =================================================================== --- x11-wm/xfce4-session/Makefile (revision 305013) +++ x11-wm/xfce4-session/Makefile (working copy) @@ -30,7 +30,8 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XFCE= configenv libmenu libutil panel xfconf USE_XORG= x11 sm ice Index: x11-wm/xfce4-wm/Makefile =================================================================== --- x11-wm/xfce4-wm/Makefile (revision 305013) +++ x11-wm/xfce4-wm/Makefile (working copy) @@ -28,7 +28,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils +USE_GNOME= gnomehack gtk20 intltool intlhack desktopfileutils +USE_PKGCONFIG= build USE_LDCONFIG= yes USE_XFCE= configenv libmenu libutil xfconf USE_XORG= x11 sm xext xrandr xrender