6 files changed, 20 insertions, 29 deletions
diff --git a/emulators/suse91_fontconfig/DESCR b/emulators/suse91_fontconfig/DESCR
index fffa11f3d2e..48a1e2cd2ab 100644
--- a/emulators/suse91_fontconfig/DESCR
+++ b/emulators/suse91_fontconfig/DESCR
@@ -1,5 +1,6 @@
-Linux compatibility package based on the SuSE Linux distribution, take a
-look at "http://www.suse.com/" for more information about it.
+Linux compatibility package based on the SuSE Linux distribution.
+Please visit http://www.suse.com/ for more information about SuSE
+Linux.
 
-This package supports running ELF binaries linked with glibc2 which require
-fontconfig shared libraries.
+This package supports running ELF binaries linked with glibc2 that
+require fontconfig shared libraries.
diff --git a/emulators/suse91_fontconfig/Makefile b/emulators/suse91_fontconfig/Makefile
index fd6f9996d92..e8f661ea773 100644
--- a/emulators/suse91_fontconfig/Makefile
+++ b/emulators/suse91_fontconfig/Makefile
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/06/30 15:37:22 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:07 jlam Exp $
 
-DISTNAME=		suse_fontconfig-${SUSE_VERSION}
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_SUSE91}
-DISTFILES=		${RPMFILES}
+DISTNAME=	suse_fontconfig-${SUSE_VERSION}
+PKGREVISION=	3
+CATEGORIES=	emulators
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.suse.com/
-COMMENT=		Linux compatibility package for fontconfig binaries
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Linux compatibility package for fontconfig
 
-DEPENDS+=		suse_expat-${SUSE_VERSION}{,nb*}:../../emulators/suse91_expat
-DEPENDS+=		suse_freetype2-${SUSE_VERSION}{,nb*}:../../emulators/suse91_freetype2
-
-EXTRACT_ONLY=		# empty
-NO_BUILD=		YES
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
-.endif
+EMUL_MODULES.linux=	expat freetype2
 
 .include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_fontconfig/Makefile.i386 b/emulators/suse91_fontconfig/Makefile.i386
deleted file mode 100644
index 430ee8a916d..00000000000
--- a/emulators/suse91_fontconfig/Makefile.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.i386,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/Makefile.x86_64 b/emulators/suse91_fontconfig/Makefile.x86_64
deleted file mode 100644
index d8374752a9c..00000000000
--- a/emulators/suse91_fontconfig/Makefile.x86_64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.x86_64,v 1.1 2006/01/08 16:53:21 salo Exp $
-
-RPMFILES=		fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/suse.i386.mk b/emulators/suse91_fontconfig/suse.i386.mk
new file mode 100644
index 00000000000..03ebb5bf3a1
--- /dev/null
+++ b/emulators/suse91_fontconfig/suse.i386.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.i386.mk,v 1.1 2007/07/29 05:19:08 jlam Exp $
+
+# SuSE i386 RPMs
+DISTFILES=	fontconfig-2.2.92.20040221-28.${SUSE_ARCH}.rpm
diff --git a/emulators/suse91_fontconfig/suse.x86_64.mk b/emulators/suse91_fontconfig/suse.x86_64.mk
new file mode 100644
index 00000000000..a4aad7e7512
--- /dev/null
+++ b/emulators/suse91_fontconfig/suse.x86_64.mk
@@ -0,0 +1,4 @@
+# $NetBSD: suse.x86_64.mk,v 1.1 2007/07/29 05:19:08 jlam Exp $
+
+# SuSE x86_64 RPMs
+DISTFILES=	fontconfig-2.2.92.20040221-24.${SUSE_ARCH}.rpm