From owner-svn-ports-head@FreeBSD.ORG Thu Jul 26 05:40:26 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F19C9106566B; Thu, 26 Jul 2012 05:40:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D86888FC08; Thu, 26 Jul 2012 05:40:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6Q5ePCR042668; Thu, 26 Jul 2012 05:40:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6Q5eOWI042609; Thu, 26 Jul 2012 05:40:24 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201207260540.q6Q5eOWI042609@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 26 Jul 2012 05:40:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301539 - in head: . Mk archivers/libcomprex archivers/py-liblzma astro/cfitsio audio/ardour audio/gogglesmm audio/libbs2b audio/libmtp audio/libsidplay2 audio/lv2core audio/opus-tools ... X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2012 05:40:26 -0000 Author: bapt Date: Thu Jul 26 05:40:22 2012 New Revision: 301539 URL: http://svn.freebsd.org/changeset/ports/301539 Log: new devel/pkgconf added to replace devel/pkg-config. new version of pkg-config are no more self hosting so we are stuck with 0.25 version while pkgconf provide the same set of features as 0.27 and a compatible frontend. A symlink to pkg-config has been added for convenience and compatibility This also introduces a new macro to use pkgconf in your ports: USE_PKGCONFIG it can take the following arguments: - yes (meaning build only dep) - build (meaning build only dep) - run (meaning run only dep) - both (meaning run and build dep) From now USE_GNOME= pkgconfig is deprecated in favour of USE_PKGCONFIG The old gnome macro has been modified to use pkgconf but still the sameway: run and build dep to avoid large breakage. While here fix some ports relying on pkg-config but not specifying it, fix some ports broken because testing wrong .pc files, and fix ports using pkg-config --version to determine pkg-config version instead of pkg-config --modversion pkg-config like recommanded by pkg-config With Hat: portmgr Exp-runs by: bapt (pointhat-west), beat (pointyhat) Added: head/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config (contents, props changed) head/devel/pkgconf/ head/devel/pkgconf/Makefile (contents, props changed) head/devel/pkgconf/distinfo (contents, props changed) head/devel/pkgconf/pkg-descr (contents, props changed) head/devel/pkgconf/pkg-plist (contents, props changed) head/games/warzone2100/files/patch-configure (contents, props changed) Modified: head/CHANGES head/Mk/bsd.gnome.mk head/Mk/bsd.port.mk head/UPDATING head/archivers/libcomprex/Makefile head/archivers/py-liblzma/Makefile head/astro/cfitsio/Makefile head/audio/ardour/Makefile head/audio/gogglesmm/Makefile head/audio/libbs2b/Makefile head/audio/libmtp/Makefile head/audio/libsidplay2/Makefile head/audio/lv2core/Makefile head/audio/opus-tools/Makefile head/audio/sidplay2/Makefile head/audio/slv2/Makefile head/cad/adms/Makefile head/chinese/sunpinyin/Makefile head/comms/cwdaemon/Makefile head/comms/qtel/Makefile head/comms/tilp2/Makefile head/converters/gbase/Makefile head/databases/animenfo-client-gtk/Makefile head/databases/dbh10/Makefile head/databases/hk_classes/Makefile head/databases/mysqlcppapi/Makefile head/databases/sqlite2/Makefile head/devel/Makefile head/devel/ace/Makefile head/devel/bufferpool/Makefile head/devel/clanlib/Makefile head/devel/compiz-bcop/Makefile head/devel/dotconf/Makefile head/devel/gnome-common/Makefile head/devel/jclassinfo/Makefile head/devel/libYGP/Makefile head/devel/libassa/Makefile head/devel/libcwd/Makefile head/devel/liblouisxml/Makefile head/devel/monotone/Makefile head/devel/py-fusefs/Makefile head/devel/ros/Makefile head/devel/rpc2/Makefile head/devel/rudiments/Makefile head/devel/rvm/Makefile head/devel/valgrind-snapshot/Makefile head/devel/valgrind/Makefile head/devel/vstr/Makefile head/devel/wininfo/Makefile head/devel/zziplib/Makefile head/dns/dnsmasq/Makefile head/emulators/vice/Makefile head/finance/opentaxsolver/Makefile head/ftp/pureadmin/Makefile head/ftp/wzdftpd/Makefile head/games/alienarena/Makefile head/games/ioquake3/Makefile head/games/libfov/Makefile head/games/pets/Makefile head/games/poker-engine/Makefile head/games/poker-eval/Makefile head/games/py-poker-eval/Makefile head/games/stonesoup/Makefile head/graphics/ImageMagick/Makefile head/graphics/agg/Makefile head/graphics/djview4/Makefile head/graphics/fv/Makefile head/graphics/gexiv2/Makefile head/graphics/giblib/Makefile head/graphics/grafx2/Makefile head/graphics/gsnapshot/Makefile head/graphics/libvisual/Makefile head/graphics/pngwriter/Makefile head/graphics/pstoedit/Makefile head/graphics/rawtherapee/Makefile head/graphics/sswf/Makefile head/graphics/swftools/Makefile head/graphics/tif22pnm/Makefile head/japanese/ochusha/Makefile head/java/icedtea-web/Makefile head/lang/gnustep-base/Makefile head/mail/firetray/Makefile head/math/freemat/Makefile head/misc/linm/Makefile head/misc/mc-light/Makefile head/misc/mc/Makefile head/multimedia/aegisub/Makefile head/multimedia/gmerlin-avdecoder/Makefile head/multimedia/handbrake/Makefile head/multimedia/libkate/Makefile head/multimedia/sabbu/Makefile head/net-im/climm/Makefile head/net-im/libjingle/Makefile head/net-im/mbpurple/Makefile head/net-mgmt/bwm-ng/Makefile head/net-mgmt/collectd/Makefile head/net-mgmt/collectd5/Makefile head/net-p2p/gkremldk/Makefile head/net/coda6_server/Makefile head/net/freeswitch-core-devel/Makefile head/net/freeswitch-core/Makefile head/net/net6/Makefile head/net/netembryo/Makefile head/net/radvd/Makefile head/net/samba34/Makefile head/net/samba35/Makefile head/net/samba36/Makefile head/net/tapidbus/Makefile head/print/cups-base/Makefile head/print/gnomephotoprinter/Makefile head/print/libijs/Makefile head/print/panda/Makefile head/security/libotr/Makefile head/security/openvas-libraries/Makefile head/security/suricata/Makefile head/security/trousers/Makefile head/security/xmlsec1/Makefile head/sysutils/archivemount/Makefile head/sysutils/etoile-system/Makefile head/sysutils/fusefs-afuse/Makefile head/sysutils/fusefs-libs/Makefile head/sysutils/fusefs-ntfs/Makefile head/sysutils/hardlink/Makefile head/sysutils/iextract/Makefile head/sysutils/moosefs-client/Makefile head/sysutils/netdump-server/Makefile head/sysutils/nut22/Makefile head/sysutils/rsyslog5-relp/Makefile head/sysutils/rsyslog5-rfc3195/Makefile head/sysutils/rsyslog6-devel-relp/Makefile head/sysutils/rsyslog6-devel-rfc3195/Makefile head/sysutils/xfburn/Makefile head/textproc/gmetadom/Makefile head/textproc/libmrss/Makefile head/textproc/scim-openvanilla/Makefile head/textproc/soothsayer/Makefile head/textproc/xmlwrapp/Makefile head/www/apache20/Makefile head/www/httpsqs/Makefile head/www/lighttpd/Makefile head/www/openvrml/Makefile head/x11-clocks/buici-clock/Makefile head/x11-fm/tdfsb/Makefile head/x11-toolkits/fltk2/Makefile head/x11-toolkits/fxscintilla/Makefile head/x11-toolkits/py-sexy/Makefile head/x11-wm/skippy-xd/Makefile head/x11-wm/skippy/Makefile head/x11-wm/windowmaker/Makefile head/x11/keyboardcast/Makefile head/x11/simdock/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Thu Jul 26 02:41:58 2012 (r301538) +++ head/CHANGES Thu Jul 26 05:40:22 2012 (r301539) @@ -10,6 +10,21 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20120726: +AUTHOR: bapt@FreeBSD.org + + * new macro USE_PKGCONFIG has been introduce in place of + USE_GNOME= pkgconfig + + USE_PKGCONFIG= yes and USE_PKGCONFIG= build + for build only dependency + + USE_PKGCONFIG= run + for run only dependency + + USE_PKGCONFIG= both + for both build and run dependency + 20120715: AUTHOR: beat@FreeBSD.org Modified: head/Mk/bsd.gnome.mk ============================================================================== --- head/Mk/bsd.gnome.mk Thu Jul 26 02:41:58 2012 (r301538) +++ head/Mk/bsd.gnome.mk Thu Jul 26 05:40:22 2012 (r301539) @@ -446,9 +446,9 @@ gtksourceview2_LIB_DEPENDS= gtksourcevie gtksourceview2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2 -pkgconfig_DETECT= ${LOCALBASE}/bin/pkg-config -pkgconfig_BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config -pkgconfig_RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config +pkgconfig_DETECT= ${LOCALBASE}/bin/pkgconf +pkgconfig_BUILD_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf +pkgconfig_RUN_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf libgsf_LIB_DEPENDS= gsf-1.114:${PORTSDIR}/devel/libgsf libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Jul 26 02:41:58 2012 (r301538) +++ head/Mk/bsd.port.mk Thu Jul 26 05:40:22 2012 (r301539) @@ -530,6 +530,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # USE_NCURSES - If set, this port relies on the ncurses package. # +# USE_PKGCONFIG - Implies that the port uses pkg-config in one way or another: +# 'build', 'run', 'both', implying build, +# runtime, and both build/run dependencies +# # Conflict checking. Use if your port cannot be installed at the same time as # another package. # @@ -1639,6 +1643,23 @@ EXTRACT_DEPENDS+= unmakeself:${PORTSDIR} BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake CONFIGURE_ENV+= MAKE=${GMAKE} .endif +.if defined(USE_PKGCONFIG) +.if ${USE_PKGCONFIG:L} == yes +USE_PKGCONFIG= build +.endif +.if ${USE_PKGCONFIG:L} == run +RUN_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf +.endif +.if ${USE_PKGCONFIG:L} == build +BUILD_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf +CONFIGURE_ENV+= PKG_CONFIG=pkgconf +.endif +.if ${USE_PKGCONFIG:L} == both +RUN_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf +BUILD_DEPENDS+= pkgconf:${PORTSDIR}/devel/pkgconf +CONFIGURE_ENV+= PKG_CONFIG=pkgconf +.endif +.endif .if defined(USE_GCC) || defined(USE_FORTRAN) .include "${PORTSDIR}/Mk/bsd.gcc.mk" Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Jul 26 02:41:58 2012 (r301538) +++ head/UPDATING Thu Jul 26 05:40:22 2012 (r301539) @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20120726: + AFFECTS: users of devel/pkg-config + AUTHOR: bapt@FreeBSD.org + + devel/pkg-config has been replaced by devel/pkgconf + + # portmaster -o devel/pkg-config devel/pkgconf + or + # portupgrade -o devel/pkg-config devel/pkgconf + 20120725: AFFECTS: users of chinese/fcitx AUTHOR: lichray@gmail.com Modified: head/archivers/libcomprex/Makefile ============================================================================== --- head/archivers/libcomprex/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/archivers/libcomprex/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -17,7 +17,7 @@ COMMENT= Transparently handles automatic LICENSE= LGPL21 -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config +USE_PKGCONFIG= yes #LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl OPTIONS_DEFINE= NLS Modified: head/archivers/py-liblzma/Makefile ============================================================================== --- head/archivers/py-liblzma/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/archivers/py-liblzma/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,8 +16,7 @@ DISTNAME= ${PYDISTUTILS_PKGNAME}-${PORTV MAINTAINER= naylor.b.david@gmail.com COMMENT= Python binding for the LZMA compression library -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config - +USE_PKGCONFIG= yes USE_BZIP2= yes USE_PYTHON= 2.6+ USE_PYDISTUTILS=yes Modified: head/astro/cfitsio/Makefile ============================================================================== --- head/astro/cfitsio/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/astro/cfitsio/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.// MAINTAINER= ports@FreeBSD.org COMMENT= Library for reading and writing files in FITS data format -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= f2c:${PORTSDIR}/lang/f2c OPTIONS_DEFINE= DOCS @@ -26,6 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_prog_FC="f2c" ALL_TARGET= shared USE_LDCONFIG= yes +USE_PKGCONFIG= yes .include Modified: head/audio/ardour/Makefile ============================================================================== --- head/audio/ardour/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/ardour/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -98,7 +98,9 @@ SCONS_ENV+= FPU_OPTIMIZATION=0 CFLAGS:= ${CFLAGS:N-fno-strict-aliasing} post-patch: - ${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/SConstruct + ${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" \ + -e "s|soundtouch-1.4|soundtouch-1.6|g" \ + ${WRKSRC}/SConstruct ${REINPLACE_CMD} -e "s|alsa_pcm|oss|g" ${WRKSRC}/templates/*.template post-install: Modified: head/audio/gogglesmm/Makefile ============================================================================== --- head/audio/gogglesmm/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/gogglesmm/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,7 +16,6 @@ COMMENT= Music collection manager and pl LICENSE= GPLv3 -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine \ tag.1:${PORTSDIR}/audio/taglib \ sqlite3.8:${PORTSDIR}/databases/sqlite3 @@ -35,6 +34,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --mandir=${PREFIX}/man --prefix=${PREFIX} MAKE_JOBS_SAFE= yes USE_GMAKE= yes +USE_PKGCONFIG= yes USE_XZ= yes INSTALLS_ICONS= yes MAN1= gogglesmm.1 Modified: head/audio/libbs2b/Makefile ============================================================================== --- head/audio/libbs2b/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/libbs2b/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -14,7 +14,6 @@ MASTER_SITES= SF/bs2b/bs2b/${PORTVERSION MAINTAINER= liangtai.s4@gmail.com COMMENT= Bauer Stereophonic-to-Binaural DSP -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \ ogg:${PORTSDIR}/audio/libogg \ FLAC:${PORTSDIR}/audio/flac \ @@ -23,6 +22,7 @@ LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= CFLAGS=`pkg-config --cflags sndfile` \ LDFLAGS=`pkg-config --libs-only-L sndfile` Modified: head/audio/libmtp/Makefile ============================================================================== --- head/audio/libmtp/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/libmtp/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,8 +16,6 @@ COMMENT= Media Transfer Protocol (MTP) l LICENSE= LGPL21 -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - OPTIONS_DEFINE= MTPZ OPTIONS_DEFAULT= MTPZ MTPZ_DESC= Enable functionality to connect to MTPZ devices @@ -26,6 +24,7 @@ USE_GNOME= gnomehack USE_ICONV= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/audio/libsidplay2/Makefile ============================================================================== --- head/audio/libsidplay2/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/libsidplay2/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,11 +15,10 @@ DISTNAME= sidplay-libs-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Library to play Commodore 64 SID-tunes cycle accurate -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_GNOME= gnomehack USE_GMAKE= yes USE_AUTOTOOLS= libtool +USE_PKGCONFIG= yes LIBTOOLFILES= builders/hardsid-builder/configure \ builders/resid-builder/configure \ libsidplay/configure \ Modified: head/audio/lv2core/Makefile ============================================================================== --- head/audio/lv2core/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/lv2core/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,10 +16,9 @@ COMMENT= LV2 Core Package LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_BZIP2= yes USE_PYTHON_BUILD= yes +USE_PKGCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/audio/opus-tools/Makefile ============================================================================== --- head/audio/opus-tools/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/opus-tools/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -17,9 +17,8 @@ COMMENT= Encode, inspect, and decode Opu LIB_DEPENDS= ogg.8:${PORTSDIR}/audio/libogg \ opus:${PORTSDIR}/audio/opus -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config - GNU_CONFIGURE= yes +USE_PKGCONFIG= yes MAKE_JOBS_SAFE= yes PLIST_FILES= bin/opusdec bin/opusenc bin/opusinfo Modified: head/audio/sidplay2/Makefile ============================================================================== --- head/audio/sidplay2/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/sidplay2/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -18,6 +18,7 @@ LIB_DEPENDS= sidplay2.1:${PORTSDIR}/audi MAN1= sidplay2.1 PLIST_FILES= bin/sidplay2 +USE_PKGCONFIG= yes GNU_CONFIGURE= yes Modified: head/audio/slv2/Makefile ============================================================================== --- head/audio/slv2/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/audio/slv2/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,14 +16,14 @@ COMMENT= LV2 Application Support Library LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core \ - pkg-config>0:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \ rdf.0:${PORTSDIR}/textproc/redland USE_BZIP2= yes USE_PYTHON_BUILD= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes MAKE_JOBS_SAFE= yes .include Modified: head/cad/adms/Makefile ============================================================================== --- head/cad/adms/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/cad/adms/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -18,11 +18,10 @@ COMMENT= A model generator for SPICE sim LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_GNOME= glib20 USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PKGCONFIG= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Modified: head/chinese/sunpinyin/Makefile ============================================================================== --- head/chinese/sunpinyin/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/chinese/sunpinyin/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -22,7 +22,6 @@ LICENSE= LGPL21 CDDL LICENSE_COMB= dual LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL.LICENSE LICENSE_FILE_CDDL= ${WRKSRC}/OPENSOLARIS.LICENSE @@ -31,6 +30,7 @@ USE_XZ= yes USE_SCONS= yes SCONS_ARGS+= --prefix=${PREFIX} --libdatadir=${PREFIX}/share USE_LDCONFIG= yes +USE_PKGCONFIG= yes USE_GMAKE= yes post-patch: Modified: head/comms/cwdaemon/Makefile ============================================================================== --- head/comms/cwdaemon/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/comms/cwdaemon/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= db MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio cw (Morse code) keyer daemon -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= cw:${PORTSDIR}/comms/unixcw INSTALL_TARGET= install-exec GNU_CONFIGURE= yes +USE_PKGCONFIG= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share/doc MAN8= cwdaemon.8 Modified: head/comms/qtel/Makefile ============================================================================== --- head/comms/qtel/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/comms/qtel/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,7 +15,6 @@ DISTNAME= svxlink-${PORTVERSION} MAINTAINER= shurd@sasktel.net COMMENT= Qt EchoLink Client and SvrLink audio server -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= sigc-1.2:${PORTSDIR}/devel/libsigc++12 \ speex:${PORTSDIR}/audio/speex \ gcrypt:${PORTSDIR}/security/libgcrypt \ @@ -39,6 +38,7 @@ MANCOMPRESSED= yes USE_GMAKE= yes USE_QT_VER= 3 USE_TCL= yes +USE_PKGCONFIG= yes USE_RC_SUBR= svxlink remotetrx USE_LDCONFIG= ${LOCALBASE}/lib ${LOCALBASE}/lib/svxlink Modified: head/comms/tilp2/Makefile ============================================================================== --- head/comms/tilp2/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/comms/tilp2/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,7 +16,6 @@ COMMENT= TI Linking Program LICENSE= GPLv2 -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= ticables2.5:${PORTSDIR}/comms/libticables2 \ tifiles2.8:${PORTSDIR}/devel/libtifiles2 \ ticalcs2.10:${PORTSDIR}/comms/libticalcs2 \ @@ -25,6 +24,7 @@ LIB_DEPENDS= ticables2.5:${PORTSDIR}/com USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes +USE_PKGCONFIG= yes USE_GNOME= gtk20 libglade2 .if !defined(WITHOUT_NLS) Modified: head/converters/gbase/Makefile ============================================================================== --- head/converters/gbase/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/converters/gbase/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,11 +16,10 @@ COMMENT= A program to convert between th LICENSE= ART10 -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - OPTIONS_DEFINE= GTK2 PLIST_FILES= bin/${PORTNAME} +USE_PKGCONFIG= yes .include Modified: head/databases/animenfo-client-gtk/Makefile ============================================================================== --- head/databases/animenfo-client-gtk/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/databases/animenfo-client-gtk/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -17,13 +17,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= dinoex@FreeBSD.org COMMENT= AnimeNfo client with GTK support -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config - LICENSE= GPLv2 USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gtk20 +USE_PKGCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include CFLAGS+= ${CPPFLAGS} Modified: head/databases/dbh10/Makefile ============================================================================== --- head/databases/dbh10/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/databases/dbh10/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -17,12 +17,11 @@ COMMENT= Disk Based Hashtables CONFLICTS= dbh-[2-9]* -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_AUTOTOOLS= libtool USE_GNOME= gnomehack GNU_CONFIGURE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes LATEST_LINK= dbh10 Modified: head/databases/hk_classes/Makefile ============================================================================== --- head/databases/hk_classes/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/databases/hk_classes/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -12,8 +12,7 @@ MASTER_SITES= SF/hk-classes/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= C++ Library for rapid development of database applications -BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ - pkg-config>0:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ xml2.5:${PORTSDIR}/textproc/libxml2 @@ -21,6 +20,7 @@ USE_BZIP2= yes USE_ICONV= yes USE_PYTHON= yes USE_GETTEXT= yes +USE_PKGCONFIG= yes CXXFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl USE_AUTOTOOLS= libtool Modified: head/databases/mysqlcppapi/Makefile ============================================================================== --- head/databases/mysqlcppapi/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/databases/mysqlcppapi/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -14,11 +14,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A fork of mysql++ C++ API for MySQL -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_AUTOTOOLS= libtool USE_MYSQL= yes USE_GNOME= gnomehack +USE_PKGCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/databases/sqlite2/Makefile ============================================================================== --- head/databases/sqlite2/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/databases/sqlite2/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,11 +15,10 @@ MASTER_SITES= http://www.sqlite.org/ MAINTAINER= ports@FreeBSD.org COMMENT= An SQL database engine in a C library -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_GMAKE= YES USE_AUTOTOOLS= libtool USE_LDCONFIG= YES +USE_PKGCONFIG= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -3070,7 +3070,7 @@ SUBDIR += pipestatus SUBDIR += pire SUBDIR += pit - SUBDIR += pkg-config + SUBDIR += pkgconf SUBDIR += plan9port SUBDIR += pmd SUBDIR += pmk Modified: head/devel/ace/Makefile ============================================================================== --- head/devel/ace/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/ace/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,8 +15,6 @@ DISTNAME= ACE-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= The Adaptive Communication Environment for C++ -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - OPTIONS_DEFINE= SSL TRIO X11 FLTK TK QT4 OPTIONS_DEFAULT=SSL TRIO_DESC= Enable trio support @@ -34,6 +32,7 @@ MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib CROSS-COMPILE=1 MAKEFILE= GNUmakefile USE_LDCONFIG= yes +USE_PKGCONFIG= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/devel/bufferpool/Makefile ============================================================================== --- head/devel/bufferpool/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/bufferpool/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -13,12 +13,11 @@ MASTER_SITES= http://lscube.org/files/do MAINTAINER= ports@FreeBSD.org COMMENT= Bufferpool - the memory management library Feng and Felix depend upon -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - GNU_CONFIGURE= yes USE_GMAKE= yes USE_BZIP2= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes USE_GNOME= gnomehack .include Modified: head/devel/clanlib/Makefile ============================================================================== --- head/devel/clanlib/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/clanlib/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -18,7 +18,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform game SDK -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ mikmod:${PORTSDIR}/audio/libmikmod \ @@ -36,6 +35,7 @@ USE_GNOME= gnomehack USE_LDCONFIG= yes USE_SDL= gfx USE_GL= yes +USE_PKGCONFIG= yes .include Modified: head/devel/compiz-bcop/Makefile ============================================================================== --- head/devel/compiz-bcop/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/compiz-bcop/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -13,7 +13,6 @@ MASTER_SITES= http://releases.compiz.org MAINTAINER= ports@FreeBSD.org COMMENT= Code generator for Compiz Fusion Plugins -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt @@ -21,6 +20,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= libxslt +USE_PKGCONFIG= yes post-patch: @${REINPLACE_CMD} \ Modified: head/devel/dotconf/Makefile ============================================================================== --- head/devel/dotconf/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/dotconf/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,9 +16,8 @@ COMMENT= A simple, powerful configuratio LICENSE= LGPL21 -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_GNOME= gnomehack +USE_PKGCONFIG= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Modified: head/devel/gnome-common/Makefile ============================================================================== --- head/devel/gnome-common/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/gnome-common/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -8,7 +8,7 @@ PORTNAME= gnome-common PORTVERSION= 2.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Added: head/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config Thu Jul 26 05:40:22 2012 (r301539) @@ -0,0 +1,70 @@ +https://bugs.gentoo.org/show_bug.cgi?id=427432 +https://bugzilla.gnome.org/show_bug.cgi?id=680363 + +--- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200 ++++ ./macros2/gnome-autogen.sh 2012-07-24 10:29:13.064750613 +0200 +@@ -77,6 +77,7 @@ + vc_min_version=$4 + vc_source=$5 + vc_status=1 ++ vc_option="--version" + + vc_checkprog=`eval echo "\\$$vc_variable"` + if [ -n "$vc_checkprog" ]; then +@@ -89,11 +90,19 @@ + else + vc_comparator=">=" + fi ++ # The most reliable way to check pkg-config version is to query the actual ++ # virtual ++ # pkg-config package entry's modversion. This works in all known ++ # implementations. ++ ++ if test "x$vc_package" = "xpkg-config"; then ++ vc_option="--modversion pkg-config" ++ fi + printbold "checking for $vc_package $vc_comparator $vc_min_version..." + for vc_checkprog in $vc_checkprogs; do + echo $ECHO_N " testing $vc_checkprog... " $ECHO_C +- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then +- vc_actual_version=`$vc_checkprog --version | head -n 1 | \ ++ if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then ++ vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \ + sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` + if compare_versions $vc_min_version $vc_actual_version; then + echo "found $vc_actual_version" +https://bugs.gentoo.org/show_bug.cgi?id=427432 +https://bugzilla.gnome.org/show_bug.cgi?id=680363 + +--- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200 ++++ ./macros2/gnome-autogen.sh 2012-07-24 10:29:13.064750613 +0200 +@@ -77,6 +77,7 @@ + vc_min_version=$4 + vc_source=$5 + vc_status=1 ++ vc_option="--version" + + vc_checkprog=`eval echo "\\$$vc_variable"` + if [ -n "$vc_checkprog" ]; then +@@ -89,11 +90,19 @@ + else + vc_comparator=">=" + fi ++ # The most reliable way to check pkg-config version is to query the actual ++ # virtual ++ # pkg-config package entry's modversion. This works in all known ++ # implementations. ++ ++ if test "x$vc_package" = "xpkg-config"; then ++ vc_option="--modversion pkg-config" ++ fi + printbold "checking for $vc_package $vc_comparator $vc_min_version..." + for vc_checkprog in $vc_checkprogs; do + echo $ECHO_N " testing $vc_checkprog... " $ECHO_C +- if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then +- vc_actual_version=`$vc_checkprog --version | head -n 1 | \ ++ if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then ++ vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \ + sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` + if compare_versions $vc_min_version $vc_actual_version; then + echo "found $vc_actual_version" Modified: head/devel/jclassinfo/Makefile ============================================================================== --- head/devel/jclassinfo/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/jclassinfo/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -14,13 +14,12 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Shows information about Java class, dependencies, and more -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_AUTOTOOLS= libtool USE_GNOME= gnomehack GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes MAN1= jclassinfo.1 Modified: head/devel/libYGP/Makefile ============================================================================== --- head/devel/libYGP/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/libYGP/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,7 +15,6 @@ DISTNAME= libYGP-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Yet another General Purpose library -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ boost_filesystem:${PORTSDIR}/devel/boost-libs @@ -23,6 +22,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_LDCONFIG= yes +USE_PKGCONFIG= yes USE_GETTEXT= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --with-gmp\ Modified: head/devel/libassa/Makefile ============================================================================== --- head/devel/libassa/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/libassa/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,11 +16,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\. MAINTAINER= ports@FreeBSD.org COMMENT= An C++ networking library and application framework -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_LDCONFIG= yes +USE_PKGCONFIG= yes PLIST_SUB= ASSA_VERSION=${PORTVERSION:R:R} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/(\.[[:digit:]])$//} Modified: head/devel/libcwd/Makefile ============================================================================== --- head/devel/libcwd/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/libcwd/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -14,10 +14,9 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= The C++ Debugging Support Library -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_GNOME= gnomehack USE_GMAKE= yes +USE_PKGCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-alloc --disable-location --disable-threading \ --disable-pch Modified: head/devel/liblouisxml/Makefile ============================================================================== --- head/devel/liblouisxml/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/liblouisxml/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -11,13 +11,13 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= wenheping@gmail.com COMMENT= Library Provide Complete Braille Transcription Services -BUILD_DEPENDS= ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= louis.2:${PORTSDIR}/devel/liblouis \ xml2.5:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes INFO= liblouisxml-guide MAN1= msword2brl.1 xml2brl.1 Modified: head/devel/monotone/Makefile ============================================================================== --- head/devel/monotone/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/monotone/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -90,6 +90,11 @@ post-patch: ${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \ -e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in .endif + ${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \ + -e "s/\"idn/\"libidn/g" \ + -e "s/\"pcre/\"libpcre/g" \ + -e "s/\"botan/\"botan-1.8/g" \ + ${WRKSRC}/configure post-install: ${MKDIR} ${PREFIX}/share/zsh/site-functions Added: head/devel/pkgconf/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -0,0 +1,58 @@ +# New ports collection makefile for: pkgconf +# Date created: 2012-07-22 +# Whom: Baptiste Daroussin +# +# $FreeBSD$ +# + +PORTNAME= pkgconf +PORTVERSION= 0.8.3 +CATEGORIES= devel +MASTER_SITES= http://nenolod.net/~nenolod/distfiles/ + +MAINTAINER= bapt@FreeBSD.org +COMMENT= pkg-config compatible utility which does not depend on glib + +LICENSE= BSD + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig \ + --with-system-libdir=/usr/lib \ + --with-system-includedir=/usr/include +USE_BZIP2= yes + +CONFLICTS_INSTALL= pkg-config-* + +post-install: + ${LN} -sf ${PREFIX}/bin/pkgconf ${PREFIX}/bin/pkg-config + +.include +# New ports collection makefile for: pkgconf +# Date created: 2012-07-22 +# Whom: Baptiste Daroussin +# +# $FreeBSD$ +# + +PORTNAME= pkgconf +PORTVERSION= 0.8.3 +CATEGORIES= devel +MASTER_SITES= http://nenolod.net/~nenolod/distfiles/ + +MAINTAINER= bapt@FreeBSD.org +COMMENT= pkg-config compatible utility which does not depend on glib + +LICENSE= BSD + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig \ + --with-system-libdir=/usr/lib \ + --with-system-includedir=/usr/include +USE_BZIP2= yes + +CONFLICTS_INSTALL= pkg-config-* + +post-install: + ${LN} -sf ${PREFIX}/bin/pkgconf ${PREFIX}/bin/pkg-config + +.include Added: head/devel/pkgconf/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/distinfo Thu Jul 26 05:40:22 2012 (r301539) @@ -0,0 +1,4 @@ +SHA256 (pkgconf-0.8.3.tar.bz2) = befb1b11a4845514248c69fd6dc3e991603fbd1acbbcb6db76bd5e30c657b8b1 +SIZE (pkgconf-0.8.3.tar.bz2) = 80112 +SHA256 (pkgconf-0.8.3.tar.bz2) = befb1b11a4845514248c69fd6dc3e991603fbd1acbbcb6db76bd5e30c657b8b1 +SIZE (pkgconf-0.8.3.tar.bz2) = 80112 Added: head/devel/pkgconf/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/pkg-descr Thu Jul 26 05:40:22 2012 (r301539) @@ -0,0 +1,12 @@ +pkgconf is a program which helps to configure compiler and linker flags for +development frameworks. It is similar to pkg-config, but was written from +scratch in Summer of 2011 to replace pkg-config, which now needs itself to build +itself. + +WWW: https://github.com/pkgconf/pkgconf +pkgconf is a program which helps to configure compiler and linker flags for +development frameworks. It is similar to pkg-config, but was written from +scratch in Summer of 2011 to replace pkg-config, which now needs itself to build +itself. + +WWW: https://github.com/pkgconf/pkgconf Added: head/devel/pkgconf/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pkgconf/pkg-plist Thu Jul 26 05:40:22 2012 (r301539) @@ -0,0 +1,6 @@ +bin/pkgconf +bin/pkg-config +share/aclocal/pkg.m4 +bin/pkgconf +bin/pkg-config +share/aclocal/pkg.m4 Modified: head/devel/py-fusefs/Makefile ============================================================================== --- head/devel/py-fusefs/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/py-fusefs/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,10 +15,10 @@ DISTNAME= fuse-python-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= FUSE Python bindings -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs USE_PYTHON= yes +USE_PKGCONFIG= yes USE_PYDISTUTILS=easy_install USE_ICONV= yes PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \ Modified: head/devel/ros/Makefile ============================================================================== --- head/devel/ros/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/ros/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -17,8 +17,6 @@ LICENSE= BSD STACKNAME= ${PORTNAME:S/ros-//} -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - CFLAGS+= -I${LOCALBASE}/include LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ gtest:${PORTSDIR}/devel/googletest @@ -37,6 +35,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/_ USE_PYTHON= yes USE_BZIP2= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes # rosmake does its own threading MAKE_JOBS_UNSAFE= yes Modified: head/devel/rpc2/Makefile ============================================================================== --- head/devel/rpc2/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/rpc2/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,10 +16,10 @@ MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/ MAINTAINER= ports@FreeBSD.org COMMENT= An interprocess communication library -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp USE_GMAKE= yes +USE_PKGCONFIG= yes GNU_CONFIGURE= yes USE_PERL5= yes Modified: head/devel/rudiments/Makefile ============================================================================== --- head/devel/rudiments/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/rudiments/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -15,10 +15,9 @@ COMMENT= A utility C++ class library for LICENSE= LGPL20 -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_OPENSSL= yes USE_GMAKE= yes +USE_PKGCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ PTHREADLIB="${PTHREAD_LIBS}" Modified: head/devel/rvm/Makefile ============================================================================== --- head/devel/rvm/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/rvm/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,12 +16,12 @@ MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/ MAINTAINER= ports@FreeBSD.org COMMENT= A persistent VM library -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= lwp.2:${PORTSDIR}/devel/lwp USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/devel/valgrind-snapshot/Makefile ============================================================================== --- head/devel/valgrind-snapshot/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/valgrind-snapshot/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -18,13 +18,12 @@ COMMENT= A (memory) debugging and profil CONFLICTS= valgrind-[0-9]* LATEST_LINK= valgrind-snapshot -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack +USE_PKGCONFIG= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME} Modified: head/devel/valgrind/Makefile ============================================================================== --- head/devel/valgrind/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/valgrind/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -19,8 +19,6 @@ CONFLICTS= valgrind-snapshot-[0-9]* ONLY_FOR_ARCHS= i386 amd64 -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - OPTIONS_DEFINE= MPI MPI_DESC= Enable build of MPI wrappers @@ -30,6 +28,7 @@ USE_GNOME= gnomehack USE_PERL5_BUILD=yes GNU_CONFIGURE= yes USE_LDCONFIG= yes +USE_PKGCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME} Modified: head/devel/vstr/Makefile ============================================================================== --- head/devel/vstr/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/vstr/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,8 +16,6 @@ MASTER_SITES= http://freebsd.unixfreunde MAINTAINER= ports@FreeBSD.org COMMENT= General purpose string library for C -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_BZIP2= yes @@ -25,6 +23,7 @@ USE_GMAKE= yes USE_CSTD= gnu89 USE_GNOME= gnomehack USE_LDCONFIG= yes +USE_PKGCONFIG= yes MAN3= vstr.3 vstr_const.3 Modified: head/devel/wininfo/Makefile ============================================================================== --- head/devel/wininfo/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/wininfo/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -14,12 +14,11 @@ MASTER_SITES= http://www.freedesktop.org MAINTAINER= ports@FreeBSD.org COMMENT= A window information utility -BUILD_DEPENDS= pkg-config>0:${PORTSDIR}/devel/pkg-config - USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \ xcomposite x11 xres USE_GNOME= gtk20 gnomeprefix GNU_CONFIGURE= yes +USE_PKGCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/devel/zziplib/Makefile ============================================================================== --- head/devel/zziplib/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/devel/zziplib/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -16,8 +16,7 @@ COMMENT= A library to provide transparen LICENSE= LGPL21 MPL LICENSE_COMB= dual -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - pkg-config>0:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip OPTIONS_DEFINE= SDL @@ -25,6 +24,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack USE_PYTHON_BUILD= yes USE_AUTOTOOLS= libtool +USE_PKGCONFIG= yes CONFIGURE_ENV= ac_cv_path_XMLTO=":" USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Modified: head/dns/dnsmasq/Makefile ============================================================================== --- head/dns/dnsmasq/Makefile Thu Jul 26 02:41:58 2012 (r301538) +++ head/dns/dnsmasq/Makefile Thu Jul 26 05:40:22 2012 (r301539) @@ -46,7 +46,7 @@ CFLAGS+= -DNO_IPV6 .endif .if ${PORT_OPTIONS:MNLS} -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +USE_PKGCONFIG= yes LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***