AMD64 patch for 'ports/x11-toolkits/linux-gtk'

[David O'Brien]

On Wed, Feb 16, 2005 at 12:12:36AM -0800, David O'Brien wrote:
Any have a problem with this updated patch?

1. uses "ARCH" instead of "MACHINE_ARCH"
2. allow "ARCH" to be over-ridable.
3. fix ordering to better follow Mk/bsd.port.mk guidelines
 
-- 
-- David  (obrien at FreeBSD.org)

Index: x11-toolkits/linux-gtk/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/linux-gtk/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- x11-toolkits/linux-gtk/Makefile	31 Dec 2004 18:24:09 -0000	1.28
+++ x11-toolkits/linux-gtk/Makefile	16 Feb 2005 08:26:15 -0000
@@ -21,16 +21,23 @@
 BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
+ONLY_FOR_ARCHS?=	i386 alpha amd64
+
 USE_LINUX_PREFIX=	yes
-USE_LINUX=	yes
 
-ONLY_FOR_ARCHS?=	i386 alpha
+.include <bsd.port.pre.mk>
+
+.if (${ARCH} == "amd64")
+ARCH=		i386
+RPMFLAGS+=	--ignorearch
+.endif
+USE_LINUX=	yes
 DIST_SUBDIR?=	rpm
 EXTRACT_ONLY=
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
-PLIST?=		${PKGDIR}/pkg-plist.${MACHINE_ARCH}
-MD5_FILE?=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
+PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
+MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
@@ -47,7 +54,7 @@
 RPM_SET?=	gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
 .endif
 DBPATH=		/var/lib/rpm
-RPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
+RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
 		--nodeps --replacepkgs
 RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
 
@@ -66,4 +73,4 @@
 		${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
 		>> ${PLIST}.new
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: x11-fonts/linux-fontconfig/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/linux-fontconfig/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-fonts/linux-fontconfig/Makefile	6 Feb 2005 00:41:17 -0000	1.8
+++ x11-fonts/linux-fontconfig/Makefile	16 Feb 2005 08:27:41 -0000
@@ -41,6 +41,7 @@
 		${FIND} * -type f -o -type l > ${PLIST}; \
 		${FIND} -d * -type d | ${GREP} font | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
+	@${MKDIR} ${PREFIX}/etc/fonts
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/