--- /usr/ports/emulators/linux_base-8/Makefile	Sun Oct 10 20:43:03 2004
+++ /usr/ports/emulators/linux_base-8/Makefile.new	Sun Oct 10 19:58:32 2004
@@ -98,7 +98,7 @@
 			etc/protocols
 BRAND_FILES=		bin/rpm sbin/ldconfig sbin/sln
 
-FALLBACK_ELF_MIB=	kern.fallback_elf_brand
+FALLBACK_ELF_MIB=	kern.elf32.fallback_brand
 LINUX_ELF=		3
 PREVIOUS_ELF!=		/sbin/sysctl -n ${FALLBACK_ELF_MIB}
 
@@ -124,7 +124,11 @@
 # Also, set the ELF fallback brand to Linux, so that we don't have to do
 # anything special to run staticly linked binaries.
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
-	@for R in ${UPD_SET1} ${DISTFILES} ${UPD_SET2}; do \
+	@for R in ${UPD_SET1}; do \
+		${ECHO} $$R; \
+		${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/$$R; \
+	done
+	@for R in ${DISTFILES} ${UPD_SET2}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
--- /usr/ports/textproc/linux-aspell/Makefile.orig	Fri May 14 04:35:42 2004
+++ /usr/ports/textproc/linux-aspell/Makefile	Sun Oct 10 20:48:04 2004
@@ -33,7 +33,7 @@
 
 DBPATH=		/var/lib/rpm
 #RPMDIR=	${DISTDIR}/${DIST_SUBDIR}
-RPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
+RPMFLAGS=	--ignoreos --ignorearch --root ${PREFIX} --dbpath ${DBPATH} \
 		--nodeps --replacepkgs
 
 CONF_DICT_ENV=	ASPELL="${PREFIX}/usr/bin/aspell" \
--- /usr/ports/x11-toolkits/linux-gtk/Makefile.orig	Sun Oct 10 19:36:43 2004
+++ /usr/ports/x11-toolkits/linux-gtk/Makefile	Sun Oct 10 20:49:19 2004
@@ -44,7 +44,7 @@
 RPM_SET?=	gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
 .endif
 DBPATH=		/var/lib/rpm
-RPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
+RPMFLAGS=	--ignoreos --ignorearch --root ${PREFIX} --dbpath ${DBPATH} \
 		--nodeps --replacepkgs
 RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
 
--- /usr/ports/x11/linux-XFree86-libs/Makefile.orig	Thu Mar 11 20:24:56 2004
+++ /usr/ports/x11/linux-XFree86-libs/Makefile	Sun Oct 10 20:50:17 2004
@@ -49,7 +49,7 @@
 	@chroot ${LINUXBASE} sbin/ldconfig
 
 do-install:
-	@rpm -U --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm --nodeps \
+	@rpm -U --ignoreos --ignorearch --root ${PREFIX} --dbpath /var/lib/rpm --nodeps \
 		--replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} || ${TRUE}
 
 .include <bsd.port.mk>
--- /usr/ports/www/linux-opera/files/patch-install.sh.orig	Tue Jul 20 19:38:59 2004
+++ /usr/ports/www/linux-opera/files/patch-install.sh	Sun Oct 10 21:02:04 2004
@@ -1,5 +1,14 @@
---- install.sh.orig	Fri Jul 16 07:39:52 2004
-+++ install.sh	Tue Jul 20 00:34:42 2004
+--- install.sh.orig	Sun Oct 10 20:58:58 2004
++++ install.sh	Sun Oct 10 21:00:28 2004
+@@ -373,7 +373,7 @@
+ 	    mvv=''    # SunOS mv (no -v verbose option)
+ 	;;
+ 
+-	i[3456]86:FreeBSD|i[3456]86:NetBSD)
++	i[3456]86:FreeBSD|i[3456]86:NetBSD|amd64:FreeBSD)
+ 		cpf='-f'
+ 		if test "$verbose" -gt '1'; then
+ 		    chmodv='-v'
 @@ -758,25 +758,21 @@
  
      debug_msg 0 "in generate_wrapper()"
@@ -13,17 +22,18 @@
 +    ${str_localdirplugin} \\"
  
      case "${machine}:${os}" in
