Tue Apr 21 21:39:41 2015 UTC ()
Pullup ticket #4676 - requested by tron
net/tigervnc: build fix

Revisions pulled up:
- net/tigervnc/Makefile                                         1.4

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat Apr 18 20:44:47 UTC 2015

   Modified Files:
   	pkgsrc/net/tigervnc: Makefile

   Log Message:
   Needs explicit libdrm dependency.


(tron)
diff -r1.3 -r1.3.2.1 pkgsrc/net/tigervnc/Makefile
cvs diff -r1.3 -r1.3.2.1 pkgsrc/net/tigervnc/Makefile (switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2015/03/22 20:07:46 1.3
+++ pkgsrc/net/tigervnc/Makefile 2015/04/21 21:39:41 1.3.2.1
@@ -1,89 +1,90 @@ @@ -1,89 +1,90 @@
1# $NetBSD: Makefile,v 1.3 2015/03/22 20:07:46 joerg Exp $ 1# $NetBSD: Makefile,v 1.3.2.1 2015/04/21 21:39:41 tron Exp $
2 2
3DISTNAME= tigervnc-1.3.1 3DISTNAME= tigervnc-1.3.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tigervnc/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tigervnc/}
7XORG_SERVER_FILE= xorg-server-1.12.4 7XORG_SERVER_FILE= xorg-server-1.12.4
8SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 8SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://tigervnc.org/ 12HOMEPAGE= http://tigervnc.org/
13COMMENT= High-performance, platform-neutral VNC client/server 13COMMENT= High-performance, platform-neutral VNC client/server
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros 16BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
17BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util 17BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util
18BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 18BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
19 19
20USE_CMAKE= yes 20USE_CMAKE= yes
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
23USE_TOOLS+= msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash 23USE_TOOLS+= msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash
24BUILD_DIRS= . unix/xserver 24BUILD_DIRS= . unix/xserver
25INSTALL_DIRS= . unix/xserver/hw/vnc 25INSTALL_DIRS= . unix/xserver/hw/vnc
26 26
27LDFLAGS+= ${BUILDLINK_LDADD.gettext} 27LDFLAGS+= ${BUILDLINK_LDADD.gettext}
28 28
29CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 29CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
30OVERRIDE_GNU_CONFIG_SCRIPTS= yes 30OVERRIDE_GNU_CONFIG_SCRIPTS= yes
31LIBTOOL_OVERRIDE=unix/xserver/libtool 31LIBTOOL_OVERRIDE=unix/xserver/libtool
32 32
33SUBST_CLASSES+= hpath 33SUBST_CLASSES+= hpath
34SUBST_STAGE.hpath= pre-configure 34SUBST_STAGE.hpath= pre-configure
35SUBST_MESSAGE.hpath= fixing hardcoded paths 35SUBST_MESSAGE.hpath= fixing hardcoded paths
36SUBST_FILES.hpath= unix/vncserver 36SUBST_FILES.hpath= unix/vncserver
37SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 37SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
38SUBST_VARS.hpath+= PREFIX X11BASE 38SUBST_VARS.hpath+= PREFIX X11BASE
39 39
40REPLACE_PERL+= unix/vncserver 40REPLACE_PERL+= unix/vncserver
41 41
42post-extract: 42post-extract:
43 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2 43 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2
44 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver 44 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
45 45
46post-patch: 46post-patch:
47 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver112.patch 47 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver112.patch
48 48
49XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR} 49XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
50XORG_CONFIGURE_ARGS+= --disable-wayland --disable-present --disable-dri3 50XORG_CONFIGURE_ARGS+= --disable-wayland --disable-present --disable-dri3
51XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace 51XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace
52XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx 52XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
53XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror 53XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
54XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --enable-glx --enable-glx-tls 54XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
55 55
56pre-configure: 56pre-configure:
57 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \ 57 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \
58 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \ 58 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \
59 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 59 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
60 ./configure ${XORG_CONFIGURE_ARGS} 60 ./configure ${XORG_CONFIGURE_ARGS}
61 61
62.include "../../mk/jpeg.buildlink3.mk" 62.include "../../mk/jpeg.buildlink3.mk"
63.include "../../converters/libiconv/buildlink3.mk" 63.include "../../converters/libiconv/buildlink3.mk"
64.include "../../devel/gettext-lib/buildlink3.mk" 64.include "../../devel/gettext-lib/buildlink3.mk"
65.include "../../devel/zlib/buildlink3.mk" 65.include "../../devel/zlib/buildlink3.mk"
66.include "../../security/gnutls/buildlink3.mk" 66.include "../../security/gnutls/buildlink3.mk"
67.include "../../security/libgcrypt/buildlink3.mk" 67.include "../../security/libgcrypt/buildlink3.mk"
68.include "../../x11/libXft/buildlink3.mk" 68.include "../../x11/libXft/buildlink3.mk"
69.include "../../x11/libX11/buildlink3.mk" 69.include "../../x11/libX11/buildlink3.mk"
70.include "../../x11/libXcursor/buildlink3.mk" 70.include "../../x11/libXcursor/buildlink3.mk"
71.include "../../x11/libXinerama/buildlink3.mk" 71.include "../../x11/libXinerama/buildlink3.mk"
72.include "../../x11/libXtst/buildlink3.mk" 72.include "../../x11/libXtst/buildlink3.mk"
 73.include "../../x11/libdrm/buildlink3.mk"
73.include "../../x11/fltk13/buildlink3.mk" 74.include "../../x11/fltk13/buildlink3.mk"
74.include "../../x11/pixman/buildlink3.mk" 75.include "../../x11/pixman/buildlink3.mk"
75.include "../../x11/xcmiscproto/buildlink3.mk" 76.include "../../x11/xcmiscproto/buildlink3.mk"
76.include "../../x11/xtrans/buildlink3.mk" 77.include "../../x11/xtrans/buildlink3.mk"
77.include "../../x11/bigreqsproto/buildlink3.mk" 78.include "../../x11/bigreqsproto/buildlink3.mk"
78.include "../../x11/compositeproto/buildlink3.mk" 79.include "../../x11/compositeproto/buildlink3.mk"
79.include "../../x11/damageproto/buildlink3.mk" 80.include "../../x11/damageproto/buildlink3.mk"
80.include "../../x11/dri2proto/buildlink3.mk" 81.include "../../x11/dri2proto/buildlink3.mk"
81.include "../../x11/libXfont/buildlink3.mk" 82.include "../../x11/libXfont/buildlink3.mk"
82.include "../../x11/libxkbfile/buildlink3.mk" 83.include "../../x11/libxkbfile/buildlink3.mk"
83.include "../../x11/randrproto/buildlink3.mk" 84.include "../../x11/randrproto/buildlink3.mk"
84.include "../../x11/fontsproto/buildlink3.mk" 85.include "../../x11/fontsproto/buildlink3.mk"
85.include "../../x11/glproto/buildlink3.mk" 86.include "../../x11/glproto/buildlink3.mk"
86.include "../../x11/resourceproto/buildlink3.mk" 87.include "../../x11/resourceproto/buildlink3.mk"
87.include "../../x11/scrnsaverproto/buildlink3.mk" 88.include "../../x11/scrnsaverproto/buildlink3.mk"
88.include "../../x11/videoproto/buildlink3.mk" 89.include "../../x11/videoproto/buildlink3.mk"
89.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"