Mon Nov 14 14:24:14 2011 UTC ()
Revert.


(joerg)
diff -r1.21 -r1.22 pkgsrc/x11/libXfont/Makefile
diff -r1.1 -r0 pkgsrc/x11/libXfont/options.mk
cvs diff -r1.21 -r1.22 pkgsrc/x11/libXfont/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXfont/Makefile 2011/11/14 14:07:35 1.21
+++ pkgsrc/x11/libXfont/Makefile 2011/11/14 14:24:14 1.22
@@ -1,34 +1,32 @@ @@ -1,34 +1,32 @@
1# $NetBSD: Makefile,v 1.21 2011/11/14 14:07:35 cheusov Exp $ 1# $NetBSD: Makefile,v 1.22 2011/11/14 14:24:14 joerg Exp $
2# 2#
3 3
4DISTNAME= libXfont-1.4.4 4DISTNAME= libXfont-1.4.4
5CATEGORIES= x11 devel fonts 5CATEGORIES= x11 devel fonts
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X font Library 11COMMENT= X font Library
12LICENSE= mit AND modified-bsd 12LICENSE= mit AND modified-bsd
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19 19
20PKGCONFIG_OVERRIDE+= xfont.pc.in 20PKGCONFIG_OVERRIDE+= xfont.pc.in
21 21
22CONFIGURE_ARGS+= --disable-devel-docs 22CONFIGURE_ARGS+= --disable-devel-docs
23 23
24.include "options.mk" 
25 
26.include "../../devel/zlib/buildlink3.mk" 24.include "../../devel/zlib/buildlink3.mk"
27.include "../../graphics/freetype2/buildlink3.mk" 25.include "../../graphics/freetype2/buildlink3.mk"
28.include "../../x11/fontcacheproto/buildlink3.mk" 26.include "../../x11/fontcacheproto/buildlink3.mk"
29.include "../../fonts/libfontenc/buildlink3.mk" 27.include "../../fonts/libfontenc/buildlink3.mk"
30.include "../../x11/fontsproto/buildlink3.mk" 28.include "../../x11/fontsproto/buildlink3.mk"
31.include "../../x11/xproto/buildlink3.mk" 29.include "../../x11/xproto/buildlink3.mk"
32.include "../../x11/xtrans/buildlink3.mk" 30.include "../../x11/xtrans/buildlink3.mk"
33 31
34.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/x11/libXfont/Attic/options.mk