- 	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+-	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
++	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD|amd64:FreeBSD)
  	    wrapper_plugin_paths="
 -    /usr/local/Acrobat[45]/Browsers/intellinux \\
 -    /usr/lib/Acrobat[45]/Browsers/intellinux \\
 -    /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\
 -    /opt/Acrobat[45]/Browsers/intellinux \\
 -    /usr/Acrobat[45]/Browsers/intellinux \\"
-+    %%LOCALBASE%%/lib/linux-flashplugin6 \\
-+    %%LOCALBASE%%/lib/linux-flashplugin7 \\
-+    %%LOCALBASE%%/Acrobat4/Browsers/intellinux \\
-+    %%LOCALBASE%%/Acrobat5/Browsers/intellinux \\"
++    /usr/local/lib/linux-flashplugin6 \\
++    /usr/local/lib/linux-flashplugin7 \\
++    /usr/local/Acrobat4/Browsers/intellinux \\
++    /usr/local/Acrobat5/Browsers/intellinux \\"
  
  	    wrapper_ibmjava="
 -	    IBMJava2-141/jre \\
@@ -43,13 +53,13 @@
 -    /usr/lib/realplay/plugins \\
 -    /usr/lib/RealPlayer8 \\
 -    /usr/lib/realplay \\
-+    %%LOCALBASE%%/lib/RealPlayer8/Plugins \\
++    /usr/local/lib/RealPlayer8/Plugins \\
      \"\${HOME}/.netscape/plugins\" \\
 -    /opt/netscape/plugins \\
 -    /usr/lib/netscape/plugins \\
 -    /usr/local/netscape/plugins \\
 -    /usr/local/lib/netscape/plugins \\"
-+    %%LOCALBASE%%/lib/netscape-linux/plugins \\"
++    /usr/local/lib/netscape-linux/plugins \\"
  
 -    wrapper_file="${wrapper_dir}/opera"
 +    wrapper_file="${wrapper_dir}/linux-opera"
@@ -82,7 +92,7 @@
 -	/usr/lib
 -	/usr/local
 -	/opt\"
-+    PREFIXES=\"%%LOCALBASE%%\"
++    PREFIXES=\"/usr/local\"
  
      for SUNJAVA in \\
 -	j2re1.4.2_01 \\
@@ -129,8 +139,8 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+    %%LOCALBASE%%/Acrobat4/bin \\
-+    %%LOCALBASE%%/Acrobat5/bin \\
++    /usr/local/Acrobat4/bin \\
++    /usr/local/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
@@ -255,13 +265,13 @@
 -	  generate_desktop /etc/X11/applnk/Internet
 -	fi
 -      elif test -w /etc/X11/applnk/Internet; then generate_desktop /etc/X11/applnk/Internet
-+    if test ! -d %%X11BASE%%/share/pixmaps; then
-+      if test -w %%X11BASE%%/share; then
-+	mkdir $mkdirv $mkdirp %%X11BASE%%/share/pixmaps/
-+	chmod $chmodv 755 %%X11BASE%%/share/pixmaps
-+	cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/linux-opera.xpm
++    if test ! -d /usr/X11R6/share/pixmaps; then
++      if test -w /usr/X11R6/share; then
++	mkdir $mkdirv $mkdirp /usr/X11R6/share/pixmaps/
++	chmod $chmodv 755 /usr/X11R6/share/pixmaps
++	cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/pixmaps/linux-opera.xpm
        fi
-+    elif test -w %%X11BASE%%/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/pixmaps/linux-opera.xpm
++    elif test -w /usr/X11R6/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/pixmaps/linux-opera.xpm
      fi
  }
  
@@ -273,7 +283,7 @@
 -
 -      # /opt/gnome share
 -      if test -d /opt/gnome/share; then
-+    if test -d %%X11BASE%%/share/gnome/; then
++    if test -d /usr/X11R6/share/gnome/; then
  
 -        # /opt/gnome icon
 -        if test ! -d /opt/gnome/share/pixmaps/; then
@@ -281,45 +291,45 @@
 -	    mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
 -	    chmod $chmodv 755 /opt/gnome/share/pixmaps
 -	    cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+        # %%X11BASE%%/share/gnome icon
-+        if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then
-+	  if test -w %%X11BASE%%/share/gnome; then
-+	    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
-+	    chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
-+	    cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm
++        # /usr/X11R6/share/gnome icon
++        if test ! -d /usr/X11R6/share/gnome/pixmaps/; then
++	  if test -w /usr/X11R6/share/gnome; then
++	    mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/pixmaps/
++	    chmod $chmodv 755 /usr/X11R6/share/gnome/pixmaps
++	    cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/linux-opera.xpm
  	  fi
 -	elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+	elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm
