pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tigervnc: remove, net/tigervnc is newer



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Jan 24 09:26:23 2017 +0100
Changeset:	a1475c9a11e1a1692bac24d1b9427fbf674be921

Modified Files:
	Makefile
Removed Files:
	tigervnc/DESCR
	tigervnc/Makefile
	tigervnc/PLIST
	tigervnc/TODO
	tigervnc/distinfo
	tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Input.c
	tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Makefile.am
	tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_xorg-version.h
	tigervnc/patches/patch-tigervnc-1.6.0_vncviewer_CMakeLists.txt

Log Message:
tigervnc: remove, net/tigervnc is newer

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a1475c9a11e1a1692bac24d1b9427fbf674be921

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   1 -
 tigervnc/DESCR                                     |   7 --
 tigervnc/Makefile                                  | 101 ---------------------
 tigervnc/PLIST                                     |  32 -------
 tigervnc/TODO                                      |   1 -
 tigervnc/distinfo                                  |  14 ---
 ...atch-tigervnc-1.6.0_unix_xserver_hw_vnc_Input.c |  13 ---
 ...-tigervnc-1.6.0_unix_xserver_hw_vnc_Makefile.am |  20 ----
 ...gervnc-1.6.0_unix_xserver_hw_vnc_xorg-version.h |  16 ----
 .../patch-tigervnc-1.6.0_vncviewer_CMakeLists.txt  |  13 ---
 10 files changed, 218 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index e496424..01ef1eb 100644
--- a/Makefile
+++ b/Makefile
@@ -4122,7 +4122,6 @@ SUBDIR+=	thepeg
 SUBDIR+=	threadingbuildingblocks
 SUBDIR+=	thrift
 SUBDIR+=	tidy
-SUBDIR+=	tigervnc
 SUBDIR+=	tilda
 SUBDIR+=	timewarrior
 SUBDIR+=	tinyca2
