summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2005-05-23 20:53:27 +0000
committerxtraeme <xtraeme>2005-05-23 20:53:27 +0000
commit94fc8c56775f050a8ebd696bf4161d801329b03c (patch)
tree2a8ff463e14b007baa8a11263fb296c338331a3f
parentbbaabe3278ca25d95cdc3d82266a74afdf2606a1 (diff)
downloadpkgsrc-94fc8c56775f050a8ebd696bf4161d801329b03c.tar.gz
* 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.
Diffstat
-rw-r--r--fonts/xorg-fonts100dpi/Makefile7
-rw-r--r--fonts/xorg-fonts100dpi/distinfo5
-rw-r--r--fonts/xorg-fonts75dpi/Makefile7
-rw-r--r--fonts/xorg-fonts75dpi/distinfo5
-rw-r--r--fonts/xorg-fontsCyrillic/Makefile7
-rw-r--r--fonts/xorg-fontsCyrillic/distinfo5
-rw-r--r--fonts/xorg-fontsEncodings/Makefile6
-rw-r--r--fonts/xorg-fontsEncodings/Makefile.common14
-rw-r--r--fonts/xorg-fontsEncodings/distinfo3
-rw-r--r--fonts/xorg-fontsEncodings/patches/patch-aa40
-rw-r--r--fonts/xorg-fontsMisc/Makefile7
-rw-r--r--fonts/xorg-fontsMisc/distinfo5
-rw-r--r--fonts/xorg-fontsTruetype/Makefile7
-rw-r--r--fonts/xorg-fontsTruetype/distinfo5
-rw-r--r--fonts/xorg-fontsType1/Makefile7
-rw-r--r--fonts/xorg-fontsType1/distinfo5
16 files changed, 70 insertions, 65 deletions
diff --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile
index d181ccba18c..7950e62bda6 100644
--- a/fonts/xorg-fonts100dpi/Makefile
+++ b/fonts/xorg-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/23 20:53:27 xtraeme Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fonts100dpi-${XORG_VER}
@@ -9,14 +9,11 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org 100dpi bitmap fonts
-BUILD_DEPENDS= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
XBUILD_DIRS= fonts/encodings fonts/bdf/100dpi
XINSTALL_DIRS= fonts/bdf/100dpi
XEXTRACTS= ${XBUILD_DIRS} fonts/bdf/75dpi/Imakefile.inc
-FILESDIR= ${.CURDIR}/../../fonts/xorg-fontsEncodings/files
-
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fonts100dpi/distinfo b/fonts/xorg-fonts100dpi/distinfo
deleted file mode 100644
index 37199a2536c..00000000000
--- a/fonts/xorg-fonts100dpi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:10 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
diff --git a/fonts/xorg-fonts75dpi/Makefile b/fonts/xorg-fonts75dpi/Makefile
index 39456eec140..f2a919cd2c4 100644
--- a/fonts/xorg-fonts75dpi/Makefile
+++ b/fonts/xorg-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/23 20:53:27 xtraeme Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fonts75dpi-${XORG_VER}
@@ -9,14 +9,11 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org 75dpi bitmap fonts
-BUILD_DEPENDS= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
XBUILD_DIRS= fonts/encodings fonts/bdf/75dpi
XINSTALL_DIRS= fonts/bdf/75dpi
XEXTRACTS= ${XBUILD_DIRS}
-FILESDIR= ${.CURDIR}/../../fonts/xorg-fontsEncodings/files
-
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fonts75dpi/distinfo b/fonts/xorg-fonts75dpi/distinfo
deleted file mode 100644
index 37199a2536c..00000000000
--- a/fonts/xorg-fonts75dpi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:10 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
diff --git a/fonts/xorg-fontsCyrillic/Makefile b/fonts/xorg-fontsCyrillic/Makefile
index 1e016f1a253..b70c34f8100 100644
--- a/fonts/xorg-fontsCyrillic/Makefile
+++ b/fonts/xorg-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/23 20:53:27 xtraeme Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsCyrillic-${XORG_VER}
@@ -9,14 +9,11 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org Cyrillic bitmap fonts
-BUILD_DEPENDS= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
XBUILD_DIRS= fonts/encodings fonts/bdf/cyrillic
XINSTALL_DIRS= fonts/bdf/cyrillic
XEXTRACTS= ${XBUILD_DIRS}
-FILESDIR= ${.CURDIR}/../../fonts/xorg-fontsEncodings/files
-
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsCyrillic/distinfo b/fonts/xorg-fontsCyrillic/distinfo
deleted file mode 100644
index a0f24e38cae..00000000000
--- a/fonts/xorg-fontsCyrillic/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:11 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
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__
diff --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile
index 12f5347e01d..722fa237f9c 100644
--- a/fonts/xorg-fontsMisc/Makefile
+++ b/fonts/xorg-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/30 20:40:31 hira Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/23 20:53:28 xtraeme Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsMisc-${XORG_VER}
@@ -9,14 +9,11 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org miscellaneous bitmap fonts
-BUILD_DEPENDS= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
XBUILD_DIRS= fonts/encodings fonts/bdf/misc
XINSTALL_DIRS= fonts/bdf/misc
XEXTRACTS= ${XBUILD_DIRS} extras/fonts
-FILESDIR= ${.CURDIR}/../../fonts/xorg-fontsEncodings/files
-
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsMisc/distinfo b/fonts/xorg-fontsMisc/distinfo
deleted file mode 100644
index a0f24e38cae..00000000000
--- a/fonts/xorg-fontsMisc/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:11 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
diff --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile
index 5e96034c6f0..f702d22e0c6 100644
--- a/fonts/xorg-fontsTruetype/Makefile
+++ b/fonts/xorg-fontsTruetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/30 20:40:31 hira Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/23 20:53:28 xtraeme Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsTruetype-${XORG_VER}
@@ -9,7 +9,6 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org Truetype fonts
-BUILD_DEPENDS= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
BUILD_DEPENDS+= fontconfig-[0-9]*:../../fonts/fontconfig
DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
@@ -17,8 +16,6 @@ XBUILD_DIRS= fonts/encodings fonts/scaled/TTF
XINSTALL_DIRS= fonts/scaled/TTF
XEXTRACTS= ${XBUILD_DIRS} extras/fonts
-FILESDIR= ${.CURDIR}/../../fonts/xorg-fontsEncodings/files
-
SUBST_CLASSES+= font
SUBST_STAGE.font= post-patch
SUBST_FILES.font= config/cf/X11.tmpl
@@ -30,5 +27,5 @@ SUBST_STAGE.TTF= post-configure
SUBST_FILES.TTF= fonts/scaled/TTF/Makefile
SUBST_SED.TTF= -e "s,/usr/X11R6,${LOCALBASE},g"
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsTruetype/distinfo b/fonts/xorg-fontsTruetype/distinfo
deleted file mode 100644
index a0f24e38cae..00000000000
--- a/fonts/xorg-fontsTruetype/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:11 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
diff --git a/fonts/xorg-fontsType1/Makefile b/fonts/xorg-fontsType1/Makefile
index af0e7902a2a..bc23dcaa55b 100644
--- a/fonts/xorg-fontsType1/Makefile
+++ b/fonts/xorg-fontsType1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/30 20:40:32 hira Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/23 20:53:28 xtraeme Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsType1-${XORG_VER}
@@ -9,15 +9,12 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org Type1 fonts
-BUILD_DEPENDS= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
XBUILD_DIRS= fonts/encodings fonts/scaled/Type1
XINSTALL_DIRS= fonts/scaled/Type1
XEXTRACTS= ${XBUILD_DIRS}
-FILESDIR= ${.CURDIR}/../../fonts/xorg-fontsEncodings/files
-
SUBST_CLASSES+= font
SUBST_STAGE.font= post-patch
SUBST_FILES.font= config/cf/X11.tmpl
@@ -29,5 +26,5 @@ SUBST_STAGE.scaled= post-configure
SUBST_FILES.scaled= fonts/scaled/Type1/Makefile
SUBST_SED.scaled= -e "s,/usr/X11R6,${LOCALBASE},g"
-.include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsType1/distinfo b/fonts/xorg-fontsType1/distinfo
deleted file mode 100644
index a0f24e38cae..00000000000
--- a/fonts/xorg-fontsType1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/01 19:00:11 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 13:07:31 +0000