++	elif test -w /usr/X11R6/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/linux-opera.xpm
  	fi
 -	# end /opt/gnome icon
-+	# end %%X11BASE%%/share/gnome icon
++	# end /usr/X11R6/share/gnome icon
  
 -	# /opt/gnome link
 -	if test -d /opt/gnome/share/gnome/apps/; then
 -          if test -d /opt/gnome/share/gnome/apps/Internet/; then
 -            if test -w /opt/gnome/share/gnome/apps/Internet; then
 -              generate_desktop /opt/gnome/share/gnome/apps/Internet
-+	# %%X11BASE%%/share/gnome link
-+	if test -d %%X11BASE%%/share/gnome/apps/; then
-+          if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
-+            if test -w %%X11BASE%%/share/gnome/apps/Internet; then
-+              generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++	# /usr/X11R6/share/gnome link
++	if test -d /usr/X11R6/share/gnome/apps/; then
++          if test -d /usr/X11R6/share/gnome/apps/Internet/; then
++            if test -w /usr/X11R6/share/gnome/apps/Internet; then
++              generate_desktop /usr/X11R6/share/gnome/apps/Internet
  	    fi
 -          elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
 -            if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then
 -	      generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
-+          elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
-+            if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
-+	      generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
++          elif test -d /usr/X11R6/share/gnome/apps/Networking/WWW/; then
++            if test -w /usr/X11R6/share/gnome/apps/Networking/WWW; then
++	      generate_desktop /usr/X11R6/share/gnome/apps/Networking/WWW
  	    fi
 -	  elif test -w /opt/gnome/share/gnome/apps; then
 -	    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
 -	    chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
 -            generate_desktop /opt/gnome/share/gnome/apps/Internet
-+	  elif test -w %%X11BASE%%/share/gnome/apps; then
-+	    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
-+	    chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
-+            generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++	  elif test -w /usr/X11R6/share/gnome/apps; then
++	    mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/apps/Internet/
++	    chmod $chmodv 755 /usr/X11R6/share/gnome/apps/Internet
++            generate_desktop /usr/X11R6/share/gnome/apps/Internet
            fi
  	fi
 -	# end /opt/gnome link
@@ -356,7 +366,7 @@
 -          fi
 -	fi
 -	# end /usr/share/gnome link
-+	# end %%X11BASE%%/share/gnome link
++	# end /usr/X11R6/share/gnome link
     fi
     # Add ximian here
  }
@@ -365,10 +375,10 @@
      debug_msg 1 "in kde()"
  
 -    if test -d /opt/kde${1}/share; then
-+    if test -d %%LOCALBASE%%/share; then
++    if test -d /usr/local/share; then
  
 -      DIR_HI=/opt/kde${1}/share/icons/hicolor
-+      DIR_HI=%%LOCALBASE%%/share/icons/hicolor
++      DIR_HI=/usr/local/share/icons/hicolor
        if test -d "$DIR_HI" -a -w "$DIR_HI"; then
 -        if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps; then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png; fi
 -        if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png; fi
@@ -379,7 +389,7 @@
        fi
  
 -      DIR_LO=/opt/kde${1}/share/icons/locolor
-+      DIR_LO=%%LOCALBASE%%/share/icons/locolor
++      DIR_LO=/usr/local/share/icons/locolor
        if test -d $DIR_LO -a -w $DIR_LO; then
 -        if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png; fi
 -        if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png; fi
@@ -393,13 +403,13 @@
 -        if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then
 -	    mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/
 -	    chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet
-+      if test -d %%LOCALBASE%%/share/applnk/; then
-+        if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then
-+	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
-+	    chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
++      if test -d /usr/local/share/applnk/; then
++        if test ! -d /usr/local/share/applnk/Internet/ -a -w /usr/local/share/applnk; then
++	    mkdir $mkdirv $mkdirp /usr/local/share/applnk/Internet/
++	    chmod $chmodv 755 /usr/local/share/applnk/Internet
  	fi
 -	if test -w /opt/kde${1}/share/applnk/Internet; then generate_desktop /opt/kde${1}/share/applnk/Internet ${1}; fi
-+	if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
++	if test -w /usr/local/share/applnk/Internet; then generate_desktop /usr/local/share/applnk/Internet ${1}; fi
        fi
  
      fi