diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-02-14 18:26:26 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-02-14 18:26:26 +0000 |
| commit | 4932fab3f227fbfbad27ff0bca77400f0c3397fe (patch) | |
| tree | c1e08f830ccc454388579e8a5bb683d354ff965d | |
| parent | df1553a4f0d66bbe0583c891b890ae9e33fd1398 (diff) | |
| download | pkgsrc-4932fab3f227fbfbad27ff0bca77400f0c3397fe.tar.gz | |
PKGCONFIG_OVERRIDE is relative to WRKSRC.
105 files changed, 252 insertions, 252 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 5664529782d..41d1071f514 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/02/14 17:21:32 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2004/02/14 18:26:26 jmmv Exp $ DISTNAME= esound-0.2.32 CATEGORIES= audio @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/esound.pc.in +PKGCONFIG_OVERRIDE= esound.pc.in GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile index a6bc4920bad..2149bb6724d 100644 --- a/audio/gnome-speech/Makefile +++ b/audio/gnome-speech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:32 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 18:26:26 jmmv Exp $ # DISTNAME= gnome-speech-0.2.8 @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gtk-doc -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-speech-1.0.pc.in +PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in .include "../../devel/libbonobo/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common index 75d37821edb..5c6576362b1 100644 --- a/audio/libao/Makefile.common +++ b/audio/libao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2004/02/14 17:21:33 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= libao-0.8.4 CATEGORIES= audio devel @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/ao.pc.in +PKGCONFIG_OVERRIDE+= ao.pc.in .include "../../mk/bsd.prefs.mk" diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index 6a8034155c5..5fbbafca683 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:33 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= audiofile-0.2.5 PKGNAME= lib${DISTNAME} @@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/audiofile.pc.in +PKGCONFIG_OVERRIDE= audiofile.pc.in DOCDIR= ${PREFIX}/share/doc/libaudiofile diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile index 4e24d1ef343..a464aba34c2 100644 --- a/audio/libcddb/Makefile +++ b/audio/libcddb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:33 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= libcddb-0.9.4 @@ -12,7 +12,7 @@ COMMENT= Library to access data on a CDDB server USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcddb.pc.in +PKGCONFIG_OVERRIDE+= libcddb.pc.in GNU_CONFIGURE= yes .include "../../misc/libcdio/buildlink3.mk" diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index 137d60a46a9..c5928bc5806 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:33 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= libogg-1.1 CATEGORIES= devel audio @@ -18,7 +18,7 @@ GCC_REQD+= 2.95.3 PLIST_SUBST+= DISTNAME=${DISTNAME} -PKGCONFIG_OVERRIDE+= ${WRKSRC}/ogg.pc.in +PKGCONFIG_OVERRIDE+= ogg.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index d0ba5b087ef..1008cfd9504 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:33 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= libvorbis-1.0.1 CATEGORIES= devel audio @@ -14,9 +14,9 @@ USE_LIBTOOL= YES GCC_REQD+= 2.95.3 -PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbis.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbisenc.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbisfile.pc.in +PKGCONFIG_OVERRIDE+= vorbis.pc.in +PKGCONFIG_OVERRIDE+= vorbisenc.pc.in +PKGCONFIG_OVERRIDE+= vorbisfile.pc.in .include "../../audio/libogg/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index d89e480b338..910b27bd38f 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:33 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= streamtuner-${DIST_VER} @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/extras/streamtuner.pc.in +PKGCONFIG_OVERRIDE= extras/streamtuner.pc.in DIST_VER= 0.10.2 diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index 8e4ee8497b9..622c02b168d 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:35 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= fribidi-0.10.4 @@ -14,7 +14,7 @@ USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/fribidi.pc.in +PKGCONFIG_OVERRIDE= fribidi.pc.in TEST_TARGET= check diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 54124db5e7d..8402ed69d9d 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:35 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= wv-1.0.0 @@ -17,7 +17,7 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/wv-1.0.pc.in +PKGCONFIG_OVERRIDE+= wv-1.0.pc.in MAKEFILE= GNUmakefile diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile index 2a7cd480bf3..6a2f87770ca 100644 --- a/databases/dbh/Makefile +++ b/databases/dbh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:35 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= dbh_1.0-15 PKGNAME= dbh-1.0.15 @@ -12,7 +12,7 @@ COMMENT= Library to create disk based Hashtables GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/src/dbh-1.0.pc.in +PKGCONFIG_OVERRIDE= src/dbh-1.0.pc.in post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dbh diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile index 23e24db06dd..b7fac449793 100644 --- a/databases/gnome-mime-data/Makefile +++ b/databases/gnome-mime-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/11 00:48:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= gnome-mime-data-2.4.1 @@ -21,7 +21,7 @@ USE_PKGLOCALEDIR= YES USE_PERL5= build GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-mime-data-2.0.pc.in +PKGCONFIG_OVERRIDE= gnome-mime-data-2.0.pc.in CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}" diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index ff474065984..85efa63d5a5 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/23 13:24:39 xtraeme Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 18:26:27 jmmv Exp $ # .include "Makefile.common" @@ -7,7 +7,7 @@ PKGREVISION= 2 COMMENT= GNU Database access library -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgda.pc.in +PKGCONFIG_OVERRIDE= libgda.pc.in .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 30d6663a4ce..568132b0e13 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= libgnomedb-1.0.0 @@ -21,7 +21,7 @@ USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomedb.pc.in +PKGCONFIG_OVERRIDE= libgnomedb.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile index 6a2fe355503..b973805d610 100644 --- a/databases/libpqxx/Makefile +++ b/databases/libpqxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:35 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:27 jmmv Exp $ # .include "../../databases/libpqxx/Makefile.common" @@ -11,7 +11,7 @@ USE_LANGUAGES= c c++ USE_BUILDLINK2= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libpqxx.pc.in +PKGCONFIG_OVERRIDE+= libpqxx.pc.in GNU_CONFIGURE= yes PG_PREFIX= ${BUILDLINK_PREFIX.postgresql-lib} diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index ee2b3b8d611..9312607b89e 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= GConf-1.0.9 @@ -20,7 +20,7 @@ USE_X11BASE= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf.pc.in +PKGCONFIG_OVERRIDE= gconf.pc.in CPPFLAGS+= -I${BUILDLINK_PREFIX.db3}/include/db3 PLIST_SUBST+= LOCALBASE=${LOCALBASE} diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index e447b28c5d3..1d57a27f9ee 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile.common,v 1.16 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= GConf-2.4.0.1 @@ -23,7 +23,7 @@ USE_LIBTOOL= yes USE_GNU_TOOLS+= make USE_PERL5= build -PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf-2.0.pc.in +PKGCONFIG_OVERRIDE= gconf-2.0.pc.in PKG_SYSCONFSUBDIR= gconf diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile index 7e926002327..8432e39c481 100644 --- a/devel/at-spi/Makefile +++ b/devel/at-spi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= at-spi-1.3.9 @@ -21,8 +21,8 @@ USE_X11= yes CONFIGURE_ARGS+= --disable-gtk-doc -PKGCONFIG_OVERRIDE+= ${WRKSRC}/cspi-1.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libspi-1.0.pc.in +PKGCONFIG_OVERRIDE+= cspi-1.0.pc.in +PKGCONFIG_OVERRIDE+= libspi-1.0.pc.in .include "../../devel/atk/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" diff --git a/devel/atk/Makefile b/devel/atk/Makefile index b303d2a0b09..c2b63c90345 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= atk-1.4.1 @@ -15,7 +15,7 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/atk.pc.in +PKGCONFIG_OVERRIDE= atk.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir="${LOCALBASE}/share/doc/html" diff --git a/devel/blib/Makefile b/devel/blib/Makefile index 3839d4be53b..98bd9263646 100644 --- a/devel/blib/Makefile +++ b/devel/blib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= blib-1.0.2 @@ -15,9 +15,9 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES SHLIBTOOL_OVERRIDE= modules/libtool -PKGCONFIG_OVERRIDE+= ${WRKSRC}/blib-directfb.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/blib-gtk.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/blib.pc.in +PKGCONFIG_OVERRIDE+= blib-directfb.pc.in +PKGCONFIG_OVERRIDE+= blib-gtk.pc.in +PKGCONFIG_OVERRIDE+= blib.pc.in CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 69652850f13..75a4fed6295 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2004/02/14 17:21:36 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= bonobo-1.0.18 @@ -25,7 +25,7 @@ CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" CONFIGURE_ENV+= X11BASE="${X11BASE}" CONFIGURE_ARGS+= --enable-gtk-doc=no -PKGCONFIG_OVERRIDE= ${WRKSRC}/libefs/libefs.pc.in +PKGCONFIG_OVERRIDE= libefs/libefs.pc.in post-install: -@${RMDIR} ${PREFIX}/share/libefs/html/libefs diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index c5ec3afc61e..064e649b31f 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:37 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= eel-2.4.1 @@ -21,7 +21,7 @@ USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/eel-2.0.pc.in +PKGCONFIG_OVERRIDE= eel-2.0.pc.in .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile index 473cf9e9971..eee451b0a8f 100644 --- a/devel/gal2/Makefile +++ b/devel/gal2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:37 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= gal-1.99.10 @@ -18,7 +18,7 @@ USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes BUILD_USES_MSGFMT= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gal-2.0.pc.in +PKGCONFIG_OVERRIDE+= gal-2.0.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index 3be07e0d66f..c70d8181c1d 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:37 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= gconfmm-2.0.1 @@ -15,8 +15,8 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make -PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf/gconfmm-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gconf/gconfmm-2.0-uninstalled.pc.in +PKGCONFIG_OVERRIDE= gconf/gconfmm-2.0.pc.in +PKGCONFIG_OVERRIDE+= gconf/gconfmm-2.0-uninstalled.pc.in .include "../../devel/GConf2/buildlink2.mk" .include "../../devel/libsigc++/buildlink2.mk" diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 244cbfd55b7..2f2f0cefa65 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2004/02/09 00:09:10 mjl Exp $ +# $NetBSD: Makefile,v 1.67 2004/02/14 18:26:27 jmmv Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -21,9 +21,9 @@ USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -PKGCONFIG_OVERRIDE= ${WRKSRC}/glib.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gthread.pc.in +PKGCONFIG_OVERRIDE= glib.pc.in +PKGCONFIG_OVERRIDE+= gmodule.pc.in +PKGCONFIG_OVERRIDE+= gthread.pc.in CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib INFO_FILES= glib.info diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 3cea4c674e5..5224e320ed8 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2004/02/14 17:21:37 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= glib-2.2.3 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -22,10 +22,10 @@ USE_LANGUAGES= c c++ USE_PERL5= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/glib-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gmodule-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gobject-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gthread-2.0.pc.in +PKGCONFIG_OVERRIDE= glib-2.0.pc.in +PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in +PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in +PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in GNU_CONFIGURE= # defined CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index e5fc97e9484..eb9028d7eb1 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= libgphoto2-2.1.2 @@ -14,7 +14,7 @@ CONFLICTS+= gphoto<2.1.1 USE_BUILDLINK2= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgphoto2/libgphoto2.pc.in +PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 581df9b620e..a4d098b68d2 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= libgsf-1.8.2 @@ -15,8 +15,8 @@ GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgsf-1.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgsf-gnome-1.pc.in +PKGCONFIG_OVERRIDE= libgsf-1.pc.in +PKGCONFIG_OVERRIDE+= libgsf-gnome-1.pc.in CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/libgsf diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 95c56e0dad8..a9e9a066409 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= libgtop-2.0.8 PKGNAME= ${DISTNAME:S/-/2-/} @@ -36,8 +36,8 @@ USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgtop-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/support/gnome-support-2.0.pc.in +PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in +PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in USE_MAKEINFO= YES INFO_FILES= libgtop2.info TEXINFO_REQD= 4.6 diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index 85d3e55e1f2..931486d0e3b 100644 --- a/devel/libidn/Makefile +++ b/devel/libidn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= libidn-0.3.3 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libidn.pc.in +PKGCONFIG_OVERRIDE+= libidn.pc.in INFO_FILES= libidn.info diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile index c9af70d3fe1..ee2a8d48efb 100644 --- a/devel/libntlm/Makefile +++ b/devel/libntlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= libntlm-0.3.2 @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libntlm.pc.in +PKGCONFIG_OVERRIDE+= libntlm.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 8bec07bee60..2879a17e774 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 18:26:27 jmmv Exp $ DISTNAME= libsigc++-1.2.5 CATEGORIES= devel @@ -14,7 +14,7 @@ USE_LIBTOOL= YES USE_GNU_TOOLS+= m4 make USE_LANGUAGES= c c++ -PKGCONFIG_OVERRIDE= ${WRKSRC}/sigc++-1.2.pc.in +PKGCONFIG_OVERRIDE= sigc++-1.2.pc.in CONFIGURE_ENV+= ac_cv_prog_M4=${M4} diff --git a/devel/loudmouth/Makefile b/devel/loudmouth/Makefile index 5bb967cff14..cf4fa8c7ca6 100644 --- a/devel/loudmouth/Makefile +++ b/devel/loudmouth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= loudmouth-0.15.1 @@ -15,7 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make -PKGCONFIG_OVERRIDE+= ${WRKSRC}/loudmouth-1.0.pc.in +PKGCONFIG_OVERRIDE+= loudmouth-1.0.pc.in CONFIGURE_ARGS+= --disable-debug diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile index 4e7a5161925..17fc305ae25 100644 --- a/devel/ogre/Makefile +++ b/devel/ogre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:39 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:27 jmmv Exp $ # DISTNAME= ogre-v0-12-1 @@ -21,7 +21,7 @@ USE_X11= yes CONFIGURE_ARGS+= --with-platform=SDL -PKGCONFIG_OVERRIDE+= ${WRKSRC}/OGRE.pc.in +PKGCONFIG_OVERRIDE+= OGRE.pc.in .include "../../devel/devIL/buildlink2.mk" .include "../../devel/SDL/buildlink2.mk" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 14e207b195f..7b2d39cf7a1 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:39 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= pango-1.2.5 @@ -22,11 +22,11 @@ GNU_CONFIGURE= yes TEST_TARGET= check USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/pango.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangoft2.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangox.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangowin32.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangoxft.pc.in +PKGCONFIG_OVERRIDE= pango.pc.in +PKGCONFIG_OVERRIDE+= pangoft2.pc.in +PKGCONFIG_OVERRIDE+= pangox.pc.in +PKGCONFIG_OVERRIDE+= pangowin32.pc.in +PKGCONFIG_OVERRIDE+= pangoxft.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index 2e05d6d24af..832493ec1be 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:40 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= xft-2.1.2 @@ -22,7 +22,7 @@ USE_GNU_TOOLS+= make USE_X11= YES USE_GNU_TOOLS+= awk -PKGCONFIG_OVERRIDE= ${WRKSRC}/xft.pc.in +PKGCONFIG_OVERRIDE= xft.pc.in MAKE_ENV+= EGREP="${EGREP}" BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2 diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index dc65dd95efd..d9b72104bbc 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:40 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= fontconfig-2.2.1 @@ -22,7 +22,7 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES USE_GNU_TOOLS+= make -PKGCONFIG_OVERRIDE= ${WRKSRC}/fontconfig.pc.in +PKGCONFIG_OVERRIDE= fontconfig.pc.in PKG_SYSCONFSUBDIR= fontconfig diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile index 8fac2e780eb..39cb69e7631 100644 --- a/fonts/gucharmap/Makefile +++ b/fonts/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:40 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gucharmap-1.2.0 @@ -21,7 +21,7 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gucharmap.pc.in +PKGCONFIG_OVERRIDE+= gucharmap.pc.in .include "../../devel/libgnomeui/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index a6d67311f23..a925859b941 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:40 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= autotrace-0.31.1 @@ -15,7 +15,7 @@ USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/autotrace.pc.in +PKGCONFIG_OVERRIDE= autotrace.pc.in .include "../../graphics/ImageMagick/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index f0f722ef272..4d3d8bc4ca9 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:40 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= cairo-0.1.17 @@ -13,7 +13,7 @@ USE_X11= yes USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/cairo.pc.in +PKGCONFIG_OVERRIDE+= cairo.pc.in GNU_CONFIGURE= yes BUILDLINK_DEPENDS.freetype2= freetype2>=2.1.5 diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index b9f2f6a7c7c..77d7873bea5 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:41 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= freetype-2.1.5 @@ -26,7 +26,7 @@ GNU_CONFIGURE= YES CONFIGURE_DIRS= ${WRKSRC}/builds/unix CONFIGURE_ARGS+= --includedir=${PREFIX}/include -PKGCONFIG_OVERRIDE= ${WRKSRC}/builds/unix/freetype2.in +PKGCONFIG_OVERRIDE= builds/unix/freetype2.in .include "../../mk/bsd.prefs.mk" diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 1bec36960e1..9cb616875bc 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gtkglext-0.7.1 @@ -18,7 +18,7 @@ USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkglext.pc.in +PKGCONFIG_OVERRIDE= gtkglext.pc.in LIBS+= -lm CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 1c84998a347..377d554591f 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2004/02/14 17:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.84 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= imlib-1.9.14 @@ -13,7 +13,7 @@ COMMENT= Image manipulation library for X11 USE_BUILDLINK3= yes USE_X11BASE= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib.pc.in +PKGCONFIG_OVERRIDE= imlib.pc.in GNU_CONFIGURE= yes PLIST_SUBST+= LOCALBASE=${LOCALBASE} USE_GNU_TOOLS+= make diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 690f6618987..307906b823b 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= imlib2-1.1.0 @@ -15,7 +15,7 @@ USE_X11= YES USE_LIBTOOL= YES USE_BUILDLINK3= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/imlib2.pc.in +PKGCONFIG_OVERRIDE= imlib2.pc.in LIBS.SunOS= -lm diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index b9c7f895f81..e29ce9f5ce2 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libgdiplus-0.1 @@ -14,7 +14,7 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgdiplus.pc.in +PKGCONFIG_OVERRIDE+= libgdiplus.pc.in GNU_CONFIGURE= yes .include "../../graphics/cairo/buildlink2.mk" diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 6054eb635ce..0515217215f 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libgnomecanvas-2.4.0 @@ -20,7 +20,7 @@ USE_GNU_TOOLS+= make USE_X11= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomecanvas/libgnomecanvas-2.0.pc.in +PKGCONFIG_OVERRIDE= libgnomecanvas/libgnomecanvas-2.0.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/graphics/libpixman/Makefile b/graphics/libpixman/Makefile index e4c3b1ccb0c..8786bc4f51a 100644 --- a/graphics/libpixman/Makefile +++ b/graphics/libpixman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:42 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libpixman-0.1.0 @@ -12,7 +12,7 @@ COMMENT= Pixel manipulation library USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libpixman.pc.in +PKGCONFIG_OVERRIDE+= libpixman.pc.in GNU_CONFIGURE= yes .include "../../mk/bsd.pkg.mk" diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common index 1844930463d..7c69c586703 100644 --- a/graphics/librsvg2/Makefile.common +++ b/graphics/librsvg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:43 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= librsvg-2.5.0 @@ -17,7 +17,7 @@ USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/librsvg-2.0.pc.in +PKGCONFIG_OVERRIDE= librsvg-2.0.pc.in CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-gimp=no diff --git a/graphics/swfdec/Makefile.common b/graphics/swfdec/Makefile.common index e662c691b81..f637603bf93 100644 --- a/graphics/swfdec/Makefile.common +++ b/graphics/swfdec/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2004/02/14 17:21:43 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= swfdec-0.2.1 @@ -18,7 +18,7 @@ USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/swfdec.pc.in +PKGCONFIG_OVERRIDE= swfdec.pc.in pre-install: echo "install:" >${WRKSRC}/plugin/Makefile diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index 994ea6dbf98..96396bf94fb 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:44 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/14 18:26:28 jmmv Exp $ # .include "Makefile.common" @@ -12,7 +12,7 @@ CONFLICTS= sylpheed-[0-9]* sylpheed-gtk2-[0-9]* BUILD_USES_MSGFMT= YES USE_PKGINSTALL= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/sylpheed-claws.pc.in +PKGCONFIG_OVERRIDE+= sylpheed-claws.pc.in CONFIGURE_ARGS+= --enable-aspell CONFIGURE_ARGS+= --enable-nls diff --git a/math/fftw/Makefile b/math/fftw/Makefile index 3c87a0eeb27..1423dae452a 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:44 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/14 18:26:28 jmmv Exp $ .if (${MACHINE_ARCH} == "powerpc") DISTNAME= fftw-3.0.1-fma @@ -15,7 +15,7 @@ HOMEPAGE= http://www.fftw.org/ COMMENT= Collection of fast C routines to compute DFTs USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/fftw.pc.in +PKGCONFIG_OVERRIDE+= fftw.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_FORTRAN= yes diff --git a/misc/gok/Makefile b/misc/gok/Makefile index 3a86837be31..cd4ab173acf 100644 --- a/misc/gok/Makefile +++ b/misc/gok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gok-0.8.4 @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --disable-gtk-doc -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gok-1.0.pc.in +PKGCONFIG_OVERRIDE+= gok-1.0.pc.in GCONF2_SCHEMAS= gok.schemas diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile index 034ae6e8f89..433d9c747ab 100644 --- a/misc/libcdio/Makefile +++ b/misc/libcdio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libcdio-0.65 @@ -12,8 +12,8 @@ COMMENT= CD-ROM access library USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcdio.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libiso9660.pc.in +PKGCONFIG_OVERRIDE+= libcdio.pc.in +PKGCONFIG_OVERRIDE+= libiso9660.pc.in GNU_CONFIGURE= yes .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile index a1196963858..e834bfbb7f6 100644 --- a/multimedia/gst-plugins/Makefile +++ b/multimedia/gst-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gst-plugins-0.6.4 @@ -18,9 +18,9 @@ USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gst-libs/gst/gconf/gstreamer-gconf.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer-libs.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer-play.pc.in +PKGCONFIG_OVERRIDE+= gst-libs/gst/gconf/gstreamer-gconf.pc.in +PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-libs.pc.in +PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-play.pc.in GNU_CONFIGURE= yes CPPFLAGS+= -I${PREFIX}/include/cdparanoia diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 72417a6f81d..cfd9ca2b2a1 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gstreamer-0.6.4 @@ -22,9 +22,9 @@ USE_PERL5= build CONFIGURE_ARGS+= --disable-plugin-builddir -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libs/ext/cothreads/cothreads.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer-control.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pkgconfig/gstreamer.pc.in +PKGCONFIG_OVERRIDE+= libs/ext/cothreads/cothreads.pc.in +PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-control.pc.in +PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer.pc.in PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 282f2655713..33bd41275f7 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/02/14 17:21:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= xine-lib-1-rc0a @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= libtool libtool-nofpic -PKGCONFIG_OVERRIDE= ${WRKSRC}/misc/libxine.pc.in +PKGCONFIG_OVERRIDE= misc/libxine.pc.in USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 1196da10ab3..817becd272a 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.103 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -25,8 +25,8 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a CONFIGURE_ENV+= LIB_WRAP="-lwrap" -PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libIDL/libIDL.pc.in +PKGCONFIG_OVERRIDE+= ORBit.pc.in +PKGCONFIG_OVERRIDE+= libIDL/libIDL.pc.in CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index 6ea09155680..4513e15c9c4 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= ORBit2-2.8.3 @@ -20,10 +20,10 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -PKGCONFIG_OVERRIDE= ${WRKSRC}/ORBit-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-CosNaming-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-imodule-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/idl-compiler/ORBit-idl-2.0.pc.in +PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in +PKGCONFIG_OVERRIDE+= ORBit-CosNaming-2.0.pc.in +PKGCONFIG_OVERRIDE+= ORBit-imodule-2.0.pc.in +PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/net/gnet/Makefile b/net/gnet/Makefile index 6f00fad75ec..288b8d18a21 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/14 17:54:14 minskim Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gnet-2.0.4 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnetlibrary.org/ COMMENT= Simple network library USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in +PKGCONFIG_OVERRIDE= gnet.pc.in GNU_CONFIGURE= YES USE_BUILDLINK3= YES CONFIGURE_ARGS= --enable-glib2 diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile index 1bf5df8f103..28c65b09ed2 100644 --- a/net/gnet1/Makefile +++ b/net/gnet1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= gnet-1.1.8 @@ -14,7 +14,7 @@ COMMENT= Simple network library (older version) CONFLICTS= gnet<=1.1.8 USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in +PKGCONFIG_OVERRIDE= gnet.pc.in GNU_CONFIGURE= YES USE_BUILDLINK2= YES CONFIGURE_ARGS= --enable-glib2 diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile index bd1c0114abc..57458ffa9aa 100644 --- a/net/libIDL/Makefile +++ b/net/libIDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libIDL-0.8.3 @@ -14,7 +14,7 @@ USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= lex USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libIDL-2.0.pc.in +PKGCONFIG_OVERRIDE= libIDL-2.0.pc.in INFO_FILES= libIDL2.info .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index 2dcd01c684d..d4ed5f19ed8 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libsoup-1.99.26 @@ -14,7 +14,7 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/soup-2.0.pc.in +PKGCONFIG_OVERRIDE+= soup-2.0.pc.in CONFIGURE_ARGS+= --disable-gtk-doc diff --git a/net/linc/Makefile b/net/linc/Makefile index b2dcc4d5dba..a37d445de87 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= linc-1.1.1 @@ -16,7 +16,7 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/linc.pc.in +PKGCONFIG_OVERRIDE= linc.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index 6c38630b918..ff272bdde62 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= pyorbit-2.0.0 @@ -16,7 +16,7 @@ PY_PATCHPLIST= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pyorbit-2.pc.in +PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} diff --git a/net/soup/Makefile b/net/soup/Makefile index 5c917b9476e..670481c51cf 100644 --- a/net/soup/Makefile +++ b/net/soup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:46 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= soup-0.7.10 @@ -14,7 +14,7 @@ COMMENT= Callback-based mechanism for sending and servicing SOAP requests GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/soup.pc.in +PKGCONFIG_OVERRIDE= soup.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 24135852b00..8f661d2ed38 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:50 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/14 18:26:28 jmmv Exp $ # DISTNAME= libgnomeprint-2.4.2 @@ -22,7 +22,7 @@ GNU_CONFIGURE= YES BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.4 -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomeprint/libgnomeprint-2.2.pc.in +PKGCONFIG_OVERRIDE= libgnomeprint/libgnomeprint-2.2.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index 3a5a1ce597b..974815dcae1 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:28 jmmv Exp $ DISTNAME= gsasl-0.0.8 PKGREVISION= 1 @@ -21,7 +21,7 @@ INFO_FILES= gsasl.info CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgsasl.pc.in +PKGCONFIG_OVERRIDE+= libgsasl.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" diff --git a/security/gss/Makefile b/security/gss/Makefile index b310754f92d..551011310db 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gss-0.0.6 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gss.pc.in +PKGCONFIG_OVERRIDE+= gss.pc.in INFO_FILES= gss.info diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 7b142a03b8a..aac90afb65a 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:52 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gnome-vfs-2.4.2 @@ -21,8 +21,8 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGINSTALL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-vfs-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-vfs-module-2.0.pc.in +PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in +PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --enable-platform-gnome-2 diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index d620e086ce7..096a56d7a71 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:52 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= nautilus-2.4.2 @@ -18,7 +18,7 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/libnautilus/libnautilus.pc.in +PKGCONFIG_OVERRIDE= libnautilus/libnautilus.pc.in CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile index eb9fc6c8a5d..57abf64aba8 100644 --- a/textproc/aiksaurus/Makefile +++ b/textproc/aiksaurus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= aiksaurus-1.0.1 @@ -13,6 +13,6 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --without-gtk -PKGCONFIG_OVERRIDE= ${WRKSRC}/base/aiksaurus-1.0.pc.in +PKGCONFIG_OVERRIDE= base/aiksaurus-1.0.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index 2f7637bd1a4..bd215d43756 100644 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= enchant-1.1.3 @@ -12,7 +12,7 @@ COMMENT= Generic spell checking library USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/enchant.pc.in +PKGCONFIG_OVERRIDE+= enchant.pc.in GNU_CONFIGURE= yes .include "../../devel/glib2/buildlink2.mk" diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 0e337e3054f..1107a48c2fc 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/12 13:49:15 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtk-doc-1.1 @@ -15,7 +15,7 @@ DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular GNU_CONFIGURE= YES USE_BUILDLINK2= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gtk-doc.pc.in +PKGCONFIG_OVERRIDE= gtk-doc.pc.in CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG} .include "../../lang/perl5/buildlink2.mk" diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 8f3902160a2..150b71ea646 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/14 18:04:39 minskim Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtkspell-2.0.5 @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkspell-2.0.pc.in +PKGCONFIG_OVERRIDE= gtkspell-2.0.pc.in SUBST_CLASSES+= subdir SUBST_MESSAGE.subdir= "Excluding unnecessary subdirs." diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 6b69ff289ef..7d801510f0e 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= libcroco-0.4.0 @@ -17,7 +17,7 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcroco.pc.in +PKGCONFIG_OVERRIDE+= libcroco.pc.in CONFIGURE_ARGS+= --enable-seleng=yes CONFIGURE_ARGS+= --enable-layeng=yes diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index 98068e7d2fd..a1b60a9f498 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= libxml-1.8.17 @@ -14,7 +14,7 @@ COMMENT= XML parser, mainly used by the GNOME project USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libxml.pc.in +PKGCONFIG_OVERRIDE= libxml.pc.in .include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 6bca51540d3..2beb1165ec6 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2004/02/14 18:26:29 jmmv Exp $ DISTNAME= libxml2-${LIBXML_VERSION} CATEGORIES= textproc @@ -12,7 +12,7 @@ COMMENT= XML parser library from the GNOME project USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/libxml-2.0.pc.in +PKGCONFIG_OVERRIDE= libxml-2.0.pc.in LIBXML_VERSION= 2.6.6 PLIST_SUBST+= LIBXML_VERSION=${LIBXML_VERSION} diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index e1f64810aad..223939156c1 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2004/02/14 18:26:29 jmmv Exp $ DISTNAME= libxslt-1.1.2 PKGNAME= ${DISTNAME} @@ -15,8 +15,8 @@ USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PERL5= build -PKGCONFIG_OVERRIDE= ${WRKSRC}/libxslt.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/libexslt.pc.in +PKGCONFIG_OVERRIDE= libxslt.pc.in +PKGCONFIG_OVERRIDE+= libexslt.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2} diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile index 8eff8871da1..829503a2f04 100644 --- a/textproc/raptor/Makefile +++ b/textproc/raptor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= raptor-1.0.0 @@ -14,7 +14,7 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/raptor.pc.in +PKGCONFIG_OVERRIDE+= raptor.pc.in .include "../../devel/glib2/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index 0b96d1d8895..57540bc87af 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= metacity-2.6.3 @@ -21,7 +21,7 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/src/libmetacity-private.pc.in +PKGCONFIG_OVERRIDE= src/libmetacity-private.pc.in GCONF2_SCHEMAS= metacity.schemas diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index f6e2bbb4073..08a39075141 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 18:26:29 jmmv Exp $ DISTNAME= openbox-3.1 PKGREVISION= 2 @@ -20,8 +20,8 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_X11= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/parser/obparser-3.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/render/obrender-3.0.pc.in +PKGCONFIG_OVERRIDE= parser/obparser-3.0.pc.in +PKGCONFIG_OVERRIDE+= render/obrender-3.0.pc.in CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} PKG_SYSCONFSUBDIR= xdg diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index ac1b96e4837..b1a6f8e8583 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:54 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtkhtml-3.0.9 @@ -16,7 +16,7 @@ USE_GNU_TOOLS+= make USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libgtkhtml.pc.in +PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in GNU_CONFIGURE= yes .include "../../devel/gail/buildlink3.mk" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index e7d08ad3fc9..52af801c175 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2004/02/09 03:26:39 jlam Exp $ +# $NetBSD: Makefile.common,v 1.33 2004/02/14 18:26:29 jmmv Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -21,12 +21,12 @@ USE_PERL5= build USE_GNU_TOOLS+= make USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-gtkmozembed.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-js.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-nspr.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-nss.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-plugin.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-xpcom.pc.in +PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc.in +PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc.in +PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc.in +PKGCONFIG_OVERRIDE+= build/unix/mozilla-nss.pc.in +PKGCONFIG_OVERRIDE+= build/unix/mozilla-plugin.pc.in +PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc.in CONFIGURE_ARGS+= --disable-tests \ --disable-debug \ --disable-pedantic \ diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 22651f041e3..88471e9a4ac 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= libXfixes-2.0.0 @@ -16,7 +16,7 @@ USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/xfixes.pc.in +PKGCONFIG_OVERRIDE+= xfixes.pc.in .include "../../x11/fixesext/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile index ad884e9e51f..abb5bdb6edc 100644 --- a/x11/Xrandr-mixedcase/Makefile +++ b/x11/Xrandr-mixedcase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= libXrandr-1.0.1 @@ -16,7 +16,7 @@ USE_BUILDLINK2= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/xrandr.pc.in +PKGCONFIG_OVERRIDE+= xrandr.pc.in BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2 diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile index 2912c7f8740..4effad1875a 100644 --- a/x11/Xrender/Makefile +++ b/x11/Xrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 18:26:29 jmmv Exp $ DISTNAME= xrender-0.8.3 PKGNAME= ${DISTNAME:S/x/X/} @@ -14,7 +14,7 @@ USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/xrender.pc.in +PKGCONFIG_OVERRIDE= xrender.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/render/buildlink3.mk" diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index c9ba7ad31da..fdc679356fc 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/16 08:39:24 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= fixesext-2.0 @@ -14,7 +14,7 @@ USE_X11= yes USE_BUILDLINK2= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/fixesext.pc.in +PKGCONFIG_OVERRIDE+= fixesext.pc.in .include "../../devel/pkgconfig/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index 804f42e6783..89f94bc89d0 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gnome-mag-0.10.4 @@ -20,7 +20,7 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-mag-1.0.pc.in +PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in .include "../../devel/at-spi/buildlink2.mk" .include "../../devel/libbonobo/buildlink2.mk" diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 4eed1a026f3..4cac4bbf7aa 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gnome-panel-2.4.2 @@ -21,7 +21,7 @@ USE_PERL5= YES USE_PKGLOCALEDIR= YES USE_X11= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libpanel-applet/libpanelapplet-2.0.pc.in +PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index 898455ae55f..bf1474bd2b1 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gnopernicus-0.7.1 @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --disable-gtk-doc -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnopernicus-1.0.pc.in +PKGCONFIG_OVERRIDE+= gnopernicus-1.0.pc.in GCONF2_SCHEMAS+= brlmonitor.schemas GCONF2_SCHEMAS+= gnopernicus.schemas diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile index 0f5e966f011..7dd3265439f 100644 --- a/x11/gtk-thinice-engine/Makefile +++ b/x11/gtk-thinice-engine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtk-thinice-engine-2.0.2 @@ -20,7 +20,7 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/gtk-thinice-engine-2.pc.in +PKGCONFIG_OVERRIDE= gtk-thinice-engine-2.pc.in .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 3bf65b1f401..d6d91dff511 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.100 2004/02/14 18:26:29 jmmv Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 6 @@ -22,8 +22,8 @@ USE_X11BASE= yes USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+.pc.in +PKGCONFIG_OVERRIDE= gdk.pc.in +PKGCONFIG_OVERRIDE+= gtk+.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-xinput=xfree \ diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index 20715614d63..08cf58a3128 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtk-engines-2.2.0 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_X11= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/gtk-engines-2.pc.in +PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 32f46a64503..edce5856c65 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtk+-2.2.4 @@ -32,10 +32,10 @@ CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" TEST_TARGET= check -PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gdk-pixbuf-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in +PKGCONFIG_OVERRIDE= gdk-2.0.pc.in +PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in +PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in +PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in BUILD_DIRS= ${WRKSRC} ${WRKSRC}/demos/gtk-demo diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile index 36da2bd2154..b9bf711c966 100644 --- a/x11/gtkglarea2/Makefile +++ b/x11/gtkglarea2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtkglarea-1.99.0 @@ -15,7 +15,7 @@ COMMENT= OpenGL widget for the GTK+2 GUI toolkit WRKSRC= ${WRKDIR}/gtkglarea-1.99.0 USE_BUILDLINK2= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtkgl-2.0.pc.in +PKGCONFIG_OVERRIDE+= gtkgl-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-lib-GL diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index 5f50403085d..6345d32c62a 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gtkmm-2.2.8 @@ -17,11 +17,11 @@ USE_GNU_TOOLS+= make USE_PERL5= YES USE_X11= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/atk/atkmm-1.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gdk/gdkmm-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/glib/glibmm-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk/gtkmm-2.0.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pango/pangomm-1.0.pc.in +PKGCONFIG_OVERRIDE= atk/atkmm-1.0.pc.in +PKGCONFIG_OVERRIDE+= gdk/gdkmm-2.0.pc.in +PKGCONFIG_OVERRIDE+= glib/glibmm-2.0.pc.in +PKGCONFIG_OVERRIDE+= gtk/gtkmm-2.0.pc.in +PKGCONFIG_OVERRIDE+= pango/pangomm-1.0.pc.in .include "../../devel/libsigc++/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile index 521f1263fdb..2a2e72ae693 100644 --- a/x11/libzvt/Makefile +++ b/x11/libzvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= libzvt-2.0.1 @@ -16,7 +16,7 @@ USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/libzvt/libzvt-2.0.pc.in +PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in .include "../../graphics/libart2/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile index 939194c354a..2eff15075da 100644 --- a/x11/paragui/Makefile +++ b/x11/paragui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= paragui-1.0.4 @@ -13,7 +13,7 @@ COMMENT= Cross-platform high-level application framework and GUI library USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/paragui.pc.in +PKGCONFIG_OVERRIDE+= paragui.pc.in GNU_CONFIGURE= yes PTHREAD_OPTS+= require native diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 9dca0213630..6d7387b81fe 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= gnome-python-2.0.0 @@ -15,7 +15,7 @@ COMMENT= Python binding for GNOME2 PY_PATCHPLIST= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-python-2.0.pc.in +PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile index ed002782249..22ca8427d58 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/14 18:26:29 jmmv Exp $ # DISTNAME= pygtk-2.0.0 @@ -17,7 +17,7 @@ CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10 PY_PATCHPLIST= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -PKGCONFIG_OVERRIDE+= ${WRKSRC}/pygtk-2.0.pc.in +PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile index d63e0c1ac29..f65bc72ab2e 100644 --- a/x11/randrext/Makefile +++ b/x11/randrext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/04 14:39:55 recht Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 18:26:30 jmmv Exp $ # DISTNAME= randrext-1.0 @@ -13,7 +13,7 @@ COMMENT= RandR extension (Headers and documentation files) USE_BUILDLINK2= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/randr.pc.in +PKGCONFIG_OVERRIDE+= randr.pc.in .include "../../devel/pkgconfig/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/render/Makefile b/x11/render/Makefile index f123bd855a7..21f6e123606 100644 --- a/x11/render/Makefile +++ b/x11/render/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/09/19 16:33:56 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/14 18:26:30 jmmv Exp $ # DISTNAME= render-0.8 @@ -11,7 +11,7 @@ COMMENT= Headers for X11 render extension USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/render.pc.in +PKGCONFIG_OVERRIDE+= render.pc.in GNU_CONFIGURE= yes CONFLICTS= Xrender<0.8 diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 73a85895893..edccaabda98 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/14 18:26:30 jmmv Exp $ DISTNAME= startup-notification-0.5 CATEGORIES= x11 gnome @@ -14,7 +14,7 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_X11= yes -PKGCONFIG_OVERRIDE= ${WRKSRC}/libstartup-notification-1.0.pc.in +PKGCONFIG_OVERRIDE= libstartup-notification-1.0.pc.in post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/startup-notification/ diff --git a/x11/vte/Makefile b/x11/vte/Makefile index 3f7b57479a2..4bcb0dab47a 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 18:26:30 jmmv Exp $ # DISTNAME= vte-0.11.10 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -PKGCONFIG_OVERRIDE+= ${WRKSRC}/vte.pc.in +PKGCONFIG_OVERRIDE+= vte.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile index e5356c08278..13651ea6ba5 100644 --- a/x11/xcursor/Makefile +++ b/x11/xcursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/14 18:26:30 jmmv Exp $ # DISTNAME= libXcursor-1.1.1 @@ -17,7 +17,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= ${WRKSRC}/xcursor.pc.in +PKGCONFIG_OVERRIDE+= xcursor.pc.in .include "../../devel/pkgconfig/buildlink2.mk" .include "../../x11/Xfixes/buildlink2.mk" |