diff options
28 files changed, 22 insertions, 143 deletions
@@ -2312,3 +2312,4 @@ deskutils/gnomeutils2|deskutils/gnome-utils|2006-05-27|Renamed to use real vendo devel/bugbuddy|devel/bug-buddy|2006-05-27|Renamed to use real vendor package name devel/gnomecrash|devel/gnome-crash|2006-05-27|Renamed to use real vendor package name devel/libgtop2|devel/libgtop|2006-05-27|Renamed to use real vendor package name +devel/pkgconfig|devel/pkg-config|2006-05-27|Renamed to use real vendor package name diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile index 667e36cfd23c..7a08a7590e33 100644 --- a/comms/tilp/Makefile +++ b/comms/tilp/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= tilp MAINTAINER= tijl@ulyssis.org COMMENT= TI Linking Program -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= ticalcs.9:${PORTSDIR}/devel/libticalcs \ ticables.12:${PORTSDIR}/comms/libticables \ tifiles.6:${PORTSDIR}/devel/libtifiles diff --git a/devel/Makefile b/devel/Makefile index c46891f85e46..0a9c756acb4c 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1439,7 +1439,7 @@ SUBDIR += picp SUBDIR += picprog SUBDIR += pinstall - SUBDIR += pkgconfig + SUBDIR += pkg-config SUBDIR += plan9port SUBDIR += ply SUBDIR += pmake diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 1b4fd6f96246..aac7e23ee083 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -6,12 +6,11 @@ # $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $ # -PORTNAME= pkgconfig +PORTNAME= pkg-config PORTVERSION= 0.20 PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ -DISTNAME= pkg-config-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile deleted file mode 100644 index 1b4fd6f96246..000000000000 --- a/devel/pkgconfig/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# New ports collection makefile for: pkgconfig -# Date created: 30 April 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $ -# - -PORTNAME= pkgconfig -PORTVERSION= 0.20 -PORTREVISION= 2 -CATEGORIES= devel -MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ -DISTNAME= pkg-config-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A utility to retrieve information about installed libraries - -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnometarget - -MAN1= pkg-config.1 - -.include <bsd.port.pre.mk> - -PC_PATH=${PREFIX}/libdata/pkgconfig -PC_PATH:=${PC_PATH}:${PREFIX}/lib/pkgconfig -.if ${LOCALBASE} != ${PREFIX} -PC_PATH:= ${PC_PATH}:${LOCALBASE}/libdata/pkgconfig -PC_PATH:= ${PC_PATH}:${LOCALBASE}/lib/pkgconfig -.endif -.if ${X11BASE} != ${PREFIX} -PC_PATH:= ${PC_PATH}:${X11BASE}/libdata/pkgconfig -PC_PATH:= ${PC_PATH}:${X11BASE}/lib/pkgconfig -.endif - -CONFIGURE_ARGS= --disable-threads \ - --with-pc-path="${PC_PATH}" - -.include <bsd.port.post.mk> diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo deleted file mode 100644 index 4376e4391911..000000000000 --- a/devel/pkgconfig/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/pkg-config-0.20.tar.gz) = fb42402593e4198bc252ab248dd4158b -SHA256 (gnome2/pkg-config-0.20.tar.gz) = a047fe95564d7afde6b52382d57754c27a40af813d9c73f338083890da416f05 -SIZE (gnome2/pkg-config-0.20.tar.gz) = 969993 diff --git a/devel/pkgconfig/files/patch-Makefile.in b/devel/pkgconfig/files/patch-Makefile.in deleted file mode 100644 index 2e7c1f405751..000000000000 --- a/devel/pkgconfig/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Apr 12 13:47:14 2005 -+++ Makefile.in Tue Apr 12 13:48:21 2005 -@@ -18,7 +18,7 @@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . - diff --git a/devel/pkgconfig/files/patch-glib-1.2.8::Makefile.in b/devel/pkgconfig/files/patch-glib-1.2.8::Makefile.in deleted file mode 100644 index 330415ed6f92..000000000000 --- a/devel/pkgconfig/files/patch-glib-1.2.8::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-1.2.8/Makefile.in.orig Tue Apr 12 13:51:56 2005 -+++ glib-1.2.8/Makefile.in Tue Apr 12 13:52:41 2005 -@@ -727,7 +727,6 @@ - installdirs-am: - - install: $(BUILT_SOURCES) -- $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive diff --git a/devel/pkgconfig/files/patch-parse.c b/devel/pkgconfig/files/patch-parse.c deleted file mode 100644 index eb828f3e7743..000000000000 --- a/devel/pkgconfig/files/patch-parse.c +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ -$MCom: ports/devel/pkgconfig/files/patch-parse.c,v 1.4 2005/10/14 20:39:57 adamw Exp $ - ---- parse.c 2001/08/01 07:24:17 1.1 -+++ parse.c 2001/08/01 07:25:02 -@@ -952,9 +952,9 @@ - { - char *output; - -- debug_spew ("Calling glib-config\n"); -+ debug_spew ("Calling glib12-config\n"); - -- pkg->version = backticks ("glib-config --version"); -+ pkg->version = backticks ("glib12-config --version"); - if (pkg->version == NULL) - { - g_free (pkg); -@@ -965,12 +965,12 @@ - pkg->key = g_strdup ("glib"); - pkg->description = g_strdup ("C Utility Library"); - -- output = backticks ("glib-config --libs"); -- parse_libs (pkg, output, "glib-config"); -+ output = backticks ("glib12-config --libs"); -+ parse_libs (pkg, output, "glib12-config"); - g_free (output); - -- output = backticks ("glib-config --cflags"); -- parse_cflags (pkg, output, "glib-config"); -+ output = backticks ("glib12-config --cflags"); -+ parse_cflags (pkg, output, "glib12-config"); - g_free (output); - - return pkg; diff --git a/devel/pkgconfig/pkg-descr b/devel/pkgconfig/pkg-descr deleted file mode 100644 index cbf7c6b4a78a..000000000000 --- a/devel/pkgconfig/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The pkg-config program is used to retrieve information about installed -libraries in the system. It is typically used to compile and link against one -or more libraries. It's more useful to the compilation process than to -the end-user. - -pkg-config retrieves information about packages from special metadata files. -These files are named after the package, with the extension .pc. By default, -pkg-config looks for these files in the following directories: -${PREFIX}/libdata/pkgconfig, ${PREFIX}/lib/pkgconfig, -${LOCALBASE}/libdata/pkgconfig, ${LOCALBASE}/lib/pkgconfig, -${X11BASE}/libdata/pkgconfig, and ${X11BASE}/lib/pkgconfig; it will also look -in the list of directories specified by the PKG_CONFIG_PATH environment -variable. - -WWW: http://pkgconfig.freedesktop.org/wiki/ diff --git a/devel/pkgconfig/pkg-plist b/devel/pkgconfig/pkg-plist deleted file mode 100644 index 5d6a4afddb18..000000000000 --- a/devel/pkgconfig/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/pkg-config -share/aclocal/pkg.m4 -@dirrmtry lib/pkgconfig -@unexec rmdir %%LOCALBASE%%/lib/pkgconfig 2>/dev/null || true -@unexec rmdir %%X11BASE%%/lib/pkgconfig 2>/dev/null || true diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile index d62167174cc8..378ebab90dff 100644 --- a/graphics/tif22pnm/Makefile +++ b/graphics/tif22pnm/Makefile @@ -16,7 +16,7 @@ COMMENT= Converts TIFF- sampled images to PNM image LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile index fcc1166faa0e..03cb3de713b7 100644 --- a/graphics/xaralx/Makefile +++ b/graphics/xaralx/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes #WXDEP= ${X11BASE}/libwx_baseu-2.6.so.0.3.1 WXDEP= wxgtk2-unicode>=2.6.3 -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkgconfig \ +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config \ ${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \ md5sum:${PORTSDIR}/archivers/dpkg \ xml2-config:${PORTSDIR}/textproc/libxml2 \ diff --git a/math/muparser/Makefile b/math/muparser/Makefile index 35649ca16d40..c4f4d7c14a71 100644 --- a/math/muparser/Makefile +++ b/math/muparser/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= nivit@email.it COMMENT= Mathematical expressions parser library written in C++ -RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/misc/linm/Makefile b/misc/linm/Makefile index d9aeb76e5be1..054fd6975ff1 100644 --- a/misc/linm/Makefile +++ b/misc/linm/Makefile @@ -16,7 +16,7 @@ MAINTAINER= cjh@FreeBSD.org COMMENT= Clone of Mdir, mc-style terminal file manager LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config USE_OPENSSL= yes USE_GMAKE= yes diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 4b94d6833113..2fa272c26302 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= utils/file/managers/mc/ MAINTAINER= fjoe@FreeBSD.org COMMENT= Midnight Commander, a free Norton Commander Clone -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config USE_GETTEXT= yes USE_GMAKE= yes diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile index a183458e00ea..22889a2a7a56 100644 --- a/multimedia/sabbu/Makefile +++ b/multimedia/sabbu/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= dinoex@FreeBSD.org COMMENT= Program used to time subtitles -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ sndfile:${PORTSDIR}/audio/libsndfile diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile index 6aef01537329..84383eab4462 100644 --- a/net-im/libjingle/Makefile +++ b/net-im/libjingle/Makefile @@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Google Talk's implementation of Jingle and Jingle-Audio BUILD_DEPENDS= \ - pkg-config:${PORTSDIR}/devel/pkgconfig + pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= \ speex.3:${PORTSDIR}/audio/speex \ ilbc.0:${PORTSDIR}/net/ilbc \ diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile index 7a91d8795c8b..749a4ec8914a 100644 --- a/net-mgmt/bwm-ng/Makefile +++ b/net-mgmt/bwm-ng/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.gropp.org/bwm-ng/ MAINTAINER= tdb@FreeBSD.org COMMENT= A small and simple bandwidth monitor -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab GNU_CONFIGURE= yes diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile index 5386d616fc8d..c2e995158e1f 100644 --- a/net-p2p/gkremldk/Makefile +++ b/net-p2p/gkremldk/Makefile @@ -17,7 +17,7 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Shows current mldonkey donwload/upload rates and allows setting them BUILD_DEPENDS= \ - pkg-config:${PORTSDIR}/devel/pkgconfig \ + pkg-config:${PORTSDIR}/devel/pkg-config \ ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile index 84b4bfe157eb..dce298c3afe2 100644 --- a/security/xmlsec/Makefile +++ b/security/xmlsec/Makefile @@ -18,7 +18,7 @@ MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ MAINTAINER= jim@corebsd.or.id COMMENT= XML Security Library -RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config BUILD_DEPENDS= ${RUN_DEPENDS} USE_OPENSSL= yes diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 7c9fc53397ac..8e6ec21284e4 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -16,7 +16,7 @@ MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ MAINTAINER= jim@corebsd.or.id COMMENT= XML Security Library -RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config BUILD_DEPENDS= ${RUN_DEPENDS} OPTIONS= GNUTLS "Enable GNUTLS support" off \ diff --git a/sysutils/netdump-server/Makefile b/sysutils/netdump-server/Makefile index c267da1f7919..63ae6e01b641 100644 --- a/sysutils/netdump-server/Makefile +++ b/sysutils/netdump-server/Makefile @@ -15,7 +15,7 @@ COMMENT= RedHat server part of netdump/netconsole package for linux LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \ glib:${PORTSDIR}/devel/glib20 -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile index d982751c9286..8b21df355a53 100644 --- a/textproc/gmetadom/Makefile +++ b/textproc/gmetadom/Makefile @@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= yinjieh@csie.nctu.edu.tw COMMENT= A Collection of DOM Implementations -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= gdome.8:${PORTSDIR}/textproc/gdome2 -RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config USE_GNOME= glib20 gnomehack libxml2 USE_GMAKE= yes diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index 0e8d22bdc330..0231a5422596 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -17,7 +17,7 @@ COMMENT= VRML97 runtime and browser ("lookat") BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \ ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ - pkg-config:${PORTSDIR}/devel/pkgconfig + pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index c469f839c602..b784f3c6c62b 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/ MAINTAINER= x11@FreeBSD.org COMMENT= X font libary -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig \ +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config \ ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile index c469f839c602..b784f3c6c62b 100644 --- a/x11/libXfont/Makefile +++ b/x11/libXfont/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/ MAINTAINER= x11@FreeBSD.org COMMENT= X font libary -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig \ +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config \ ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 0c2fe44c4ebb..819049de04e7 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -15,7 +15,7 @@ MAINTAINER= thierry@FreeBSD.org COMMENT= A clone of the terminal emulator rxvt modified to support Unicode LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config USE_X_PREFIX= yes USE_XPM= yes |