ports/79009: [patch] Some linux ports are incorrectly specified i386-only

[Francois Tigeot]

>Number:         79009
>Category:       ports
>Synopsis:       [patch] Some linux ports are incorrectly specified i386-only
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 19 12:00:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Francois Tigeot
>Release:        FreeBSD 5.4-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD aoi.wolfpond.org 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Wed Mar 16 19:56:57 CET 2005 ftigeot at aoi.wolfpond.org:/usr/obj/usr/src/sys/AOI amd64


>Description:

Some linux ports are specified as for the i386 architecture only and fail to
install on amd64 systems.

>How-To-Repeat:

cd to /usr/ports/devel/linux-glib2 and try to install the port

>Fix:

Please apply the attached patch.

diff -urN ports.orig/accessibility/linux-atk/Makefile ports/accessibility/linux-atk/Makefile
--- ports.orig/accessibility/linux-atk/Makefile	Tue Mar 15 05:32:24 2005
+++ ports/accessibility/linux-atk/Makefile	Sat Mar 19 10:54:31 2005
@@ -17,7 +17,7 @@
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
 
 BASEVERSION=	9
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${PKGDIR}/pkg-plist
 RESTRICTED=	"binary under GNU LGPL without accompanying source"
 RPM_SET=	atk-1.2.0-2.i386.rpm
diff -urN ports.orig/devel/linux-glib2/Makefile ports/devel/linux-glib2/Makefile
--- ports.orig/devel/linux-glib2/Makefile	Tue Mar 15 05:35:01 2005
+++ ports/devel/linux-glib2/Makefile	Sat Mar 19 10:44:05 2005
@@ -14,7 +14,7 @@
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
 
 BASEVERSION=	9
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${PKGDIR}/pkg-plist
 RESTRICTED=	"binary under GNU LGPL without accompanying source"
 RPM_SET=	glib2-2.2.1-1.i386.rpm
diff -urN ports.orig/graphics/linux-jpeg/Makefile ports/graphics/linux-jpeg/Makefile
--- ports.orig/graphics/linux-jpeg/Makefile	Fri Dec 31 19:23:55 2004
+++ ports/graphics/linux-jpeg/Makefile	Sat Mar 19 10:57:41 2005
@@ -13,6 +13,9 @@
 MAINTAINER=	freebsd-emulation at FreeBSD.org
 COMMENT=	RPM of the JPEG lib
 
+.if (${MACHINE_ARCH} == "amd64")
+MACHINE_ARCH=i386
+.endif
 RPM_SET=	libjpeg-6b-15.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff -urN ports.orig/graphics/linux-png/Makefile ports/graphics/linux-png/Makefile
--- ports.orig/graphics/linux-png/Makefile	Sun Feb  6 22:50:35 2005
+++ ports/graphics/linux-png/Makefile	Sat Mar 19 11:00:27 2005
@@ -17,7 +17,7 @@
 
 DIST_SUBDIR=	rpm/i386/fc3
 # no alpha rpm is available
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 RPM_SET=	libpng-${PORTVERSION}-1.i386.rpm
 
 PLIST_FILES=	\
diff -urN ports.orig/textproc/linux-expat/Makefile ports/textproc/linux-expat/Makefile
--- ports.orig/textproc/linux-expat/Makefile	Fri Mar 18 23:10:32 2005
+++ ports/textproc/linux-expat/Makefile	Sun Feb  6 01:41:17 2005
@@ -2,7 +2,7 @@
 # Date created:				2003-07-05
 # Whom:					trevor
 #
-# $FreeBSD: ports/textproc/linux-expat/Makefile,v 1.10 2005/03/18 22:10:32 joerg Exp $
+# $FreeBSD: ports/textproc/linux-expat/Makefile,v 1.9 2005/02/06 00:41:17 obrien Exp $
 #
 
 PORTNAME=	expat
@@ -13,7 +13,7 @@
 MAINTAINER=	freebsd-emulation at FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-RUN_DEPENDS=	${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
diff -urN ports.orig/x11-toolkits/linux-gtk2/Makefile ports/x11-toolkits/linux-gtk2/Makefile
--- ports.orig/x11-toolkits/linux-gtk2/Makefile	Tue Mar 15 05:53:55 2005
+++ ports/x11-toolkits/linux-gtk2/Makefile	Sat Mar 19 10:41:56 2005
@@ -25,7 +25,7 @@
 		${BUILD_DEPENDS}
 
 BASEVERSION=	9
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${PKGDIR}/pkg-plist
 RESTRICTED=	"binaries under GNU LGPL without accompanying source"
 RPM_SET=	gtk2-2.2.1-4.i386.rpm
diff -urN ports.orig/x11-toolkits/linux-pango/Makefile ports/x11-toolkits/linux-pango/Makefile
--- ports.orig/x11-toolkits/linux-pango/Makefile	Fri Dec 31 19:24:10 2004
+++ ports/x11-toolkits/linux-pango/Makefile	Sat Mar 19 11:05:08 2005
@@ -22,7 +22,7 @@
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 BASEVERSION=	9
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	pango-1.2.1-3.i386.rpm
 
>Release-Note:
>Audit-Trail:
>Unformatted: