From eaa75b40822b656b3eec19c61aff6646cfdc94af Mon Sep 17 00:00:00 2001 From: grant Date: Fri, 1 Oct 2004 10:37:32 +0000 Subject: there will not be a NetBSD-1.[7-9] but will be a NetBSD-[2-9].* adjust patterns used in ONLY_FOR_PLATFORM/NOT_FOR_PLATFORM to reflect this. --- archivers/rar-linux/Makefile | 4 ++-- archivers/unace22/Makefile | 6 +++--- audio/rioutil/Makefile | 4 ++-- audio/xmms-fmradio/Makefile | 4 ++-- audio/xmms-tv-scope/Makefile | 4 ++-- benchmarks/kttcp/Makefile | 4 ++-- devel/pvs/Makefile | 4 ++-- emulators/linuxppc_lib/Makefile | 4 ++-- emulators/rewind/Makefile | 5 ++--- emulators/suse_base/Makefile | 4 ++-- emulators/wine/Makefile | 4 ++-- mbone/vic/Makefile | 5 +++-- misc/openoffice-linux/Makefile | 4 ++-- multimedia/alevt/Makefile | 4 ++-- multimedia/ogle/Makefile | 6 +++--- security/gtk-systrace/Makefile | 4 ++-- security/nfsbug/Makefile | 8 ++++---- sysutils/i2ocfg/Makefile | 4 ++-- www/firefox-bin-java/Makefile | 4 ++-- x11/mlterm/Makefile | 6 +++--- 20 files changed, 46 insertions(+), 46 deletions(-) diff --git a/archivers/rar-linux/Makefile b/archivers/rar-linux/Makefile index ecc6f50ed62..53050a77ecc 100644 --- a/archivers/rar-linux/Makefile +++ b/archivers/rar-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/22 04:02:41 kristerw Exp $ +# $NetBSD: Makefile,v 1.5 2004/10/01 10:37:33 grant Exp $ # DISTNAME= rarlinux-3.3.0 @@ -12,7 +12,7 @@ COMMENT= RAR command line archiver (Linux binary) LICENSE= rar-license NO_BUILDLINK= yes -ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 \ +ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.6*-i386 \ NetBSD-[2-9]*-i386 Linux-*-i[3-6]86 WRKSRC= ${WRKDIR}/rar diff --git a/archivers/unace22/Makefile b/archivers/unace22/Makefile index b6736ba141d..8516046c938 100644 --- a/archivers/unace22/Makefile +++ b/archivers/unace22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/06/28 21:45:42 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2004/10/01 10:37:33 grant Exp $ # DISTNAME= linunace22 @@ -17,8 +17,8 @@ MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://www.winace.com/ COMMENT= Extract, list and test files in ACE archives (2.2 linux binary) -ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 \ - NetBSD-[2-9]*-i386 Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.6*-i386 \ + NetBSD-[2-9]*-i386 Linux-*-i[3-6]86 WRKSRC= ${WRKDIR} diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile index 31da5a0c222..8f46ec68f8b 100644 --- a/audio/rioutil/Makefile +++ b/audio/rioutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/08/19 03:33:35 schmonz Exp $ +# $NetBSD: Makefile,v 1.14 2004/10/01 10:37:33 grant Exp $ # DISTNAME= rioutil-1.4.6 @@ -15,7 +15,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-libusb -ONLY_FOR_PLATFORM= Darwin-*-* Linux-*-* NetBSD-1.[6-9]*-* NetBSD-[2-9]*-* +ONLY_FOR_PLATFORM= Darwin-*-* Linux-*-* NetBSD-1.6*-* NetBSD-[2-9]*-* # depends on -r1.6 of sys/dev/usb/urio.c ONLY_FOR_PLATFORM+= NetBSD-1.5Z-* NetBSD-1.5Z[A-Z]-* diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile index 797738b2871..1acecce6e98 100644 --- a/audio/xmms-fmradio/Makefile +++ b/audio/xmms-fmradio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/03/22 03:58:00 kristerw Exp $ +# $NetBSD: Makefile,v 1.10 2004/10/01 10:37:33 grant Exp $ # DISTNAME= xmms-FMRadio-1.4 @@ -12,7 +12,7 @@ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://silicone.free.fr/xmms-FMRadio/ COMMENT= Use a Radio Tuner card in XMMS -ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.[6-9]*-* NetBSD-[2-9]*-* +ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.6*-* NetBSD-[2-9]*-* USE_BUILDLINK3= YES USE_X11= YES diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile index 05340e7d1b3..b5e44c4b45e 100644 --- a/audio/xmms-tv-scope/Makefile +++ b/audio/xmms-tv-scope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/12 04:34:53 snj Exp $ +# $NetBSD: Makefile,v 1.12 2004/10/01 10:37:33 grant Exp $ # DISTNAME= tv_scope-0.0.2 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES ONLY_FOR_PLATFORM= SunOS-*-* Linux-*-* Darwin-*-* -ONLY_FOR_PLATFORM+= NetBSD-1.6[N-Z]-* NetBSD-1.6Z[A-Z]-* NetBSD-1.[7-9]* +ONLY_FOR_PLATFORM+= NetBSD-1.6[N-Z]-* NetBSD-1.6Z[A-Z]-* ONLY_FOR_PLATFORM+= NetBSD-[2-9]* .include "../../audio/xmms/buildlink3.mk" diff --git a/benchmarks/kttcp/Makefile b/benchmarks/kttcp/Makefile index 7c0ddbc96a0..20d52eac176 100644 --- a/benchmarks/kttcp/Makefile +++ b/benchmarks/kttcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/30 15:50:37 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2004/10/01 10:37:33 grant Exp $ DISTNAME= kttcp-${VERSION} CATEGORIES= benchmarks net @@ -10,7 +10,7 @@ COMMENT= kttcp kernel network throughput benchmark VERSION= 20020711 -ONLY_FOR_PLATFORM= NetBSD-1.6[B-Z]*-* NetBSD-1.[7-9]* NetBSD-[2-9]* +ONLY_FOR_PLATFORM= NetBSD-1.6[B-Z]*-* NetBSD-[2-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index 93470dc2311..6c9c2b855a9 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/05/09 20:19:44 snj Exp $ +# $NetBSD: Makefile,v 1.15 2004/10/01 10:37:33 grant Exp $ # DISTNAME= pvs-${VERSION} @@ -36,7 +36,7 @@ NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -ONLY_FOR_PLATFORM= NetBSD-1.[6-9]*-* NetBSD-[2-9]*-* Linux-*-* SunOS-*-* +ONLY_FOR_PLATFORM= NetBSD-1.6*-* NetBSD-[2-9]*-* Linux-*-* SunOS-*-* .include "../../mk/bsd.prefs.mk" diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile index 04155f3522f..7c8ba437ac0 100644 --- a/emulators/linuxppc_lib/Makefile +++ b/emulators/linuxppc_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/05/24 08:25:33 kristerw Exp $ +# $NetBSD: Makefile,v 1.22 2004/10/01 10:37:33 grant Exp $ DISTNAME= linuxppc_lib-2000.4.6 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS+= rpm2pkg-1.2:../../pkgtools/rpm2pkg CONFLICTS= suse_base-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \ - NetBSD-1.[6-9]*-powerpc NetBSD-[2-9]*-powerpc + NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc WRKSRC= ${WRKDIR}/${DISTNAME} SHLIB_HANDLING= NO diff --git a/emulators/rewind/Makefile b/emulators/rewind/Makefile index 8ed012e249f..08d7198a73b 100644 --- a/emulators/rewind/Makefile +++ b/emulators/rewind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/24 23:55:40 snj Exp $ +# $NetBSD: Makefile,v 1.12 2004/10/01 10:37:33 grant Exp $ DISTNAME= rewind-20020420 PKGREVISION= 4 @@ -12,8 +12,7 @@ COMMENT= BSD/X11 licenced fork of Wine (Windows on Unix) CONFLICTS= wine-[0-9]* -ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386 \ - NetBSD-[2-9]*-i386 +ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 USE_BUILDLINK3= YES USE_X11= YES diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile index b31513d406a..5e2b8a1a136 100644 --- a/emulators/suse_base/Makefile +++ b/emulators/suse_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2004/07/23 18:25:31 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2004/10/01 10:37:33 grant Exp $ DISTNAME= suse_base-${SUSE_VERSION} PKGREVISION= 6 @@ -15,7 +15,7 @@ CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386 ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= NetBSD-1.6[L-Z]-powerpc NetBSD-1.6Z[A-Z]-powerpc -ONLY_FOR_PLATFORM+= NetBSD-1.[7-9]*-powerpc NetBSD-[2-9]*-powerpc +ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-powerpc ONLY_FOR_PLATFORM+= FreeBSD-*-i386 NO_BUILDLINK= YES diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 231f7170cd2..7560172b998 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2004/08/28 21:09:08 ben Exp $ +# $NetBSD: Makefile,v 1.74 2004/10/01 10:37:33 grant Exp $ # DISTNAME= Wine-20040505 @@ -18,7 +18,7 @@ YACC= ${PREFIX}/bin/bison -y CONFLICTS= rewind-[0-9]* -ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386 NetBSD-2*-i386 +ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/} diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 6c1584342bd..1b9fb81e273 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/03/08 20:27:15 minskim Exp $ +# $NetBSD: Makefile,v 1.28 2004/10/01 10:37:33 grant Exp $ # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp # @@ -9,7 +9,8 @@ CATEGORIES= mbone tk MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/ .include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:MNetBSD-1.[6-9]*) + +.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) PATCH_SITES= ftp://tink.ims.ac.jp/pub/NetBSD/vic/ PATCHFILES= vic-2.8_ov511p0.diff.gz .endif diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile index 64e5b60b7be..33bf9ccde1d 100644 --- a/misc/openoffice-linux/Makefile +++ b/misc/openoffice-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/06/27 16:07:36 mrauch Exp $ +# $NetBSD: Makefile,v 1.25 2004/10/01 10:37:33 grant Exp $ DISTNAME= OOo_1.1.2_LinuxIntel_install PKGNAME= openoffice-linux-1.1.2 @@ -18,7 +18,7 @@ NO_CONFIGURE= yes CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* -ONLY_FOR_PLATFORM= NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386 +ONLY_FOR_PLATFORM= NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 TEMP?= ${WRKSRC} diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile index 88ed4ed9f63..7a10017854e 100644 --- a/multimedia/alevt/Makefile +++ b/multimedia/alevt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/14 19:30:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/10/01 10:37:33 grant Exp $ DISTNAME= alevt-1.6.0 PKGREVISION= 2 @@ -13,7 +13,7 @@ DEPENDS+= png>=1.2.1:../../graphics/png DEPENDS+= fxtv>=1.02:../../multimedia/fxtv ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \ - NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-* \ + NetBSD-1.5_ALPHA-* NetBSD-1.[56]*-* \ NetBSD-[2-9]*-* USE_DIRS+= xdg-1.1 diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index fb961c10c42..35f04a9b55a 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/07/24 21:47:09 jdc Exp $ +# $NetBSD: Makefile,v 1.10 2004/10/01 10:37:33 grant Exp $ DISTNAME= ogle-0.9.2 PKGREVISION= 1 @@ -10,8 +10,8 @@ HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= DVD player with menus ONLY_FOR_PLATFORM= NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386 -ONLY_FOR_PLATFORM+= NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= NetBSD-1.6[D-Z]*-powerpc NetBSD-1.[7-9]*-powerpc +ONLY_FOR_PLATFORM+= NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 +ONLY_FOR_PLATFORM+= NetBSD-1.6[D-Z]*-powerpc ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-powerpc ONLY_FOR_PLATFORM+= NetBSD-1.6Z*-alpha NetBSD-[2-9]*-alpha ONLY_FOR_PLATFORM+= NetBSD-1.6Z*-sparc64 NetBSD-[2-9]*-sparc64 diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile index 49e7f59adbe..ae40f43766a 100644 --- a/security/gtk-systrace/Makefile +++ b/security/gtk-systrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/25 05:04:52 snj Exp $ +# $NetBSD: Makefile,v 1.9 2004/10/01 10:37:32 grant Exp $ # DISTNAME= gtk-systrace-2002-12-01 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.citi.umich.edu/u/provos/systrace/index.html COMMENT= GTK interface to systrace(1) -ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-1.[7-9]*-* NetBSD-[2-9]* +ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-[2-9]* WRKSRC= ${WRKDIR}/notification-0.1 GNU_CONFIGURE= YES diff --git a/security/nfsbug/Makefile b/security/nfsbug/Makefile index 9345a868906..4caa0e56365 100644 --- a/security/nfsbug/Makefile +++ b/security/nfsbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/03/22 03:27:18 kristerw Exp $ +# $NetBSD: Makefile,v 1.11 2004/10/01 10:37:33 grant Exp $ DISTNAME= nfsshell-1.0 CATEGORIES= net security @@ -17,9 +17,9 @@ NO_EXPORT_CPP= yes # needed since we use rpcgen # Only works on 1.5B or greater on most platforms but will work on any x86 # since struct pmap didn't get exposed through vm.h there. -ONLY_FOR_PLATFORM= NetBSD-1.5[B-Z]-* NetBSD-1.5Z[A-Z]-* NetBSD-1.[6-9]*-* \ - NetBSD-[2-9]* \ - NetBSD-*-i386 +ONLY_FOR_PLATFORM= NetBSD-1.5[B-Z]-* NetBSD-1.5Z[A-Z]-* +ONLY_FOR_PLATFORM+= NetBSD-1.6*-* NetBSD-[2-9]*-* +ONLY_FOR_PLATFORM+= NetBSD-*-i386 INSTALLATION_DIRS= bin diff --git a/sysutils/i2ocfg/Makefile b/sysutils/i2ocfg/Makefile index 96ab80da158..560d293c39a 100644 --- a/sysutils/i2ocfg/Makefile +++ b/sysutils/i2ocfg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/05/07 11:54:35 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2004/10/01 10:37:33 grant Exp $ DISTNAME= i2ocfg-1.0 CATEGORIES= sysutils @@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.interlude.eu.org/~ad/software/i2ocfg/ COMMENT= I2O configuration dialog gateway -ONLY_FOR_PLATFORM= NetBSD-1.5[J-Z]-* NetBSD-1.[6-9]*-* NetBSD-[2-9]* +ONLY_FOR_PLATFORM= NetBSD-1.5[J-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-* MANCOMPRESSED_IF_MANZ= YES diff --git a/www/firefox-bin-java/Makefile b/www/firefox-bin-java/Makefile index 2aa2abf7ad7..7bb13c5f468 100644 --- a/www/firefox-bin-java/Makefile +++ b/www/firefox-bin-java/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/08/21 00:49:30 jdolecek Exp $ +# $NetBSD: Makefile,v 1.7 2004/10/01 10:37:33 grant Exp $ DISTNAME= firefox-bin-java-1.1 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= Java Run Time Environment (JRE) 1.3 plugin for firefox-bin DEPENDS+= sun-jre14-[0-9]*:../../lang/sun-jre14 DEPENDS+= firefox-bin>=0.8:../../www/firefox-bin -ONLY_FOR_PLATFORM= Linux-*-i386 NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386 +ONLY_FOR_PLATFORM= Linux-*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 WRKSRC= ${WRKDIR} NO_CHECKSUM= YES diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 51db27ffceb..ac81a9e483d 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/05/08 15:08:06 minskim Exp $ +# $NetBSD: Makefile,v 1.25 2004/10/01 10:37:33 grant Exp $ DISTNAME= mlterm-2.8.0 PKGNAME= ${DISTNAME}pl1 @@ -14,8 +14,8 @@ HOMEPAGE= http://mlterm.sourceforge.net/ COMMENT= Multilingual terminal emulator # CODESET is only supported on NetBSD in 1.5T and later - see -ONLY_FOR_PLATFORM= NetBSD-1.5[T-Z]-* NetBSD-1.5Z[A-Z]-* NetBSD-1.[6-9]* \ - NetBSD-[2-9]* +ONLY_FOR_PLATFORM= NetBSD-1.5[T-Z]-* NetBSD-1.5Z[A-Z]-* +ONLY_FOR_PLATFORM+= NetBSD-1.6*-* NetBSD-[2-9]*-* USE_BUILDLINK3= yes USE_X11= yes -- cgit v1.2.3