diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-02-13 10:59:25 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-02-13 10:59:25 +0000 |
| commit | 700ef1413da5409b488c1b0815bda147a65c129e (patch) | |
| tree | 8e8b8e8aa419cd2e0b1a963ea942b98f2e9f9332 | |
| parent | 0750dde835e4172dab0d5419cfcc795b12242db2 (diff) | |
More MACHINE_ARCH tweaks
| -rw-r--r-- | distrib/notes/m4.common | 3 | ||||
| -rw-r--r-- | distrib/notes/packages | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index 7061706ec30..9792b840f55 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,9 +1,10 @@ dnl -dnl $OpenBSD: m4.common,v 1.48 2004/02/09 13:32:45 todd Exp $ +dnl $OpenBSD: m4.common,v 1.49 2004/02/13 10:59:24 miod Exp $ dnl dnl a simple MACHINE->MACHINE_ARCH converter. define(`MACHINE_ARCH', `ifelse( +MACHINE,amd64,x86_64, MACHINE,amiga,m68k, MACHINE,cats,arm, MACHINE,hp300,m68k, diff --git a/distrib/notes/packages b/distrib/notes/packages index 9e150413918..888b83325d1 100644 --- a/distrib/notes/packages +++ b/distrib/notes/packages @@ -1,4 +1,4 @@ -dnl $OpenBSD: packages,v 1.31 2003/09/06 21:19:17 miod Exp $ +dnl $OpenBSD: packages,v 1.32 2004/02/13 10:59:24 miod Exp $ As complete as your OpenBSD system is, you may want to add any of several excellent third party software applications. There are several ways to do this. You can: @@ -43,7 +43,7 @@ Installing applications from the CD-ROM package collection: Password: <enter your root password> # mkdir -p /cdrom # mount /dev/cd0a /cdrom - # pkg_add /cdrom/OSREV/packages/MACHINE_ARCH/<package-name> + {:-#-:} pkg_add /cdrom/OSREV/packages/MACHINE_ARCH/<package-name> # <add more packages if desired> # umount /cdrom @@ -1227,6 +1227,8 @@ define({:-PORTS-:}, {:-ifelse( MACHINE_ARCH,alpha,{:-FreeBSD ports or NetBSD package collection-:}, +MACHINE_ARCH,arm,{:-NetBSD + package collection-:}, dnl MACHINE_ARCH,hppa,{:-NetBSD dnl package collection-:}, MACHINE_ARCH,i386,{:-FreeBSD @@ -1240,7 +1242,9 @@ MACHINE_ARCH,sparc,{:-NetBSD MACHINE_ARCH,sparc64,{:-FreeBSD ports or NetBSD package collection-:}, MACHINE_ARCH,vax,{:-NetBSD - package collection-:})-:})dnl + package collection-:}, +MACHINE_ARCH,x86_64,{:-FreeBSD + ports or NetBSD package collection-:})-:})dnl dnl dnl If this architecture supports FreeBSD or NetBSD emulation by default, dnl define text that tells which binary packages you can try to run. |