From owner-freebsd-emulation@FreeBSD.ORG  Tue Jan 17 17:01:17 2006
Return-Path: <owner-freebsd-emulation@FreeBSD.ORG>
X-Original-To: freebsd-emulation@FreeBSD.org
Delivered-To: freebsd-emulation@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BA65116A422;
	Tue, 17 Jan 2006 17:01:17 +0000 (GMT)
	(envelope-from laszlof@ritamari.vonostingroup.com)
Received: from ritamari.vonostingroup.com (ritamari.vonostingroup.com
	[216.144.193.230])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4DC0543D82;
	Tue, 17 Jan 2006 17:01:13 +0000 (GMT)
	(envelope-from laszlof@ritamari.vonostingroup.com)
Received: from laszlof by ritamari.vonostingroup.com with local (Exim 4.60
	(FreeBSD)) (envelope-from <laszlof@ritamari.vonostingroup.com>)
	id 1EyuCm-0000su-32; Tue, 17 Jan 2006 12:01:12 -0500
To: FreeBSD-gnats-submit@freebsd.org
From: Frank Laszlo <laszlof@vonostingroup.com>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <E1EyuCm-0000su-32@ritamari.vonostingroup.com>
Date: Tue, 17 Jan 2006 12:01:12 -0500
X-AntiAbuse: This header was added to track abuse,
	please include it with any abuse report
X-AntiAbuse: Primary Hostname - ritamari.vonostingroup.com
X-AntiAbuse: Original Domain - freebsd.org
X-AntiAbuse: Originator/Caller UID/GID - [1001 1001] / [26 6]
X-AntiAbuse: Sender Address Domain - ritamari.vonostingroup.com
X-Source: 
X-Source-Args: 
X-Source-Dir: 
Cc: freebsd-emulation@FreeBSD.org
Subject: [PATCH]: x11-toolkits/linux-gtk2: distfile unfetchable
X-BeenThere: freebsd-emulation@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Frank Laszlo <laszlof@vonostingroup.com>
List-Id: Development of Emulators of other operating systems
	<freebsd-emulation.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-emulation>, 
	<mailto:freebsd-emulation-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-emulation>
List-Post: <mailto:freebsd-emulation@freebsd.org>
List-Help: <mailto:freebsd-emulation-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-emulation>, 
	<mailto:freebsd-emulation-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2006 17:01:17 -0000


>Submitter-Id:	current-users
>Originator:	Frank Laszlo
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH]: x11-toolkits/linux-gtk2: distfile unfetchable
>Severity:	
>Priority:	
>Category:	ports
>Class:		
>Release:	FreeBSD 6.0-STABLE i386
>Environment:
System: FreeBSD ritamari.vonostingroup.com 6.0-STABLE FreeBSD 6.0-STABLE #0: Mon Nov 7 12:06:15 EST 2005 laszlof@ritamari.vonostingroup.com:/usr/obj/usr/src/sys/RITAMARI i386


	
>Description:
	The distfile for this port is unfetchable if ARCH=amd64. The reason for this is that the rpm packager decided to
	ARCH=x86_64 instead of amd64 in their naming convention. This patch will fix the issue.

>How-To-Repeat:
	cd ${PORTSDIR}/x11-toolkits/linux-gtk2 && make ARCH=amd64 fetch
>Fix:

	



--- linux-gtk2-amd64.diff begins here ---
diff -NrU3 linux-gtk2.orig/Makefile linux-gtk2/Makefile
--- linux-gtk2.orig/Makefile	Tue Jan 17 11:53:16 2006
+++ linux-gtk2/Makefile	Tue Jan 17 11:58:10 2006
@@ -30,8 +30,16 @@
 PLIST=		${PKGDIR}/pkg-plist
 USE_XLIB=	yes
 RESTRICTED=	"binaries under GNU LGPL without accompanying source"
-RPM_SET=	gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+RPM_SET=	gtk2-${PORTVERSION}-4.fc3.3.${ARCH_SUB}.rpm
 PLIST_SUB=	LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+ARCH_SUB=x86_64
+.else
+ARCH_SUB=${ARCH}
+.endif
 
 post-install:
 .for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
--- linux-gtk2-amd64.diff ends here ---