diff options
| author | wiz <wiz@pkgsrc.org> | 2005-07-21 16:29:42 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-07-21 16:29:42 +0000 |
| commit | d774725534eb709b0dd369ce5f0d86deabd856d1 (patch) | |
| tree | 3fc559ca19ff752d447aa7e195b740fa86038d73 | |
| parent | c92aa28893be470e6f58d9a7cd32adbde07704a9 (diff) | |
| download | pkgsrc-d774725534eb709b0dd369ce5f0d86deabd856d1.tar.gz | |
Change path from devel/pkgconfig to devel/pkg-config.
No PKGREVISION bump since pkg-config is only a BUILD_DEPENDS.
364 files changed, 729 insertions, 729 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 99ddd215eb7..dd327f2f49b 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/06/06 14:48:05 hira Exp $ +# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:42 wiz Exp $ # DISTNAME= file-roller-2.10.2 @@ -46,7 +46,7 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 13566b26c21..5dc2c70232b 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/23 13:14:05 seb Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:42 wiz Exp $ DISTNAME= amarok-1.2.4 CATEGORIES= audio kde @@ -29,7 +29,7 @@ BUILDLINK_DEPENDS.arts+= arts>=1.2 .include "../../audio/taglib/buildlink3.mk" .include "../../audio/tunepimp/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../meta-pkgs/kde3/kde3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../multimedia/gst-plugins/buildlink3.mk" diff --git a/audio/arts/Makefile b/audio/arts/Makefile index f1ed399166f..b364dd6bb2c 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/05/31 21:46:38 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:43 wiz Exp $ DISTNAME= arts-1.4.1 CATEGORIES= audio @@ -22,7 +22,7 @@ _IN_ARTS_BUILD= yes .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile index c2f2742a375..a13e7691228 100644 --- a/audio/aumix-gtk/Makefile +++ b/audio/aumix-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2004/10/22 18:30:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:43 wiz Exp $ .include "../../audio/aumix/Makefile.common" @@ -10,6 +10,6 @@ CONFLICTS= aumix-[0-9]* CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/^--without-gtk$//} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile index a9a7406af44..b802ad3fe10 100644 --- a/audio/bmp-musepack/Makefile +++ b/audio/bmp-musepack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:44:51 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= bmp-musepack-1.1 @@ -14,5 +14,5 @@ GNU_CONFIGURE= yes .include "../../audio/bmp/buildlink3.mk" .include "../../audio/libmusepack/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common index 3893192b26c..5f9f3b277ad 100644 --- a/audio/bmp/Makefile.common +++ b/audio/bmp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:02:37 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= bmp-0.9.7 @@ -71,7 +71,7 @@ post-patch: .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile index 6b400ec6697..666fadedee8 100644 --- a/audio/gkrellm-volume/Makefile +++ b/audio/gkrellm-volume/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:38 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:43 wiz Exp $ DISTNAME= gkrellm-volume-2.1.13 CATEGORIES= audio @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/gkrellm-volume MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \ enable_nls=1 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile index 43257a1867c..9e41760aab9 100644 --- a/audio/gkrellm-xmms/Makefile +++ b/audio/gkrellm-xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:38 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= gkrellmms-2.1.20 @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/gkrellmms MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \ enable_nls=1 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile index a9cfec595eb..adcc02c3b6d 100644 --- a/audio/gmpc/Makefile +++ b/audio/gmpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= gmpc-0.11.2 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile index b13685cb291..d84e4e0fa76 100644 --- a/audio/gnome-speech/Makefile +++ b/audio/gnome-speech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:38 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= gnome-speech-0.3.6 @@ -28,7 +28,7 @@ PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/goom/Makefile b/audio/goom/Makefile index 1682465631a..66fa821b9a9 100644 --- a/audio/goom/Makefile +++ b/audio/goom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= goom-2k4-0-src @@ -17,6 +17,6 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgoom2.pc.in GNU_CONFIGURE= yes GCC_REQD+= 3.3 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index a5fe1bf804e..4b21e68d0f3 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:38 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:43 wiz Exp $ DISTNAME= gqmpeg-0.91.1 PKGREVISION= 2 @@ -28,7 +28,7 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common index a0f56b5fc2f..4e3cf68b1d5 100644 --- a/audio/libao/Makefile.common +++ b/audio/libao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2005/06/06 01:52:39 minskim Exp $ +# $NetBSD: Makefile.common,v 1.23 2005/07/21 16:29:43 wiz Exp $ DISTNAME= libao-0.8.6 CATEGORIES= audio devel @@ -32,6 +32,6 @@ CONFIGURE_ARGS+= ENABLE_SOLARIS=no MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile index c8d1b57963e..0fefeaad618 100644 --- a/audio/libcdaudio/Makefile +++ b/audio/libcdaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/04/15 01:50:56 rh Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:43 wiz Exp $ DISTNAME= libcdaudio-0.99.12 PKGREVISION= 1 @@ -15,5 +15,5 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= libcdaudio.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile index 750b198e11c..a90d2f10977 100644 --- a/audio/libcddb/Makefile +++ b/audio/libcddb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/18 15:31:11 drochner Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:43 wiz Exp $ DISTNAME= libcddb-1.0.2 CATEGORIES= audio @@ -20,5 +20,5 @@ GCC_REQD+= 2.95 TEST_TARGET= check .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile index 030660a0007..53d34999011 100644 --- a/audio/libid3tag/Makefile +++ b/audio/libid3tag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:44:54 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= libid3tag-0.15.1b @@ -31,6 +31,6 @@ post-build: post-install: ${INSTALL_DATA} ${WRKDIR}/id3tag.pc ${PREFIX}/lib/pkgconfig -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile index 01c178356f3..d6b748b1d40 100644 --- a/audio/libmad/Makefile +++ b/audio/libmad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:44:54 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= libmad-0.15.1b @@ -31,5 +31,5 @@ post-build: post-install: ${INSTALL_DATA} ${WRKDIR}/mad.pc ${PREFIX}/lib/pkgconfig -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile index b1714cc208e..5d05a7aafab 100644 --- a/audio/libopendaap/Makefile +++ b/audio/libopendaap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:54 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:43 wiz Exp $ DISTNAME= libopendaap-0.3.0 PKGREVISION= 1 @@ -14,7 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile index 24485d073c2..750232a2924 100644 --- a/audio/libvisual-bmp/Makefile +++ b/audio/libvisual-bmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:54 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= libvisual-bmp-0.2.0 @@ -23,7 +23,7 @@ post-extract: .include "../../audio/bmp/buildlink3.mk" .include "../../audio/libvisual/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile index b43369aca39..327fbc6641a 100644 --- a/audio/libvisual-plugins/Makefile +++ b/audio/libvisual-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/19 17:14:44 kristerw Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= libvisual-plugins-0.2.0 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes # sorry, but the bug with strtof has come, please report.. CONFIGURE_ARGS+= --disable-dancingparticles -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../audio/goom/buildlink3.mk" .include "../../audio/libvisual/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/audio/libvisual-xmms/Makefile b/audio/libvisual-xmms/Makefile index 7932488ca4b..7fcf019d75a 100644 --- a/audio/libvisual-xmms/Makefile +++ b/audio/libvisual-xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:54 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= libvisual-xmms-0.2.0 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes .include "../../audio/libvisual/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile index ed00390441a..2ea5d1b1439 100644 --- a/audio/libvisual/Makefile +++ b/audio/libvisual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:38 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:43 wiz Exp $ # DISTNAME= libvisual-0.2.0 @@ -13,6 +13,6 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= ${WRKSRC}/libvisual.pc.in GNU_CONFIGURE= yes -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile index 891b2b4b4a5..dcf92dbde30 100644 --- a/audio/liteamp/Makefile +++ b/audio/liteamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/31 21:59:20 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:44 wiz Exp $ DISTNAME= liteamp-0.2.4.2 PKGREVISION= 1 @@ -23,7 +23,7 @@ CPPFLAGS+= -UGTK_DISABLE_DEPRECATED .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/audio/muse/Makefile b/audio/muse/Makefile index 26b20544521..851fedb6e88 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:38 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= MuSE-0.9 @@ -33,7 +33,7 @@ SUBST_MESSAGE.dsp= "Fixing hardcoded audio device." .include "../../audio/lame/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile index 2db0556e939..241f042eafa 100644 --- a/audio/musicbrainz/Makefile +++ b/audio/musicbrainz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:44 wiz Exp $ DISTNAME= libmusicbrainz-2.1.1 PKGNAME= ${DISTNAME:S/lib//} @@ -21,5 +21,5 @@ PKGCONFIG_OVERRIDE= libmusicbrainz.pc.in CONFIGURE_ARGS+= --enable-cpp-headers .include "../../textproc/expat/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index 5c4d594ccdf..eba29c2d575 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:55 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:44 wiz Exp $ DISTNAME= ncmpc-0.11.1 CATEGORIES= audio @@ -18,6 +18,6 @@ INCOMPAT_CURSES+= NetBSD-1.6.*-* NetBSD-1.6_*-* .include "../../devel/glib2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 7def4d71527..16100db760f 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= rhythmbox-0.8.8 @@ -37,7 +37,7 @@ GCONF2_SCHEMAS= rhythmbox.schemas .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/gstreamer/buildlink3.mk" .include "../../multimedia/gst-plugins/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 00e9ac2cca8..8acdfcc4e4b 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/03 23:02:13 markd Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= speex-1.0.5 @@ -24,7 +24,7 @@ CONFIGURE_ENV+= F77=${FALSE} BUILDLINK_TRANSFORM+= l:gnugetopt:getopt .include "../../devel/libgetopt/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index f2b4d5c4fbb..28391bd5e0e 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= streamtuner-0.99 @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= extras/streamtuner.pc.in .include "../../audio/taglib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/python/pyversion.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 76a9630153a..6badb5994da 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:39 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= sweep-0.8.3 @@ -32,7 +32,7 @@ MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS} .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/tdb/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile index 6025a01288c..e93b3685f0c 100644 --- a/audio/tunesbrowser/Makefile +++ b/audio/tunesbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:57 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= tunesbrowser-0.2.0 @@ -26,7 +26,7 @@ BUILDLINK_DEPENDS.libopendaap+= libopendaap>=0.3.0 #.include "../../audio/gst-plugins-spider/buildlink3.mk" .include "../../audio/libopendaap/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/gstreamer/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/gst-plugins-gnomevfs/buildlink3.mk" diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile index a13b894f17b..549d57af8ad 100644 --- a/audio/xmms-faad/Makefile +++ b/audio/xmms-faad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/01 20:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:44 wiz Exp $ DISTNAME= faad2-2.0 PKGNAME= xmms-faad-2.0 @@ -49,6 +49,6 @@ do-install: .include "../../audio/faad2/buildlink3.mk" .include "../../audio/id3lib/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile index de9e06e8209..575d92b106f 100644 --- a/audio/xmms-mad/Makefile +++ b/audio/xmms-mad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:59 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= xmms-mad-0.5.5 @@ -16,7 +16,7 @@ CPPFLAGS.NetBSD+= -DHAVE_NANOSLEEP=1 BUILDLINK_DEPENDS.libmad= libmad>=0.15.0bnb1 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../audio/libid3tag/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile index 426ed3bfa56..7f43381e1e1 100644 --- a/audio/xmms-modplug/Makefile +++ b/audio/xmms-modplug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:39 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= modplugxmms-2.05 @@ -25,7 +25,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../audio/libmodplug/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile index fbed68b3547..752d06b29c3 100644 --- a/audio/xmms-musepack/Makefile +++ b/audio/xmms-musepack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:59 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= xmms-musepack-1.1 @@ -16,6 +16,6 @@ GNU_CONFIGURE= yes .include "../../audio/libmusepack/buildlink3.mk" .include "../../audio/xmms/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gattrib/Makefile b/cad/gattrib/Makefile index 343a445c3e3..092e94cd96a 100644 --- a/cad/gattrib/Makefile +++ b/cad/gattrib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:01 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $ DISTNAME= geda-gattrib-${PKGVERSION} PKGNAME= gattrib-${PKGVERSION} @@ -15,6 +15,6 @@ USE_PKGLOCALEDIR= YES .include "../../x11/gtk2/buildlink3.mk" .include "../../cad/libgeda/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile index a870ad20801..124b919cd91 100644 --- a/cad/geda-utils/Makefile +++ b/cad/geda-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/07/16 01:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= geda-utils-${PKGVERSION} @@ -42,5 +42,5 @@ REPLACE_PERL+= scripts/pads_backannotate \ scripts/sarlacc_sym .include "../../cad/libgeda/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 3f6496359a6..b1af1127d5a 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:01 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= geda-${PKGVERSION} @@ -25,6 +25,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../cad/libgeda/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile index 81b9004d219..072a29c164a 100644 --- a/cad/gnetlist/Makefile +++ b/cad/gnetlist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/07/15 20:14:03 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= geda-gnetlist-${PKGVERSION} @@ -35,5 +35,5 @@ post-patch: .endfor .include "../../cad/libgeda/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile index 0ba9ea145d0..bdc34031473 100644 --- a/cad/gschem/Makefile +++ b/cad/gschem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/04/11 21:45:02 tv Exp $ +# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= geda-gschem-${PKGVERSION} @@ -23,5 +23,5 @@ INFO_FILES= gschemdoc.info .include "../../cad/libgeda/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libstroke/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile index 7f0a505497d..c91cc5b51d4 100644 --- a/cad/gsmc/Makefile +++ b/cad/gsmc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:41 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= gsmc-1.1 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_TOOLS+= gmake -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" # The following were just links in the distfile so diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile index d0e0de0d7a6..8b1ecda9c47 100644 --- a/cad/gsymcheck/Makefile +++ b/cad/gsymcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:02 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= geda-gsymcheck-${PKGVERSION} @@ -20,5 +20,5 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../cad/libgeda/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile index 1748b5cc089..bac98bc9316 100644 --- a/cad/libgeda/Makefile +++ b/cad/libgeda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:02 tv Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= libgeda-${PKGVERSION} @@ -17,7 +17,7 @@ USE_LIBTOOL= YES INFO_FILES= libgedadoc.info -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgdgeda/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile index cb564fceff4..6d3e06647ed 100644 --- a/cad/transcalc/Makefile +++ b/cad/transcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:41 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:44 wiz Exp $ # DISTNAME= transcalc-0.14 @@ -13,7 +13,7 @@ COMMENT= Transmission line analysis/synthesis GNU_CONFIGURE= YES USE_TOOLS+= gmake -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" #.include "../../graphics/imlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 74963ea691f..10c4d8426fa 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:41 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= bitlbee-0.91 @@ -59,6 +59,6 @@ CONFIGURE_ARGS+= --ipv6=1 .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index a2a0b3dcb9a..a488899e462 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/07/20 14:27:06 adam Exp $ +# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:45 wiz Exp $ DISTNAME= ekg-1.6rc3 PKGNAME= ekg-1.6 @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --with-pthread .endif .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index ab71685de98..5551cd002d4 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2005/07/09 03:56:12 grant Exp $ +# $NetBSD: Makefile,v 1.92 2005/07/21 16:29:45 wiz Exp $ DISTNAME= gaim-1.4.0 CATEGORIES= chat x11 @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --disable-screensaver .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/nss/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/silc-toolkit/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile index ad71bc77c83..a533e175d8a 100644 --- a/chat/gg2/Makefile +++ b/chat/gg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/27 13:47:05 adam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:45 wiz Exp $ DISTNAME= gg2-2.2.6 CATEGORIES= chat @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --without-update .include "../../chat/ekg/buildlink3.mk" .include "../../chat/libtlen/buildlink3.mk" .include "../../chat/loudmouth/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile index 9c8cbfdee49..2a7f09ac6a5 100644 --- a/chat/gnomeicu/Makefile +++ b/chat/gnomeicu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:41 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:45 wiz Exp $ DISTNAME= gnomeicu-0.99.5 CATEGORIES= chat gnome @@ -29,7 +29,7 @@ GCONF2_SCHEMAS= gnomeicu.schemas .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index 14b99cc9a37..90109378983 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/05/22 20:07:42 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= gossip-0.8 @@ -26,6 +26,6 @@ GCONF2_SCHEMAS= gossip.schemas .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile index 80b120527ee..f970bde96cd 100644 --- a/chat/irssi/Makefile +++ b/chat/irssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/07/17 14:32:46 dillo Exp $ +# $NetBSD: Makefile,v 1.36 2005/07/21 16:29:45 wiz Exp $ DISTNAME= ${IRSSI_DISTNAME} PKGREVISION= 5 @@ -30,7 +30,7 @@ CONF_FILES= ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf .include "options.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" post-install: ${INSTALL_DATA} ${WRKSRC}/config.h ${IRSSI_CONFIG_H} diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile index 0c3ca2424f5..56f7536e4e0 100644 --- a/chat/loudmouth/Makefile +++ b/chat/loudmouth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:42 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:45 wiz Exp $ DISTNAME= loudmouth-0.17.2 PKGREVISION= 1 @@ -24,6 +24,6 @@ BUILDLINK_DEPENDS.gnutls+= gnutls>=1.2.0 .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile index a3fde06f871..c0aea4777b6 100644 --- a/chat/mu-conference/Makefile +++ b/chat/mu-conference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:42 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= mu-conference-0.6.0 @@ -55,6 +55,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/muc-jcr.xml ${EGDIR} .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile index 319ef0c9135..5fa5ff0042c 100644 --- a/chat/xchat-systray-integration/Makefile +++ b/chat/xchat-systray-integration/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/06 11:47:06 tron Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:45 wiz Exp $ DISTNAME= xchat-systray-integration-2.4.5-src PKGNAME= ${DISTNAME:S/-src//} @@ -19,6 +19,6 @@ CFLAGS+= -fPIC MAKE_ENV+= prefix=${PREFIX} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index 38086269264..8cce2f012f9 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2005/06/06 11:43:50 tron Exp $ +# $NetBSD: Makefile.common,v 1.42 2005/07/21 16:29:45 wiz Exp $ # # Please do not merge this file into "Makefile" because it is used by # packages in "pkgsrc-wip". @@ -18,4 +18,4 @@ USE_LIBTOOL= YES USE_TOOLS+= gmake .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index e1424092190..1c80219c0d4 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:41 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:45 wiz Exp $ DISTNAME= jpilot-syncmal_0.71.2 PKGNAME= jpilot-syncmal-0.71.2 @@ -29,6 +29,6 @@ PLIST_SUBST+= PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///} .include "../../comms/jpilot/buildlink3.mk" .include "../../comms/pilot-link-libs/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index e1d3a899f3b..f250e6a7017 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/06/01 18:02:41 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= jpilot-0.99.5 @@ -33,7 +33,7 @@ PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index d471f930dcc..f2563a372f7 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:08 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= fribidi-0.10.4 @@ -18,5 +18,5 @@ PKGCONFIG_OVERRIDE= fribidi.pc.in TEST_TARGET= check -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 55195259bea..81f6024f494 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/06/01 18:02:41 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:45 wiz Exp $ DISTNAME= wv-1.0.3 PKGREVISION= 2 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile index 5b7a4253de0..b97008ef816 100644 --- a/converters/wv2/Makefile +++ b/converters/wv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 02:45:58 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= wv2-0.2.2 @@ -23,5 +23,5 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile index 0c66dc218a2..a385026a488 100644 --- a/databases/dbh/Makefile +++ b/databases/dbh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:11 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:45 wiz Exp $ DISTNAME= dbh-1.0.24 CATEGORIES= databases @@ -22,5 +22,5 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} doc/dbh-hash-tables.html \ ${PREFIX}/share/doc/dbh/html -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gq/Makefile b/databases/gq/Makefile index f340adebd92..a555f562bcf 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:42 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= gq-1.0beta1 @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --enable-cache .include "../../security/openssl/buildlink3.mk" .include "../../databases/openldap/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile index d568e2cc8fe..b1d697ab346 100644 --- a/databases/gramps/Makefile +++ b/databases/gramps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/26 21:19:06 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= gramps-1.0.11 @@ -25,7 +25,7 @@ PYTHON_VERSION_REQD= 23 MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../graphics/py-imaging/buildlink3.mk" diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile index 1ab20de0237..44f662b4dbb 100644 --- a/databases/gramps2/Makefile +++ b/databases/gramps2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/07/07 17:08:54 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:45 wiz Exp $ # DISTNAME= gramps-2.0.5 @@ -28,7 +28,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} GCONF2_SCHEMAS+= gramps.schemas -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../databases/py-bsddb3/buildlink3.mk" diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index 6e8fdaaefa1..01967445a24 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2005/06/26 16:54:07 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.32 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= libgda-1.2.2 @@ -45,7 +45,7 @@ SUBST_SED.libs+= -e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.li .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index b7cd448ed9d..5f0e38769ea 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/26 16:54:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= libgnomedb-1.2.2 @@ -31,7 +31,7 @@ GCONF2_SCHEMAS= libgnomedb.schemas .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 364546b78a4..3b9e755ce2b 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/07/16 01:19:08 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= mergeant-0.52 @@ -24,7 +24,7 @@ USE_LIBTOOL= YES .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index ea1b26afe9c..f55d86ef4f9 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/07/17 16:29:56 kristerw Exp $ +# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= rrdtool-1.2.10 @@ -28,7 +28,7 @@ PERL5_PACKLIST+= auto/RRDs/.packlist .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../www/cgilib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile index 46bb8944c40..0e911b8193e 100644 --- a/databases/shared-mime-info/Makefile +++ b/databases/shared-mime-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= shared-mime-info-0.16 @@ -33,7 +33,7 @@ PRINT_PLIST_AWK+= /^@dirrm share\/mime/ { next; } .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile index 47c51c4ad16..86debc557c6 100644 --- a/devel/ArX/Makefile +++ b/devel/ArX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= ArX-1.0.20 @@ -40,7 +40,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR} .endfor -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile index 48f170f2648..3e369086a78 100644 --- a/devel/ArX2/Makefile +++ b/devel/ArX2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/12 18:57:05 recht Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= ArX-2.2.2 @@ -42,6 +42,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR} .endfor -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index 261532bf9b3..4f9bfc67eea 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2005/07/16 01:19:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.30 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= GConf-2.10.0 @@ -34,4 +34,4 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile index 831f96c03c1..9e75d49d447 100644 --- a/devel/at-spi/Makefile +++ b/devel/at-spi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= at-spi-1.6.3 @@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+= libspi-1.0.pc.in .include "../../devel/atk/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/devel/atk/Makefile b/devel/atk/Makefile index 80fc521649b..dcb8f03943d 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:48 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= atk-1.10.1 @@ -31,6 +31,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/blib/Makefile b/devel/blib/Makefile index 3bf978ed344..c4a12a7e9d2 100644 --- a/devel/blib/Makefile +++ b/devel/blib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:18 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= blib-1.0.2 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-directfb post-extract: ${TOUCH} ${WRKSRC}/modules/libtool -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index 457e0041ad4..7938fb2c08a 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= coconut-0.3.0 @@ -23,7 +23,7 @@ MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe=" .include "../../textproc/libxslt/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/gnet1/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index e608a234493..428c8825b1c 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:08 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $ DISTNAME= devhelp-0.7 PKGREVISION= 11 @@ -25,7 +25,7 @@ BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../www/libgtkhtml/buildlink3.mk" diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index 1c5bbfd9380..65dfc0108db 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:46 wiz Exp $ DISTNAME= eel-2.10.1 PKGNAME= ${DISTNAME:S/-/2-/} @@ -27,7 +27,7 @@ PKGCONFIG_OVERRIDE= eel-2.0.pc.in .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" diff --git a/devel/eet/Makefile b/devel/eet/Makefile index 29a538717e9..c2fa4f4752f 100644 --- a/devel/eet/Makefile +++ b/devel/eet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:20 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= eet-0.9.9 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= eet.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index a42d170a52d..7cb92ce77da 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:46 wiz Exp $ DISTNAME= g-wrap-1.9.6 CATEGORIES= devel @@ -23,6 +23,6 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws .include "../../devel/glib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gail/Makefile b/devel/gail/Makefile index 5f79405ebe5..ce60610e845 100644 --- a/devel/gail/Makefile +++ b/devel/gail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= gail-1.8.4 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile index 4244d2d35b4..132e42cbbec 100644 --- a/devel/gal2/Makefile +++ b/devel/gal2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:46 wiz Exp $ # # Check the API before updating this package! gal-2.5 and above should # get their own gal26 package! @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile index 7c7dd93dfdc..340523a4f73 100644 --- a/devel/gal20/Makefile +++ b/devel/gal20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= gal-1.99.11 @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index e48fa53b231..7c085a4fe06 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= gconfmm-2.0.2 @@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE= gconf/gconfmm-2.0.pc.in PKGCONFIG_OVERRIDE+= gconf/gconfmm-2.0-uninstalled.pc.in .include "../../devel/GConf2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" # gtkmm must be 2.0/2.2 .include "../../x11/gtkmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index b5329b0e799..99090453e4e 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $ # DISTNAME= gconfmm-2.6.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/glibmm24/buildlink3.mk" .include "../../x11/gtkmm24/buildlink3.mk" diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common index ef44ea52f45..ad61851d79d 100644 --- a/devel/glade2/Makefile.common +++ b/devel/glade2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/07/21 16:29:46 wiz Exp $ DISTNAME= glade-2.10.0 PKGNAME= ${DISTNAME:S/-/2-/} @@ -21,7 +21,7 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index ed602469e80..e31f0ef7645 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.76 2005/07/21 16:29:46 wiz Exp $ DISTNAME= glib-2.6.5 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -74,7 +74,7 @@ PRINT_PLIST_AWK+= /^@dirrm include\/glib$$/ \ .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/glibmm24/Makefile b/devel/glibmm24/Makefile index 06b5f10268b..2f16a23625e 100644 --- a/devel/glibmm24/Makefile +++ b/devel/glibmm24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:47 wiz Exp $ DISTNAME= glibmm-2.4.5 PKGNAME= glibmm24-2.4.5 @@ -19,5 +19,5 @@ USE_LANGUAGES= c c++ .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libsigc++2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile index 292357f3681..379d221e8b8 100644 --- a/devel/gnome2-libole2/Makefile +++ b/devel/gnome2-libole2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:43 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:47 wiz Exp $ # DISTNAME= libole2-2.2.8 @@ -19,6 +19,6 @@ USE_LIBTOOL= YES .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 7f6b5fed4c0..5bbf7aa69ba 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:24 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:47 wiz Exp $ # DISTNAME= gob2-2.0.11 @@ -13,5 +13,5 @@ COMMENT= GNOME object builder for glib2 GNU_CONFIGURE= YES .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 35a5bb75cd9..73fe748a17b 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/06/25 01:23:28 kristerw Exp $ +# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:47 wiz Exp $ DISTNAME= libbonobo-2.8.1 PKGREVISION= 1 @@ -37,7 +37,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \ .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile index 0063a9dc396..a36a029f6a8 100644 --- a/devel/libbonoboui/Makefile +++ b/devel/libbonoboui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:44 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:47 wiz Exp $ # DISTNAME= libbonoboui-2.8.1 @@ -31,7 +31,7 @@ BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.8.1 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile index 55ced764ad9..39a09201fe6 100644 --- a/devel/libgail-gnome/Makefile +++ b/devel/libgail-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/18 16:11:52 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:47 wiz Exp $ # DISTNAME= libgail-gnome-1.1.1 @@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE= libgail-gnome.pc.in .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 85fa1b2e660..68452471560 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/06 18:37:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libglade-2.5.1 @@ -33,7 +33,7 @@ post-install: .include "../../devel/atk/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/libglademm20/Makefile b/devel/libglademm20/Makefile index b61a4d2e47b..86669217ffb 100644 --- a/devel/libglademm20/Makefile +++ b/devel/libglademm20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libglademm-2.2.0 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" # gtkmm must be 2.0/2.2 .include "../../x11/gtkmm/buildlink3.mk" diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile index 7a579905f9b..a8a4d795cff 100644 --- a/devel/libglademm24/Makefile +++ b/devel/libglademm24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libglademm-2.4.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../x11/gtkmm24/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index f5f3468e35c..dabe4c44274 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgnome-2.10.0 @@ -58,7 +58,7 @@ GCONF2_SCHEMAS+= desktop_gnome_typing_break.schemas .include "../../devel/glib2/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/devel/libgnomemm20/Makefile b/devel/libgnomemm20/Makefile index 4a4f25e1f9d..3a49ec6a53b 100644 --- a/devel/libgnomemm20/Makefile +++ b/devel/libgnomemm20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgnomemm-2.0.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" # gtkmm must be 2.0/2.2 .include "../../x11/gtkmm/buildlink3.mk" diff --git a/devel/libgnomemm26/Makefile b/devel/libgnomemm26/Makefile index 59698e8801a..7bef63a5ed1 100644 --- a/devel/libgnomemm26/Makefile +++ b/devel/libgnomemm26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgnomemm-2.6.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../x11/gtkmm24/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index b6bf93798c1..6503ee631cb 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgnomeui-2.10.0 @@ -45,7 +45,7 @@ post-configure: .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" diff --git a/devel/libgnomeuimm20/Makefile b/devel/libgnomeuimm20/Makefile index 1c891c637ce..1ea726aa17a 100644 --- a/devel/libgnomeuimm20/Makefile +++ b/devel/libgnomeuimm20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgnomeuimm-2.0.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libgnomemm20/buildlink3.mk" .include "../../graphics/libgnomecanvasmm20/buildlink3.mk" diff --git a/devel/libgnomeuimm26/Makefile b/devel/libgnomeuimm26/Makefile index 777e30fd822..4ce7d501b3b 100644 --- a/devel/libgnomeuimm26/Makefile +++ b/devel/libgnomeuimm26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgnomeuimm-2.6.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libgnomemm26/buildlink3.mk" .include "../../graphics/libgnomecanvasmm26/buildlink3.mk" diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index 0ab109dfa70..8e9789d3a2e 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/07/19 17:24:27 drochner Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgphoto2-2.1.6 @@ -26,6 +26,6 @@ PLIST_SUBST+= HAVE_LIBUSB="@comment" .include "../../devel/libusb/buildlink3.mk" PLIST_SUBST+= HAVE_LIBUSB="" .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 94d4657ae36..4b2f138fb78 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/24 21:28:03 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libgsf-1.12.1 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/libgsf .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index a7e5c682b5e..5cb072bd2a5 100644 --- a/devel/libidn/Makefile +++ b/devel/libidn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/31 17:58:08 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libidn-0.5.17 @@ -22,6 +22,6 @@ INFO_FILES= libidn.info .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile index 428738eaf01..602ffad56e0 100644 --- a/devel/libmatchbox/Makefile +++ b/devel/libmatchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:44 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libmatchbox-1.6 @@ -13,7 +13,7 @@ COMMENT= Library for matchbox window manager for computers with small displays USE_LIBTOOL= yes GNU_CONFIGURE= yes -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile index bd7d4d2d0f9..35b583cb1e9 100644 --- a/devel/libntlm/Makefile +++ b/devel/libntlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:27 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:48 wiz Exp $ # DISTNAME= libntlm-0.3.6 @@ -15,5 +15,5 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libntlm.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile index be8a41aace1..562d9756a83 100644 --- a/devel/libstatgrab/Makefile +++ b/devel/libstatgrab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:27 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:48 wiz Exp $ DISTNAME= libstatgrab-0.11 CATEGORIES= devel @@ -40,5 +40,5 @@ PLIST_SUBST+= SAIDAR="" .include "../../devel/ncurses/buildlink3.mk" .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile index 43ae4a8b15f..64b39cb1ed6 100644 --- a/devel/libwnck/Makefile +++ b/devel/libwnck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= libwnck-2.10.0 @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile index 6aa3261f082..f37e206343f 100644 --- a/devel/ogre/Makefile +++ b/devel/ogre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:44 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= ogre-v0-12-1 @@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= OGRE.pc.in .include "../../devel/devIL/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile index 35bea38e9e5..f04b0c1237a 100644 --- a/devel/p5-ExtUtils-PkgConfig/Makefile +++ b/devel/p5-ExtUtils-PkgConfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/13 18:01:25 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= ExtUtils-PkgConfig-1.06 @@ -16,6 +16,6 @@ PERL5_REQD= 5.8 PERL5_PACKLIST= auto/ExtUtils/PkgConfig/.packlist -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile index 23297c06b5d..2fde0b290d6 100644 --- a/devel/p5-glib2/Makefile +++ b/devel/p5-glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/13 18:01:30 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= Glib-${DIST_VERSION} @@ -25,6 +25,6 @@ DIST_VERSION= 1.040 PERL5_PACKLIST= auto/Glib/.packlist .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 6f64e21fa08..1f81bc94ed9 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2005/06/01 18:02:44 jlam Exp $ +# $NetBSD: Makefile,v 1.57 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= pango-1.8.1 @@ -38,7 +38,7 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 489cf2b1ccc..96e3f4a2906 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/06/30 13:16:51 adam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/07/21 16:29:49 wiz Exp $ # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating ABIWORD_VERSION= 2.2.8 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png} .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index 64968d46d71..cb421487e8c 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= conglomerate-0.9.0 @@ -31,7 +31,7 @@ GCONF2_SCHEMAS= conglomerate.schemas .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../textproc/enchant/buildlink3.mk" diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index e0cb64c64e7..76369fff128 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:45 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= dasher-3.2.15 @@ -27,7 +27,7 @@ USE_PKGLOCALEDIR= yes .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 315ae6a2166..310f79c0b57 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/06/01 18:02:45 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= gconf-editor-2.10.0 @@ -30,7 +30,7 @@ BUILDLINK_DEPENDS.GConf2+= GConf2>=2.10.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 3adab3faf9f..ab84c65a2ad 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= gedit-2.10.3 @@ -35,7 +35,7 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" diff --git a/editors/gice/Makefile b/editors/gice/Makefile index 8f7535b01ec..96dc4b94ab6 100644 --- a/editors/gice/Makefile +++ b/editors/gice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/16 06:57:49 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= gice-0.6.2 @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES BUILD_TARGET= gice INSTALLATION_DIRS= bin -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" do-install: diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile index b195fa75df0..547d1be8e68 100644 --- a/editors/gtranslator/Makefile +++ b/editors/gtranslator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:45 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:49 wiz Exp $ DISTNAME= gtranslator-1.0.2 CATEGORIES= editors @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --disable-debug .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile index 1c3d5b1e20b..a469475be9a 100644 --- a/editors/leafpad/Makefile +++ b/editors/leafpad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:41 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= leafpad-0.7.8 @@ -15,6 +15,6 @@ USE_PKGLOCALEDIR= YES .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index fbc63de5a28..c7138fc41ea 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= mlview-0.7.0 @@ -28,7 +28,7 @@ GCONF2_SCHEMAS= mlview.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libcroco/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/emulators/blinkensim/Makefile b/emulators/blinkensim/Makefile index 3439af3dbcb..8021a486a98 100644 --- a/emulators/blinkensim/Makefile +++ b/emulators/blinkensim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:43 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= blinkensim-2.2 @@ -18,6 +18,6 @@ post-install: cd ${PREFIX}/bin && ${LN} -s blinkensim-gtk blinkensim .include "../../devel/blib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/ckmame/Makefile b/emulators/ckmame/Makefile index e06e45c8cdd..86736185948 100644 --- a/emulators/ckmame/Makefile +++ b/emulators/ckmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/06/30 19:47:21 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:49 wiz Exp $ # DISTNAME= ckmame-0.6 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes TEST_TARGET= check .include "../../archivers/libzip/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/db1.builtin.mk" diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 09d69b81208..d18144e47d3 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:50 wiz Exp $ DISTNAME= fuse-0.7.0 PKGREVISION= 1 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gtk2 LIBS+= ${LIBOSSAUDIO} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../emulators/libspectrum/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/finance/gkrellm-stock/Makefile b/finance/gkrellm-stock/Makefile index 9f57860a495..5cff09db6fe 100644 --- a/finance/gkrellm-stock/Makefile +++ b/finance/gkrellm-stock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= gkrellstock-0.5.1 @@ -22,6 +22,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gkrellstock.so ${PREFIX}/lib/gkrellm2/plugins ${INSTALL_SCRIPT} ${WRKSRC}/GetQuote2 ${PREFIX}/bin -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index c2bfee507a0..0dbd3f8b014 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/06/01 18:02:48 jlam Exp $ +# $NetBSD: Makefile,v 1.87 2005/07/21 16:29:50 wiz Exp $ DISTNAME= gnucash-1.8.11 PKGREVISION= 2 @@ -50,7 +50,7 @@ INFO_FILES= gnucash-design.info .include "../../print/gnome-print/buildlink3.mk" .include "../../devel/g-wrap/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/swig/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index 892ee8f3b7e..085577c20ec 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:48 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:50 wiz Exp $ DISTNAME= libXft-2.1.6 PKGNAME= Xft2-2.1.6 @@ -23,7 +23,7 @@ MAKE_ENV+= EGREP="${EGREP}" BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2 BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile index 46a34e1b78f..2ea10c65864 100644 --- a/fonts/gucharmap/Makefile +++ b/fonts/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:48 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= gucharmap-1.4.3 @@ -27,7 +27,7 @@ GTK2_IMMODULES= yes .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/games/asc/Makefile b/games/asc/Makefile index 464966fa821..7f636b5ec83 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= asc-source-1.15.3.0 @@ -34,7 +34,7 @@ post-extract: .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDLmm/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../multimedia/smpeg/buildlink3.mk" .include "../../x11/paragui/buildlink3.mk" diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile index 83907e1f03c..ecb275765f6 100644 --- a/games/ccgo/Makefile +++ b/games/ccgo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:48 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= ccgo-0.3.4 @@ -30,6 +30,6 @@ PREFIX.gnugo_DEFAULT= ${LOCALBASE} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gconfmm/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index 4c847ff0eaa..f325e8de733 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:50 wiz Exp $ DISTNAME= crack-attack-1.1.14 CATEGORIES= games @@ -16,7 +16,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${PREFIX}/share/doc/html/${PKGBASE} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/games/freeciv-client-gtk2/Makefile b/games/freeciv-client-gtk2/Makefile index ee0a18c1eb1..f5b61eea558 100644 --- a/games/freeciv-client-gtk2/Makefile +++ b/games/freeciv-client-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:50 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk2-/} COMMENT= Freeciv client with GTK+ interface @@ -18,7 +18,7 @@ do-install: ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} .include "../../audio/esound/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index ef5e29194bf..a9f433c43d6 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= gnocatan-0.8.1.16 @@ -18,6 +18,6 @@ USE_PKGLOCALEDIR= YES .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index f04724e5be0..2eb582b0c3d 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2005/07/21 16:29:50 wiz Exp $ DISTNAME= gnome-games-2.10.1 CATEGORIES= games gnome @@ -74,7 +74,7 @@ BUILDLINK_DEPENDS.libgnome+= libgnome>=2.10.0 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/games/grhino/Makefile b/games/grhino/Makefile index f5eb60d9129..dbef48ca3d6 100644 --- a/games/grhino/Makefile +++ b/games/grhino/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/19 00:49:49 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= grhino-0.15.0 @@ -14,7 +14,7 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile index 23ca2a78ef3..c2712cfbc08 100644 --- a/games/gtetrinet/Makefile +++ b/games/gtetrinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= gtetrinet-0.7.7 @@ -33,6 +33,6 @@ GCONF2_SCHEMAS= gtetrinet.schemas .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile index 7278f81cfa1..4bcacf6446e 100644 --- a/games/gtkmagnetic/Makefile +++ b/games/gtkmagnetic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= Magnetic22Src @@ -24,7 +24,7 @@ LIBS.SunOS+= -lCrun INSTALLATION_DIRS= bin -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/smpeg/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/games/gturing/Makefile b/games/gturing/Makefile index e10dd99de14..0021262d37b 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= gturing-0.1.1 @@ -22,7 +22,7 @@ BUILDLINK_TRANSFORM+= rm:-D.*_DISABLE_DEPRECATED .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/sirius/Makefile b/games/sirius/Makefile index b9194dbe792..8658d5578a6 100644 --- a/games/sirius/Makefile +++ b/games/sirius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:52 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= sirius-0.8.0 @@ -21,7 +21,7 @@ USE_PKGLOCALEDIR= YES .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 573520ffd2d..0fa5ce06244 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/07/14 21:47:57 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= wesnoth-0.9.3 @@ -23,7 +23,7 @@ BUILDLINK_DEPENDS.SDL_mixer= SDL_mixer>=1.2.5nb3 # use included SDL_ttf library #.include "../../devel/SDL_ttf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/blinkenthemes/Makefile b/graphics/blinkenthemes/Makefile index d7697e1d150..21498446324 100644 --- a/graphics/blinkenthemes/Makefile +++ b/graphics/blinkenthemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= blinkenthemes-0.8 @@ -13,6 +13,6 @@ COMMENT= Blinkenlights simulator themes GNU_CONFIGURE= YES .include "../../devel/blib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/blinkentools/Makefile b/graphics/blinkentools/Makefile index 6bd8db733e6..a938b5e8db3 100644 --- a/graphics/blinkentools/Makefile +++ b/graphics/blinkentools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= blinkentools-2.2 @@ -15,7 +15,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-oldtools .include "../../devel/blib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 5482603ebdd..e7e43e6d4b3 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/06 18:40:10 drochner Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:50 wiz Exp $ DISTNAME= cairo-0.5.1 CATEGORIES= graphics @@ -20,7 +20,7 @@ BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5 BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common index 7721a928d31..e1d214a876a 100644 --- a/graphics/dia/Makefile.common +++ b/graphics/dia/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:02:54 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:50 wiz Exp $ # DISTNAME= dia-0.94 @@ -45,7 +45,7 @@ BUILDLINK_DEPMETHOD.gtk2+= build .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 9af5662c15d..67036822d06 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:51 wiz Exp $ DISTNAME= digikam-0.7.2 CATEGORIES= graphics kde @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes .include "../../databases/gdbm/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../graphics/libkexif/buildlink3.mk" .include "../../graphics/libkipi/buildlink3.mk" diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 09c18d661ec..2f7cc6fc4c4 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/06/29 09:45:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= eog-2.10.2 @@ -28,7 +28,7 @@ BUILDLINK_DEPENDS.libart2+= libart2>=2.3.16 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile index 3c74ea04cb8..11df9471143 100644 --- a/graphics/exif/Makefile +++ b/graphics/exif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:02 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= exif-0.6.9 @@ -20,7 +20,7 @@ LIBS+= ${BUILDLINK_LDADD.iconv} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile index 61ac4638a43..6d2497f864a 100644 --- a/graphics/gfract/Makefile +++ b/graphics/gfract/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/16 06:57:57 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= gfract-0.30 @@ -23,7 +23,7 @@ SUBST_SED.prefix= -e "s,/usr/local,${PREFIX},g" INSTALLATION_DIRS= bin -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 8cdccf2e1f8..b0961b1bb53 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:55 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:51 wiz Exp $ DISTNAME= gimageview-0.2.27 CATEGORIES= graphics @@ -26,7 +26,7 @@ LDFLAGS.NetBSD+= ${PTHREAD_LDFLAGS} .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile index 71d3c1ebceb..2631fc57ed7 100644 --- a/graphics/gimp-ufraw/Makefile +++ b/graphics/gimp-ufraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= ufraw-0.4 @@ -16,7 +16,7 @@ INSTALL_TARGET= install-admin BUILDLINK_TRANSFORM+= rm:-std=gnu99 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/gimp/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index baffc165739..754f0931ed7 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2005/07/18 19:13:37 reed Exp $ +# $NetBSD: Makefile,v 1.123 2005/07/21 16:29:51 wiz Exp $ DISTNAME= gimp-2.2.8 PKGREVISION= 1 @@ -55,7 +55,7 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/aalib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 637ed4c7771..f08619043fc 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/07/19 17:28:13 drochner Exp $ +# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:51 wiz Exp $ DISTNAME= gphoto2-2.1.6 CATEGORIES= graphics @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-readline .include "../../devel/cdk/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/aalib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 4c9402b602c..8a560e7560f 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2005/05/15 16:37:47 drochner Exp $ +# $NetBSD: Makefile,v 1.54 2005/07/21 16:29:51 wiz Exp $ DISTNAME= gqview-2.0.1 CATEGORIES= graphics x11 @@ -15,7 +15,7 @@ USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= # defined .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 94083635006..8456ba84cc5 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/07/19 14:45:52 gdt Exp $ +# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= graphviz-2.2.1 @@ -40,7 +40,7 @@ pre-build: ${TOUCH} ${WRKSRC}/Makefile .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index c3751a952ec..30b94073b01 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/04 20:01:15 drochner Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:51 wiz Exp $ DISTNAME= gthumb-2.6.6 CATEGORIES= graphics @@ -24,7 +24,7 @@ GCONF2_SCHEMAS+= gthumb.schemas .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 79c77e14297..c02c1cef3e4 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:11 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:51 wiz Exp $ DISTNAME= gtkglext-1.0.6 CATEGORIES= graphics @@ -20,7 +20,7 @@ LIBS+= -lm CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --enable-gtk-doc=no -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 7dd0d40631d..c5932c69764 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:51 wiz Exp $ DISTNAME= imlib2-1.2.0 PKGREVISION= 3 @@ -20,7 +20,7 @@ LIBS.SunOS= -lm .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 138bfac6f6e..d4908d4981f 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= inkscape-0.41 @@ -27,7 +27,7 @@ BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.4 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libsigc++2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index 2d403115837..f76463156a1 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:51 wiz Exp $ DISTNAME= kipi-plugins-0.1.0-beta2 PKGNAME= kipi-plugins-0.1.0beta2 @@ -30,7 +30,7 @@ pre-build: .include "../../meta-pkgs/kde3/kde3.mk" .include "../../devel/libgphoto2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../graphics/libkexif/buildlink3.mk" diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile index 6722e8b0cf5..494a9c44646 100644 --- a/graphics/libexif-gtk/Makefile +++ b/graphics/libexif-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:05 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:51 wiz Exp $ DISTNAME= libexif-gtk-0.3.5 PKGREVISION= 1 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libexif-gtk/libexif-gtk.pc.in .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index e2d63ef549f..469fe6f8107 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/19 02:59:41 kristerw Exp $ +# $NetBSD: Makefile,v 1.20 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= libgdiplus-1.1.5 @@ -25,7 +25,7 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 BUILDLINK_TRANSFORM+= rm:-Werror -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 93835fb7119..04b2c9f22d1 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/07/04 20:06:29 drochner Exp $ +# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= libgnomecanvas-2.10.2 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgnomecanvasmm20/Makefile b/graphics/libgnomecanvasmm20/Makefile index d477eb75472..ef7b343a8e7 100644 --- a/graphics/libgnomecanvasmm20/Makefile +++ b/graphics/libgnomecanvasmm20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= libgnomecanvasmm-2.0.2 @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" # gtkmm must be 2.0/2.2 .include "../../x11/gtkmm/buildlink3.mk" diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index fc714e3852a..80fec578554 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:51 wiz Exp $ # DISTNAME= libgnomecanvasmm-2.6.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtkmm24/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile index 75aa23fc11b..825095c6102 100644 --- a/graphics/libkexif/Makefile +++ b/graphics/libkexif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:51 wiz Exp $ DISTNAME= libkexif-0.2.1 CATEGORIES= graphics @@ -17,7 +17,7 @@ USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= libtool .include "../../meta-pkgs/kde3/kde3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common index c00de5d7e11..be93e8e6db6 100644 --- a/graphics/librsvg2/Makefile.common +++ b/graphics/librsvg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= librsvg-2.9.5 @@ -23,5 +23,5 @@ CONFIGURE_ARGS+= --with-gimp=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/librsvg2 CONFIGURE_ARGS+= --with-tags= -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile index 70c7d85fe55..cecbca8e7d6 100644 --- a/graphics/showimg/Makefile +++ b/graphics/showimg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= showimg-0.9.4-1 @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdebase3/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/libkexif/buildlink3.mk" .include "../../graphics/libkipi/buildlink3.mk" diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile index 6988903cf76..3efe2cb7ce1 100644 --- a/ham/gmfsk/Makefile +++ b/ham/gmfsk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= gmfsk-0.6 @@ -16,7 +16,7 @@ GCONF2_SCHEMAS+=gmfsk.schemas CONFIGURE_ARGS+=--enable-hamlib .include "../../devel/GConf2/schemas.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../math/fftw2/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile index 163d858a914..69a0d03969c 100644 --- a/ham/xdx/Makefile +++ b/ham/xdx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= xdx-1.2 @@ -15,6 +15,6 @@ USE_PKGLOCALEDIR=yes BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile index 602fac691e5..221f8939a86 100644 --- a/ham/xlog/Makefile +++ b/ham/xlog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= xlog-1.0 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake CONFIGURE_ARGS= --enable-hamlib -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" diff --git a/inputmethod/imhangul/Makefile b/inputmethod/imhangul/Makefile index 7e4b690c048..57dd4922ae0 100644 --- a/inputmethod/imhangul/Makefile +++ b/inputmethod/imhangul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:11 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:52 wiz Exp $ DISTNAME= imhangul-0.9.11 PKGREVISION= 1 @@ -16,6 +16,6 @@ SHLIBTOOL_OVERRIDE= libtool USE_PKGLOCALEDIR= YES GTK2_IMMODULES= YES -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile index 3a30486416d..7ce37f97d9d 100644 --- a/inputmethod/imhangul_status_applet/Makefile +++ b/inputmethod/imhangul_status_applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= imhangul_status_applet-0.2 @@ -21,7 +21,7 @@ USE_LIBTOOL= yes GCONF2_SCHEMAS= imhangul_status.schemas .include "../../devel/GConf2/schemas.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile index bcaf80c8c0d..8d557fba283 100644 --- a/inputmethod/nabi/Makefile +++ b/inputmethod/nabi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:58 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= nabi-0.15 @@ -14,6 +14,6 @@ USE_PKGLOCALEDIR= YES .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index 5c0f3b07242..de93d8e8463 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/04 10:20:22 uebayasi Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= uim-0.4.6 @@ -36,7 +36,7 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile index ac627df26b3..37134304c8e 100644 --- a/lang/classpath-gui/Makefile +++ b/lang/classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/11/29 15:17:00 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:52 wiz Exp $ .include "../../lang/classpath/Makefile.common" @@ -15,7 +15,7 @@ BUILDLINK_FILES.libart2+= bin/libart2-config BUILDLINK_TRANSFORM.libart2+= -e 's|/libart2-config|/libart-config|g' .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 380111c996a..c4980d5d706 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/07/16 01:19:11 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:52 wiz Exp $ DISTNAME= mono-1.1.6 CATEGORIES= lang @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --with-sigaltstack=no .endif .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile index 869e27a8f61..6815ead4c2a 100644 --- a/lang/sablevm-classpath-gui/Makefile +++ b/lang/sablevm-classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/10/03 00:15:02 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:52 wiz Exp $ # .include "../../lang/sablevm-classpath/Makefile.common" @@ -18,7 +18,7 @@ PRINT_PLIST_AWK+= \ { print "@comment in sablevm-classpath: "$$0; next; } .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/java-env.mk" diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index 5baf5a5940a..d7de5857d55 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:12 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:52 wiz Exp $ DISTNAME= balsa-2.2.6 PKGREVISION= 2 @@ -48,7 +48,7 @@ BUILDLINK_DEPENDS.gmime+= gmime>=2.1.9 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mail/gmime/buildlink3.mk" .include "../../mail/libesmtp/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 6462e6193bb..16cb79a4ecb 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/07/16 01:19:12 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/07/21 16:29:52 wiz Exp $ DISTNAME= dspam-3.4.8 CATEGORIES= mail @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \ --sysconfdir=${PKG_SYSCONFDIR} .include "options.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" DOCDIR= ${PREFIX}/share/doc/dspam diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile index 145b6ab9035..7b79b261078 100644 --- a/mail/evolution-data-server/Makefile +++ b/mail/evolution-data-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/07/20 18:55:44 kristerw Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= evolution-data-server-1.2.3 @@ -68,7 +68,7 @@ BUILDLINK_TRANSFORM+= rm:-ldl .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/nss/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/libsoup-devel/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index b3b55f9ae42..2611d123f1b 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2005/06/06 14:53:19 hira Exp $ +# $NetBSD: Makefile,v 1.86 2005/07/21 16:29:52 wiz Exp $ DISTNAME= evolution-2.2.2 PKGREVISION= 1 @@ -121,7 +121,7 @@ LDFLAGS+= -lsemaphore .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile index af0426a5422..582b493f2a5 100644 --- a/mail/evolution14/Makefile +++ b/mail/evolution14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:59 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:52 wiz Exp $ DISTNAME= evolution-1.4.6 PKGNAME= ${DISTNAME:S/evolution/evolution14/} @@ -78,7 +78,7 @@ LDFLAGS+= -lsemaphore .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index de25f8ac42b..8fdc3776553 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= gmime-2.1.9 @@ -21,6 +21,6 @@ PKGCONFIG_OVERRIDE+= gmime-2.0.pc.in .include "options.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index 74219b827ab..67851966780 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= mail-notification-1.0 @@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --disable-ssl .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile index 5b27c44ba08..973443f6c60 100644 --- a/mail/sylpheed-claws-ghostscript-viewer/Makefile +++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:27 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= ghostscript-viewer-0.6 @@ -19,7 +19,7 @@ PLIST_SRC= ${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins PLIST_SUBST+= PLUGIN_NAME=ghostscript_viewer MESSAGE_SRC+= ${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mail/sylpheed-claws/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile index 62f6e0350cf..0ae283f41a8 100644 --- a/mail/ximian-connector/Makefile +++ b/mail/ximian-connector/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= ximian-connector-2.2.2 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/ximian-connector .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../mail/evolution/buildlink3.mk" .include "../../net/libsoup-devel/buildlink3.mk" diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile index d1affdaed79..6d796aa4aa1 100644 --- a/math/calcoo/Makefile +++ b/math/calcoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/18 15:46:06 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:52 wiz Exp $ # DISTNAME= calcoo-1.3.16 @@ -11,6 +11,6 @@ COMMENT= Scientific calculator GNU_CONFIGURE= yes -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/cln/Makefile b/math/cln/Makefile index a57cf183b2a..880739381ee 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:53 wiz Exp $ DISTNAME= cln-1.1.9 CATEGORIES= math @@ -19,5 +19,5 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/cln.pc.in INFO_FILES= cln.info -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/galculator/Makefile b/math/galculator/Makefile index fe123b25d37..34fb43ab866 100644 --- a/math/galculator/Makefile +++ b/math/galculator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:13 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= galculator-1.2.5 @@ -13,7 +13,7 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 0af89b3443e..82ed254dfa3 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/07/18 00:09:38 kristerw Exp $ +# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gcalctool-5.5.42 @@ -34,7 +34,7 @@ post-wrapper: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile index a71a57cf486..305ccbe68de 100644 --- a/math/gnumeric14/Makefile +++ b/math/gnumeric14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:14 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gnumeric-1.4.3 @@ -40,7 +40,7 @@ BUILDLINK_DEPENDS.libgsf+= libgsf>=1.11.1 .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" # guile is currently not supported in gnumeric #.include "../../lang/guile/buildlink3.mk" diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common index e24b92dbedb..28ceeb7f80a 100644 --- a/meta-pkgs/xfce4/Makefile.common +++ b/meta-pkgs/xfce4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2005/06/15 08:57:03 hira Exp $ +# $NetBSD: Makefile.common,v 1.25 2005/07/21 16:29:53 wiz Exp $ MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.2/src/ \ http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.2/src/ \ @@ -25,7 +25,7 @@ PKG_CONFIG_PATH= ${BUILDLINK_DIR}/lib/pkgconfig XFCE4_EGBASE= ${PREFIX}/share/examples/xfce4 .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" ## # Use the latest GNU tar when the native tar is buggy diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile index acc8dd169f1..0540f59b1cd 100644 --- a/misc/blccc/Makefile +++ b/misc/blccc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:33 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= blccc-1.99 @@ -17,7 +17,7 @@ SHLIBTOOL_OVERRIDE= libtool EGDIR= ${PREFIX}/share/examples/blccc .include "../../devel/blib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" post-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/misc/gkrellm-flynn/Makefile b/misc/gkrellm-flynn/Makefile index f8f920657bf..e09fbb586fa 100644 --- a/misc/gkrellm-flynn/Makefile +++ b/misc/gkrellm-flynn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:15 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gkrellflynn-0.8 @@ -15,6 +15,6 @@ USE_TOOLS+= gmake BUILD_TARGET= gkrellm2 INSTALL_TARGET= installgkrellm2 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm-launch/Makefile b/misc/gkrellm-launch/Makefile index 8484a6fdd62..f93ac243f7c 100644 --- a/misc/gkrellm-launch/Makefile +++ b/misc/gkrellm-launch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gkrellmlaunch-0.5 @@ -18,6 +18,6 @@ INSTALLATION_DIRS= lib/gkrellm2/plugins do-install: ${INSTALL_DATA} ${WRKSRC}/gkrellmlaunch.so ${PREFIX}/lib/gkrellm2/plugins -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm-leds/Makefile b/misc/gkrellm-leds/Makefile index bae058c6a2a..710cacd7d97 100644 --- a/misc/gkrellm-leds/Makefile +++ b/misc/gkrellm-leds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:34 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gkleds-0.8.2 @@ -15,6 +15,6 @@ USE_LIBTOOL= YES CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/gkrellm2/plugins -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile index a0dfafa5ff1..44715dbc7df 100644 --- a/misc/gkrellm-moon/Makefile +++ b/misc/gkrellm-moon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:34 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gkrellmoon-0.6 @@ -13,6 +13,6 @@ COMMENT= GKrellM2 moonclock plugin BUILD_TARGET= gkrellmoon.so -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile index 34d94e52cfc..8a9bb642289 100644 --- a/misc/gkrellm-weather/Makefile +++ b/misc/gkrellm-weather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/16 19:10:39 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:53 wiz Exp $ DISTNAME= gkrellweather-2.0.6 PKGNAME= gkrellm-weather-2.0.6 @@ -30,7 +30,7 @@ pre-build: ${WRKSRC}/GrabWeather.orig > ${WRKSRC}/GrabWeather .include "../../sysutils/gkrellm/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile index a017574abbf..9b9ab5d99c4 100644 --- a/misc/gnome2-utils/Makefile +++ b/misc/gnome2-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:14 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gnome-utils-2.10.1 @@ -34,7 +34,7 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" diff --git a/misc/gok/Makefile b/misc/gok/Makefile index 274564b52e2..4bc6b6792e5 100644 --- a/misc/gok/Makefile +++ b/misc/gok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gok-1.0.3 @@ -34,7 +34,7 @@ GCONF2_SCHEMAS= gok.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index 105354e28cc..fb4e1085086 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:53 wiz Exp $ DISTNAME= gperiodic-2.0.8 CATEGORIES= misc x11 @@ -23,6 +23,6 @@ MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} BUILD_TARGET= gperiodic .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile index bab98d0c389..5c45ab9191e 100644 --- a/misc/gxmame/Makefile +++ b/misc/gxmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gxmame-0.35beta1 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile index 73cc21b83c7..5e12c53aa86 100644 --- a/misc/kanjipad/Makefile +++ b/misc/kanjipad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:14 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= kanjipad-2.0.0 @@ -12,7 +12,7 @@ COMMENT= Japanese handwriting recognition USE_TOOLS+= gmake perl -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" post-install: diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile index d56f3bfc500..374e469ef78 100644 --- a/misc/kdeaccessibility3/Makefile +++ b/misc/kdeaccessibility3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:35 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:53 wiz Exp $ DISTNAME= kdeaccessibility-${_KDE_VERSION} CATEGORIES= misc @@ -23,7 +23,7 @@ PLIST_SUBST+= HAVE_GST="@comment " .endif .include "../../meta-pkgs/kde3/kde3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile index 6033b18293c..d917ac9604b 100644 --- a/misc/libcdio/Makefile +++ b/misc/libcdio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:14 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= libcdio-0.74 @@ -31,7 +31,7 @@ pre-patch: ${CP} ${FILESDIR}/_cdio_netbsd.c ${WRKSRC}/lib/driver/FreeBSD/freebsd.c .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile index 0c78c3c8c5b..29da7eac09d 100644 --- a/misc/yelp/Makefile +++ b/misc/yelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/07/21 13:11:42 dillo Exp $ +# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= yelp-2.10.0 @@ -35,7 +35,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.yelp .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 5b97ccc4cd2..2756e1b3840 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/11 16:57:29 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= avidemux-2.0.40 @@ -46,7 +46,7 @@ post-configure: .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../multimedia/mjpegtools/buildlink3.mk" .include "../../multimedia/xvidcore/buildlink3.mk" diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile index c9459aa97fc..73a5927aed0 100644 --- a/multimedia/dirac/Makefile +++ b/multimedia/dirac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:40 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= Dirac-0.2.0 @@ -15,5 +15,5 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= dirac.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index 59b1c2ec8c5..5e1f4cd573b 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $ # DISTNAME= gmencoder-0.1.0 @@ -36,6 +36,6 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile index bfb62981767..c4b8c448251 100644 --- a/multimedia/gnome2-media/Makefile +++ b/multimedia/gnome2-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:15 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:53 wiz Exp $ DISTNAME= gnome-media-2.10.2 CATEGORIES= multimedia gnome @@ -44,7 +44,7 @@ GCONF2_SCHEMAS+= gnome-sound-recorder.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/gst-plugins/buildlink3.mk" .include "../../multimedia/gstreamer/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common index a37778434ff..d6694ad6a39 100644 --- a/multimedia/gst-plugins/Makefile.common +++ b/multimedia/gst-plugins/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/05/25 21:07:59 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= gst-plugins-0.8.9 @@ -166,5 +166,5 @@ BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.9.1 .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/gstreamer/plugins.mk" diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 8472d009e6e..caccc72669e 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:15 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= gstreamer-0.8.10 @@ -42,7 +42,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb1 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../lang/python/application.mk" _GSTREAMER_NO_DEPEND= # defined diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 90d9d10702e..10c33ec536f 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/06/03 22:58:54 markd Exp $ +# $NetBSD: Makefile,v 1.29 2005/07/21 16:29:54 wiz Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} CATEGORIES= multimedia @@ -52,7 +52,7 @@ UNLIMIT_RESOURCES+= datasize .include "../../audio/musicbrainz/buildlink3.mk" .include "../../audio/tunepimp/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index a03519f37ef..e0603e3a8e1 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:15 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= kmplayer-0.8.4b @@ -30,7 +30,7 @@ SUBST_STAGE.desktop= pre-configure SUBST_FILES.desktop= src/kmplayer.desktop SUBST_SED.desktop= -e 's|@PREFIX@|${PREFIX}|g' -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile index ce4412c6ba3..010b89b882d 100644 --- a/multimedia/libassetml/Makefile +++ b/multimedia/libassetml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= libassetml-1.2.1 @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes INFO_FILES= libassetml.info .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common index 3261e051a5d..0da05f145ba 100644 --- a/multimedia/libdv/Makefile.common +++ b/multimedia/libdv/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2005/06/03 15:40:31 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/07/21 16:29:54 wiz Exp $ DISTNAME= libdv-0.104 CATEGORIES= multimedia @@ -32,7 +32,7 @@ LIBS+= ${LIBOSSAUDIO} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 4167cf0686f..c496ee8e583 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/18 07:26:02 grant Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:54 wiz Exp $ DISTNAME= mpeg2dec-0.4.0b PKGNAME= libmpeg2-0.4.0b @@ -25,5 +25,5 @@ PKGCONFIG_OVERRIDE+= libmpeg2/libmpeg2.pc.in CONFIGURE_ARGS+= --enable-shared .include "../../devel/SDL/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile index 05ba8c6cef6..14afba5705c 100644 --- a/multimedia/libogg/Makefile +++ b/multimedia/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= libogg-1.1.2 @@ -23,6 +23,6 @@ PKGCONFIG_OVERRIDE+= ogg.pc.in TEST_TARGET= check -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common index 5907d007acc..643307b43a9 100644 --- a/multimedia/mplayer-plugin-firefox/Makefile.common +++ b/multimedia/mplayer-plugin-firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= mplayerplug-in-2.70 @@ -65,6 +65,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.xpt \ ${PREFIX}/lib/${BROWSER}/plugins -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile index be5f7314499..e19e265afd8 100644 --- a/multimedia/openquicktime/Makefile +++ b/multimedia/openquicktime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= ${PKGNAME_NOREV}-src @@ -25,6 +25,6 @@ pre-configure: ${CHMOD} +x ${BUILDLINK_DIR}/bin/glib-config-2.0 .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/swfdec/Makefile.common b/multimedia/swfdec/Makefile.common index df481ebdae8..095e114e322 100644 --- a/multimedia/swfdec/Makefile.common +++ b/multimedia/swfdec/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/06/12 16:43:29 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= swfdec-0.2.2 @@ -24,4 +24,4 @@ BUILDLINK_TRANSFORM+= rm:-Werror pre-install: ${ECHO} "install:" >${WRKSRC}/plugin/Makefile -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common index 7ae12403c8e..edc070f4928 100644 --- a/multimedia/totem/Makefile.common +++ b/multimedia/totem/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:07 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= totem-1.0.2 @@ -32,7 +32,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/nautilus/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index a945ec5b291..5b3c105bbd7 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2005/06/01 20:08:01 jlam Exp $ +# $NetBSD: Makefile.common,v 1.23 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= xine-lib-1.0.1 @@ -42,7 +42,7 @@ pre-configure: cd ${WRKSRC} && autoconf .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile index e39b1b5be57..47559b21ee1 100644 --- a/multimedia/xvid4conf/Makefile +++ b/multimedia/xvid4conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/20 21:28:20 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:54 wiz Exp $ DISTNAME= xvid4conf-1.12 PKGREVISION= 1 @@ -11,6 +11,6 @@ COMMENT= XviD Configuration Panel GNU_CONFIGURE= YES -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index 9e1922b6bd3..90c1e63f852 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= ORBit2-2.12.2 @@ -33,7 +33,7 @@ PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \ " 2>/dev/null || $${TRUE}"; next; } .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/amule/Makefile b/net/amule/Makefile index 7d78a593ad0..a1659108983 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= aMule-1.2.8 @@ -27,7 +27,7 @@ LIBS+= -lm UNLIMIT_RESOURCES+= datasize .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile index 062775bfb9f..60b4274c10e 100644 --- a/net/bug-buddy/Makefile +++ b/net/bug-buddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/01 18:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= bug-buddy-2.10.0 @@ -29,7 +29,7 @@ GCONF2_SCHEMAS= bug-buddy.schemas .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile index d7519463dc8..4bbba28e2b5 100644 --- a/net/dc_gui2/Makefile +++ b/net/dc_gui2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:54 wiz Exp $ # DISTNAME= dc_gui2-0.75 @@ -35,5 +35,5 @@ post-configure: .include "../../databases/db4/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile index c8c19f277f5..005209dec7d 100644 --- a/net/ed2k-gtk-gui/Makefile +++ b/net/ed2k-gtk-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:54 wiz Exp $ DISTNAME= ed2k-gtk-gui-0.6.3 PKGREVISION= 1 @@ -23,7 +23,7 @@ SUBST_SED.shell= -e 's,/bin/bash,/bin/sh,g' BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/gnet/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/net/etherape/Makefile b/net/etherape/Makefile index 4f739cafe88..ad445bb6033 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/07/13 14:16:15 drochner Exp $ +# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:54 wiz Exp $ DISTNAME= etherape-0.9.1 PKGREVISION= 1 @@ -32,5 +32,5 @@ post-install: .include "../../net/libpcap/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 382e4917651..a11491e04fd 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2005/07/16 01:19:15 jlam Exp $ +# $NetBSD: Makefile,v 1.112 2005/07/21 16:29:54 wiz Exp $ DISTNAME= ethereal-0.10.11 PKGREVISION= 1 @@ -53,7 +53,7 @@ pre-build: .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" .include "../../net/net-snmp/buildlink3.mk" diff --git a/net/gift/Makefile b/net/gift/Makefile index a06875a9d88..9c84beec965 100644 --- a/net/gift/Makefile +++ b/net/gift/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:46 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= gift-0.11.8.1 @@ -19,6 +19,6 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/lib/libgift.pc.in .include "../../devel/libltdl/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile index 5c6fef062f2..88156ed6e4a 100644 --- a/net/gkrellm-multiping/Makefile +++ b/net/gkrellm-multiping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:47 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= gkrellm-multiping-2.0.8 @@ -21,7 +21,7 @@ post-patch: ${SED} -e s,@@PREFIX@@,${PREFIX}, ${WRKSRC}/multiping.c > ${WRKSRC}/multiping.c.sed ${CP} ${WRKSRC}/multiping.c.sed ${WRKSRC}/multiping.c -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile index b75e2974b79..8e04e57c926 100644 --- a/net/gkrellm-snmp/Makefile +++ b/net/gkrellm-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:47 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= gkrellm_snmp-0.21 @@ -12,7 +12,7 @@ HOMEPAGE= http://triq.net/gkrellm_snmp.html COMMENT= GKrellM plugin to display values collected from a SNMP agent -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../net/net-snmp/buildlink3.mk" diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile index ef7dce3a5c5..bf3a8d132de 100644 --- a/net/gkrellm-wireless/Makefile +++ b/net/gkrellm-wireless/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:24 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:55 wiz Exp $ DISTNAME= gkrellmwireless-2.0.3 PKGNAME= ${DISTNAME:S/gkrellm/gkrellm-/} @@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM= *BSD-*-* Linux-*-* WRKSRC= ${WRKDIR}/gkrellmwireless USE_TOOLS+= gmake -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gkrellm/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gnet/Makefile b/net/gnet/Makefile index b49b38c78eb..cd590fa2de3 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/25 11:41:32 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= gnet-2.0.7 @@ -18,5 +18,5 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc TEST_TARGET= check .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile index 2980b8e53b9..3248b7b3bfd 100644 --- a/net/gnet1/Makefile +++ b/net/gnet1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:47 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= gnet-1.1.8 @@ -20,5 +20,5 @@ CONFIGURE_ARGS= --enable-glib2 TEST_TARGET= check .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index 9a349466849..828db220e6c 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:24 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= gnome-netstatus-2.10.0 @@ -23,7 +23,7 @@ GCONF2_SCHEMAS= netstatus.schemas .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/net/howl/Makefile b/net/howl/Makefile index 482430ae7de..43640bf1fb0 100644 --- a/net/howl/Makefile +++ b/net/howl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:48 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $ DISTNAME= howl-0.9.10 CATEGORIES= net @@ -17,6 +17,6 @@ RCD_SCRIPTS= howl PKG_GROUPS+= howl PKG_USERS+= howl:howl::Zeroconf\\ user -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile index 5ae0fc75faf..ce44e364fee 100644 --- a/net/jigdo/Makefile +++ b/net/jigdo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:48 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:55 wiz Exp $ DISTNAME= jigdo-0.7.1 CATEGORIES= net @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ #.include "../../databases/db3/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../www/libwww/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile index 5b595c72498..75689301f3d 100644 --- a/net/libIDL/Makefile +++ b/net/libIDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/05/23 01:21:26 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= libIDL-0.8.5 @@ -30,7 +30,7 @@ CONFIGURE_ENV.SunOS+= CPP=/usr/lib/cpp CONFIGURE_ENV+= F77=${FALSE} .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libsoup-devel/Makefile b/net/libsoup-devel/Makefile index c8291a8cfbc..74311a7a282 100644 --- a/net/libsoup-devel/Makefile +++ b/net/libsoup-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:49 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= libsoup-2.2.3 @@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= libsoup-2.2.pc.in CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index 9cafeb5a461..963ed55465e 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/23 15:02:14 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= libsoup-1.99.28 @@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= soup-2.0.pc.in CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/net/linc/Makefile b/net/linc/Makefile index 04c26eb7352..9fc19d086bb 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:49 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= linc-1.1.1 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --with-openssl .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index 81f1b0db5a0..d3d8c69c19f 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:25 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= pyorbit-2.0.1 @@ -21,7 +21,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PYTHON_VERSIONS_ACCEPTED= 24 23 22 BUILDLINK_DEPENDS.python22= python22>=2.2.2nb2 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 15fa8fc6c4a..baf64045882 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= tsclient-0.132 @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/vino/Makefile b/net/vino/Makefile index b6bb6af9f63..d3cbf4ffeb5 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= vino-2.10.0 @@ -25,7 +25,7 @@ GCONF2_SCHEMAS= vino-server.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile index a25a06daa9d..b138dcb22b0 100644 --- a/net/wistumbler2-gtk/Makefile +++ b/net/wistumbler2-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/25 14:47:06 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:55 wiz Exp $ # .include "../../net/wistumbler2/Makefile.common" @@ -7,6 +7,6 @@ PKGNAME= ${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/} CONFLICTS+= wistumbler2-[0-9]* -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/pan/Makefile b/news/pan/Makefile index b1abc45f754..5b2d0e7ebc9 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= pan-0.14.2 @@ -25,7 +25,7 @@ LIBS+= -lcompat .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/gnet/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/parallel/linda/Makefile b/parallel/linda/Makefile index f591801b686..b9f4f7316eb 100644 --- a/parallel/linda/Makefile +++ b/parallel/linda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:04 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= linda-0.1.1 @@ -14,5 +14,5 @@ GNU_CONFIGURE= # defined USE_LIBTOOL= # defined .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 029ed64ffb3..8bfe9cd0903 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:09 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= ggv-2.8.4 @@ -24,7 +24,7 @@ GCONF2_SCHEMAS= ggv.schemas .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/print/glabels/Makefile b/print/glabels/Makefile index cb26cd65efe..676eed77d68 100644 --- a/print/glabels/Makefile +++ b/print/glabels/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:28 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:55 wiz Exp $ # DISTNAME= glabels-2.0.2 @@ -18,7 +18,7 @@ USE_TOOLS+= gmake .include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile index e28d135c190..9680d303a54 100644 --- a/print/gpdf/Makefile +++ b/print/gpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:09 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= gpdf-2.10.0 @@ -27,7 +27,7 @@ GCONF2_SCHEMAS= gpdf.schemas .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/print/imposter/Makefile b/print/imposter/Makefile index 969c4c8f2ca..1478404ba89 100644 --- a/print/imposter/Makefile +++ b/print/imposter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:09 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= imposter-0.2 @@ -17,6 +17,6 @@ USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile index 3be8af93430..6c476a93b1f 100644 --- a/print/libgnomecups/Makefile +++ b/print/libgnomecups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:08 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= libgnomecups-0.2.0 @@ -16,7 +16,7 @@ PKGCONFIG_OVERRIDE= libgnomecups-1.0.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/cups/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 4a501e35477..9e84fb99ea4 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/06/01 18:03:20 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= libgnomeprint-2.10.3 @@ -52,7 +52,7 @@ PRINT_PLIST_AWK+= /cups/ { print "$${USE_CUPS}" $$0; next; } .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile index ec7da66f871..df8783ce4ab 100644 --- a/print/libgnomeprintui/Makefile +++ b/print/libgnomeprintui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/06/01 18:03:20 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= libgnomeprintui-2.10.2 @@ -28,7 +28,7 @@ BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.10.2 .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index f3ca7151840..d6a539846db 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:11 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= gnome-keyring-0.4.2 @@ -20,6 +20,6 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 38d3effc831..576af17b77a 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:11 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= gpa-0.7.0 @@ -13,7 +13,7 @@ COMMENT= GUI frontend to gnupg GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gpass/Makefile b/security/gpass/Makefile index 3f0ef31118b..b6ee0bc4615 100644 --- a/security/gpass/Makefile +++ b/security/gpass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:12 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= gpass-0.4.4 @@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= YES .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index 9d5e0d7fbb5..571fe678732 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:12 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:56 wiz Exp $ DISTNAME= gsasl-0.2.5 CATEGORIES= security @@ -26,7 +26,7 @@ PKGCONFIG_OVERRIDE+= libgsasl.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" .include "../../devel/libntlm/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/gss/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/security/gss/Makefile b/security/gss/Makefile index b36523e4e23..a00ec63bd08 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:12 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= gss-0.0.15 @@ -19,5 +19,5 @@ PKGCONFIG_OVERRIDE+= gss.pc.in INFO_FILES= gss.info -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/hydra/Makefile b/security/hydra/Makefile index b59ab72be1f..2110dd82cbd 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/06/17 03:50:32 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= ${PKGNAME}-src @@ -42,7 +42,7 @@ PKG_SUPPORTED_OPTIONS= gtkfe .if !empty(PKG_OPTIONS:Mgtkfe) -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" post-configure: diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 9351ed34d31..2c52e5b86d9 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:21 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:56 wiz Exp $ DISTNAME= seahorse-0.7.8 CATEGORIES= security @@ -32,7 +32,7 @@ BUILDLINK_DEPENDS.gpgme+= gpgme>=1.0.1nb2 .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/libsoup-devel/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 5ccd7fc6b69..a8ec12faad4 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:20 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= xmlsec1-1.2.6 @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes #CONFIGURE_ARGS+= --without-openssl CONFIGURE_ARGS+= --without-gnutls -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" #.include "../../security/gnutls/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common index b62b59f5bfc..50251bcf3e8 100644 --- a/sysutils/dbus/Makefile.common +++ b/sysutils/dbus/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:56 wiz Exp $ # # XXX Do not update to 0.30 or above yet. The API in the 0.2x series is @@ -78,5 +78,5 @@ BUILDLINK_DEPENDS.dbus+= dbus>=${DBUS_VERSION} . include "../../sysutils/dbus/buildlink3.mk" .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile index bb190a48ed2..97b189a61da 100644 --- a/sysutils/desktop-file-utils/Makefile +++ b/sysutils/desktop-file-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:23 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:56 wiz Exp $ # DISTNAME= desktop-file-utils-0.10 @@ -29,6 +29,6 @@ PRINT_PLIST_AWK+= /^share\/applications\/mimeinfo.cache$$/ \ next; } .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile index 6afd6ae5c4d..96b8e95de5a 100644 --- a/sysutils/gkrellm-server/Makefile +++ b/sysutils/gkrellm-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/21 04:10:18 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:57 wiz Exp $ .include "../../sysutils/gkrellm/Makefile.common" PKGREVISION= # empty1 @@ -43,6 +43,6 @@ MAKE_ENV+= USE_GLIB12=yes .else .include "../../devel/glib2/buildlink3.mk" .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index a5768a0e2b8..6d163dd696b 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/07/21 16:29:57 wiz Exp $ .include "Makefile.common" PKGREVISION= # empty1 @@ -35,7 +35,7 @@ post-install: .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile index 36a7f23069e..b8ca0ac9414 100644 --- a/sysutils/gnome-menus/Makefile +++ b/sysutils/gnome-menus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= gnome-menus-2.10.1 @@ -41,7 +41,7 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index 1ff9d23c099..f0f5c580614 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:24 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= gnome-pkgview-1.0.6 @@ -22,7 +22,7 @@ GCONF2_SCHEMAS= gnome-pkgview.schemas .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 7ec3c0c30ce..e655cfd840a 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:57 wiz Exp $ DISTNAME= gnome-vfs-1.0.5 PKGREVISION= 8 @@ -27,7 +27,7 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=yes .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/gnome-mime-data/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/GConf/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index 3cbeb4f13f0..3861588d9b3 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/06/17 03:50:34 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= gnome-vfs-2.10.1 @@ -88,5 +88,5 @@ do-install: ${PREFIX}/lib/gnome-vfs-2.0/modules .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/sysutils/gnome-vfsmm26/Makefile b/sysutils/gnome-vfsmm26/Makefile index ff4aab9f5f4..a1b5f8f129a 100644 --- a/sysutils/gnome-vfsmm26/Makefile +++ b/sysutils/gnome-vfsmm26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:32 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= gnome-vfsmm-2.6.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../devel/glibmm24/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile index c246e39885f..3ac27089a97 100644 --- a/sysutils/gnome2-system-monitor/Makefile +++ b/sysutils/gnome2-system-monitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/01 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= gnome-system-monitor-2.10.1 @@ -30,7 +30,7 @@ pre-configure: .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/libgtop2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile index f8c97c534b4..03171910a9c 100644 --- a/sysutils/gtk-send-pr/Makefile +++ b/sysutils/gtk-send-pr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= gtk-send-pr-0.4.5 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.energyhq.es.eu.org/gtk-send-pr.html COMMENT= GTK+ based problem report tool -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mail/libesmtp/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile index 363ad4b6e0c..14549562bb7 100644 --- a/sysutils/idesk/Makefile +++ b/sysutils/idesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/09 21:09:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= idesk-0.7.2 @@ -19,7 +19,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/idesk ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/idesk -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile index 7a80110652b..114f61b0a19 100644 --- a/sysutils/libgtop2/Makefile +++ b/sysutils/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:20 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/21 16:29:57 wiz Exp $ DISTNAME= libgtop-2.10.1 PKGNAME= ${DISTNAME:S/-/2-/} @@ -98,6 +98,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile index 90bb95be63f..09e1cf6499e 100644 --- a/sysutils/mc/Makefile +++ b/sysutils/mc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2005/06/23 17:10:28 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2005/07/21 16:29:57 wiz Exp $ DISTNAME= mc-4.6.1-pre4 PKGNAME= mc-4.6.1rc4.1 @@ -44,5 +44,5 @@ PLIST_SRC+= ${PKGDIR}/PLIST.end .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 9276da0fc25..c2d47765f95 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= nautilus-cd-burner-2.10.1 @@ -42,7 +42,7 @@ GCONF2_SCHEMAS= ncb.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index 0d3676efc2f..9b975694b9a 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/06/04 22:05:56 jmmv Exp $ +# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= nautilus-2.10.1 @@ -37,7 +37,7 @@ BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile index 169660934a2..5f7a4e824a3 100644 --- a/sysutils/rox-session/Makefile +++ b/sysutils/rox-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= ROX-Session-0.1.14 @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes INSTALLATION_DIRS= libexec/rox share/rox -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile index 03a1f0f56f0..cbc0086b092 100644 --- a/sysutils/rox/Makefile +++ b/sysutils/rox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:57 wiz Exp $ # DISTNAME= rox-2.2.0 @@ -52,7 +52,7 @@ do-install: ${PREFIX}/share/mime/packages .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile index 830a413e986..50be338cec1 100644 --- a/sysutils/vcdimager-devel/Makefile +++ b/sysutils/vcdimager-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= vcdimager-0.7.22 @@ -22,7 +22,7 @@ BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver .endif .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 8a8d88cfaef..5e49e00d500 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/07/19 10:12:14 grant Exp $ +# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:58 wiz Exp $ DISTNAME= xcdroast-0.98alpha15 PKGNAME= xcdroast-0.98a15 @@ -51,7 +51,7 @@ post-install: done) .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index 902c84efe68..86335d49a59 100644 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/13 20:09:32 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= enchant-1.1.6 @@ -16,6 +16,6 @@ GNU_CONFIGURE= yes CFLAGS.SunOS+= -D__EXTENSIONS__ .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index f0a54c7721b..fed9f85b02d 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/19 21:08:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= gnome-doc-utils-0.2.0 @@ -30,7 +30,7 @@ PYTHON_PATCH_SCRIPTS+= xml2po/xml2po.py BUILDLINK_DEPMETHOD.libxslt?= build BUILDLINK_DEPMETHOD.libxml2?= build -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile index af720a8e557..390cb00fc44 100644 --- a/textproc/gnome-spell/Makefile +++ b/textproc/gnome-spell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:34 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:58 wiz Exp $ DISTNAME= gnome-spell-1.0.6 CATEGORIES= textproc gnome @@ -22,7 +22,7 @@ BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3 .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 8adb79d63a0..ad7db88e773 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:23 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:58 wiz Exp $ DISTNAME= gtkspell-2.0.10 CATEGORIES= textproc devel @@ -20,7 +20,7 @@ SUBST_FILES.subdir= Makefile.in SUBST_SED.subdir= -e 's|SUBDIRS = gtkspell examples docs|SUBDIRS = gtkspell|' .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 4dfd851a0b5..0ccc5aba200 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:23 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= libcroco-0.6.0 @@ -23,6 +23,6 @@ CONFIGURE_ARGS+= --enable-layeng=yes .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile index 2bf7e1f1263..2ff17d17b2b 100644 --- a/time/evolution-webcal/Makefile +++ b/time/evolution-webcal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= evolution-webcal-2.2.1 @@ -20,7 +20,7 @@ GCONF2_SCHEMAS= evolution-webcal.schemas .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../net/libsoup-devel/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile index b7cb8f0deb7..6eac6cfa9b2 100644 --- a/time/gnotime/Makefile +++ b/time/gnotime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/26 18:45:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:58 wiz Exp $ DISTNAME= gnotime-2.2.1 PKGREVISION= 1 @@ -23,7 +23,7 @@ GCONF2_SCHEMAS= gnotime.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile index 816dfd82d64..b1f4369472e 100644 --- a/time/gtodo-applet/Makefile +++ b/time/gtodo-applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:44 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= gtodo-applet-0.1 @@ -19,6 +19,6 @@ USE_LIBTOOL= YES .include "../../devel/GConf2/schemas.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile index 02088ba4fa5..6625edf54be 100644 --- a/time/gtodo/Makefile +++ b/time/gtodo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= gtodo-0.14 @@ -20,7 +20,7 @@ GCONF2_SCHEMAS= gtodo.schemas .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile index 3cd2c43baf1..5a544deba8a 100644 --- a/wm/e16menuedit2/Makefile +++ b/wm/e16menuedit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= e16menuedit2-0.0.1 @@ -23,7 +23,7 @@ pre-configure: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile index 8de7dbb477a..470be170f4a 100644 --- a/wm/matchbox/Makefile +++ b/wm/matchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:25 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= matchbox-window-manager-0.9.3 @@ -25,7 +25,7 @@ post-install: ${PREFIX}/share/examples/matchbox/ .include "../../devel/libmatchbox/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index 58e24d68e00..c1f5f4c2abb 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/06/29 08:41:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= metacity-2.10.2 @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --disable-xinerama .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile index 5f7ef5d665f..a8f94cfd9de 100644 --- a/wm/obconf/Makefile +++ b/wm/obconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:58 wiz Exp $ DISTNAME= obconf-1.5 PKGREVISION= 5 @@ -16,6 +16,6 @@ GNU_CONFIGURE= YES .include "../../wm/openbox/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index 63035d07515..fc7b264ec17 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:25 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:58 wiz Exp $ DISTNAME= openbox-3.2 PKGREVISION= 1 @@ -32,7 +32,7 @@ CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile index 7326a07ca8a..2624695b87b 100644 --- a/wm/openbox2/Makefile +++ b/wm/openbox2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:25 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= openbox-2.2.3 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES CPPFLAGS+= -DHAVE_STRFTIME=1 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/selectwm/Makefile b/wm/selectwm/Makefile index 9017ab1f6ae..e041f4ccc20 100644 --- a/wm/selectwm/Makefile +++ b/wm/selectwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/04/15 12:42:40 agc Exp $ +# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= selectwm-0.4.1 @@ -13,5 +13,5 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes .include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile index ee30a4756ba..d5810a823d7 100644 --- a/wm/skippy/Makefile +++ b/wm/skippy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:25 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= skippy-0.5.0 @@ -18,7 +18,7 @@ INSTALLATION_DIRS= share/examples/${PKGBASE} post-install: ${INSTALL_DATA} ${WRKSRC}/skippyrc-default ${EGDIR}/skippyrc -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile index a3f1328deb3..11f4d189ed1 100644 --- a/wm/waimea/Makefile +++ b/wm/waimea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:24 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= waimea-0.4.0 @@ -34,7 +34,7 @@ REPLACE_PERL = \ data/scripts/procinfo.pl \ data/scripts/stylesdir.pl.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile index 9a4d96c5a89..429387eaa32 100644 --- a/wm/windowlab/Makefile +++ b/wm/windowlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:26 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:58 wiz Exp $ # DISTNAME= windowlab-1.12 @@ -23,7 +23,7 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/menurc.sample ${EGDIR}/menurc.default -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmctrl/Makefile b/wm/wmctrl/Makefile index 0bcc9c40742..65a6b81bca2 100644 --- a/wm/wmctrl/Makefile +++ b/wm/wmctrl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:26 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:58 wiz Exp $ DISTNAME= wmctrl-1.05 PKGREVISION= 1 @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile index 3997eacf56a..9e573a9a60c 100644 --- a/www/ap2-transform/Makefile +++ b/www/ap2-transform/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:51 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= mod_transform-0.4.0 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../www/apache2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index ca10fc19ade..a9b7fd39e47 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2005/06/25 00:48:26 kristerw Exp $ +# $NetBSD: Makefile,v 1.55 2005/07/21 16:29:59 wiz Exp $ DISTNAME= bluefish-1.0 PKGREVISION= 2 @@ -30,7 +30,7 @@ CONFIGURE_ENV+= EXTERNAL_FIND="${TOOLS_FIND}" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/aspell/buildlink3.mk" diff --git a/www/drivel/Makefile b/www/drivel/Makefile index 94e0a5f2a1c..3e96a2822ab 100644 --- a/www/drivel/Makefile +++ b/www/drivel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/26 16:55:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= drivel-2.0.1 @@ -27,7 +27,7 @@ BUILDLINK_DEPENDS.curl+= curl>=7.14.0nb1 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index db927833616..409bdcdd39b 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/13 09:55:50 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= epiphany-extensions-1.6.4 @@ -38,7 +38,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/opensp/buildlink3.mk" diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 435b18c3b0a..7df4e74f9db 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/07/21 13:11:42 dillo Exp $ +# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= epiphany-1.6.4 @@ -59,7 +59,7 @@ BUILDLINK_DEPENDS.pango+= pango>=1.8.0 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 36898d724b5..36fd7a536e0 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2005/07/21 13:11:43 dillo Exp $ +# $NetBSD: Makefile,v 1.82 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= galeon-1.3.21 @@ -43,7 +43,7 @@ CONF_FILES= ${EGDIR}/sound/events/galeon.soundlist \ .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/www/gtkhtml30/Makefile b/www/gtkhtml30/Makefile index 273b6dc5eeb..389d08ef5fc 100644 --- a/www/gtkhtml30/Makefile +++ b/www/gtkhtml30/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= gtkhtml-3.0.10 @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes .include "../../devel/gail/buildlink3.mk" .include "../../devel/gal20/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/gtkhtml36/Makefile b/www/gtkhtml36/Makefile index 536d1e20d0a..a5320717f4c 100644 --- a/www/gtkhtml36/Makefile +++ b/www/gtkhtml36/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= gtkhtml-3.6.2 @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index dd4e9cebf73..1e6358d6634 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:26 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= libgtkhtml-2.6.3 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in .include "../../devel/gail/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/www/liferea/Makefile b/www/liferea/Makefile index 9b37bb86fe4..c631cd7c59b 100644 --- a/www/liferea/Makefile +++ b/www/liferea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:26 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/07/21 16:29:59 wiz Exp $ DISTNAME= liferea-0.6.4 CATEGORIES= www @@ -21,7 +21,7 @@ GCONF2_SCHEMAS= liferea.schemas .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../www/libgtkhtml/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 0ff8a184ac2..f00281b91d6 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.59 2005/07/16 01:19:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.60 2005/07/21 16:29:59 wiz Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -54,7 +54,7 @@ UNLIMIT_RESOURCES= datasize memorysize stacksize .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .ifdef _MOZILLA_USE_GTK2 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs @@ -185,7 +185,7 @@ CONFIGURE_ARGS+= --with-pthreads .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h) CONFIGURE_ARGS+= --enable-xft # pkgconfig defaults to a "build" dependency, which is what we want. -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .endif diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile index 6db7d599c90..55d3f6af21a 100644 --- a/x11/Xcomposite/Makefile +++ b/x11/Xcomposite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:27 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= libXcomposite-1.0.1 @@ -20,5 +20,5 @@ PKGCONFIG_OVERRIDE+= xcomposite.pc.in .include "../../x11/Xfixes/buildlink3.mk" .include "../../x11/compositeext/buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 8c3f38735ce..4a86d8899f5 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:27 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= libXfixes-2.0.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xfixes.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile index f257662cb32..fdf8d13bc2f 100644 --- a/x11/Xrandr-mixedcase/Makefile +++ b/x11/Xrandr-mixedcase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/09 02:38:43 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= libXrandr-1.0.2 @@ -25,6 +25,6 @@ BUILDLINK_DEPENDS.randrext+= randrext>=1.0 .include "../../x11/Xrender/buildlink3.mk" .include "../../x11/randrext/buildlink3.mk" .include "../../x11/xextensions/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile index fcd049f2317..1989f814c09 100644 --- a/x11/Xrender/Makefile +++ b/x11/Xrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/06 19:08:56 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:59 wiz Exp $ DISTNAME= libXrender-0.8.4 PKGNAME= ${DISTNAME:S/lib//} @@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE= xrender.pc.in BUILDLINK_DEPENDS.render+= render>=0.8 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/render/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile index 6b20579abea..931b79ecfd9 100644 --- a/x11/compositeext/Makefile +++ b/x11/compositeext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:59 wiz Exp $ # DISTNAME= compositeext-2.0 @@ -18,5 +18,5 @@ PKGCONFIG_OVERRIDE+= compositeext.pc.in .include "../../x11/fixesext/buildlink3.mk" .include "../../x11/xextensions/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile index e5f38d6555f..949acbc9265 100644 --- a/x11/devilspie/Makefile +++ b/x11/devilspie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:27 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/07/21 16:30:00 wiz Exp $ DISTNAME= devilspie-0.10 CATEGORIES= x11 @@ -23,7 +23,7 @@ post-install: .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile index 8eee0060226..65f2f1be0c0 100644 --- a/x11/fbdesk/Makefile +++ b/x11/fbdesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= fbdesk-1.2.1 @@ -20,5 +20,5 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index a73005344c0..773f5bf9d17 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= fixesext-2.0.1 @@ -16,6 +16,6 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= fixesext.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index bdefafab9d8..c8ddc9d73a2 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2005/07/13 13:11:57 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gdm-2.8.0.0 @@ -121,7 +121,7 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 1c67cbc22c6..7b5858479a6 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-desktop-2.10.2 @@ -23,7 +23,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../graphics/gnome2-pixmaps/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index 9e003accbea..03a5be54144 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-mag-0.12.0 @@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index c3070ecc5e2..62a8df4c04c 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.55 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-panel-2.10.2 @@ -44,7 +44,7 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.5.0 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 6e13f1e35fa..75ea6d71148 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.53 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-session-2.10.0 @@ -40,7 +40,7 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.3nb1 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/buildlink3.mk" diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile index 2529a71bd7b..0d8c628c6ce 100644 --- a/x11/gnome-themes-extras/Makefile +++ b/x11/gnome-themes-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-themes-extras-0.8.1 @@ -27,7 +27,7 @@ BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk2-engines/buildlink3.mk" diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index 07724e1779d..3c440989cd3 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-themes-2.10.1 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../wm/metacity/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index 52359b65abd..9eb2b5fdabd 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-applets-2.10.1 @@ -80,7 +80,7 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/gucharmap/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../multimedia/gstreamer/buildlink3.mk" diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 629682d24d6..b148f2c1ced 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= control-center-2.10.1 @@ -51,7 +51,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index c0e806ef35a..8eb0a69e1b1 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnome-terminal-2.10.0 @@ -29,7 +29,7 @@ BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index 23e11f8c457..8f6e4bc7093 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/06/01 19:46:17 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gnopernicus-0.10.6 @@ -59,7 +59,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.4.1 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile index 54645636ba2..50b21b75397 100644 --- a/x11/gromit/Makefile +++ b/x11/gromit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/06/17 03:50:44 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gromit-20041213 @@ -16,6 +16,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gromit ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gromit -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile index 716c5b1c587..f267ce771a5 100644 --- a/x11/gtk-thinice-engine/Makefile +++ b/x11/gtk-thinice-engine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gtk-thinice-engine-2.0.2 @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= gtk-thinice-engine-2.pc.in .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile index 99807c9d8b5..ef91ff70310 100644 --- a/x11/gtk2-chtheme/Makefile +++ b/x11/gtk2-chtheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:27 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gtk-chtheme-0.3.1 @@ -14,6 +14,6 @@ COMMENT= GTK+2 theme changer with preview USE_TOOLS+= gmake perl REPLACE_PERL= replace -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile index d7f7a7d311c..00459d681ab 100644 --- a/x11/gtk2-engines-bluecurve/Makefile +++ b/x11/gtk2-engines-bluecurve/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= GTK2-Wonderland-Engine-1.0 @@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR}/Bluecurve SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index 9b5b19cceea..84ae368d843 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:29 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/21 16:30:00 wiz Exp $ DISTNAME= gtk-engines-2.6.3 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -23,6 +23,6 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile index a208a2f2e66..72c7e901de0 100644 --- a/x11/gtk2-theme-switch/Makefile +++ b/x11/gtk2-theme-switch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:44 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gtk-theme-switch-2.0.0rc2 @@ -22,6 +22,6 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/switch.1 \ ${PREFIX}/man/man1/gtk2-theme-switch.1 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 27723db685c..8c140dc968b 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/06/26 19:43:54 jmmv Exp $ +# $NetBSD: Makefile,v 1.87 2005/07/21 16:30:00 wiz Exp $ # DISTNAME= gtk+-2.6.8 @@ -76,7 +76,7 @@ _BUILDING_GTK2= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile index fc380614de3..a6bc3a5a281 100644 --- a/x11/gtkglarea2/Makefile +++ b/x11/gtkglarea2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= gtkglarea-1.99.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-lib-GL CONFIGURE_ARGS+= --with-GL-prefix=${BUILDLINK_PREFIX.MesaLib} -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index b65dab3e7f4..4d674f7007f 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= gtkmm-2.2.12 @@ -22,6 +22,6 @@ PKGCONFIG_OVERRIDE+= gtk/gtkmm-2.0.pc.in PKGCONFIG_OVERRIDE+= pango/pangomm-1.0.pc.in .include "../../devel/libsigc++/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile index 15b26115db9..3da26d29068 100644 --- a/x11/gtkmm24/Makefile +++ b/x11/gtkmm24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/07/21 16:30:01 wiz Exp $ DISTNAME= gtkmm-2.4.8 PKGNAME= gtkmm24-2.4.8 @@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= pango/pangomm-1.4.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glibmm24/buildlink3.mk" .include "../../devel/libsigc++2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile index f370b2b9b11..c087961cc29 100644 --- a/x11/gtksourceview/Makefile +++ b/x11/gtksourceview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= gtksourceview-1.2.0 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile index c8a876dd740..c4aa56c55c5 100644 --- a/x11/gtkterm2/Makefile +++ b/x11/gtkterm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:29 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:30:01 wiz Exp $ DISTNAME= gtkterm2-0.2.3 CATEGORIES= x11 @@ -12,7 +12,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index ec71459c247..3c62d2fc868 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/06/16 01:11:04 markd Exp $ +# $NetBSD: Makefile,v 1.84 2005/07/21 16:30:01 wiz Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 1 @@ -155,7 +155,7 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE' .if ${OPSYS} != "SunOS" .include "../../devel/libusb/buildlink3.mk" .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile index 229d74e5b84..ba75f68e2ba 100644 --- a/x11/lablgtk2/Makefile +++ b/x11/lablgtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/01 21:00:26 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= lablgtk-2.4.0 @@ -17,7 +17,7 @@ BUILDLINK_DEPMETHOD.ocaml= full .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 95c30262834..ccee65127b2 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:29 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= libxklavier-2.0 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --enable-xmm-support BUILDLINK_TRANSFORM+= rm:-Werror -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile index c756ae9076b..2e623c18a8a 100644 --- a/x11/libzvt/Makefile +++ b/x11/libzvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:29 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= libzvt-2.0.1 @@ -18,6 +18,6 @@ PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in .include "../../graphics/libart2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index c01dab5509a..044ad89af8c 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/14 02:28:08 hira Exp $ +# $NetBSD: Makefile,v 1.36 2005/07/21 16:30:01 wiz Exp $ DISTNAME= mlterm-2.9.2 PKGREVISION= 1 @@ -46,7 +46,7 @@ SUBST_SED.link= -e 's|(LIBTOOL_LINK).*(LIBS)|& -R${X11BASE}/lib|g' \ -e 's|/usr/local/|${PREFIX}/|g' \ -e 's|/usr/X11R6/|${X11BASE}/|g' -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile index 104d1b8fb5a..0a89952f74e 100644 --- a/x11/py-gnome2-extras/Makefile +++ b/x11/py-gnome2-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/03 13:19:19 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= gnome-python-extras-2.10.1 @@ -22,7 +22,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../www/libgtkhtml/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index b4762a2cfe5..bf8dc561491 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/06 07:04:57 reed Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= gnome-python-2.10.0 @@ -28,7 +28,7 @@ BUILDLINK_DEPENDS.GConf2+= GConf2>=2.9.0 .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1 .include "../../net/py-ORBit/buildlink3.mk" diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile index b62c0bfe4e0..7487d3139b5 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= pygtk-2.6.2 @@ -23,7 +23,7 @@ USE_TOOLS+= gmake PYTHON_VERSIONS_ACCEPTED= 24 23 .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../math/py-Numeric/buildlink3.mk" diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile index 61ab774a2b3..2b3dc139d74 100644 --- a/x11/py-wxWidgets/Makefile +++ b/x11/py-wxWidgets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= wxPythonSrc-2.4.2.4 @@ -34,7 +34,7 @@ PYSETUPBUILDARGS= NO_SCRIPTS=1 ${WXARG} PYSETUPINSTALLARGS= NO_SCRIPTS=1 ${WXARG} PYBINMODULE= yes -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 6a339a59bd5..9a92b16a026 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:31 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:01 wiz Exp $ DISTNAME= startup-notification-0.8 CATEGORIES= x11 gnome @@ -22,6 +22,6 @@ post-install: doc/startup-notification.txt \ ${PREFIX}/share/doc/startup-notification/ -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/vte/Makefile b/x11/vte/Makefile index a4a8ea62975..47356b8f5e4 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/07 13:30:07 markd Exp $ +# $NetBSD: Makefile,v 1.23 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= vte-0.11.13 @@ -31,7 +31,7 @@ BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1.93 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index 745495d0608..9c3608ca303 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/06/11 17:17:56 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= wxGTK-2.4.2 @@ -45,7 +45,7 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile index 83018f184f6..1185907e7c1 100644 --- a/x11/xcompmgr/Makefile +++ b/x11/xcompmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:32 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= xcompmgr-1.1.1 @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes PKG_SKIP_REASON+= "This package is exclusively for X.org." .endif -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/Xcomposite/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" .include "../../x11/compositeext/buildlink3.mk" diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile index 7f756483cc7..acf8e952b2d 100644 --- a/x11/xcursor/Makefile +++ b/x11/xcursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:32 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= libXcursor-1.1.2 @@ -21,7 +21,7 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/Xfixes/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile index 413e1d8ecd6..89f6b12fb22 100644 --- a/x11/xscreensaver-demo/Makefile +++ b/x11/xscreensaver-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/28 10:03:14 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/21 16:30:01 wiz Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} @@ -24,7 +24,7 @@ post-install: ${PREFIX}/man/man1/xscreensaver-demo.1 .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/xscreensaver/buildlink3.mk" diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 01adede0eaa..42b7e239726 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:33 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/07/21 16:30:01 wiz Exp $ # DISTNAME= zenity-2.10.0 @@ -24,7 +24,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" |