From 56bdebd3f2a99fbde877691b3f232c92a36e7e96 Mon Sep 17 00:00:00 2001 From: dholland Date: Thu, 17 Jan 2013 06:05:31 +0000 Subject: There are altogether too many packages whose PKGNAME and PKGDIR don't match. These now pbulk-scan properly. --- meta-pkgs/bulk-large/Makefile | 5 +++-- meta-pkgs/bulk-medium/Makefile | 40 +++++++++++++++++++++------------------- meta-pkgs/bulk-small/Makefile | 12 ++++++------ 3 files changed, 30 insertions(+), 27 deletions(-) (limited to 'meta-pkgs') diff --git a/meta-pkgs/bulk-large/Makefile b/meta-pkgs/bulk-large/Makefile index 6fd9ee528c0..b064baca3f8 100644 --- a/meta-pkgs/bulk-large/Makefile +++ b/meta-pkgs/bulk-large/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/01/17 03:51:05 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2013/01/17 06:05:31 dholland Exp $ DISTNAME= bulk-large-20130113 CATEGORIES= meta-pkgs @@ -45,7 +45,7 @@ DEPENDS+= gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils DEPENDS+= kdebase3-[0-9]*:../../x11/kdebase3 DEPENDS+= kdelibs3-[0-9]*:../../x11/kdelibs3 DEPENDS+= kdelibs4-[0-9]*:../../x11/kdelibs4 -DEPENDS+= py-gtk2-[0-9]*:../../x11/py-gtk2 +DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 DEPENDS+= qt3-libs-[0-9]*:../../x11/qt3-libs DEPENDS+= qt3-tools-[0-9]*:../../x11/qt3-tools DEPENDS+= qt4-libs-[0-9]*:../../x11/qt4-libs @@ -170,4 +170,5 @@ DEPENDS+= modular-xorg-[0-9]*:../../meta-pkgs/modular-xorg DEPENDS+= bulk-medium-[0-9]*:../../meta-pkgs/bulk-medium DEPENDS+= bulk-small-[0-9]*:../../meta-pkgs/bulk-small +.include "../../lang/python/pyversion.mk" # for PYPKGPREFIX .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile index 9629ca3a19b..face9eb8d19 100644 --- a/meta-pkgs/bulk-medium/Makefile +++ b/meta-pkgs/bulk-medium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/01/17 03:51:05 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2013/01/17 06:05:31 dholland Exp $ DISTNAME= bulk-medium-20130113 CATEGORIES= meta-pkgs @@ -47,15 +47,15 @@ DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 DEPENDS+= mpg321-[0-9]*:../../audio/mpg321 DEPENDS+= sox-[0-9]*:../../audio/sox DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools -DEPENDS+= jabberd-[0-9]*:../../chat/jabberd -DEPENDS+= jabberd2-[0-9]*:../../chat/jabberd2 +DEPENDS+= jabberd>=1<2:../../chat/jabberd +DEPENDS+= jabberd>=2:../../chat/jabberd2 DEPENDS+= sirc-[0-9]*:../../chat/sirc DEPENDS+= xchat-[0-9]*:../../chat/xchat DEPENDS+= xchat-perl-[0-9]*:../../chat/xchat-perl DEPENDS+= xchat-python-[0-9]*:../../chat/xchat-python DEPENDS+= fribidi-[0-9]*:../../converters/fribidi -DEPENDS+= mysql51-client-[0-9]*:../../databases/mysql51-client -DEPENDS+= mysql55-client-[0-9]*:../../databases/mysql55-client +DEPENDS+= mysql-client>=5.1<5.5:../../databases/mysql51-client +DEPENDS+= mysql-client>=5.5:../../databases/mysql55-client DEPENDS+= openldap-client-[0-9]*:../../databases/openldap-client DEPENDS+= postgresql84-client-[0-9]*:../../databases/postgresql84-client DEPENDS+= postgresql91-client-[0-9]*:../../databases/postgresql91-client @@ -74,9 +74,9 @@ DEPENDS+= wine-[0-9]*:../../emulators/wine DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick DEPENDS+= gnuplot-[0-9]*:../../graphics/gnuplot DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm -DEPENDS+= py-matplotlib-[0-9]*:../../graphics/py-matplotlib -DEPENDS+= py-matplotlib-gtk2-[0-9]*:../../graphics/py-matplotlib-gtk2 -DEPENDS+= py-matplotlib-tk-[0-9]*:../../graphics/py-matplotlib-tk +DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib +DEPENDS+= ${PYPKGPREFIX}-matplotlib-gtk-[0-9]*:../../graphics/py-matplotlib-gtk2 +DEPENDS+= ${PYPKGPREFIX}-matplotlib-tk-[0-9]*:../../graphics/py-matplotlib-tk DEPENDS+= gawk-[0-9]*:../../lang/gawk DEPENDS+= php>=5.3<5.4:../../lang/php53 DEPENDS+= php>=5.4<5.5:../../lang/php54 @@ -98,13 +98,14 @@ DEPENDS+= mhonarc-[0-9]*:../../mail/mhonarc DEPENDS+= mutt-[0-9]*:../../mail/mutt DEPENDS+= re-alpine-[0-9]*:../../mail/re-alpine DEPENDS+= spamassassin-[0-9]*:../../mail/spamassassin -DEPENDS+= bind96-[0-9]*:../../net/bind96 -DEPENDS+= bind97-[0-9]*:../../net/bind97 -DEPENDS+= bind98-[0-9]*:../../net/bind98 -DEPENDS+= bind99-[0-9]*:../../net/bind99 +DEPENDS+= bind>=9.6<9.7:../../net/bind96 +DEPENDS+= bind>=9.7<9.8:../../net/bind97 +DEPENDS+= bind>=9.8<9.9:../../net/bind98 +DEPENDS+= bind>=9.9<9.10:../../net/bind99 DEPENDS+= clive-[0-9]*:../../net/clive DEPENDS+= nmap-[0-9]*:../../net/nmap -DEPENDS+= samba35-[0-9]*:../../net/samba35 +DEPENDS+= samba>=3.5<3.6:../../net/samba35 +DEPENDS+= samba>=3.6:../../net/samba DEPENDS+= wpa_supplicant-[0-9]*:../../net/wpa_supplicant DEPENDS+= xymon-[0-9]*:../../net/xymon DEPENDS+= xymonclient-[0-9]*:../../net/xymonclient @@ -146,11 +147,11 @@ DEPENDS+= p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql DEPENDS+= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI -DEPENDS+= py-bsddb3-[0-9]*:../../databases/py-bsddb3 -DEPENDS+= py-gdbm-[0-9]*:../../databases/py-gdbm -DEPENDS+= py-postgresql-[0-9]*:../../databases/py-postgresql -DEPENDS+= py-psycopg2-[0-9]*:../../databases/py-psycopg2 -DEPENDS+= py-sqlite3-[0-9]*:../../databases/py-sqlite3 +DEPENDS+= ${PYPKGPREFIX}-bsddb3-[0-9]*:../../databases/py-bsddb3 +DEPENDS+= ${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm +DEPENDS+= ${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql +DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 +DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= SDL-[0-9]*:../../devel/SDL DEPENDS+= atk-[0-9]*:../../devel/atk DEPENDS+= boehm-gc-[0-9]*:../../devel/boehm-gc @@ -199,7 +200,7 @@ DEPENDS+= tk-[0-9]*:../../x11/tk # # 4. Linux compat packages # -DEPENDS+= suse121-[0-9]*:../../meta-pkgs/suse121 +DEPENDS+= suse>=12.1:../../meta-pkgs/suse121 # # 5. Desktop infrastructure and support services @@ -226,4 +227,5 @@ DEPENDS+= lua-stdlib-doc-[0-9]*:../../devel/lua-stdlib-doc # We are supposed to be a superset of bulk-small. DEPENDS+= bulk-small-[0-9]*:../../meta-pkgs/bulk-small +.include "../../lang/python/pyversion.mk" # for PYPKGPREFIX .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/bulk-small/Makefile b/meta-pkgs/bulk-small/Makefile index 15cee4a67ea..475506c8376 100644 --- a/meta-pkgs/bulk-small/Makefile +++ b/meta-pkgs/bulk-small/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/01/17 03:51:05 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2013/01/17 06:05:31 dholland Exp $ DISTNAME= bulk-small-20130113 CATEGORIES= meta-pkgs @@ -50,11 +50,11 @@ DEPENDS+= irssi-icb-[0-9]*:../../chat/irssi-icb DEPENDS+= weechat-[0-9]*:../../chat/weechat DEPENDS+= base64-[0-9]*:../../converters/base64 DEPENDS+= mpack-[0-9]*:../../converters/mpack -DEPENDS+= emacs22-[0-9]*:../../editors/emacs22 +DEPENDS+= emacs>=22<23:../../editors/emacs22 DEPENDS+= nano-[0-9]*:../../editors/nano DEPENDS+= vim-[0-9]*:../../editors/vim DEPENDS+= vim-share-[0-9]*:../../editors/vim-share -DEPENDS+= mutt-devel-[0-9]*:../../mail/mutt-devel +DEPENDS+= mutt>=1.5:../../mail/mutt-devel DEPENDS+= procmail-[0-9]*:../../mail/procmail DEPENDS+= screen-[0-9]*:../../misc/screen DEPENDS+= rsync-[0-9]*:../../net/rsync @@ -73,7 +73,7 @@ DEPENDS+= tcsh-[0-9]*:../../shells/tcsh DEPENDS+= zsh-[0-9]*:../../shells/zsh DEPENDS+= fluxbox-[0-9]*:../../wm/fluxbox DEPENDS+= fvwm-[0-9]*:../../wm/fvwm -DEPENDS+= apache22-[0-9]*:../../www/apache22 +DEPENDS+= apache>=2.2:../../www/apache22 DEPENDS+= bozohttpd-[0-9]*:../../www/bozohttpd DEPENDS+= curl-[0-9]*:../../www/curl DEPENDS+= xlockmore-lite-[0-9]*:../../x11/xlockmore-lite @@ -82,7 +82,7 @@ DEPENDS+= xlockmore-lite-[0-9]*:../../x11/xlockmore-lite # 2. Base packages for the very popular languages that enormous # numbers of other packages depend on. # -DEPENDS+= perl5-[0-9]*:../../lang/perl5 +DEPENDS+= perl>=5:../../lang/perl5 DEPENDS+= python27-[0-9]*:../../lang/python27 # @@ -102,7 +102,7 @@ DEPENDS+= gmake-[0-9]*:../../devel/gmake DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base DEPENDS+= m4-[0-9]*:../../devel/m4 DEPENDS+= pkg-config-[0-9]*:../../devel/pkg-config -DEPENDS+= osabi-[0-9]*:../../pkgtools/osabi +#DEPENDS+= osabi-[0-9]*:../../pkgtools/osabi DEPENDS+= pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup DEPENDS+= x11-links-[0-9]*:../../pkgtools/x11-links -- cgit v1.2.3