* There's no need to use a distinfo file for every xorg-fonts*

  package anymore, they are using the same distfile.
* Apply patch from Joerg Sonnenberger to fix build/installation on
  DragonFlyBSD -current.

This should fix PR pkg/30254 from Joerg.

4 files changed, 58 insertions, 5 deletions

diff --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile
index 7d4bacdfe19..85237696613 100644
--- a/fonts/xorg-fontsEncodings/Makefile
+++ b/fonts/xorg-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/30 20:40:31 hira Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/23 20:53:28 xtraeme Exp $
 
 DISTNAME=	X11R${XORG_VER}-src1
 PKGNAME=	xorg-fontsEncodings-${XORG_VER}
@@ -9,10 +9,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org Encoding fonts
 
-BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
-
 XBUILD_DIRS=	fonts/encodings
 XEXTRACTS=	${XBUILD_DIRS}
 
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsEncodings/Makefile.common b/fonts/xorg-fontsEncodings/Makefile.common
new file mode 100644
index 00000000000..ccdf9fc704a
--- /dev/null
+++ b/fonts/xorg-fontsEncodings/Makefile.common
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile.common,v 1.1 2005/05/23 20:53:28 xtraeme Exp $
+
+.ifndef XORG_FONTSENCODINGS_COMMON
+XORG_FONTSENCODINGS_COMMON=	defined
+
+BUILD_DEPENDS+=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
+
+FILESDIR=	${PKGSRCDIR}/fonts/xorg-fontsEncodings/files
+PATCHDIR=	${PKGSRCDIR}/fonts/xorg-fontsEncodings/patches
+DISTINFO_FILE=	${PKGSRCDIR}/fonts/xorg-fontsEncodings/distinfo
+
+.include "../../meta-pkgs/xorg/Makefile.common"
+
+.endif
diff --git a/fonts/xorg-fontsEncodings/distinfo b/fonts/xorg-fontsEncodings/distinfo
index a0f24e38cae..dfba8509cb2 100644
--- a/fonts/xorg-fontsEncodings/distinfo
+++ b/fonts/xorg-fontsEncodings/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:11 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2005/05/23 20:53:28 xtraeme Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
 Size (X11R6.8.2-src1.tar.gz) = 32373802 bytes
+SHA1 (patch-aa) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
diff --git a/fonts/xorg-fontsEncodings/patches/patch-aa b/fonts/xorg-fontsEncodings/patches/patch-aa
new file mode 100644
index 00000000000..a8ea7d6908e
--- /dev/null
+++ b/fonts/xorg-fontsEncodings/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2005/05/23 20:53:28 xtraeme Exp $
+
+--- config/cf/Imake.cf.orig	2004-08-12 06:14:01.000000000 +0900
++++ config/cf/Imake.cf	2004-11-09 03:52:53.000000000 +0900
+@@ -246,6 +246,10 @@
+ #   define PpcArchitecture
+ #   undef __powerpc__
+ # endif
++# ifdef __x86_64__
++#  define AMD64Architecture
++#  undef __x86_64__
++# endif
+ #endif /* NetBSD */
+ 
+ /* Systems based on kernel of NetBSD */
+@@ -253,7 +257,23 @@
+ #define KNetBSDArchitecture
+ #endif
+ 
+-#ifdef __FreeBSD__
++#ifdef __DragonFly__
++# define MacroIncludeFile <DragonFly.cf>
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# define FreeBSDArchitecture
++# define KFreeBSDArchitecture
++# ifdef __i386__
++#  define i386BsdArchitecture
++#  define i386Architecture
++#  undef i386
++# endif
++# ifdef __amd64__
++#  define AMD64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++#elif defined __FreeBSD__
+ # define MacroIncludeFile <FreeBSD.cf>
+ # define MacroFile FreeBSD.cf
+ # undef __FreeBSD__