diff --git a/tigervnc/DESCR b/tigervnc/DESCR
deleted file mode 100644
index 7fe9a4b..0000000
--- a/tigervnc/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual
-Network Computing), a client/server application that allows users to launch and
-interact with graphical applications on remote machines. TigerVNC provides the
-levels of performance necessary to run 3D and video applications, and it
-attempts to maintain a common look and feel and re-use components, where
-possible, across the various platforms that it supports. TigerVNC also provides
-extensions for advanced authentication methods and TLS encryption.
diff --git a/tigervnc/Makefile b/tigervnc/Makefile
deleted file mode 100644
index d82456b..0000000
--- a/tigervnc/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	tigervnc-1.6.0
-PKGREVISION=	6
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GITHUB:=TigerVNC/}
-
-COMMENT=	VNC server and client with TLS, RandR, and shared clipboard
-HOMEPAGE=	http://tigervnc.org/
-MAINTAINER=	dominik.muth%gmx.de@localhost
-LICENSE=	gnu-gpl-v2
-GITHUB_PROJECT=	TigerVNC
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-TIGERVNC_XORGVERSION=	1.18.1
-DISTFILE_XORG=	xorg-server-${TIGERVNC_XORGVERSION}.tar.gz
-DISTFILES=	${DEFAULT_DISTFILES} ${DISTFILE_XORG}
-SITES.${DISTFILE_XORG}= ${MASTER_SITE_XORG:=xserver/}
-
-CONFLICTS=	vnc-[0-9]* vncviewer-[0-9]* tightvnc-[0-9]*
-
-USE_CMAKE=	yes
-USE_LIBTOOL=	yes
-USE_LANGUAGES= 	c c++
-USE_TOOLS+=	autoconf automake autoreconf gmake msgfmt patch perl:run pkg-config tar
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-	cd ${WRKSRC} && \
-		${TAR} zxf ${DISTDIR}/${DEFAULT_DISTFILES}
-	cd ${WRKSRC} && \
-		${TAR} zxf ${DISTDIR}/xorg-server-${TIGERVNC_XORGVERSION}.tar.gz
-	cd ${WRKSRC} && \
-		cp -R xorg-server-${TIGERVNC_XORGVERSION}/* ${DISTNAME}/unix/xserver/
-	cd ${WRKSRC}/${DISTNAME}/unix/xserver && \
-		${PATCH} -Np1 -z __shipped -i ../xserver117.patch
-
-CONFIGURE_DIRS=	${DISTNAME}
-CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX}
-
-pre-configure:
-	cd ${WRKSRC}/${DISTNAME}/unix/xserver && \
-		autoreconf -fiv
-	cd ${WRKSRC}/${DISTNAME}/unix/xserver && \
-		env ${CONFIGURE_ENV} \
-			PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig \
-		${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
-			--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR} \
-			--without-dtrace --with-pic \
-			--disable-static --disable-unit-tests \
-			--disable-devel-docs \
-			--disable-selective-werror \
-			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-			--disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \
-			--disable-config-hal --disable-config-udev \
-			--disable-dri --disable-dri2 --disable-dri3 --disable-glx
-
-# BUILD_MAKE_FLAGS+=	-j8
-
-BUILD_DIRS=	${DISTNAME} ${DISTNAME}/unix/xserver
-
-INSTALL_DIRS=	${DISTNAME} ${DISTNAME}/unix/xserver/hw/vnc
-
-post-install:
-	mv ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	rmdir ${DESTDIR}${PREFIX}/share/man/man1
-	rmdir ${DESTDIR}${PREFIX}/share/man
-
-DEPENDS+=	xauth-[0-9]*:../../x11/xauth
-DEPENDS+=	xkbcomp-[0-9]*:../../x11/xkbcomp
-
-PREFER_PKGSRC=	presentproto randrproto
-
-.include	"../../mk/jpeg.buildlink3.mk"
-
-.include	"../../x11/bigreqsproto/buildlink3.mk"
-.include	"../../x11/compositeproto/buildlink3.mk"
-.include	"../../x11/damageproto/buildlink3.mk"
-.include	"../../x11/fltk13/buildlink3.mk"
-.include	"../../fonts/font-util/buildlink3.mk"
-.include	"../../security/gnutls/buildlink3.mk"
-.include	"../../x11/libXdamage/buildlink3.mk"
-.include	"../../x11/libXfont/buildlink3.mk"
-.include	"../../x11/libXtst/buildlink3.mk"
-.include	"../../security/libgcrypt/buildlink3.mk"
-.include	"../../security/openpam/buildlink3.mk"
-.include	"../../x11/pixman/buildlink3.mk"
-.include	"../../graphics/png/buildlink3.mk"
-.include	"../../x11/presentproto/buildlink3.mk"
-.include	"../../x11/randrproto/buildlink3.mk"
-.include	"../../x11/resourceproto/buildlink3.mk"
-.include	"../../x11/scrnsaverproto/buildlink3.mk"
-.include	"../../x11/videoproto/buildlink3.mk"
-.include	"../../x11/xcmiscproto/buildlink3.mk"
-.include	"../../x11/xf86vidmodeproto/buildlink3.mk"
-.include	"../../x11/xkeyboard-config/buildlink3.mk"
-.include	"../../devel/xorg-util-macros/buildlink3.mk"
-.include	"../../x11/xproto/buildlink3.mk"
-.include	"../../x11/xtrans/buildlink3.mk"
-
-.include	"../../mk/bsd.pkg.mk"
diff --git a/tigervnc/PLIST b/tigervnc/PLIST
deleted file mode 100644
index dda8004..0000000
--- a/tigervnc/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD$
-bin/Xvnc
-bin/vncconfig
-bin/vncpasswd
-bin/vncserver
-bin/vncviewer
-bin/x0vncserver
-man/man1/Xvnc.1
-man/man1/vncconfig.1
-man/man1/vncpasswd.1
-man/man1/vncserver.1
-man/man1/vncviewer.1
-man/man1/x0vncserver.1
-share/doc/${PKGNAME}/LICENCE.TXT
-share/doc/${PKGNAME}/README.txt
-share/locale/bg/LC_MESSAGES/tigervnc.mo
-share/locale/da/LC_MESSAGES/tigervnc.mo
-share/locale/de/LC_MESSAGES/tigervnc.mo
-share/locale/el/LC_MESSAGES/tigervnc.mo
-share/locale/eo/LC_MESSAGES/tigervnc.mo
-share/locale/es/LC_MESSAGES/tigervnc.mo
-share/locale/fi/LC_MESSAGES/tigervnc.mo
-share/locale/fr/LC_MESSAGES/tigervnc.mo
-share/locale/it/LC_MESSAGES/tigervnc.mo
-share/locale/nl/LC_MESSAGES/tigervnc.mo
-share/locale/pl/LC_MESSAGES/tigervnc.mo
-share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
-share/locale/ru/LC_MESSAGES/tigervnc.mo
-share/locale/sk/LC_MESSAGES/tigervnc.mo
-share/locale/sv/LC_MESSAGES/tigervnc.mo
-share/locale/tr/LC_MESSAGES/tigervnc.mo
-share/locale/uk/LC_MESSAGES/tigervnc.mo
diff --git a/tigervnc/TODO b/tigervnc/TODO
deleted file mode 100644
index 5bfdc67..0000000
--- a/tigervnc/TODO
+++ /dev/null
@@ -1 +0,0 @@
---enable-glx
diff --git a/tigervnc/distinfo b/tigervnc/distinfo
deleted file mode 100644
index fa5eb5e..0000000
--- a/tigervnc/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-SHA1 (tigervnc-1.6.0.tar.gz) = 2e2edd6a94be18380a8b00b064e268ac892c8070
-RMD160 (tigervnc-1.6.0.tar.gz) = fc2cea59032b5b1c6c8adaf5966221d1a773ccf1
-SHA512 (tigervnc-1.6.0.tar.gz) = b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135
-Size (tigervnc-1.6.0.tar.gz) = 1291089 bytes
-SHA1 (xorg-server-1.18.1.tar.gz) = 73009ea90952bcbc790a76020e4c32beff6c9bad
-RMD160 (xorg-server-1.18.1.tar.gz) = cef7f3ecd1494b88b7898bef0ae425fd7817239b
-SHA512 (xorg-server-1.18.1.tar.gz) = e05ef1f1b6e684019164983d67e879927d449bbaa21e7417040575e57e3aa2fdc01cdc51c9dd500058bce7b416e75e0e0cc989ad9155721e52902c12393b78ee
-Size (xorg-server-1.18.1.tar.gz) = 8186779 bytes
-SHA1 (patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Input.c) = 45cb74c2d1c561cfe6db74f04a312c97144d3212
-SHA1 (patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Makefile.am) = b1c754c87a2332049616281c8c4e4de1b88aaa7a
-SHA1 (patch-tigervnc-1.6.0_unix_xserver_hw_vnc_xorg-version.h) = d4cebca615a8b737ff34bc33266978b5b0ee1c31
-SHA1 (patch-tigervnc-1.6.0_vncviewer_CMakeLists.txt) = e2303cb9399429eb431280c8da632adb7dc59f5f
diff --git a/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Input.c b/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Input.c
deleted file mode 100644
index d93ecbc..0000000
--- a/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Input.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- tigervnc-1.6.0/unix/xserver/hw/vnc/Input.c.orig	2015-12-24 20:18:02.000000000 +0000
-+++ tigervnc-1.6.0/unix/xserver/hw/vnc/Input.c
-@@ -300,6 +300,8 @@ static inline void pressKey(DeviceIntPtr
- #if XORG < 111
- 	n = GetKeyboardEvents(eventq, dev, action, kc);
- 	enqueueEvents(dev, n);
-+#elif XORG > 117
-+	QueueKeyboardEvents(dev, action, kc);
- #else
- 	QueueKeyboardEvents(dev, action, kc, NULL);
- #endif
diff --git a/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Makefile.am b/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Makefile.am
deleted file mode 100644
index 9518257..0000000
--- a/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- tigervnc-1.6.0/unix/xserver/hw/vnc/Makefile.am.orig	2015-12-24 20:18:02.000000000 +0000
-+++ tigervnc-1.6.0/unix/xserver/hw/vnc/Makefile.am
-@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la
- NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
- XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
-+OS_LIB=$(LIB_DIR)/os/libos.la
- COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
- noinst_LTLIBRARIES = libvnccommon.la
-@@ -64,6 +65,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 
- libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
--libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
-+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
- 
- EXTRA_DIST = Xvnc.man
diff --git a/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_xorg-version.h b/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_xorg-version.h
deleted file mode 100644
index d155184..0000000
--- a/tigervnc/patches/patch-tigervnc-1.6.0_unix_xserver_hw_vnc_xorg-version.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- tigervnc-1.6.0/unix/xserver/hw/vnc/xorg-version.h.orig	2015-12-24 20:18:02.000000000 +0000
-+++ tigervnc-1.6.0/unix/xserver/hw/vnc/xorg-version.h
-@@ -48,8 +48,10 @@
- #define XORG 116
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
- #define XORG 117
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
-+#define XORG 118
- #else
--#error "X.Org newer than 1.17 is not supported"
-+#error "X.Org newer than 1.18 is not supported"
- #endif
- 
- #endif
diff --git a/tigervnc/patches/patch-tigervnc-1.6.0_vncviewer_CMakeLists.txt b/tigervnc/patches/patch-tigervnc-1.6.0_vncviewer_CMakeLists.txt
deleted file mode 100644
index 7662b94..0000000
--- a/tigervnc/patches/patch-tigervnc-1.6.0_vncviewer_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- tigervnc-1.6.0/vncviewer/CMakeLists.txt.orig	2016-03-03 22:05:49.000000000 +0000
-+++ tigervnc-1.6.0/vncviewer/CMakeLists.txt
-@@ -46,7 +46,7 @@ else()
-   add_executable(vncviewer ${VNCVIEWER_SOURCES})
- endif()
- 
--target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
-+target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES} png16)
- 
- if(APPLE)
-   target_link_libraries(vncviewer "-framework Cocoa" "-framework Carbon")


Home | Main Index | Thread Index | Old Index