Sat Oct 27 17:43:32 2012 UTC ()
Do not set vendor, since some code checks for vendor-specific workarounds
and we do not want to have to add cases for pkgsrc.
Bump PKGREVISION.


(wiz)
diff -r1.70 -r1.71 pkgsrc/x11/modular-xorg-server/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2012/10/23 10:24:20 1.70
+++ pkgsrc/x11/modular-xorg-server/Makefile 2012/10/27 17:43:28 1.71
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.70 2012/10/23 10:24:20 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2012/10/27 17:43:28 wiz Exp $
2# 2#
3 3
4DISTNAME= xorg-server-1.6.5 4DISTNAME= xorg-server-1.6.5
5PKGNAME= modular-${DISTNAME} 5PKGNAME= modular-${DISTNAME}
6PKGREVISION= 12 6PKGREVISION= 13
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://xorg.freedesktop.org/ 12HOMEPAGE= http://xorg.freedesktop.org/
13COMMENT= Modular X11 server from modular X.org 13COMMENT= Modular X11 server from modular X.org
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 16SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
@@ -32,40 +32,37 @@ XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX @@ -32,40 +32,37 @@ XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX
32CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 32CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
33CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 33CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
34 34
35.if !empty(USE_TOOLS:Mauto*) 35.if !empty(USE_TOOLS:Mauto*)
36BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 36BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
37.endif 37.endif
38 38
39DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 39DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
40DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 40DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
41 41
42.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
43 43
44CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q} 44CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q}
45CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation" 
46CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc" 
47.if ${OPSYS} == "NetBSD" 45.if ${OPSYS} == "NetBSD"
48CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 46CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
49CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 47CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
50.endif 48.endif
51.if ${OPSYS} == "NetBSD" 49.if ${OPSYS} == "NetBSD"
52CONFIGURE_ARGS+= --without-dtrace 50CONFIGURE_ARGS+= --without-dtrace
53.endif 51.endif
54.if ${OPSYS} == "FreeBSD" 52.if ${OPSYS} == "FreeBSD"
55CONFIGURE_ARGS+= --without-dtrace 53CONFIGURE_ARGS+= --without-dtrace
56.endif 54.endif
57CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 55CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
58CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/" 
59 56
60CONFIGURE_ARGS+= --enable-xorg 57CONFIGURE_ARGS+= --enable-xorg
61 58
62CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11 59CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11
63 60
64LEGACY_FONT_PATH= 61LEGACY_FONT_PATH=
65DEFAULT_FONT_PATH= 62DEFAULT_FONT_PATH=
66.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic 63.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic
67DEFAULT_FONT_PATH+= ${PREFIX}/share/fonts/X11/${f} 64DEFAULT_FONT_PATH+= ${PREFIX}/share/fonts/X11/${f}
68LEGACY_FONT_PATH+= ${PREFIX}/lib/X11/fonts/${f} 65LEGACY_FONT_PATH+= ${PREFIX}/lib/X11/fonts/${f}
69.endfor 66.endfor
70FONT_PATH= ${DEFAULT_FONT_PATH} ${LEGACY_FONT_PATH} 67FONT_PATH= ${DEFAULT_FONT_PATH} ${LEGACY_FONT_PATH}
71 68