diff options
| -rw-r--r-- | fonts/xorg-fontserver/Makefile | 6 | ||||
| -rw-r--r-- | fonts/xorg-fontserver/PLIST | 3 | ||||
| -rw-r--r-- | x11/xorg-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-bn | 13 |
4 files changed, 21 insertions, 4 deletions
diff --git a/fonts/xorg-fontserver/Makefile b/fonts/xorg-fontserver/Makefile index 6bdce1e0be7..ee40db73dca 100644 --- a/fonts/xorg-fontserver/Makefile +++ b/fonts/xorg-fontserver/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2006/02/12 15:29:18 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2006/04/12 21:53:58 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-fontserver-${XORG_VER} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= fonts x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \ @@ -12,6 +12,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org font server +USE_TOOLS+= imake + DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches diff --git a/fonts/xorg-fontserver/PLIST b/fonts/xorg-fontserver/PLIST index 7ee2ef2bfd0..a8b6f9484c5 100644 --- a/fonts/xorg-fontserver/PLIST +++ b/fonts/xorg-fontserver/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 05:00:46 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/04/12 21:53:58 joerg Exp $ ${X11ROOT_PREFIX}/bin/xfs ${X11ROOT_PREFIX}/lib/X11/fs/config ${X11ROOT_PREFIX}/${MAN_DIR}/xfs.${MAN_SUFFIX} +@dirrm ${X11ROOT_PREFIX}/lib/X11/fs diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index ddc3931431c..72a7c7b6958 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.38 2006/03/20 21:34:59 joerg Exp $ +$NetBSD: distinfo,v 1.39 2006/04/12 21:53:58 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -44,3 +44,4 @@ SHA1 (patch-bf) = 753c56b84a6859fa4048d88a53f9c04400525d72 SHA1 (patch-bg) = 3db63fcbe81d9f801ccac6353ad4a213a15c3ffe SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860 +SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c diff --git a/x11/xorg-libs/patches/patch-bn b/x11/xorg-libs/patches/patch-bn new file mode 100644 index 00000000000..224e67d63ff --- /dev/null +++ b/x11/xorg-libs/patches/patch-bn @@ -0,0 +1,13 @@ +$NetBSD: patch-bn,v 1.4 2006/04/12 21:53:58 joerg Exp $ + +--- programs/xfs/Imakefile.orig 2006-04-12 21:45:29.000000000 +0000 ++++ programs/xfs/Imakefile +@@ -51,8 +51,6 @@ ServerTarget(xfs,$(FSDIRS),NullParameter + ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(FSSYSLIBS) $(EXTRA_LIBRARIES)) + #endif + +-LinkConfDirectory(fs,.,fs,.) +- + CppFileTarget(config,config.cpp,$(SITE_CONFIG),$(ICONFIGFILES)) + + InstallManPage(xfs,$(MANDIR)) |