Thu Mar 19 13:24:13 2015 UTC ()
Needs libintl.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/net/tigervnc/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2015/02/08 19:42:09 1.1
+++ pkgsrc/net/tigervnc/Makefile 2015/03/19 13:24:13 1.2
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1# $NetBSD: Makefile,v 1.1 2015/02/08 19:42:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2015/03/19 13:24:13 jperkin Exp $
2 2
3DISTNAME= tigervnc-1.3.1 3DISTNAME= tigervnc-1.3.1
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tigervnc/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tigervnc/}
6XORG_SERVER_FILE= xorg-server-1.12.4 6XORG_SERVER_FILE= xorg-server-1.12.4
7SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 7SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://tigervnc.org/ 11HOMEPAGE= http://tigervnc.org/
12COMMENT= High-performance, platform-neutral VNC client/server 12COMMENT= High-performance, platform-neutral VNC client/server
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros 15BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
16BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util 16BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util
17BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 17BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
18 18
19USE_CMAKE= yes 19USE_CMAKE= yes
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_TOOLS+= msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash 22USE_TOOLS+= msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash
23BUILD_DIRS= . unix/xserver 23BUILD_DIRS= . unix/xserver
24INSTALL_DIRS= . unix/xserver/hw/vnc 24INSTALL_DIRS= . unix/xserver/hw/vnc
25 25
 26LDFLAGS+= ${BUILDLINK_LDADD.gettext}
 27
26CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 28CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
27OVERRIDE_GNU_CONFIG_SCRIPTS= yes 29OVERRIDE_GNU_CONFIG_SCRIPTS= yes
28LIBTOOL_OVERRIDE=unix/xserver/libtool 30LIBTOOL_OVERRIDE=unix/xserver/libtool
29 31
30SUBST_CLASSES+= hpath 32SUBST_CLASSES+= hpath
31SUBST_STAGE.hpath= pre-configure 33SUBST_STAGE.hpath= pre-configure
32SUBST_MESSAGE.hpath= fixing hardcoded paths 34SUBST_MESSAGE.hpath= fixing hardcoded paths
33SUBST_FILES.hpath= unix/vncserver 35SUBST_FILES.hpath= unix/vncserver
34SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 36SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
35SUBST_VARS.hpath+= PREFIX X11BASE 37SUBST_VARS.hpath+= PREFIX X11BASE
36 38
37REPLACE_PERL+= unix/vncserver 39REPLACE_PERL+= unix/vncserver
38 40
@@ -48,26 +50,27 @@ XORG_CONFIGURE_ARGS+= --disable-wayland  @@ -48,26 +50,27 @@ XORG_CONFIGURE_ARGS+= --disable-wayland
48XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace 50XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace
49XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx 51XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
50XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror 52XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
51XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --enable-glx --enable-glx-tls 53XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
52 54
53pre-configure: 55pre-configure:
54 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \ 56 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \
55 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \ 57 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \
56 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 58 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
57 ./configure ${XORG_CONFIGURE_ARGS} 59 ./configure ${XORG_CONFIGURE_ARGS}
58 60
59.include "../../mk/jpeg.buildlink3.mk" 61.include "../../mk/jpeg.buildlink3.mk"
60.include "../../converters/libiconv/buildlink3.mk" 62.include "../../converters/libiconv/buildlink3.mk"
 63.include "../../devel/gettext-lib/buildlink3.mk"
61.include "../../devel/zlib/buildlink3.mk" 64.include "../../devel/zlib/buildlink3.mk"
62.include "../../security/gnutls/buildlink3.mk" 65.include "../../security/gnutls/buildlink3.mk"
63.include "../../security/libgcrypt/buildlink3.mk" 66.include "../../security/libgcrypt/buildlink3.mk"
64.include "../../x11/libXft/buildlink3.mk" 67.include "../../x11/libXft/buildlink3.mk"
65.include "../../x11/libX11/buildlink3.mk" 68.include "../../x11/libX11/buildlink3.mk"
66.include "../../x11/libXcursor/buildlink3.mk" 69.include "../../x11/libXcursor/buildlink3.mk"
67.include "../../x11/libXinerama/buildlink3.mk" 70.include "../../x11/libXinerama/buildlink3.mk"
68.include "../../x11/libXtst/buildlink3.mk" 71.include "../../x11/libXtst/buildlink3.mk"
69.include "../../x11/fltk13/buildlink3.mk" 72.include "../../x11/fltk13/buildlink3.mk"
70.include "../../x11/pixman/buildlink3.mk" 73.include "../../x11/pixman/buildlink3.mk"
71.include "../../x11/xcmiscproto/buildlink3.mk" 74.include "../../x11/xcmiscproto/buildlink3.mk"
72.include "../../x11/xtrans/buildlink3.mk" 75.include "../../x11/xtrans/buildlink3.mk"
73.include "../../x11/bigreqsproto/buildlink3.mk" 76.include "../../x11/bigreqsproto/buildlink3.mk"